Compare commits

..

No commits in common. "ef1a25c8c41fd0d2be7af12711c64851631b9226" and "e0cafb20d6d0ebf2113419c4d5adfbe966abefb6" have entirely different histories.

2 changed files with 2 additions and 32 deletions

View File

@ -49,7 +49,7 @@ const ControlsContext = React.createContext<Controls>({
export function Provider({children}: React.PropsWithChildren<{}>) { export function Provider({children}: React.PropsWithChildren<{}>) {
const activeStarterPack = useActiveStarterPack() const activeStarterPack = useActiveStarterPack()
const {hasSession} = useSession() const {hasSession} = useSession()
const shouldShowStarterPack = Boolean(activeStarterPack?.uri) && !hasSession const shouldShowStarterPack = false
const [state, setState] = React.useState<State>({ const [state, setState] = React.useState<State>({
showLoggedOut: shouldShowStarterPack, showLoggedOut: shouldShowStarterPack,
requestedAccountSwitchTo: shouldShowStarterPack requestedAccountSwitchTo: shouldShowStarterPack

View File

@ -24,7 +24,6 @@ enum ScreenState {
S_LoginOrCreateAccount, S_LoginOrCreateAccount,
S_Login, S_Login,
S_CreateAccount, S_CreateAccount,
S_StarterPack,
} }
export {ScreenState as LoggedOutScreenState} export {ScreenState as LoggedOutScreenState}
@ -37,8 +36,6 @@ export function LoggedOut({onDismiss}: {onDismiss?: () => void}) {
const [screenState, setScreenState] = React.useState<ScreenState>(() => { const [screenState, setScreenState] = React.useState<ScreenState>(() => {
if (requestedAccountSwitchTo === 'new') { if (requestedAccountSwitchTo === 'new') {
return ScreenState.S_CreateAccount return ScreenState.S_CreateAccount
} else if (requestedAccountSwitchTo === 'starterpack') {
return ScreenState.S_StarterPack
} else if (requestedAccountSwitchTo != null) { } else if (requestedAccountSwitchTo != null) {
return ScreenState.S_Login return ScreenState.S_Login
} else { } else {
@ -62,34 +59,7 @@ export function LoggedOut({onDismiss}: {onDismiss?: () => void}) {
return ( return (
<View testID="noSessionView" style={[s.hContentRegion, pal.view]}> <View testID="noSessionView" style={[s.hContentRegion, pal.view]}>
<ErrorBoundary> <ErrorBoundary>
{onDismiss && screenState === ScreenState.S_LoginOrCreateAccount ? ( {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 <SplashScreen
onPressSignin={() => { onPressSignin={() => {
setScreenState(ScreenState.S_Login) setScreenState(ScreenState.S_Login)