fix: preserve imported token migrations

[samholmes]

Imported token migrations were losing their parent wallet context between wallet creation and the migration flow, which made token migrations disappear or crash before users could review them.

Track the created wallet ids during import completion and carry the parent wallet metadata into the migration payload so imported tokens reach the migration scenes as first-class assets.

CHANGELOG

Does this branch warrant an entry to the CHANGELOG?

• Yes
• No

Dependencies

none

Requirements

If you have made any visual changes to the GUI. Make sure you have:

• Tested on iOS device
• Tested on Android device
• Tested on small-screen device (iPod Touch)
• Tested on large-screen device (tablet)

---

Note

High Risk
Changes transaction-building and broadcast paths for wallet migration and private-key sweep flows, including new bundled makeMaxSpend handling; mistakes could impact fee calculation, asset selection, or token enable/disable behavior during fund transfers.

Overview
Ensures imported token migrations retain their parent wallet context by building migrateWalletList from successfully created wallets and attaching matching tokens with the correct createWalletId in CreateWalletCompletionScene.

Updates migration and sweep fee calculation to use wallet-provided otherMethods.makeMaxSpend when available, marking token rows as "Included" (new string_included) and treating bundled tokens differently from the mainnet fee row.

Adjusts completion flows to handle bundled max-spend behavior (including passing sweep selection metadata and enabling tokens when token transfers are implicitly included in the mainnet transaction).

^{Reviewed by Cursor Bugbot for commit 4bfced1. Bugbot is set up for automated code reviews on this repo. Configure here.}

---

• To see the specific tasks where the Asana app for GitHub is being used, see below:
  • https://app.asana.com/0/0/1213831335736726
  • https://app.asana.com/0/0/1213968564434715

[cursor]

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Autofix Details

Bugbot Autofix prepared a fix for the issue found in the latest run.

• ✅ Fixed: PluginId-keyed map loses wallets sharing same plugin
  • Changed createdWalletIdsByPluginId to key by unique item.key instead of pluginId, preventing wallet ID overwrites when multiple wallets share the same pluginId.

Or push these changes by commenting:

@cursor push 14928f7cff

Preview (14928f7cff)

diff --git a/src/components/scenes/CreateWalletCompletionScene.tsx b/src/components/scenes/CreateWalletCompletionScene.tsx
--- a/src/components/scenes/CreateWalletCompletionScene.tsx
+++ b/src/components/scenes/CreateWalletCompletionScene.tsx
@@ -56,8 +56,9 @@
   const defaultIsoFiat = useSelector(state => state.ui.settings.defaultIsoFiat)
 
   const [done, setDone] = React.useState(false)
-  const [createdWalletIdsByPluginId, setCreatedWalletIdsByPluginId] =
-    React.useState<Record<string, string>>({})
+  const [createdWalletIdsByKey, setCreatedWalletIdsByKey] = React.useState<
+    Record<string, string>
+  >({})
 
   const { newWalletItems, newTokenItems } = React.useMemo(
     () => splitCreateWalletItems(createWalletList),
@@ -157,13 +158,12 @@
       }
 
       // Save the created wallets
-      const newCreatedWalletIdsByPluginId: Record<string, string> = {}
+      const newCreatedWalletIdsByKey: Record<string, string> = {}
       walletResults.forEach((result, index) => {
         if (!result.ok) return
-        newCreatedWalletIdsByPluginId[newWalletItems[index].pluginId] =
-          result.result.id
+        newCreatedWalletIdsByKey[newWalletItems[index].key] = result.result.id
       })
-      setCreatedWalletIdsByPluginId(newCreatedWalletIdsByPluginId)
+      setCreatedWalletIdsByKey(newCreatedWalletIdsByKey)
 
       setDone(true)
       return () => {}
@@ -264,7 +264,8 @@
 
       return {
         ...createWallet,
-        createWalletId: createdWalletIdsByPluginId[pluginId] ?? '',
+        createWalletId:
+          createdWalletIdsByKey[parentWalletItem?.key ?? key] ?? '',
         walletType: parentWalletItem?.walletType ?? createWallet.walletType,
         displayName:
           parentWalletItem == null

_{This Bugbot Autofix run was free. To enable autofix for future PRs, go to the Cursor dashboard.}

[cursor]

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Autofix Details

Bugbot Autofix prepared a fix for the issue found in the latest run.

• ✅ Fixed: Double successCount increment in makeMaxSpend path
  • Removed the redundant successCount++ at line 278 to make both makeMaxSpend and legacy paths increment successCount consistently only once per successful bundle.

Or push these changes by commenting:

@cursor push a855b7e9e0

Preview (a855b7e9e0)

diff --git a/src/components/scenes/MigrateWalletCalculateFeeScene.tsx b/src/components/scenes/MigrateWalletCalculateFeeScene.tsx
--- a/src/components/scenes/MigrateWalletCalculateFeeScene.tsx
+++ b/src/components/scenes/MigrateWalletCalculateFeeScene.tsx
@@ -274,8 +274,6 @@
                     item.tokenId == null ? txFee : 'included'
                   )
                 }
-
-                successCount++
               } catch (e: any) {
                 for (const key of bundlesFeeTotals.keys()) {
                   const insufficientFundsError =

_{This Bugbot Autofix run was free. To enable autofix for future PRs, go to the Cursor dashboard.}

[cursor]

Cursor Bugbot has reviewed your changes and found 1 potential issue.

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

^{Reviewed by Cursor Bugbot for commit 4bfced1. Configure here.}

[cursor]

Duplicated MakeMaxSpendMethod type across three files

Low Severity

MakeMaxSpendMethod is independently defined in three files with slightly different shapes — the completion scene variant adds an optional metadata field while the other two omit it. Having three copies risks drift and makes updating the contract error-prone. A single shared definition (with metadata optional) would be cleaner.

Additional Locations (2)

• src/components/scenes/MigrateWalletCompletionScene.tsx#L43-L48
• src/components/scenes/SweepPrivateKeyCalculateFeeScene.tsx#L43-L47

 

^{Triggered by project rule: Bugbot Review Rules}

^{Reviewed by Cursor Bugbot for commit 4bfced1. Configure here.}