fix: bridge initiated from core web (#48)

ava-labs · Sep 18, 2024 · 8d5cc2c · 8d5cc2c
1 parent 4c2f611
commit 8d5cc2c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/src/background/services/bridge/handlers/avalanche_bridgeAsset.test.ts b/src/background/services/bridge/handlers/avalanche_bridgeAsset.test.ts
@@ -421,13 +421,15 @@ describe('background/services/bridge/handlers/avalanche_bridgeAsset', () => {
 
       const balanceServiceMock = {
         getBalancesForNetworks: jest.fn().mockResolvedValueOnce({
-          [43113]: {
-            C_address: {
-              WETH: {
-                symbol: 'WETH',
-                type: TokenType.ERC20,
-                balance: new BN(100),
-                decimals: 1,
+          tokens: {
+            [43113]: {
+              C_address: {
+                WETH: {
+                  symbol: 'WETH',
+                  type: TokenType.ERC20,
+                  balance: new BN(100),
+                  decimals: 1,
+                },
               },
             },
           },

diff --git a/src/background/services/bridge/handlers/avalanche_bridgeAsset.ts b/src/background/services/bridge/handlers/avalanche_bridgeAsset.ts
@@ -163,10 +163,11 @@ export class AvalancheBridgeAsset extends DAppRequestHandler<BridgeActionParams>
     }
 
     // get the correct balance information for the asset
-    const balances = await this.balanceAggregatorService.getBalancesForNetworks(
-      [sourceNetwork.chainId],
-      [activeAccount]
-    );
+    const { tokens } =
+      await this.balanceAggregatorService.getBalancesForNetworks(
+        [sourceNetwork.chainId],
+        [activeAccount]
+      );
 
     const balanceAddress =
       sourceNetwork && isBitcoinNetwork(sourceNetwork)
@@ -179,7 +180,7 @@ export class AvalancheBridgeAsset extends DAppRequestHandler<BridgeActionParams>
       findTokenForAsset(
         asset.symbol,
         asset.nativeNetwork,
-        Object.values(balances?.[sourceNetwork.chainId]?.[balanceAddress] ?? {})
+        Object.values(tokens?.[sourceNetwork.chainId]?.[balanceAddress] ?? {})
       );
 
     const action: Action<BridgeActionDisplayData> = {

diff --git a/src/pages/ApproveAction/BridgeTransferAsset.tsx b/src/pages/ApproveAction/BridgeTransferAsset.tsx
@@ -41,7 +41,7 @@ export function BridgeTransferAsset({
     GasFeeModifier.INSTANT
   );
 
-  const tokenPrice = displayData.token.priceInCurrency;
+  const tokenPrice = displayData?.token?.priceInCurrency;
   const fiatValue: Big | undefined =
     typeof tokenPrice === 'number'
       ? new Big(displayData.amountStr).times(tokenPrice)