refactor: remove unused swap selectors and fix selector types

shared/constants/bridge.ts

@@ -41,7 +41,7 @@ export const ALLOWED_BRIDGE_CHAIN_IDS = [
   ///: BEGIN:ONLY_INCLUDE_IF(tron)
   MultichainNetworks.TRON,
   ///: END:ONLY_INCLUDE_IF
-];
+] as const;
 
 export const ALLOWED_BRIDGE_CHAIN_IDS_IN_CAIP =
   ALLOWED_EVM_BRIDGE_CHAIN_IDS.map(toEvmCaipChainId).concat(

test/data/bridge/mock-bridge-store.ts

@@ -1,6 +1,8 @@
 import {
   getDefaultBridgeControllerState,
   formatChainIdToCaip,
+  FeatureFlagResponse,
+  BridgeControllerState,
 } from '@metamask/bridge-controller';
 import { DEFAULT_BRIDGE_STATUS_CONTROLLER_STATE } from '@metamask/bridge-status-controller';
 import { AVAILABLE_MULTICHAIN_NETWORK_CONFIGURATIONS } from '@metamask/multichain-network-controller';
@@ -118,25 +120,21 @@ export const MOCK_EVM_ACCOUNT_2 = {
 };
 
 export const createBridgeMockStore = ({
-  featureFlagOverrides = {},
+  featureFlagOverrides = { bridgeConfig: {} },
   bridgeSliceOverrides = {},
   bridgeStateOverrides = {},
   bridgeStatusStateOverrides = {},
   metamaskStateOverrides = {},
   stateOverrides = {},
 }: {
-  // featureFlagOverrides?: Partial<BridgeControllerState['bridgeFeatureFlags']>;
-  // bridgeStateOverrides?: Partial<BridgeControllerState>;
+  featureFlagOverrides?: { bridgeConfig: Partial<FeatureFlagResponse> };
+  bridgeStateOverrides?: Partial<BridgeControllerState>;
   // bridgeStatusStateOverrides?: Partial<BridgeStatusState>;
   // metamaskStateOverrides?: Partial<BridgeAppState['metamask']>;
   // TODO replace these with correct types
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  featureFlagOverrides?: Record<string, any>;
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   bridgeSliceOverrides?: Record<string, any>;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  bridgeStateOverrides?: Record<string, any>;
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   bridgeStatusStateOverrides?: Record<string, any>;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   metamaskStateOverrides?: Record<string, any>;
@@ -352,7 +350,6 @@ export const createBridgeMockStore = ({
             support: false,
             refreshRate: 5000,
             maxRefreshCount: 5,
-            ...featureFlagOverrides?.extensionConfig,
             ...featureFlagOverrides?.bridgeConfig,
             chains: {
               [formatChainIdToCaip('0x1')]: {
@@ -361,9 +358,7 @@ export const createBridgeMockStore = ({
               },
               ...Object.fromEntries(
                 Object.entries(
-                  featureFlagOverrides?.extensionConfig?.chains ??
-                    featureFlagOverrides?.bridgeConfig?.chains ??
-                    {},
+                  featureFlagOverrides?.bridgeConfig?.chains ?? {},
                 ).map(([chainId, config]) => [
                   formatChainIdToCaip(chainId),
                   config,

test/e2e/tests/settings/state-logs.json

@@ -110,8 +110,6 @@
     "sortOrder": "string",
     "toChainId": "null",
     "toToken": "null",
-    "toTokenExchangeRate": "null",
-    "toTokenUsdExchangeRate": "null",
     "txAlert": "null",
     "wasTxDeclined": "boolean"
   },

ui/ducks/bridge/actions.ts

@@ -7,14 +7,11 @@ import {
   getNativeAssetForChainId,
   type RequiredEventContextFromClient,
   UnifiedSwapBridgeEventName,
+  formatChainIdToHex,
 } from '@metamask/bridge-controller';
-import { type InternalAccount } from '@metamask/keyring-internal-api';
-import { type CaipChainId } from '@metamask/utils';
-import type {
-  AddNetworkFields,
-  NetworkConfiguration,
-} from '@metamask/network-controller';
+import type { CaipChainId, Hex } from '@metamask/utils';
 import { trace, TraceName } from '../../../shared/lib/trace';
+import { selectDefaultNetworkClientIdsByChainId } from '../../../shared/modules/selectors/networks';
 import {
   forceUpdateMetamaskState,
   setActiveNetworkWithError,
@@ -23,15 +20,14 @@ import { submitRequestToBackground } from '../../store/background-connection';
 import type { MetaMaskReduxDispatch } from '../../store/store';
 import {
   bridgeSlice,
-  setDestTokenExchangeRates,
-  setDestTokenUsdExchangeRates,
   setSrcTokenExchangeRates,
   setTxAlerts,
   setEVMSrcTokenBalance as setEVMSrcTokenBalance_,
   setEVMSrcNativeBalance,
 } from './bridge';
-import type { TokenPayload } from './types';
-import { isNetworkAdded, isNonEvmChain } from './utils';
+import { type TokenPayload } from './types';
+import { type BridgeAppState } from './selectors';
+import { isNonEvmChain } from './utils';
 
 const {
   setToChainId,
@@ -52,8 +48,6 @@ export {
   setToToken,
   setFromToken,
   setFromTokenInputValue,
-  setDestTokenExchangeRates,
-  setDestTokenUsdExchangeRates,
   setSrcTokenExchangeRates,
   setSortOrder,
   setSelectedQuote,
@@ -145,33 +139,26 @@ export const setEVMSrcTokenBalance = (
 };
 
 export const setFromChain = ({
-  networkConfig,
-  selectedAccount,
+  chainId,
   token = null,
 }: {
-  networkConfig?:
-    | NetworkConfiguration
-    | AddNetworkFields
-    | (Omit<NetworkConfiguration, 'chainId'> & { chainId: CaipChainId });
-  selectedAccount: InternalAccount | null;
+  chainId: Hex | CaipChainId;
   token?: TokenPayload['payload'];
 }) => {
-  return async (dispatch: MetaMaskReduxDispatch) => {
-    if (!networkConfig) {
-      return;
-    }
-
+  return async (
+    dispatch: MetaMaskReduxDispatch,
+    getState: () => BridgeAppState,
+  ) => {
     // Check for ALL non-EVM chains
-    const isNonEvm = isNonEvmChain(networkConfig.chainId);
+    const isNonEvm = isNonEvmChain(chainId);
 
     // Set the src network
     if (isNonEvm) {
-      dispatch(setActiveNetworkWithError(networkConfig.chainId));
+      dispatch(setActiveNetworkWithError(chainId));
     } else {
-      const networkId = isNetworkAdded(networkConfig)
-        ? networkConfig.rpcEndpoints?.[networkConfig.defaultRpcEndpointIndex]
-            ?.networkClientId
-        : null;
+      const hexChainId = formatChainIdToHex(chainId);
+      const networkId =
+        selectDefaultNetworkClientIdsByChainId(getState())[hexChainId];
       if (networkId) {
         dispatch(setActiveNetworkWithError(networkId));
       }
@@ -182,33 +169,15 @@ export const setFromChain = ({
       dispatch(setFromToken(token));
     } else if (isNonEvm) {
       // Auto-select native token for non-EVM chains when switching
-      const nativeAsset = getNativeAssetForChainId(networkConfig.chainId);
+      const nativeAsset = getNativeAssetForChainId(chainId);
       if (nativeAsset) {
         dispatch(
           setFromToken({
             ...nativeAsset,
-            chainId: networkConfig.chainId,
+            chainId,
           }),
         );
       }
     }
-
-    // Fetch the native balance (EVM only)
-    if (selectedAccount && !isNonEvm) {
-      trace({
-        name: TraceName.BridgeBalancesUpdated,
-        data: {
-          srcChainId: formatChainIdToCaip(networkConfig.chainId),
-          isNative: true,
-        },
-        startTime: Date.now(),
-      });
-      await dispatch(
-        setEVMSrcNativeBalance({
-          selectedAddress: selectedAccount.address,
-          chainId: networkConfig.chainId,
-        }),
-      );
-    }
   };
 };

ui/ducks/bridge/bridge.test.ts

@@ -5,11 +5,8 @@ import {
   BridgeBackgroundAction,
   BridgeUserAction,
   formatChainIdToCaip,
-  getNativeAssetForChainId,
 } from '@metamask/bridge-controller';
-import * as controllerUtils from '@metamask/controller-utils';
 import { createBridgeMockStore } from '../../../test/data/bridge/mock-bridge-store';
-import { toAssetId } from '../../../shared/lib/asset-utils';
 import { CHAIN_IDS } from '../../../shared/constants/network';
 import { setBackgroundConnection } from '../../store/background-connection';
 import { MultichainNetworks } from '../../../shared/constants/multichain/networks';
@@ -23,7 +20,6 @@ import {
   setToChainId,
   updateQuoteRequestParams,
   resetBridgeState,
-  setDestTokenExchangeRates,
   setWasTxDeclined,
   setSlippage,
 } from './actions';
@@ -110,7 +106,6 @@ describe('Ducks - Bridge', () => {
           chainId: '0xa',
           image:
             'https://static.cx.metamask.io/api/v2/tokenIcons/assets/eip155/10/erc20/0x13341431.png',
-          string: '0',
         }),
       );
     });
@@ -144,11 +139,9 @@ describe('Ducks - Bridge', () => {
         slippage: SlippageValue.BridgeDefault,
         fromTokenInputValue: null,
         sortOrder: 'cost_ascending',
-        toTokenExchangeRate: null,
         fromTokenExchangeRate: null,
         wasTxDeclined: false,
         txAlert: null,
-        toTokenUsdExchangeRate: null,
         fromTokenBalance: null,
         fromNativeBalance: null,
       });
@@ -245,119 +238,13 @@ describe('Ducks - Bridge', () => {
         toChainId: null,
         toToken: null,
         txAlert: null,
-        toTokenExchangeRate: null,
         wasTxDeclined: false,
-        toTokenUsdExchangeRate: null,
         fromTokenBalance: null,
         fromNativeBalance: null,
       });
     });
   });
 
-  describe('setDestTokenExchangeRates', () => {
-    it('fetches token prices and updates dest exchange rates in state, native dest token', async () => {
-      // TODO: Fix in https://github.com/MetaMask/metamask-extension/issues/31973
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      const mockStore = configureMockStore<any>(middleware)(
-        createBridgeMockStore(),
-      );
-      const state = mockStore.getState().bridge;
-      const fetchTokenExchangeRatesSpy = jest
-        .spyOn(controllerUtils, 'handleFetch')
-        .mockResolvedValue({
-          [getNativeAssetForChainId(CHAIN_IDS.LINEA_MAINNET).assetId]: {
-            price: 0.356628,
-          },
-        });
-
-      await mockStore.dispatch(
-        setDestTokenExchangeRates({
-          chainId: CHAIN_IDS.LINEA_MAINNET,
-          tokenAddress: zeroAddress(),
-          currency: 'usd',
-        }) as never,
-      );
-
-      expect(fetchTokenExchangeRatesSpy).toHaveBeenCalledTimes(1);
-      expect(fetchTokenExchangeRatesSpy).toHaveBeenCalledWith(
-        'https://price.api.cx.metamask.io/v3/spot-prices?assetIds=eip155%3A59144%2Fslip44%3A60&includeMarketData=true&vsCurrency=usd',
-        {
-          headers: { 'X-Client-Id': 'extension' },
-          method: 'GET',
-          signal: undefined,
-        },
-      );
-
-      const actions = mockStore.getActions();
-      expect(actions).toHaveLength(2);
-      expect(actions[0].type).toStrictEqual(
-        'bridge/setDestTokenExchangeRates/pending',
-      );
-      expect(actions[1].type).toStrictEqual(
-        'bridge/setDestTokenExchangeRates/fulfilled',
-      );
-      const newState = bridgeReducer(state, actions[1]);
-      expect(newState).toStrictEqual({
-        toChainId: null,
-        toTokenExchangeRate: 0.356628,
-        sortOrder: 'cost_ascending',
-      });
-    });
-
-    it('fetches token prices and updates dest exchange rates in state, erc20 dest token', async () => {
-      // TODO: Fix in https://github.com/MetaMask/metamask-extension/issues/31973
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      const mockStore = configureMockStore<any>(middleware)(
-        createBridgeMockStore(),
-      );
-      const state = mockStore.getState().bridge;
-      const fetchTokenExchangeRatesSpy = jest
-        .spyOn(controllerUtils, 'handleFetch')
-        .mockResolvedValue({
-          [toAssetId(
-            '0x3c499c542cEF5E3811e1192ce70d8cC03d5c3359'.toLowerCase(),
-            formatChainIdToCaip(CHAIN_IDS.LINEA_MAINNET),
-          ) as never]: {
-            price: 0.999881,
-          },
-        });
-
-      await mockStore.dispatch(
-        setDestTokenExchangeRates({
-          chainId: CHAIN_IDS.LINEA_MAINNET,
-          tokenAddress:
-            '0x3c499c542cEF5E3811e1192ce70d8cC03d5c3359'.toLowerCase(),
-          currency: 'usd',
-        }) as never,
-      );
-
-      expect(fetchTokenExchangeRatesSpy).toHaveBeenCalledTimes(1);
-      expect(fetchTokenExchangeRatesSpy).toHaveBeenCalledWith(
-        'https://price.api.cx.metamask.io/v3/spot-prices?assetIds=eip155%3A59144%2Ferc20%3A0x3c499c542cef5e3811e1192ce70d8cc03d5c3359&includeMarketData=true&vsCurrency=usd',
-        {
-          headers: { 'X-Client-Id': 'extension' },
-          method: 'GET',
-          signal: undefined,
-        },
-      );
-
-      const actions = mockStore.getActions();
-      expect(actions).toHaveLength(2);
-      expect(actions[0].type).toStrictEqual(
-        'bridge/setDestTokenExchangeRates/pending',
-      );
-      expect(actions[1].type).toStrictEqual(
-        'bridge/setDestTokenExchangeRates/fulfilled',
-      );
-      const newState = bridgeReducer(state, actions[1]);
-      expect(newState).toStrictEqual({
-        toChainId: null,
-        toTokenExchangeRate: 0.999881,
-        sortOrder: 'cost_ascending',
-      });
-    });
-  });
-
   describe('setWasTxDeclined', () => {
     it('sets the wasTxDeclined flag to true', () => {
       const state = store.getState().bridge;