Compare commits
2 Commits
e0cafb20d6
...
ef1a25c8c4
Author | SHA1 | Date |
---|---|---|
Ducky | ef1a25c8c4 | |
Ducky | fce6f31006 |
|
@ -49,7 +49,7 @@ const ControlsContext = React.createContext<Controls>({
|
|||
export function Provider({children}: React.PropsWithChildren<{}>) {
|
||||
const activeStarterPack = useActiveStarterPack()
|
||||
const {hasSession} = useSession()
|
||||
const shouldShowStarterPack = false
|
||||
const shouldShowStarterPack = Boolean(activeStarterPack?.uri) && !hasSession
|
||||
const [state, setState] = React.useState<State>({
|
||||
showLoggedOut: shouldShowStarterPack,
|
||||
requestedAccountSwitchTo: shouldShowStarterPack
|
||||
|
|
|
@ -24,6 +24,7 @@ enum ScreenState {
|
|||
S_LoginOrCreateAccount,
|
||||
S_Login,
|
||||
S_CreateAccount,
|
||||
S_StarterPack,
|
||||
}
|
||||
export {ScreenState as LoggedOutScreenState}
|
||||
|
||||
|
@ -36,6 +37,8 @@ export function LoggedOut({onDismiss}: {onDismiss?: () => void}) {
|
|||
const [screenState, setScreenState] = React.useState<ScreenState>(() => {
|
||||
if (requestedAccountSwitchTo === 'new') {
|
||||
return ScreenState.S_CreateAccount
|
||||
} else if (requestedAccountSwitchTo === 'starterpack') {
|
||||
return ScreenState.S_StarterPack
|
||||
} else if (requestedAccountSwitchTo != null) {
|
||||
return ScreenState.S_Login
|
||||
} else {
|
||||
|
@ -59,7 +62,34 @@ export function LoggedOut({onDismiss}: {onDismiss?: () => void}) {
|
|||
return (
|
||||
<View testID="noSessionView" style={[s.hContentRegion, pal.view]}>
|
||||
<ErrorBoundary>
|
||||
{screenState === ScreenState.S_LoginOrCreateAccount ? (
|
||||
{onDismiss && screenState === ScreenState.S_LoginOrCreateAccount ? (
|
||||
<Pressable
|
||||
accessibilityHint={_(msg`Go back`)}
|
||||
accessibilityLabel={_(msg`Go back`)}
|
||||
accessibilityRole="button"
|
||||
style={{
|
||||
position: 'absolute',
|
||||
top: isIOS ? 0 : 20,
|
||||
right: 20,
|
||||
padding: 10,
|
||||
zIndex: 100,
|
||||
backgroundColor: pal.text.color,
|
||||
borderRadius: 100,
|
||||
}}
|
||||
onPress={onPressDismiss}>
|
||||
<FontAwesomeIcon
|
||||
icon="x"
|
||||
size={12}
|
||||
style={{
|
||||
color: String(pal.textInverted.color),
|
||||
}}
|
||||
/>
|
||||
</Pressable>
|
||||
) : null}
|
||||
|
||||
{screenState === ScreenState.S_StarterPack ? (
|
||||
<LandingScreen setScreenState={setScreenState} />
|
||||
) : screenState === ScreenState.S_LoginOrCreateAccount ? (
|
||||
<SplashScreen
|
||||
onPressSignin={() => {
|
||||
setScreenState(ScreenState.S_Login)
|
||||
|
|
Loading…
Reference in New Issue