Merge pull request #5263 from EdgeApp/william/router-types

Router types

src/__tests__/scenes/ChangePasswordScene.test.tsx

@@ -14,7 +14,7 @@ describe('ChangePasswordScene', () => {
 
     const actual = renderer.render(
       <FakeProviders initialState={rootState}>
-        <ChangePasswordScene {...fakeSceneProps('changePassword', {})} />
+        <ChangePasswordScene {...fakeSceneProps('changePassword', undefined)} />
       </FakeProviders>
     )
 

src/__tests__/scenes/ChangePinScene.test.tsx

@@ -14,7 +14,7 @@ describe('ChangePinComponent', () => {
 
     const actual = renderer.render(
       <FakeProviders initialState={rootState}>
-        <ChangePinScene {...fakeSceneProps('changePin', {})} />
+        <ChangePinScene {...fakeSceneProps('changePin', undefined)} />
       </FakeProviders>
     )
 

src/__tests__/scenes/DefaultFiatSettingScene.test.tsx

@@ -12,7 +12,7 @@ describe('DefaultFiatSettingComponent', () => {
 
     const actual = renderer.render(
       <DefaultFiatSettingComponent
-        {...fakeSceneProps('defaultFiatSetting', {})}
+        {...fakeSceneProps('defaultFiatSetting', undefined)}
         supportedFiats={[
           {
             label: 'Dollars',

src/__tests__/scenes/FioAddressListScene.test.tsx

@@ -23,7 +23,7 @@ describe('FioAddressList', () => {
 
     const actual = renderer.render(
       <FioAddressList
-        {...fakeSceneProps('fioAddressList', {})}
+        {...fakeSceneProps('fioAddressList', undefined)}
         fioAddresses={[
           {
             name: 'fio@edge',

src/__tests__/scenes/FioAddressRegisterScene.test.tsx

@@ -23,7 +23,7 @@ describe('FioAddressRegister', () => {
 
     const actual = renderer.render(
       <FioAddressRegister
-        {...fakeSceneProps('fioAddressRegister', {})}
+        {...fakeSceneProps('fioAddressRegister', undefined)}
         fioWallets={[fakeWallet]}
         fioPlugin={
           {

src/__tests__/scenes/FioDomainRegisterScene.test.tsx

@@ -20,7 +20,7 @@ describe('FioDomainRegister', () => {
 
     const actual = renderer.render(
       <FioDomainRegister
-        {...fakeSceneProps('fioDomainRegister', {})}
+        {...fakeSceneProps('fioDomainRegister', undefined)}
         fioWallets={[fakeWallet]}
         fioPlugin={
           {

src/__tests__/scenes/SettingsScene.test.tsx

@@ -25,7 +25,7 @@ describe('SettingsScene', () => {
   it('should render SettingsScene', () => {
     const renderer = TestRenderer.create(
       <FakeProviders initialState={mockState}>
-        <SettingsScene {...fakeSceneProps('settingsOverview', {})} />
+        <SettingsScene {...fakeSceneProps('settingsOverview', undefined)} />
       </FakeProviders>
     )
 

src/__tests__/scenes/SwapSuccessScene.test.tsx

@@ -62,7 +62,7 @@ describe('SwapSuccessSceneComponent', () => {
 
     const renderer = TestRenderer.create(
       <FakeProviders initialState={fakeState}>
-        <SwapSuccessScene {...fakeSceneProps('swapSuccess', {})} />
+        <SwapSuccessScene {...fakeSceneProps('swapSuccess', undefined)} />
       </FakeProviders>
     )
 

src/__tests__/scenes/__snapshots__/ChangePasswordScene.test.tsx.snap

@@ -82,7 +82,7 @@ exports[`ChangePasswordScene should render with loading props 1`] = `
                 {
                   "key": "changePassword-0",
                   "name": "changePassword",
-                  "params": {},
+                  "params": undefined,
                 }
               }
             />

src/__tests__/scenes/__snapshots__/ChangePinScene.test.tsx.snap

@@ -82,7 +82,7 @@ exports[`ChangePinComponent should render with loading props 1`] = `
                 {
                   "key": "changePin-0",
                   "name": "changePin",
-                  "params": {},
+                  "params": undefined,
                 }
               }
             />

src/actions/BackupModalActions.tsx

@@ -23,7 +23,7 @@ export const showBackupModal = (props: { navigation: NavigationBase; forgetLogin
   })
     .then((userSel?: BackupModalResult) => {
       if (userSel === 'upgrade') {
-        navigation.navigate('upgradeUsername', {})
+        navigation.navigate('upgradeUsername')
       }
     })
     .finally(() => {
@@ -43,7 +43,7 @@ export const checkAndShowLightBackupModal = (account: EdgeAccount, navigation: N
     })
       .then((userSel?: BackupForTransferModalResult) => {
         if (userSel === 'upgrade') {
-          navigation.navigate('upgradeUsername', {})
+          navigation.navigate('upgradeUsername')
         }
       })
       .finally(() => {

src/actions/DeepLinkingActions.tsx

@@ -162,7 +162,7 @@ async function handleLink(navigation: NavigationBase, dispatch: Dispatch, state:
       } else {
         showError(lstrings.azteco_service_unavailable)
       }
-      navigation.navigate('homeTab', { screen: 'home' })
+      navigation.navigate('home')
       break
     }
 

src/actions/LoginActions.tsx

@@ -86,8 +86,11 @@ export function initializeAccount(navigation: NavigationBase, account: EdgeAccou
       // during account creation
       await readLocalAccountSettings(account)
 
-      const newAccountFlow = async (navigation: NavigationProp<'createWalletSelectCrypto'>, items: WalletCreateItem[]) => {
-        navigation.replace('edgeTabs', { screen: 'homeTab', params: { screen: 'home' } })
+      const newAccountFlow = async (
+        navigation: NavigationProp<'createWalletSelectCrypto' | 'createWalletSelectCryptoNewAccount'>,
+        items: WalletCreateItem[]
+      ) => {
+        navigation.replace('edgeTabs', { screen: 'home' })
         const createWalletsPromise = createCustomWallets(account, fiatCurrencyCode, items, dispatch).catch(error => showError(error))
 
         // New user FIO handle registration flow (if env is properly configured)
@@ -114,7 +117,13 @@ export function initializeAccount(navigation: NavigationBase, account: EdgeAccou
 
       performance.mark('loginEnd', { detail: { isNewAccount: newAccount } })
     } else {
-      rootNavigation.replace('edgeApp', {})
+      rootNavigation.replace('edgeApp', {
+        screen: 'edgeAppStack',
+        params: {
+          screen: 'edgeTabs',
+          params: { screen: 'home' }
+        }
+      })
       referralPromise.catch(() => console.log(`Failed to load account referral info`))
 
       performance.mark('loginEnd', { detail: { isNewAccount: newAccount } })
@@ -157,7 +166,7 @@ export function initializeAccount(navigation: NavigationBase, account: EdgeAccou
 
     // Check for security alerts:
     if (hasSecurityAlerts(account)) {
-      navigation.push('securityAlerts', {})
+      navigation.push('securityAlerts')
       hideSurvey = true
     }
 

src/actions/RecoveryReminderActions.tsx

@@ -54,5 +54,5 @@ async function showReminderModal(navigation: NavigationBase) {
       }}
     />
   ))
-  if (reply === 'ok') navigation.push('passwordRecovery', {})
+  if (reply === 'ok') navigation.push('passwordRecovery')
 }

src/actions/ScanActions.tsx

@@ -15,7 +15,7 @@ import { config } from '../theme/appConfig'
 import { RequestAddressLink } from '../types/DeepLinkTypes'
 import { Dispatch, RootState, ThunkAction } from '../types/reduxTypes'
 import { NavigationBase } from '../types/routerTypes'
-import { getCurrencyCode, getWalletTokenId } from '../util/CurrencyInfoHelpers'
+import { getCurrencyCode } from '../util/CurrencyInfoHelpers'
 import { parseDeepLink } from '../util/DeepLinkParser'
 import { logActivity } from '../util/logger'
 import { makeCurrencyCodeTable, upgradeCurrencyCodes } from '../util/tokenIdTools'
@@ -103,14 +103,13 @@ export const doRequestAddress = async (navigation: NavigationBase, account: Edge
       <WalletListModal bridge={bridge} navigation={navigation} headerTitle={lstrings.select_wallet} allowedAssets={edgeAssets} showCreateWallet />
     )).then(async result => {
       if (result?.type === 'wallet') {
-        const { walletId, currencyCode } = result
+        const { walletId, tokenId } = result
         const { currencyWallets } = account
         const wallet = currencyWallets[walletId]
-        const tokenId = getWalletTokenId(wallet, currencyCode)
 
         // TODO: Extend getReceiveAddress() to generate the full bitcion:XXXX address instead of using raw addresses here
         const { publicAddress } = await wallet.getReceiveAddress({ tokenId })
-        jsonPayloadMap[`${currencyWallets[walletId].currencyInfo.currencyCode}_${currencyCode}`] = publicAddress
+        jsonPayloadMap[`${currencyWallets[walletId].currencyInfo.currencyCode}_${getCurrencyCode(wallet, tokenId)}`] = publicAddress
       }
     })
   }

src/actions/SettingsActions.tsx

@@ -276,7 +276,7 @@ export function showRestoreWalletsModal(navigation: NavigationBase): ThunkAction
       )
       logActivity(`Restore Wallets: ${account.username}`)
 
-      navigation.navigate('homeTab', { screen: 'home' })
+      navigation.navigate('home')
     }
   }
 }

src/components/FioAddress/DomainListModal.tsx

@@ -113,7 +113,7 @@ class DomainListModalComponent extends React.Component<Props, State> {
   registerNewDomain = () => {
     const { bridge, navigation } = this.props
     bridge.resolve(undefined)
-    navigation.navigate('fioDomainRegister', {})
+    navigation.navigate('fioDomainRegister')
   }
 
   selectItem = (value: any) => this.props.bridge.resolve(value)