diff options
| -rw-r--r-- | src/App.native.tsx | 32 | ||||
| -rw-r--r-- | src/App.web.tsx | 22 | ||||
| -rw-r--r-- | src/state/session/index.tsx | 23 | ||||
| -rw-r--r-- | src/state/session/types.ts | 2 |
4 files changed, 43 insertions, 36 deletions
diff --git a/src/App.native.tsx b/src/App.native.tsx index ac6c2e83d..dc1ccda6d 100644 --- a/src/App.native.tsx +++ b/src/App.native.tsx @@ -16,6 +16,7 @@ import {useLingui} from '@lingui/react' import {useQueryClient} from '@tanstack/react-query' import {Provider as StatsigProvider} from '#/lib/statsig/statsig' +import {logger} from '#/logger' import {init as initPersistedState} from '#/state/persisted' import {Provider as LabelDefsProvider} from '#/state/preferences/label-defs' import {Provider as ModerationOptsProvider} from '#/state/preferences/moderation-opts' @@ -34,6 +35,7 @@ import {Provider as PrefsStateProvider} from 'state/preferences' import {Provider as UnreadNotifsProvider} from 'state/queries/notifications/unread' import { Provider as SessionProvider, + SessionAccount, useSession, useSessionApi, } from 'state/session' @@ -53,8 +55,9 @@ import {listenSessionDropped} from './state/events' SplashScreen.preventAutoHideAsync() function InnerApp() { - const {isInitialLoad, currentAccount} = useSession() - const {resumeSession} = useSessionApi() + const [isReady, setIsReady] = React.useState(false) + const {currentAccount} = useSession() + const {initSession} = useSessionApi() const theme = useColorModeTheme() const {_} = useLingui() @@ -62,18 +65,31 @@ function InnerApp() { // init useEffect(() => { - listenSessionDropped(() => { - Toast.show(_(msg`Sorry! Your session expired. Please log in again.`)) - }) - + async function resumeSession(account?: SessionAccount) { + try { + if (account) { + await initSession(account) + } + } catch (e) { + logger.error(`session: resumeSession failed`, {message: e}) + } finally { + setIsReady(true) + } + } const account = readLastActiveAccount() resumeSession(account) - }, [resumeSession, _]) + }, [initSession]) + + useEffect(() => { + return listenSessionDropped(() => { + Toast.show(_(msg`Sorry! Your session expired. Please log in again.`)) + }) + }, [_]) return ( <SafeAreaProvider initialMetrics={initialWindowMetrics}> <Alf theme={theme}> - <Splash isReady={!isInitialLoad}> + <Splash isReady={isReady}> <React.Fragment // Resets the entire tree below when it changes: key={currentAccount?.did}> diff --git a/src/App.web.tsx b/src/App.web.tsx index bc9cd01f1..cf28421c9 100644 --- a/src/App.web.tsx +++ b/src/App.web.tsx @@ -6,6 +6,7 @@ import {RootSiblingParent} from 'react-native-root-siblings' import {SafeAreaProvider} from 'react-native-safe-area-context' import {Provider as StatsigProvider} from '#/lib/statsig/statsig' +import {logger} from '#/logger' import {init as initPersistedState} from '#/state/persisted' import {Provider as LabelDefsProvider} from '#/state/preferences/label-defs' import {Provider as ModerationOptsProvider} from '#/state/preferences/moderation-opts' @@ -22,6 +23,7 @@ import {Provider as PrefsStateProvider} from 'state/preferences' import {Provider as UnreadNotifsProvider} from 'state/queries/notifications/unread' import { Provider as SessionProvider, + SessionAccount, useSession, useSessionApi, } from 'state/session' @@ -36,19 +38,31 @@ import {Provider as PortalProvider} from '#/components/Portal' import I18nProvider from './locale/i18nProvider' function InnerApp() { - const {isInitialLoad, currentAccount} = useSession() - const {resumeSession} = useSessionApi() + const [isReady, setIsReady] = React.useState(false) + const {currentAccount} = useSession() + const {initSession} = useSessionApi() const theme = useColorModeTheme() useIntentHandler() // init useEffect(() => { + async function resumeSession(account?: SessionAccount) { + try { + if (account) { + await initSession(account) + } + } catch (e) { + logger.error(`session: resumeSession failed`, {message: e}) + } finally { + setIsReady(true) + } + } const account = readLastActiveAccount() resumeSession(account) - }, [resumeSession]) + }, [initSession]) // wait for session to resume - if (isInitialLoad) return null + if (!isReady) return null return ( <Alf theme={theme}> diff --git a/src/state/session/index.tsx b/src/state/session/index.tsx index 582680e97..64f3837c7 100644 --- a/src/state/session/index.tsx +++ b/src/state/session/index.tsx @@ -35,7 +35,6 @@ const PUBLIC_BSKY_AGENT = new BskyAgent({service: PUBLIC_BSKY_SERVICE}) configureModerationForGuest() const StateContext = React.createContext<SessionStateContext>({ - isInitialLoad: true, isSwitchingAccounts: false, accounts: [], currentAccount: undefined, @@ -47,7 +46,6 @@ const ApiContext = React.createContext<SessionApiContext>({ login: async () => {}, logout: async () => {}, initSession: async () => {}, - resumeSession: async () => {}, removeAccount: () => {}, selectAccount: async () => {}, updateCurrentAccount: () => {}, @@ -67,7 +65,6 @@ type State = { } export function Provider({children}: React.PropsWithChildren<{}>) { - const [isInitialLoad, setIsInitialLoad] = React.useState(true) const [isSwitchingAccounts, setIsSwitchingAccounts] = React.useState(false) const [state, setState] = React.useState<State>({ accounts: persisted.get('session').accounts, @@ -389,21 +386,6 @@ export function Provider({children}: React.PropsWithChildren<{}>) { [upsertAccount, clearCurrentAccount, createPersistSessionHandler], ) - const resumeSession = React.useCallback<SessionApiContext['resumeSession']>( - async account => { - try { - if (account) { - await initSession(account) - } - } catch (e) { - logger.error(`session: resumeSession failed`, {message: e}) - } finally { - setIsInitialLoad(false) - } - }, - [initSession], - ) - const removeAccount = React.useCallback<SessionApiContext['removeAccount']>( account => { setState(s => { @@ -547,11 +529,10 @@ export function Provider({children}: React.PropsWithChildren<{}>) { currentAccount: state.accounts.find( a => a.did === state.currentAccountDid, ), - isInitialLoad, isSwitchingAccounts, hasSession: !!state.currentAccountDid, }), - [state, isInitialLoad, isSwitchingAccounts], + [state, isSwitchingAccounts], ) const api = React.useMemo( @@ -560,7 +541,6 @@ export function Provider({children}: React.PropsWithChildren<{}>) { login, logout, initSession, - resumeSession, removeAccount, selectAccount, updateCurrentAccount, @@ -571,7 +551,6 @@ export function Provider({children}: React.PropsWithChildren<{}>) { login, logout, initSession, - resumeSession, removeAccount, selectAccount, updateCurrentAccount, diff --git a/src/state/session/types.ts b/src/state/session/types.ts index fbfac82e9..a2a9f8cf8 100644 --- a/src/state/session/types.ts +++ b/src/state/session/types.ts @@ -6,7 +6,6 @@ export type SessionAccount = PersistedAccount export type SessionStateContext = { accounts: SessionAccount[] currentAccount: SessionAccount | undefined - isInitialLoad: boolean isSwitchingAccounts: boolean hasSession: boolean } @@ -46,7 +45,6 @@ export type SessionApiContext = { */ clearCurrentAccount: () => void initSession: (account: SessionAccount) => Promise<void> - resumeSession: (account?: SessionAccount) => Promise<void> removeAccount: (account: SessionAccount) => void selectAccount: ( account: SessionAccount, |