From 1cca7efa0d7de19feb22ce0964184012f3423106 Mon Sep 17 00:00:00 2001 From: Hailey Date: Fri, 14 Jun 2024 15:59:27 -0700 Subject: [PATCH] fix entry initial state --- src/components/hooks/useStarterPackEntry.ts | 6 ------ src/view/com/auth/LoggedOut.tsx | 20 +++++++++++--------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/src/components/hooks/useStarterPackEntry.ts b/src/components/hooks/useStarterPackEntry.ts index bee4da3142..dc92a0b698 100644 --- a/src/components/hooks/useStarterPackEntry.ts +++ b/src/components/hooks/useStarterPackEntry.ts @@ -7,20 +7,14 @@ export function useStarterPackEntry() { React.useEffect(() => { const url = new URL(window.location.href) - if (url.pathname.startsWith('/start/')) { - console.log('yes sp') const [_, _start, name, rkey] = url.pathname.split('/') - console.log() - if (name && rkey) { setUsedStarterPack({ uri: window.location.href, }) } - } else { - console.log('no sp') } }, [setUsedStarterPack]) diff --git a/src/view/com/auth/LoggedOut.tsx b/src/view/com/auth/LoggedOut.tsx index bf725be889..bce86d3f65 100644 --- a/src/view/com/auth/LoggedOut.tsx +++ b/src/view/com/auth/LoggedOut.tsx @@ -40,15 +40,17 @@ export function LoggedOut({onDismiss}: {onDismiss?: () => void}) { const setMinimalShellMode = useSetMinimalShellMode() const {screen} = useAnalytics() const {requestedAccountSwitchTo} = useLoggedOutView() - const [screenState, setScreenState] = React.useState( - requestedAccountSwitchTo - ? requestedAccountSwitchTo === 'new' - ? ScreenState.S_CreateAccount - : ScreenState.S_Login - : requestedAccountSwitchTo === 'starterpack' - ? ScreenState.S_StarterPack - : ScreenState.S_LoginOrCreateAccount, - ) + const [screenState, setScreenState] = React.useState(() => { + if (requestedAccountSwitchTo === 'new') { + return ScreenState.S_CreateAccount + } else if (requestedAccountSwitchTo === 'starterpack') { + return ScreenState.S_StarterPack + } else if (requestedAccountSwitchTo != null) { + return ScreenState.S_Login + } else { + return ScreenState.S_LoginOrCreateAccount + } + }) const {isMobile} = useWebMediaQueries() const {clearRequestedAccount} = useLoggedOutViewControls() const navigation = useNavigation()