Put LoginWithPinOrBiometryScreen as overlay on WalletScreenStack (#1101)

ava-labs · Dec 11, 2023 · fb82081 · fb82081
1 parent 697b1e3
commit fb82081
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/packages/core-mobile/app/navigation/AppNavigation.ts b/packages/core-mobile/app/navigation/AppNavigation.ts
@@ -3,8 +3,7 @@ enum Root {
   Onboard = 'Root.Onboard',
   RefreshToken = 'Root.RefreshToken',
   CopyPhraseWarning = 'Root.CopyPhraseWarning',
-  ForgotPin = 'Root.ForgotPin',
-  Login = 'Root.Login'
+  ForgotPin = 'Root.ForgotPin'
 }
 
 enum OnboardScreens {

diff --git a/packages/core-mobile/app/navigation/RootScreenStack.tsx b/packages/core-mobile/app/navigation/RootScreenStack.tsx
@@ -43,14 +43,14 @@ export type RootScreenStackParamList = {
     title: string
     message: string
   }
-  [AppNavigation.Root.Login]: undefined
 }
 
 const RootStack = createStackNavigator<RootScreenStackParamList>()
 
 const WalletScreenStackWithContext: FC = () => {
   const { onExit } = useApplicationContext().appHook
   const { inBackground } = useBgDetect()
+  const walletState = useSelector(selectWalletState)
 
   const doExit = useCallback(() => {
     onExit((confirmExit, cancel) => {
@@ -75,6 +75,7 @@ const WalletScreenStackWithContext: FC = () => {
   return (
     <>
       <WalletScreenStack onExit={doExit} />
+      {walletState === WalletState.INACTIVE && <LoginWithPinOrBiometryScreen />}
 
       {/* This protects from leaking last screen in "recent apps" list.                                 */}
       {/* For Android it is additionally implemented natively in MainActivity.java because react-native */}
@@ -101,7 +102,7 @@ const RootScreenStack: FC = () => {
             animationEnabled: false
           }}
         />
-      ) : walletState === WalletState.ACTIVE ? (
+      ) : (
         <RootStack.Screen
           name={AppNavigation.Root.Wallet}
           component={WalletScreenStackWithContext}
@@ -110,11 +111,6 @@ const RootScreenStack: FC = () => {
             presentation: 'card'
           }}
         />
-      ) : (
-        <RootStack.Screen
-          name={AppNavigation.Root.Login}
-          component={LoginWithPinOrBiometryScreen}
-        />
       )}
       <RootStack.Screen
         name={AppNavigation.Root.RefreshToken}