[pull] main from MetaMask:main

app/actions/settings/index.js

@@ -12,13 +12,6 @@ export function setShowHexData(showHexData) {
   };
 }
 
-export function setShowCustomNonce(showCustomNonce) {
-  return {
-    type: 'SET_SHOW_CUSTOM_NONCE',
-    showCustomNonce,
-  };
-}
-
 export function setShowFiatOnTestnets(showFiatOnTestnets) {
   return {
     type: 'SET_SHOW_FIAT_ON_TESTNETS',

app/components/UI/Earn/constants/musd.ts

@@ -6,24 +6,20 @@ import { CHAIN_IDS } from '@metamask/transaction-controller';
 import { Hex } from '@metamask/utils';
 import { NETWORKS_CHAIN_ID } from '../../../../constants/network';
 
-export const MUSD_TOKEN_MAINNET = {
-  address: '0xaca92e438df0b2401ff60da7e4337b687a2435da',
+export const MUSD_TOKEN = {
   symbol: 'MUSD',
   name: 'MUSD',
   decimals: 6,
-  chainId: CHAIN_IDS.MAINNET,
 } as const;
 
-export const MUSD_CURRENCY = 'MUSD';
-
-// mUSD token address on Ethereum mainnet (6 decimals)
-export const MUSD_ADDRESS_ETHEREUM =
-  '0xaca92e438df0b2401ff60da7e4337b687a2435da';
+export const MUSD_TOKEN_ADDRESS_BY_CHAIN: Record<Hex, Hex> = {
+  [CHAIN_IDS.MAINNET]: '0xaca92e438df0b2401ff60da7e4337b687a2435da',
+};
 
-// Ethereum mainnet chain ID
-export const ETHEREUM_MAINNET_CHAIN_ID = '0x1';
+export const MUSD_CURRENCY = 'MUSD';
 
-export const STABLECOIN_SYMBOL_TO_ADDRESS_BY_CHAIN: Record<
+// All stablecoins that are supported in the mUSD conversion flow.
+export const MUSD_CONVERSION_STABLECOINS_BY_CHAIN_ID: Record<
   Hex,
   Record<string, Hex>
 > = {
@@ -33,20 +29,20 @@ export const STABLECOIN_SYMBOL_TO_ADDRESS_BY_CHAIN: Record<
     DAI: '0x6b175474e89094c44da98b954eedeac495271d0f',
   },
   // Temp: Uncomment once we support Linea -> Linea quotes
-  // [NETWORKS_CHAIN_ID.LINEA_MAINNET]: {
-  //   USDC: '0x176211869ca2b568f2a7d4ee941e073a821ee1ff',
-  //   USDT: '0xa219439258ca9da29e9cc4ce5596924745e12b93',
-  // },
-  // [NETWORKS_CHAIN_ID.BSC]: {
-  //   USDC: '0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d',
-  //   USDT: '0x55d398326f99059ff775485246999027b3197955',
-  // },
+  [NETWORKS_CHAIN_ID.LINEA_MAINNET]: {
+    USDC: '0x176211869ca2b568f2a7d4ee941e073a821ee1ff',
+    USDT: '0xa219439258ca9da29e9cc4ce5596924745e12b93',
+  },
+  [NETWORKS_CHAIN_ID.BSC]: {
+    USDC: '0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d',
+    USDT: '0x55d398326f99059ff775485246999027b3197955',
+  },
 };
 
 export const CONVERTIBLE_STABLECOINS_BY_CHAIN: Record<Hex, Hex[]> = (() => {
   const result: Record<Hex, Hex[]> = {};
   for (const [chainId, symbolMap] of Object.entries(
-    STABLECOIN_SYMBOL_TO_ADDRESS_BY_CHAIN,
+    MUSD_CONVERSION_STABLECOINS_BY_CHAIN_ID,
   )) {
     result[chainId as Hex] = Object.values(symbolMap);
   }

app/components/UI/Earn/hooks/useMusdConversion.test.ts

@@ -1,8 +1,5 @@
 import { renderHook, act } from '@testing-library/react-hooks';
-import {
-  useMusdConversion,
-  areValidAllowedPaymentTokens,
-} from './useMusdConversion';
+import { useMusdConversion } from './useMusdConversion';
 import Engine from '../../../../core/Engine';
 import Logger from '../../../../util/Logger';
 import { generateTransferData } from '../../../../util/transactions';
@@ -93,13 +90,7 @@ describe('useMusdConversion', () => {
 
   describe('initiateConversion', () => {
     const mockConfig = {
-      outputToken: {
-        address: '0xacA92E438df0B2401fF60dA7E4337B687a2435DA' as Hex,
-        chainId: '0x1' as Hex,
-        symbol: 'MUSD',
-        name: 'MUSD',
-        decimals: 6,
-      },
+      outputChainId: '0x1' as Hex,
       preferredPaymentToken: {
         address: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48' as Hex,
         chainId: '0x1' as Hex,
@@ -126,9 +117,11 @@ describe('useMusdConversion', () => {
         screen: Routes.FULL_SCREEN_CONFIRMATIONS.REDESIGNED_CONFIRMATIONS,
         params: {
           loader: ConfirmationLoader.CustomAmount,
-          preferredPaymentToken: mockConfig.preferredPaymentToken,
-          outputToken: mockConfig.outputToken,
-          allowedPaymentTokens: undefined,
+          preferredPaymentToken: {
+            address: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+            chainId: '0x1',
+          },
+          outputChainId: '0x1',
         },
       });
     });
@@ -151,11 +144,11 @@ describe('useMusdConversion', () => {
 
       expect(mockTransactionController.addTransaction).toHaveBeenCalledWith(
         {
-          to: mockConfig.outputToken.address,
-          from: mockSelectedAccount.address,
+          to: '0xaca92e438df0b2401ff60da7e4337b687a2435da',
+          from: '0x123456789abcdef',
           data: '0xmockedTransferData',
           value: '0x0',
-          chainId: mockConfig.outputToken.chainId,
+          chainId: '0x1',
         },
         {
           networkClientId: 'mainnet',
@@ -164,7 +157,7 @@ describe('useMusdConversion', () => {
           type: TransactionType.musdConversion,
           nestedTransactions: [
             {
-              to: mockConfig.outputToken.address,
+              to: '0xaca92e438df0b2401ff60da7e4337b687a2435da',
               data: '0xmockedTransferData',
               value: '0x0',
             },
@@ -197,7 +190,7 @@ describe('useMusdConversion', () => {
       expect(Array.isArray(options.nestedTransactions)).toBe(true);
       expect(options.nestedTransactions).toHaveLength(1);
       expect(options.nestedTransactions[0]).toEqual({
-        to: mockConfig.outputToken.address,
+        to: '0xaca92e438df0b2401ff60da7e4337b687a2435da',
         data: '0xmockedTransferData',
         value: '0x0',
       });
@@ -239,7 +232,7 @@ describe('useMusdConversion', () => {
       expect(Logger.error).toHaveBeenCalled();
     });
 
-    it('throws error when outputToken is missing', async () => {
+    it('throws error when outputChainId is missing', async () => {
       const mockSelectorFn = jest.fn(() => mockSelectedAccount);
       mockUseSelector.mockReturnValue(mockSelectorFn);
       mockSelectorFn.mockReturnValue(mockSelectedAccount);
@@ -248,15 +241,15 @@ describe('useMusdConversion', () => {
 
       const invalidConfig = {
         ...mockConfig,
-        outputToken: undefined,
+        outputChainId: undefined,
       };
 
       await act(async () => {
         await expect(
-          // @ts-expect-error - Intentionally testing invalid config with missing outputToken
+          // @ts-expect-error - Intentionally testing invalid config with missing outputChainId
           result.current.initiateConversion(invalidConfig),
         ).rejects.toThrow(
-          'Output token and preferred payment token are required',
+          'Output chain ID and preferred payment token are required',
         );
       });
     });
@@ -278,7 +271,7 @@ describe('useMusdConversion', () => {
           // @ts-expect-error - Intentionally testing invalid config with missing preferredPaymentToken
           result.current.initiateConversion(invalidConfig),
         ).rejects.toThrow(
-          'Output token and preferred payment token are required',
+          'Output chain ID and preferred payment token are required',
         );
       });
     });
@@ -335,39 +328,6 @@ describe('useMusdConversion', () => {
       );
     });
 
-    it('includes allowedPaymentTokens in navigation params when provided', async () => {
-      const mockSelectorFn = jest.fn(() => mockSelectedAccount);
-      mockUseSelector.mockReturnValue(mockSelectorFn);
-      mockSelectorFn.mockReturnValue(mockSelectedAccount);
-
-      mockNetworkController.findNetworkClientIdByChainId.mockReturnValue(
-        'mainnet',
-      );
-      mockTransactionController.addTransaction.mockResolvedValue({
-        transactionMeta: { id: 'tx-123' },
-      });
-
-      const { result } = renderHook(() => useMusdConversion());
-
-      const allowedTokens: Record<Hex, Hex[]> = {
-        '0x1': ['0xabc' as Hex],
-      };
-
-      const configWithAllowedTokens = {
-        ...mockConfig,
-        allowedPaymentTokens: allowedTokens,
-      };
-
-      await result.current.initiateConversion(configWithAllowedTokens);
-
-      expect(mockNavigation.navigate).toHaveBeenCalledWith(Routes.EARN.ROOT, {
-        screen: Routes.FULL_SCREEN_CONFIRMATIONS.REDESIGNED_CONFIRMATIONS,
-        params: expect.objectContaining({
-          allowedPaymentTokens: allowedTokens,
-        }),
-      });
-    });
-
     it('returns transaction ID on success', async () => {
       const mockSelectorFn = jest.fn(() => mockSelectedAccount);
       mockUseSelector.mockReturnValue(mockSelectorFn);
@@ -410,14 +370,8 @@ describe('useMusdConversion', () => {
 
       const { result } = renderHook(() => useMusdConversion());
 
-      const mockConfig = {
-        outputToken: {
-          address: '0xacA92E438df0B2401fF60dA7E4337B687a2435DA' as Hex,
-          chainId: '0x1' as Hex,
-          symbol: 'MUSD',
-          name: 'MUSD',
-          decimals: 6,
-        },
+      const testConfig = {
+        outputChainId: '0x1' as Hex,
         preferredPaymentToken: {
           address: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48' as Hex,
           chainId: '0x1' as Hex,
@@ -430,7 +384,7 @@ describe('useMusdConversion', () => {
 
       await act(async () => {
         await expect(
-          result.current.initiateConversion(mockConfig),
+          result.current.initiateConversion(testConfig),
         ).rejects.toThrow('Transaction failed');
       });
 
@@ -441,87 +395,10 @@ describe('useMusdConversion', () => {
       });
 
       await act(async () => {
-        await result.current.initiateConversion(mockConfig);
+        await result.current.initiateConversion(testConfig);
       });
 
       expect(result.current.error).toBeNull();
     });
   });
 });
-
-describe('areValidAllowedPaymentTokens', () => {
-  it('returns true for valid Record<Hex, Hex[]>', () => {
-    const validInput: Record<Hex, Hex[]> = {
-      '0x1': ['0xabc' as Hex, '0xdef' as Hex],
-      '0x2': ['0x123' as Hex],
-    };
-
-    const result = areValidAllowedPaymentTokens(validInput);
-
-    expect(result).toBe(true);
-  });
-
-  it('returns false for null', () => {
-    const result = areValidAllowedPaymentTokens(null);
-
-    expect(result).toBe(false);
-  });
-
-  it('returns false for undefined', () => {
-    const result = areValidAllowedPaymentTokens(undefined);
-
-    expect(result).toBe(false);
-  });
-
-  it('returns false for arrays', () => {
-    const result = areValidAllowedPaymentTokens(['0x1', '0x2']);
-
-    expect(result).toBe(false);
-  });
-
-  it('returns false when keys are not hex strings', () => {
-    const invalidInput = {
-      notHex: ['0xabc' as Hex],
-    };
-
-    const result = areValidAllowedPaymentTokens(invalidInput);
-
-    expect(result).toBe(false);
-  });
-
-  it('returns false when values are not arrays', () => {
-    const invalidInput = {
-      '0x1': '0xabc',
-    };
-
-    const result = areValidAllowedPaymentTokens(invalidInput);
-
-    expect(result).toBe(false);
-  });
-
-  it('returns false when array elements are not hex strings', () => {
-    const invalidInput = {
-      '0x1': ['notHex'],
-    };
-
-    const result = areValidAllowedPaymentTokens(invalidInput);
-
-    expect(result).toBe(false);
-  });
-
-  it('returns true for empty object', () => {
-    const result = areValidAllowedPaymentTokens({});
-
-    expect(result).toBe(true);
-  });
-
-  it('returns true for object with empty arrays', () => {
-    const validInput: Record<Hex, Hex[]> = {
-      '0x1': [],
-    };
-
-    const result = areValidAllowedPaymentTokens(validInput);
-
-    expect(result).toBe(true);
-  });
-});