diff options
author | Eric Bailey <git@esb.lol> | 2024-06-03 20:10:43 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-06-04 02:10:43 +0100 |
commit | 3e1f0768916774642516d88254a6cf7a6a82331f (patch) | |
tree | 03204ed91e457eef7082c8cf8e1213bb622e5bdb /src/view/shell/createNativeStackNavigatorWithAuth.tsx | |
parent | de93e8de746f3c8a7b1755aaa034043951371ae0 (diff) | |
download | voidsky-3e1f0768916774642516d88254a6cf7a6a82331f.tar.zst |
[🙅] Disambiguation of the deactivation (#4267)
* Disambiguation of the deactivation * Snapshot crackle pop * Change log context * [🙅] Add status to session state (#4269) * Add status to session state * [🙅] Add new deactivated screen (#4270) * Add new deactivated screen * Update copy, handle logout * Remove icons, adjust padding * [🙅] Add deactivate account dialog (#4290) * Deactivate dialog (cherry picked from commit 33940e2dfe0d710c0665a7f68b198b46f54db4a2) * Factor out dialog, add to delete modal too (cherry picked from commit 47d70f6b74e7d2ea7330fd172499fe91ba41062d) * Update copy, icon (cherry picked from commit e6efabbe78c3f3d9f0f8fb0a06a6a1c4fbfb70a9) * Update copy (cherry picked from commit abb0ce26f6747ab0548f6f12df0dee3c64464852) * Sizing tweaks (cherry picked from commit fc716d5716873f0fddef56496fc48af0614b2e55) * Add a11y label
Diffstat (limited to 'src/view/shell/createNativeStackNavigatorWithAuth.tsx')
-rw-r--r-- | src/view/shell/createNativeStackNavigatorWithAuth.tsx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/view/shell/createNativeStackNavigatorWithAuth.tsx b/src/view/shell/createNativeStackNavigatorWithAuth.tsx index 882fdbe6e..3c611351d 100644 --- a/src/view/shell/createNativeStackNavigatorWithAuth.tsx +++ b/src/view/shell/createNativeStackNavigatorWithAuth.tsx @@ -32,6 +32,7 @@ import { import {isWeb} from 'platform/detection' import {Deactivated} from '#/screens/Deactivated' import {Onboarding} from '#/screens/Onboarding' +import {SignupQueued} from '#/screens/SignupQueued' import {LoggedOut} from '../com/auth/LoggedOut' import {BottomBarWeb} from './bottom-bar/BottomBarWeb' import {DesktopLeftNav} from './desktop/LeftNav' @@ -102,12 +103,15 @@ function NativeStackNavigator({ if ((!PWI_ENABLED || activeRouteRequiresAuth) && !hasSession) { return <LoggedOut /> } - if (hasSession && currentAccount?.deactivated) { - return <Deactivated /> + if (hasSession && currentAccount?.signupQueued) { + return <SignupQueued /> } if (showLoggedOut) { return <LoggedOut onDismiss={() => setShowLoggedOut(false)} /> } + if (currentAccount?.status === 'deactivated') { + return <Deactivated /> + } if (onboardingState.isActive) { return <Onboarding /> } |