Merge pull request #5141 from EdgeApp/matthew/activateTokenError

3 fixes
EdgeApp · Jul 11, 2024 · 2cec06e · 2cec06e
2 parents ab501a9 + 2efb7cc
commit 2cec06e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 15 deletions.
diff --git a/src/actions/SettingsActions.tsx b/src/actions/SettingsActions.tsx
@@ -29,6 +29,7 @@ export function checkEnabledExchanges(): ThunkAction<void> {
     const exchanges = account.swapConfig
     if (exchanges == null) return
     for (const exchange of Object.keys(exchanges)) {
+      if (exchange === 'transfer') continue
       if (exchanges[exchange].enabled) {
         isAnyExchangeEnabled = true
       }

diff --git a/src/actions/WalletActions.tsx b/src/actions/WalletActions.tsx
@@ -214,7 +214,7 @@ const activateWalletTokens = async (
     const displayFee = div(nativeFee, feeDenom.multiplier, log10(feeDenom.multiplier))
     let fiatFee = convertCurrencyFromExchangeRates(state.exchangeRates, paymentCurrencyCode, defaultIsoFiat, exchangeNetworkFee)
     if (lt(fiatFee, '0.001')) fiatFee = '<0.001'
-    fiatFee = round(fiatFee, -3)
+    else fiatFee = round(fiatFee, -3)
     const feeString = `${displayFee} ${feeDenom.name} (${fiatFee} ${defaultFiat})`
     let bodyText = lstrings.activate_wallet_token_scene_body
 

diff --git a/src/components/scenes/CreateWalletCompletionScene.tsx b/src/components/scenes/CreateWalletCompletionScene.tsx
@@ -73,18 +73,6 @@ const CreateWalletCompletionComponent = (props: Props) => {
   // Create the wallets and enable the tokens
   useAsyncEffect(
     async () => {
-      // Create tokens on existing wallets:
-      let tokenPromise: Promise<void> | undefined
-      if (tokenKey != null) {
-        tokenPromise = dispatch(enableTokensAcrossWallets(newTokenItems)).then(
-          () => setItemStatus(currentState => ({ ...currentState, [tokenKey]: 'complete' })),
-          error => {
-            showError(error)
-            setItemStatus(currentState => ({ ...currentState, [tokenKey]: 'error' }))
-          }
-        )
-      }
-
       // Create new wallets in parallel:
       const walletResults = await createWallets(
         account,
@@ -115,8 +103,15 @@ const CreateWalletCompletionComponent = (props: Props) => {
         }
       }
 
-      if (tokenPromise != null) {
-        await tokenPromise
+      // Create tokens on existing wallets:
+      if (tokenKey != null) {
+        await dispatch(enableTokensAcrossWallets(newTokenItems)).then(
+          () => setItemStatus(currentState => ({ ...currentState, [tokenKey]: 'complete' })),
+          error => {
+            showError(error)
+            setItemStatus(currentState => ({ ...currentState, [tokenKey]: 'error' }))
+          }
+        )
       }
 
       // Save the created wallets