Merge pull request #5984 from EdgeApp/jon/fix/disable-empty-migrate

Disable Migrate Wallets when no assets to migrate

Author: j0ntz

CHANGELOG.md

@@ -8,6 +8,7 @@
 - added: New Banxa payment methods
 - added: Debug settings scene (Developer Mode only) with nodes/servers inspection, engine `dataDump` viewer, and log viewer
 - fixed: Swap quote timeout error interrupting user after cancelling a slow swap search
+- fixed: Disable "Migrate Wallets" button when no assets are available to migrate
 
 ## 4.45.0 (2025-03-10)
 

eslint.config.mjs

@@ -104,7 +104,7 @@ export default [
       'src/actions/SoundActions.ts',
       'src/actions/TokenTermsActions.tsx',
       'src/actions/TransactionExportActions.tsx',
-      'src/actions/WalletActions.tsx',
+
       'src/actions/WalletListActions.tsx',
       'src/actions/WalletListMenuActions.tsx',
       'src/app.ts',
@@ -240,7 +240,6 @@ export default [
       'src/components/scenes/ConfirmScene.tsx',
       'src/components/scenes/CreateWalletAccountSelectScene.tsx',
       'src/components/scenes/CreateWalletAccountSetupScene.tsx',
-      'src/components/scenes/CreateWalletCompletionScene.tsx',
 
       'src/components/scenes/CreateWalletImportOptionsScene.tsx',
       'src/components/scenes/CreateWalletImportScene.tsx',
@@ -280,8 +279,6 @@ export default [
       'src/components/scenes/Loans/LoanStatusScene.tsx',
 
       'src/components/scenes/ManageTokensScene.tsx',
-      'src/components/scenes/MigrateWalletCalculateFeeScene.tsx',
-      'src/components/scenes/MigrateWalletCompletionScene.tsx',
 
       'src/components/scenes/NotificationCenterScene.tsx',
       'src/components/scenes/NotificationScene.tsx',

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

@@ -4540,7 +4540,7 @@ exports[`SettingsScene should render SettingsScene 1`] = `
                 allowFontScaling={false}
                 style={
                   {
-                    "color": "#FFFFFF",
+                    "color": "#888888",
                     "flexGrow": 1,
                     "flexShrink": 1,
                     "fontFamily": "Quicksand-Regular",
@@ -4644,7 +4644,7 @@ exports[`SettingsScene should render SettingsScene 1`] = `
                             "fontSize": 22,
                           },
                           {
-                            "color": "#00f1a2",
+                            "color": "rgba(255, 255, 255, .75)",
                             "fontSize": 22,
                             "marginHorizontal": 11,
                           },

src/actions/WalletActions.tsx

@@ -38,6 +38,7 @@ import type { NavigationBase } from '../types/routerTypes'
 import type { MapObject } from '../types/types'
 import { getCurrencyCode, isKeysOnlyPlugin } from '../util/CurrencyInfoHelpers'
 import { getWalletName } from '../util/CurrencyWalletHelpers'
+import { getMigrateWalletItemList } from '../util/getMigrateWalletItemList'
 import { fetchInfo } from '../util/network'
 
 export interface SelectWalletTokenParams {
@@ -68,7 +69,7 @@ export function selectWalletToken({
     // Manually un-pause the wallet, if necessary:
     const wallet: EdgeCurrencyWallet = currencyWallets[walletId]
     if (wallet.paused && !isKeysOnlyPlugin(wallet.currencyInfo.pluginId))
-      wallet.changePaused(false).catch(error => {
+      wallet.changePaused(false).catch((error: unknown) => {
         showError(error)
       })
 
@@ -93,7 +94,7 @@ export function selectWalletToken({
     const { isAccountActivationRequired } = getSpecialCurrencyInfo(
       wallet.currencyInfo.pluginId
     )
-    if (isAccountActivationRequired) {
+    if (isAccountActivationRequired === true) {
       // activation-required wallets need different path in case not activated yet
       if (alwaysActivate) {
         return await dispatch(
@@ -141,7 +142,7 @@ function selectActivationRequiredWallet(
           )}
           buttons={{ ok: { label: lstrings.string_ok } }}
         />
-      )).catch(err => {
+      )).catch((err: unknown) => {
         showError(err)
       })
       return false
@@ -172,7 +173,7 @@ export function updateMostRecentWalletsSelected(
           data: { mostRecentWallets: currentMostRecentWallets }
         })
       })
-      .catch(error => {
+      .catch((error: unknown) => {
         showError(error)
       })
   }
@@ -278,7 +279,7 @@ export function activateWalletTokens(
                 message={sprintf(msg, feeString)}
                 buttons={{ ok: { label: lstrings.string_ok } }}
               />
-            )).catch(err => {
+            )).catch((err: unknown) => {
               showError(err)
             })
             navigation.pop()
@@ -306,7 +307,7 @@ export function activateWalletTokens(
               )
               navigation.pop()
             })
-            .catch(e => {
+            .catch((e: unknown) => {
               navigation.pop()
               showError(e)
             })
@@ -413,7 +414,7 @@ export function checkCompromisedKeys(
       const keyInfo = exposedKeyInfos.find(
         info => info.pubKeyHash === pubkeyHash
       )
-      if (keyInfo?.exposed) {
+      if (keyInfo?.exposed === true) {
         exposedWalletIds.push(walletId)
       } else {
         securityCheckedWallets[walletId] = {
@@ -450,13 +451,17 @@ export function checkCompromisedKeys(
       ))
     }
 
-    // If any walletId come back true show modal to go to migration scene with affected wallets preselected
-    if (exposedWalletIds.length > 0) {
-      const walletNames = exposedWalletIds.map(walletId =>
+    const migratableItems = getMigrateWalletItemList(currencyWallets)
+    const migratableWalletIds = exposedWalletIds.filter(id =>
+      migratableItems.some(item => item.createWalletId === id)
+    )
+
+    if (migratableWalletIds.length > 0) {
+      const walletNames = migratableWalletIds.map(walletId =>
         getWalletName(currencyWallets[walletId])
       )
       const response = await MigrateWalletsModal(walletNames)
-      exposedWalletIds.forEach(walletId => {
+      migratableWalletIds.forEach(walletId => {
         const { checked, modalShown } = securityCheckedWallets[walletId]
         securityCheckedWallets[walletId] = {
           checked,
@@ -466,7 +471,7 @@ export function checkCompromisedKeys(
 
       if (response === 'yes') {
         navigation.push('migrateWalletSelectCrypto', {
-          preSelectedWalletIds: exposedWalletIds
+          preSelectedWalletIds: migratableWalletIds
         })
       }
     }

src/components/scenes/CreateWalletCompletionScene.tsx

@@ -39,7 +39,7 @@ export interface CreateWalletCompletionParams {
 
 interface Props extends EdgeAppSceneProps<'createWalletCompletion'> {}
 
-const CreateWalletCompletionComponent = (props: Props) => {
+const CreateWalletCompletionComponent: React.FC<Props> = props => {
   const { navigation, route } = props
   const {
     createWalletList,
@@ -145,7 +145,7 @@ const CreateWalletCompletionComponent = (props: Props) => {
               [tokenKey]: 'complete'
             }))
           },
-          error => {
+          (error: unknown) => {
             showError(error)
             setItemStatus(currentState => ({
               ...currentState,
@@ -255,15 +255,14 @@ const CreateWalletCompletionComponent = (props: Props) => {
     // Transform filtered items into the structure expected by the migration component
     const migrateWalletList: MigrateWalletItem[] = newWalletItems.map(
       createWallet => {
-        // Link the createWalletIds with the created wallets
         const { key, pluginId } = createWallet
         const wallet = wallets.find(
           wallet => wallet.currencyInfo.pluginId === pluginId
         )
 
         return {
           ...createWallet,
-          createWalletIds: wallet == null ? [''] : [wallet.id],
+          createWalletId: wallet == null ? '' : wallet.id,
           displayName: walletNames[key],
           key,
           type: 'create'

src/components/scenes/MigrateWalletCalculateFeeScene.tsx

@@ -41,7 +41,7 @@ type Props = EdgeAppSceneProps<'migrateWalletCalculateFee'>
 
 type AssetRowState = string | Error
 
-const MigrateWalletCalculateFeeComponent = (props: Props) => {
+const MigrateWalletCalculateFeeComponent: React.FC<Props> = props => {
   const { navigation, route } = props
   const { migrateWalletList } = route.params
 
@@ -71,10 +71,14 @@ const MigrateWalletCalculateFeeComponent = (props: Props) => {
 
   const renderCurrencyRow = useHandler(
     (data: ListRenderItemInfo<MigrateWalletItem>) => {
-      const { key, pluginId, tokenId, walletType, createWalletIds } = data.item
+      const {
+        key,
+        pluginId,
+        tokenId,
+        walletType,
+        createWalletId: walletId
+      } = data.item
       if (walletType == null) return null
-
-      const walletId = createWalletIds[0]
       const wallet = currencyWallets[walletId]
       if (wallet == null) return null
       const {
@@ -198,12 +202,11 @@ const MigrateWalletCalculateFeeComponent = (props: Props) => {
       // This bundles the assets by similar walletId with the main asset (ie. ETH) at the end of each array so its makeSpend is called last
       const bundledWalletAssets: MigrateWalletItem[][] =
         migrateWalletList.reduce((bundles: MigrateWalletItem[][], asset) => {
-          const { createWalletIds } = asset
-          const walletId = createWalletIds[0]
+          const { createWalletId: walletId } = asset
 
           // Find the bundle with the main currency at the end of it
           const index = bundles.findIndex(
-            bundle => walletId === bundle[0].createWalletIds[0]
+            bundle => walletId === bundle[0].createWalletId
           )
           if (index === -1) {
             bundles.push([asset]) // create bundle for this walletId
@@ -221,8 +224,7 @@ const MigrateWalletCalculateFeeComponent = (props: Props) => {
       let successCount = 0
       const walletPromises = []
       for (const bundle of bundledWalletAssets) {
-        const wallet =
-          currencyWallets[bundle[bundle.length - 1].createWalletIds[0]]
+        const wallet = currencyWallets[bundle[bundle.length - 1].createWalletId]
         const {
           currencyInfo: { pluginId }
         } = wallet
@@ -322,11 +324,9 @@ const MigrateWalletCalculateFeeComponent = (props: Props) => {
 
   // Wait for wallets to sync
   React.useEffect(() => {
-    const migrateWalletIds = migrateWalletList.map(
-      item => item.createWalletIds[0]
-    )
+    const migrateWalletIds = migrateWalletList.map(item => item.createWalletId)
 
-    const updateProgress = () => {
+    const updateProgress = (): void => {
       const syncedWallets = migrateWalletIds.filter(walletId => {
         const wallet = currencyWallets[walletId]
 

src/components/scenes/MigrateWalletCompletionScene.tsx

@@ -42,7 +42,7 @@ interface MigrateWalletTokenItem extends MigrateWalletItem {
   tokenId: string
 }
 
-const MigrateWalletCompletionComponent = (props: Props) => {
+const MigrateWalletCompletionComponent: React.FC<Props> = props => {
   const { navigation, route } = props
   const { migrateWalletList } = route.params
 
@@ -54,12 +54,11 @@ const MigrateWalletCompletionComponent = (props: Props) => {
 
   const sortedMigrateWalletListBundles = React.useMemo(() => {
     return migrateWalletList.reduce((bundles: MigrateWalletItem[][], asset) => {
-      const { createWalletIds } = asset
-      const walletId = createWalletIds[0]
+      const { createWalletId: walletId } = asset
 
       // Find the bundle with the main currency at the end of it
       const index = bundles.findIndex(
-        bundle => walletId === bundle[0].createWalletIds[0]
+        bundle => walletId === bundle[0].createWalletId
       )
 
       if (index === -1) {
@@ -98,7 +97,7 @@ const MigrateWalletCompletionComponent = (props: Props) => {
   const handleItemStatus = (
     item: MigrateWalletItem,
     status: 'complete' | 'error'
-  ) => {
+  ): void => {
     setItemStatus(currentState => ({ ...currentState, [item.key]: status }))
     const index = sortedMigrateWalletList.findIndex(
       asset => asset.key === item.key
@@ -119,8 +118,7 @@ const MigrateWalletCompletionComponent = (props: Props) => {
       const migrationPromises = []
       for (const bundle of sortedMigrateWalletListBundles) {
         const mainnetItem = bundle[bundle.length - 1]
-        const { createWalletIds } = mainnetItem
-        const oldWalletId = createWalletIds[0]
+        const { createWalletId: oldWalletId } = mainnetItem
 
         securityCheckedWallets[oldWalletId] ??= {
           checked: false,
@@ -135,7 +133,7 @@ const MigrateWalletCompletionComponent = (props: Props) => {
         const newWalletName = `${oldWalletName}${lstrings.migrate_wallet_new_fragment}`
 
         // Create new wallet
-        const createNewWalletPromise = async () => {
+        const createNewWalletPromise = async (): Promise<void> => {
           const previouslyCreatedWalletInfo = account.allKeys.find(
             keys =>
               keys.migratedFromWalletId === oldWalletId &&
@@ -342,9 +340,7 @@ const MigrateWalletCompletionComponent = (props: Props) => {
   const renderRow = useHandler(
     (data: ListRenderItemInfo<MigrateWalletItem>) => {
       const { item } = data
-      const { createWalletIds } = item
-
-      const walletId = createWalletIds[0]
+      const { createWalletId: walletId } = item
       const wallet = currencyWallets[walletId]
       if (wallet == null) return null
       return (