Fix missing security alerts scene

Author: swansontec

src/actions/LoginActions.tsx

@@ -25,7 +25,11 @@ import { lstrings } from '../locales/strings'
 import type { WalletCreateItem } from '../selectors/getCreateWalletList'
 import { config } from '../theme/appConfig'
 import type { Dispatch, GetState, ThunkAction } from '../types/reduxTypes'
-import type { EdgeAppSceneProps, NavigationBase } from '../types/routerTypes'
+import type {
+  EdgeAppSceneProps,
+  NavigationBase,
+  RootSceneProps
+} from '../types/routerTypes'
 import { currencyCodesToEdgeAssets } from '../util/CurrencyInfoHelpers'
 import { logActivity } from '../util/logger'
 import { logEvent, trackError } from '../util/tracking'
@@ -52,12 +56,11 @@ const PER_WALLET_TIMEOUT = 5000
 const MIN_CREATE_WALLET_TIMEOUT = 20000
 
 export function initializeAccount(
-  navigation: NavigationBase,
+  navigation: RootSceneProps<'login'>['navigation'],
   account: EdgeAccount
 ): ThunkAction<Promise<void>> {
   return async (dispatch, getState) => {
     const { newAccount } = account
-    const rootNavigation = getRootNavigation(navigation)
 
     // Load all settings upfront so we can navigate immediately after LOGIN
     const [syncedSettings, localSettings] = await Promise.all([
@@ -80,15 +83,15 @@ export function initializeAccount(
     // Navigate immediately - all settings are now in Redux
     if (newAccount) {
       await navigateToNewAccountFlow(
-        rootNavigation,
+        navigation,
         account,
         syncedSettings,
         referralPromise,
         dispatch,
         getState
       )
     } else {
-      navigateToExistingAccountHome(rootNavigation, referralPromise)
+      navigateToExistingAccountHome(navigation, referralPromise)
     }
 
     performance.mark('loginEnd', { detail: { isNewAccount: newAccount } })
@@ -143,6 +146,9 @@ export function initializeAccount(
 
     // Check for security alerts:
     if (hasSecurityAlerts(account)) {
+      // This is not the normal security alerts scene!
+      // Since we only have access to the root navigator,
+      // this scene exists as a peer of the main app:
       navigation.push('securityAlerts')
       hideSurvey = true
     }
@@ -208,7 +214,7 @@ export function initializeAccount(
  * Navigate to wallet creation flow for new accounts.
  */
 async function navigateToNewAccountFlow(
-  rootNavigation: NavigationBase,
+  navigation: RootSceneProps<'login'>['navigation'],
   account: EdgeAccount,
   syncedSettings: SyncedAccountSettings,
   referralPromise: Promise<void>,
@@ -279,7 +285,7 @@ async function navigateToNewAccountFlow(
     )
   }
 
-  rootNavigation.replace('edgeApp', {
+  navigation.replace('edgeApp', {
     screen: 'edgeAppStack',
     params: {
       screen: 'createWalletSelectCryptoNewAccount',
@@ -296,11 +302,11 @@ async function navigateToNewAccountFlow(
  * Navigate to home screen for existing accounts.
  */
 function navigateToExistingAccountHome(
-  rootNavigation: NavigationBase,
+  navigation: RootSceneProps<'login'>['navigation'],
   referralPromise: Promise<void>
 ): void {
   const { defaultScreen } = getDeviceSettings()
-  rootNavigation.replace('edgeApp', {
+  navigation.replace('edgeApp', {
     screen: 'edgeAppStack',
     params: {
       screen: 'edgeTabs',

src/components/Main.tsx

@@ -1280,6 +1280,11 @@ export const Main: React.FC = () => {
                 return <LoginScene {...props} />
               }}
             </RootStack.Screen>
+
+            <RootStack.Screen
+              name="securityAlerts"
+              component={SecurityAlertsScene}
+            />
           </RootStack.Navigator>
           {navigation == null ? null : (
             <DeepLinkingManager navigation={navigation} />

src/components/scenes/LoginScene.tsx

@@ -77,9 +77,7 @@ export const LoginScene: React.FC<Props> = props => {
         context
           .loginWithPIN(YOLO_USERNAME, YOLO_PIN)
           .then(async account => {
-            await dispatch(
-              initializeAccount(navigation as NavigationBase, account)
-            )
+            await dispatch(initializeAccount(navigation, account))
           })
           .catch((error: unknown) => {
             showError(error)
@@ -89,9 +87,7 @@ export const LoginScene: React.FC<Props> = props => {
         context
           .loginWithPassword(YOLO_USERNAME, YOLO_PASSWORD)
           .then(async account => {
-            await dispatch(
-              initializeAccount(navigation as NavigationBase, account)
-            )
+            await dispatch(initializeAccount(navigation, account))
           })
           .catch((error: unknown) => {
             showError(error)
@@ -110,9 +106,7 @@ export const LoginScene: React.FC<Props> = props => {
           useLoginId: true
         })
         .then(async account => {
-          await dispatch(
-            initializeAccount(navigation as NavigationBase, account)
-          )
+          await dispatch(initializeAccount(navigation, account))
         })
         .catch((error: unknown) => {
           showError(error)
@@ -144,11 +138,9 @@ export const LoginScene: React.FC<Props> = props => {
     : undefined
 
   const handleLogin = useHandler((account: EdgeAccount) => {
-    dispatch(initializeAccount(navigation as NavigationBase, account)).catch(
-      (error: unknown) => {
-        showError(error)
-      }
-    )
+    dispatch(initializeAccount(navigation, account)).catch((error: unknown) => {
+      showError(error)
+    })
   })
 
   const handleSendLogs = useHandler(() => {

src/components/scenes/SecurityAlertsScene.tsx

@@ -3,11 +3,13 @@ import * as React from 'react'
 
 import { useHandler } from '../../hooks/useHandler'
 import { useDispatch, useSelector } from '../../types/reactRedux'
-import type { EdgeAppSceneProps } from '../../types/routerTypes'
+import type { RootSceneProps } from '../../types/routerTypes'
 import { logEvent } from '../../util/tracking'
 import { SceneWrapper } from '../common/SceneWrapper'
 
-interface Props extends EdgeAppSceneProps<'securityAlerts'> {}
+// Danger: This scene is mounted in two places,
+// so this could also be `EdgeAppSceneProps<'securityAlerts'>`:
+interface Props extends RootSceneProps<'securityAlerts'> {}
 
 export const SecurityAlertsScene: React.FC<Props> = props => {
   const { navigation } = props

src/types/routerTypes.tsx

@@ -270,6 +270,7 @@ export type RootParamList = {} & {
   edgeApp: NavigationCore.NavigatorScreenParams<DrawerParamList> | undefined
   gettingStarted: GettingStartedParams
   login: LoginParams
+  securityAlerts: undefined
 }
 
 // Upgraded types to comply with the navigation upgrade requirements
@@ -322,6 +323,7 @@ export type WalletsTabSceneProps<Name extends keyof WalletsTabParamList> =
 // defined above.
 // -------------------------------------------------------------------------
 
+/** @deprecated Use one of the XyzParamList types instead */
 export type AppParamList = RootParamList &
   DrawerParamList &
   EdgeAppStackParamList &
@@ -330,31 +332,32 @@ export type AppParamList = RootParamList &
   BuySellTabParamList &
   WalletsTabParamList
 
-export type RouteSceneKey = keyof AppParamList
-
 /**
  * The of the `navigation` prop passed to each scene,
  * but without any scene-specific stuff.
+ * @deprecated Use one of the `XyzSceneProps<"routeName">['navigation']` types.
  */
 export type NavigationBase = NavigationCore.NavigationProp<AppParamList> &
   StackActionHelpers<AppParamList>
 
 /**
  * The `navigation` prop passed to each scene.
+ * @deprecated Use one of the `XyzSceneProps<"routeName">['navigation']` types.
  */
-
 export type NavigationProp<RouteName extends keyof AppParamList> =
   NavigationCore.NavigationProp<AppParamList, RouteName> &
     StackActionHelpers<AppParamList>
 
 /**
  * The `route` prop passed to each scene.
+ * @deprecated Use one of the `XyzSceneProps<"routeName">['route']` types.
  */
 export type RouteProp<Name extends keyof AppParamList> =
   NavigationCore.RouteProp<AppParamList, Name>
 
 /**
  * All the props passed to each scene.
+ * @deprecated Use one of the `XyzSceneProps<"routeName">` types.
  */
 export interface EdgeSceneProps<Name extends keyof AppParamList> {
   navigation: NavigationProp<Name>