fix entry initial state

This commit is contained in:
Hailey
2024-06-14 15:59:27 -07:00
parent d90c93e52c
commit 1cca7efa0d
2 changed files with 11 additions and 15 deletions
@@ -7,20 +7,14 @@ export function useStarterPackEntry() {
React.useEffect(() => { React.useEffect(() => {
const url = new URL(window.location.href) const url = new URL(window.location.href)
if (url.pathname.startsWith('/start/')) { if (url.pathname.startsWith('/start/')) {
console.log('yes sp')
const [_, _start, name, rkey] = url.pathname.split('/') const [_, _start, name, rkey] = url.pathname.split('/')
console.log()
if (name && rkey) { if (name && rkey) {
setUsedStarterPack({ setUsedStarterPack({
uri: window.location.href, uri: window.location.href,
}) })
} }
} else {
console.log('no sp')
} }
}, [setUsedStarterPack]) }, [setUsedStarterPack])
+11 -9
View File
@@ -40,15 +40,17 @@ export function LoggedOut({onDismiss}: {onDismiss?: () => void}) {
const setMinimalShellMode = useSetMinimalShellMode() const setMinimalShellMode = useSetMinimalShellMode()
const {screen} = useAnalytics() const {screen} = useAnalytics()
const {requestedAccountSwitchTo} = useLoggedOutView() const {requestedAccountSwitchTo} = useLoggedOutView()
const [screenState, setScreenState] = React.useState<ScreenState>( const [screenState, setScreenState] = React.useState<ScreenState>(() => {
requestedAccountSwitchTo if (requestedAccountSwitchTo === 'new') {
? requestedAccountSwitchTo === 'new' return ScreenState.S_CreateAccount
? ScreenState.S_CreateAccount } else if (requestedAccountSwitchTo === 'starterpack') {
: ScreenState.S_Login return ScreenState.S_StarterPack
: requestedAccountSwitchTo === 'starterpack' } else if (requestedAccountSwitchTo != null) {
? ScreenState.S_StarterPack return ScreenState.S_Login
: ScreenState.S_LoginOrCreateAccount, } else {
) return ScreenState.S_LoginOrCreateAccount
}
})
const {isMobile} = useWebMediaQueries() const {isMobile} = useWebMediaQueries()
const {clearRequestedAccount} = useLoggedOutViewControls() const {clearRequestedAccount} = useLoggedOutViewControls()
const navigation = useNavigation<NavigationProp>() const navigation = useNavigation<NavigationProp>()