Merge pull request #584 from EdgeApp/paul/fixTokenActivation

Fix token activation
EdgeApp · Feb 3, 2024 · c952aca · c952aca
2 parents 340a05b + dd4f6c0
commit c952aca
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 2.1.1 (2024-02-02)
+
+- fixed: Token activation causing error and insufficient funds when used with core 1.x plugins
+
 ## 2.1.0 (2024-01-18)
 
 - added: Make swap timeouts adjustable.

diff --git a/src/core/account/account-api.ts b/src/core/account/account-api.ts
@@ -596,10 +596,14 @@ export function makeAccountApi(ai: ApiInput, accountId: string): EdgeAccount {
           `getActivationAssets unsupported by walletId ${activateWalletId}`
         )
 
-      return await engine.engineGetActivationAssets({
+      const out = await engine.engineGetActivationAssets({
         currencyWallets,
         activateTokenIds
       })
+
+      // Added for backward compatibility for plugins using core 1.x
+      out.assetOptions.forEach(asset => (asset.tokenId = asset.tokenId ?? null))
+      return out
     },
 
     async activateWallet(
@@ -632,8 +636,18 @@ export function makeAccountApi(ai: ApiInput, accountId: string): EdgeAccount {
                 wallet,
                 tokenId: paymentInfo.tokenId
               }
-            : undefined
+            : undefined,
+
+        // Added for backward compatibility for plugins using core 1.x
+        // @ts-expect-error
+        paymentTokenId: paymentInfo?.tokenId,
+        paymentWallet: wallet
       })
+
+      // Added for backward compatibility for plugins using core 1.x
+      // @ts-expect-error
+      if (out.networkFee.tokenId === undefined) out.networkFee.tokenId = null
+
       return bridgifyObject(out)
     },