feat: invert fromToken and fromChain dependency

micaelae · micaelae · commit 3bebb5b57d56 · 2025-11-28T15:39:47.000-08:00
diff --git a/test/data/bridge/mock-bridge-store.ts b/test/data/bridge/mock-bridge-store.ts
@@ -75,6 +75,47 @@ export const MOCK_SOLANA_ACCOUNT = {
   },
 };
 
+export const MOCK_BITCOIN_ACCOUNT = {
+  type: 'bip122:p2wpkh',
+  scopes: ['bip122:000000000019d6689c085ae165831e93'],
+  id: '40b25442-ed7e-4b94-9f9f-ea8ff06d03b3',
+  address: 'bc1q2pxsagdzfdn6k6umvf9gj3eme7a27p7acym9g2',
+  options: {
+    entropySource: '01K8NT6Z7XDKEKX9MFSZ5EPFMW',
+    exportable: false,
+    entropy: {
+      type: 'mnemonic',
+      id: '01K8NT6Z7XDKEKX9MFSZ5EPFMW',
+      derivationPath: "m/84'/0'/0'",
+      groupIndex: 0,
+    },
+  },
+  methods: [
+    'signPsbt',
+    'computeFee',
+    'fillPsbt',
+    'broadcastPsbt',
+    'sendTransfer',
+    'getUtxo',
+    'listUtxos',
+    'publicDescriptor',
+    'signMessage',
+  ],
+  metadata: {
+    name: 'Snap Account 9',
+    importTime: 1763417984346,
+    keyring: {
+      type: 'Snap Keyring',
+    },
+    snap: {
+      id: 'npm:@metamask/bitcoin-wallet-snap',
+      name: 'Bitcoin',
+      enabled: true,
+    },
+    lastSelected: 1764203245474,
+  },
+};
+
 export const MOCK_EVM_ACCOUNT = {
   address: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
   id: 'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3',
@@ -163,6 +204,7 @@ export const createBridgeMockStore = ({
       ...(internalAccountsOverrides?.accounts ?? {}),
       [MOCK_LEDGER_ACCOUNT.id]: MOCK_LEDGER_ACCOUNT,
       [MOCK_SOLANA_ACCOUNT.id]: MOCK_SOLANA_ACCOUNT,
+      [MOCK_BITCOIN_ACCOUNT.id]: MOCK_BITCOIN_ACCOUNT,
       [MOCK_EVM_ACCOUNT.id]: MOCK_EVM_ACCOUNT,
       [MOCK_EVM_ACCOUNT_2.id]: MOCK_EVM_ACCOUNT_2,
     },
@@ -259,7 +301,11 @@ export const createBridgeMockStore = ({
                     groupIndex: 0,
                   },
                 },
-                accounts: [MOCK_EVM_ACCOUNT.id, MOCK_SOLANA_ACCOUNT.id],
+                accounts: [
+                  MOCK_EVM_ACCOUNT.id,
+                  MOCK_SOLANA_ACCOUNT.id,
+                  MOCK_BITCOIN_ACCOUNT.id,
+                ],
               },
               'entropy:01K2FF18CTTXJYD34R78X4N1N1/1': {
                 type: 'multichain-account',
@@ -325,6 +371,14 @@ export const createBridgeMockStore = ({
             name: '',
           },
         },
+        {
+          type: KeyringType.snap,
+          accounts: [MOCK_BITCOIN_ACCOUNT.address],
+          metadata: {
+            id: '01K6GQ6SXDB9GKP6CAPSRV5AJG',
+            name: '',
+          },
+        },
         {
           type: KeyringType.ledger,
           accounts: [MOCK_LEDGER_ACCOUNT.address],
diff --git a/ui/ducks/bridge/selectors.test.ts b/ui/ducks/bridge/selectors.test.ts
@@ -9,7 +9,10 @@ import {
 } from '@metamask/bridge-controller';
 import { toEvmCaipChainId } from '@metamask/multichain-network-controller';
 import { SolAccountType, SolScope } from '@metamask/keyring-api';
-import { createBridgeMockStore } from '../../../test/data/bridge/mock-bridge-store';
+import {
+  createBridgeMockStore,
+  MOCK_BITCOIN_ACCOUNT,
+} from '../../../test/data/bridge/mock-bridge-store';
 import { CHAIN_IDS, FEATURED_RPCS } from '../../../shared/constants/network';
 import { ALLOWED_BRIDGE_CHAIN_IDS } from '../../../shared/constants/bridge';
 import { mockNetworkState } from '../../../test/stub/networks';
@@ -466,7 +469,7 @@ describe('Bridge selectors', () => {
     it('returns selected toToken', () => {
       const state = createBridgeMockStore({
         bridgeSliceOverrides: {
-          fromToken: { address: '0x123', symbol: 'TEST' },
+          fromToken: { address: '0x123', symbol: 'TEST', chainId: '0x1' },
           toChainId: formatChainIdToCaip(1),
           toToken: { address: '0x567', symbol: 'DEST' },
         },
@@ -487,7 +490,7 @@ describe('Bridge selectors', () => {
     it('returns default token if toToken is not set', () => {
       const state = createBridgeMockStore({
         bridgeSliceOverrides: {
-          fromToken: { address: '0x123', symbol: 'TEST' },
+          fromToken: { address: '0x123', symbol: 'TEST', chainId: '0x1' },
           toChainId: formatChainIdToCaip(1),
         },
         featureFlagOverrides: {
@@ -575,6 +578,10 @@ describe('Bridge selectors', () => {
                 isActiveSrc: true,
                 isActiveDest: true,
               },
+              [MultichainNetworks.BITCOIN]: {
+                isActiveSrc: true,
+                isActiveDest: true,
+              },
             },
             bip44DefaultPairs: {
               bip122: {
@@ -587,6 +594,18 @@ describe('Bridge selectors', () => {
             },
           },
         },
+        metamaskStateOverrides: {
+          internalAccounts: {
+            selectedAccount: MOCK_BITCOIN_ACCOUNT.id,
+          },
+          balances: {
+            [MOCK_BITCOIN_ACCOUNT.id]: {
+              [getNativeAssetForChainId(ChainId.BTC).assetId]: {
+                amount: '2',
+              },
+            },
+          },
+        },
       });
       const result = getToToken(state as never);
 
@@ -1919,6 +1938,7 @@ describe('Bridge selectors', () => {
           fromToken: {
             address: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
             decimals: 6,
+            chainId: '0x1',
           },
         },
         featureFlagOverrides: {
@@ -1954,6 +1974,7 @@ describe('Bridge selectors', () => {
           fromToken: {
             address: zeroAddress(),
             decimals: 18,
+            chainId: '0x1',
           },
         },
         featureFlagOverrides: {
@@ -2011,6 +2032,7 @@ describe('Bridge selectors', () => {
             decimals: 6,
             assetId:
               'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/token:EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v',
+            chainId: MultichainNetworks.SOLANA,
           },
         },
         featureFlagOverrides: {
@@ -2064,6 +2086,7 @@ describe('Bridge selectors', () => {
           fromToken: {
             address: zeroAddress(),
             decimals: 18,
+            chainId: MultichainNetworks.SOLANA,
           },
         },
         featureFlagOverrides: {
diff --git a/ui/ducks/bridge/selectors.ts b/ui/ducks/bridge/selectors.ts
@@ -315,16 +315,53 @@ export const getLastSelectedChainId = createSelector(
 );
 
 // This returns undefined if the selected chain is not supported by swap/bridge (i.e, testnets)
-export const getFromChain = createDeepEqualSelector(
-  [getFromChains, getMultichainProviderConfig],
-  (fromChains, providerConfig) => {
+export const getFromToken = createSelector(
+  [
+    (state: BridgeAppState) => state.bridge.fromToken,
+    getFromChains,
+    getMultichainProviderConfig,
+  ],
+  (fromToken, fromChains, providerConfig) => {
     // When the page loads the global network always matches the network filter
     // Because useBridging checks whether the lastSelectedNetwork matches the provider config
     // Then useBridgeQueryParams sets the global network to lastSelectedNetwork as needed
     // TODO remove providerConfig references and just use getLastSelectedChainId
-    return fromChains.find(
+    const fromChain = fromChains.find(
       ({ chainId }) => chainId === providerConfig?.chainId,
     );
+    if (!fromChain) {
+      return null;
+    }
+    const fromChainId = fromChain.chainId;
+    if (
+      fromToken &&
+      fromToken.address &&
+      !isCrossChain(fromToken.chainId, fromChainId)
+    ) {
+      return fromToken;
+    }
+    const { iconUrl, ...nativeAsset } = getNativeAssetForChainId(fromChainId);
+    const newToToken = toBridgeToken(nativeAsset);
+    return newToToken
+      ? {
+          ...newToToken,
+          chainId: formatChainIdToCaip(fromChainId),
+        }
+      : newToToken;
+  },
+);
+
+// Return's the chain matching the fromToken's chainId
+export const getFromChain = createSelector(
+  [getFromToken, getFromChains],
+  (fromToken, fromChains) => {
+    if (!fromToken) {
+      return undefined;
+    }
+    return fromChains.find(
+      ({ chainId }) =>
+        formatChainIdToCaip(chainId) === formatChainIdToCaip(fromToken.chainId),
+    );
   },
 );
 
@@ -418,29 +455,6 @@ export const getToChain = createSelector(
   },
 );
 
-export const getFromToken = createSelector(
-  [
-    (state: BridgeAppState) => state.bridge.fromToken,
-    (state) => getFromChain(state)?.chainId,
-  ],
-  (fromToken, fromChainId) => {
-    if (!fromChainId) {
-      return null;
-    }
-    if (fromToken?.address) {
-      return fromToken;
-    }
-    const { iconUrl, ...nativeAsset } = getNativeAssetForChainId(fromChainId);
-    const newToToken = toBridgeToken(nativeAsset);
-    return newToToken
-      ? {
-          ...newToToken,
-          chainId: formatChainIdToCaip(fromChainId),
-        }
-      : newToToken;
-  },
-);
-
 export const getToToken = createSelector(
   [getFromToken, getToChain, (state) => state.bridge.toToken],
   (fromToken, toChain, toToken) => {
@@ -727,10 +741,7 @@ export const getToTokenConversionRate = createDeepEqualSelector(
     }
     if (toChain?.chainId && toToken) {
       const nativeAssetId = getNativeAssetForChainId(toChain.chainId)?.assetId;
-      const tokenAssetId = toAssetId(
-        toToken.address,
-        formatChainIdToCaip(toChain.chainId),
-      );
+      const tokenAssetId = toToken.assetId;
 
       // For non-EVM tokens (Solana, Bitcoin, Tron), we use the conversion rates provided by the multichain rates controller
       if (isNonEvmChain(toChain.chainId) && nativeAssetId && tokenAssetId) {
diff --git a/ui/hooks/bridge/useBridgeQueryParams.test.ts b/ui/hooks/bridge/useBridgeQueryParams.test.ts
@@ -59,13 +59,30 @@ describe('useBridgeQueryParams', () => {
       featureFlagOverrides: {
         bridgeConfig: {
           chains: {
+            [CHAIN_IDS.MAINNET]: {
+              isActiveSrc: true,
+              isActiveDest: true,
+            },
             [ChainId.SOLANA]: {
               isActiveSrc: true,
               isActiveDest: true,
             },
           },
         },
       },
+      metamaskStateOverrides: {
+        internalAccounts: {
+          selectedAccount: 'bf13d52c-d6e8-40ea-9726-07d7149a3ca5',
+        },
+        balances: {
+          'bf13d52c-d6e8-40ea-9726-07d7149a3ca5': {
+            [bridgeControllerUtils.getNativeAssetForChainId(ChainId.SOLANA)
+              .assetId]: {
+              amount: '2',
+            },
+          },
+        },
+      },
     });
 
     const searchParams = new URLSearchParams({
diff --git a/ui/hooks/bridge/useTokenAlerts.test.ts b/ui/hooks/bridge/useTokenAlerts.test.ts
@@ -51,12 +51,14 @@ describe('useTokenAlerts', () => {
       bridgeSliceOverrides: {
         fromToken: {
           address: '0x3fa807b6f8d4c407e6e605368f4372d14658b38c',
+          chainId: CHAIN_IDS.MAINNET,
         },
         fromChain: {
           chainId: CHAIN_IDS.MAINNET,
         },
         toToken: {
           address: '6p6xgHyF7AeE6TZkSmFsko444wqoP15icUSqi2jfGiPN',
+          chainId: MultichainNetworks.SOLANA,
         },
         toChainId: MultichainNetworks.SOLANA,
       },
