From 6c94cd4c563cfa9f9cc27a62d6e0e4f7119f23d3 Mon Sep 17 00:00:00 2001
From: Matthew Wall <matthew.wallt@gmail.com>
Date: Wed, 15 Jan 2025 12:26:28 -0500
Subject: [PATCH] Fix Android import first wallet navigation stack (#6393)

* fixes android not replacing route on first wallet import

* cleanup console logs

* Update src/hooks/useImportingWallet.ts

* fix bad rebase
---
 src/hooks/useImportingWallet.ts         | 33 ++++++++++++++-----------
 src/react-native-cool-modals/Portal.tsx |  2 --
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/hooks/useImportingWallet.ts b/src/hooks/useImportingWallet.ts
index 051aebd864c..73466b06cc2 100644
--- a/src/hooks/useImportingWallet.ts
+++ b/src/hooks/useImportingWallet.ts
@@ -18,7 +18,6 @@ import { PROFILES, useExperimentalFlag } from '@/config';
 import { fetchReverseRecord } from '@/handlers/ens';
 import { getProvider, isValidBluetoothDeviceId, resolveUnstoppableDomain } from '@/handlers/web3';
 import { isENSAddressFormat, isUnstoppableAddressFormat, isValidWallet } from '@/helpers/validators';
-import WalletBackupStepTypes from '@/helpers/walletBackupStepTypes';
 import { walletInit } from '@/model/wallet';
 import { Navigation, useNavigation } from '@/navigation';
 import { walletsLoadState } from '@/redux/wallets';
@@ -30,8 +29,11 @@ import { handleReviewPromptAction } from '@/utils/reviewAlert';
 import { ReviewPromptAction } from '@/storage/schema';
 import { ChainId } from '@/state/backendNetworks/types';
 import { backupsStore } from '@/state/backups/backups';
+import { walletLoadingStore } from '@/state/walletLoading/walletLoading';
+import { WalletLoadingStates } from '@/helpers/walletLoadingStates';
 import { IS_TEST } from '@/env';
 import walletBackupTypes from '@/helpers/walletBackupTypes';
+import WalletBackupStepTypes from '@/helpers/walletBackupStepTypes';
 
 export default function useImportingWallet({ showImportModal = true } = {}) {
   const { accountAddress } = useAccountSettings();
@@ -75,7 +77,7 @@ export default function useImportingWallet({ showImportModal = true } = {}) {
   const handleSetSeedPhrase = useCallback(
     (text: string) => {
       if (isImporting) return null;
-      return setSeedPhrase(text);
+      return setSeedPhrase(text.trim());
     },
     [isImporting]
   );
@@ -282,6 +284,9 @@ export default function useImportingWallet({ showImportModal = true } = {}) {
     if (!wasImporting && isImporting) {
       const asyncFn = async () => {
         const input = resolvedAddress ? resolvedAddress : sanitizeSeedPhrase(seedPhrase);
+        walletLoadingStore.setState({
+          loadingState: WalletLoadingStates.IMPORTING_WALLET,
+        });
 
         if (!showImportModal) {
           await walletInit(
@@ -313,21 +318,16 @@ export default function useImportingWallet({ showImportModal = true } = {}) {
             .then(success => {
               ios && handleSetImporting(false);
               if (success) {
-                dangerouslyGetParent?.()?.goBack();
                 InteractionManager.runAfterInteractions(async () => {
-                  if (previousWalletCount === 0) {
-                    navigate(Routes.SWIPE_LAYOUT, {
-                      params: { initialized: true },
+                  Navigation.handleAction(
+                    Routes.SWIPE_LAYOUT,
+                    {
                       screen: Routes.WALLET_SCREEN,
-                    });
-                  } else {
-                    dangerouslyGetParent?.()?.goBack();
-
-                    navigate(Routes.SWIPE_LAYOUT, {
                       params: { initialized: true },
-                      screen: Routes.WALLET_SCREEN,
-                    });
-                  }
+                    },
+                    previousWalletCount === 0
+                  );
+
                   if (android) {
                     handleSetImporting(false);
                   }
@@ -356,6 +356,11 @@ export default function useImportingWallet({ showImportModal = true } = {}) {
                   analytics.track('Imported seed phrase', {
                     isWalletEthZero,
                   });
+
+                  walletLoadingStore.setState({
+                    loadingState: null,
+                  });
+                  dangerouslyGetParent?.()?.goBack();
                 });
               } else {
                 if (android) {
diff --git a/src/react-native-cool-modals/Portal.tsx b/src/react-native-cool-modals/Portal.tsx
index dd2830ee0b4..e5fbf4ae200 100644
--- a/src/react-native-cool-modals/Portal.tsx
+++ b/src/react-native-cool-modals/Portal.tsx
@@ -20,8 +20,6 @@ export function Portal() {
     return null;
   }
 
-  console.log('blockTouches', blockTouches);
-
   return (
     <Wrapper
       pointerEvents={blockTouches ? 'none' : 'auto'}