feat: submit multichain tx

app/scripts/controllers/bridge-status/bridge-status-controller.test.ts

@@ -20,7 +20,7 @@ const getMessengerMock = ({
 } = {}) =>
   ({
     call: jest.fn((method: string) => {
-      if (method === 'AccountsController:getSelectedAccount') {
+      if (method === 'AccountsController:getSelectedMultichainAccount') {
         return { address: account };
       } else if (method === 'NetworkController:findNetworkClientIdByChainId') {
         return 'networkClientId';
@@ -216,7 +216,7 @@ describe('BridgeStatusController', () => {
       let getSelectedAccountCalledTimes = 0;
       const messengerMock = {
         call: jest.fn((method: string) => {
-          if (method === 'AccountsController:getSelectedAccount') {
+          if (method === 'AccountsController:getSelectedMultichainAccount') {
             let account;
             if (getSelectedAccountCalledTimes === 0) {
               account = '0xaccount1';
@@ -399,7 +399,7 @@ describe('BridgeStatusController', () => {
       jest.useFakeTimers();
       const messengerMock = {
         call: jest.fn((method: string) => {
-          if (method === 'AccountsController:getSelectedAccount') {
+          if (method === 'AccountsController:getSelectedMultichainAccount') {
             return { address: '0xaccount1' };
           } else if (
             method === 'NetworkController:findNetworkClientIdByChainId'

app/scripts/controllers/bridge-status/bridge-status-controller.ts

@@ -157,7 +157,7 @@ export default class BridgeStatusController extends StaticIntervalPollingControl
       targetContractAddress,
     } = startPollingForBridgeTxStatusArgs;
     const { bridgeStatusState } = this.state;
-    const { address: account } = this.#getSelectedAccount();
+    const accountAddress = this.#getMultichainSelectedAccountAddress();
 
     // Write all non-status fields to state so we can reference the quote in Activity list without the Bridge API
     // We know it's in progress but not the exact status yet
@@ -176,7 +176,7 @@ export default class BridgeStatusController extends StaticIntervalPollingControl
       },
       initialDestAssetBalance,
       targetContractAddress,
-      account,
+      account: accountAddress,
       status: {
         // We always have a PENDING status when we start polling for a tx, don't need the Bridge API for that
         // Also we know the bare minimum fields for status at this point in time
@@ -210,8 +210,14 @@ export default class BridgeStatusController extends StaticIntervalPollingControl
     await this.#fetchBridgeTxStatus(pollingInput);
   };
 
-  #getSelectedAccount() {
-    return this.messagingSystem.call('AccountsController:getSelectedAccount');
+  // Returns an empty string if no account is selected, but this will never happen since
+  // the multichain selected account defaults to the EVM account
+  #getMultichainSelectedAccountAddress() {
+    return (
+      this.messagingSystem.call(
+        'AccountsController:getSelectedMultichainAccount',
+      )?.address ?? ''
+    );
   }
 
   #fetchBridgeTxStatus = async ({

app/scripts/controllers/bridge-status/types.ts

@@ -8,7 +8,7 @@ import {
   NetworkControllerGetNetworkClientByIdAction,
   NetworkControllerGetStateAction,
 } from '@metamask/network-controller';
-import { AccountsControllerGetSelectedAccountAction } from '@metamask/accounts-controller';
+import { AccountsControllerGetSelectedMultichainAccountAction } from '@metamask/accounts-controller';
 import { TransactionControllerGetStateAction } from '@metamask/transaction-controller';
 import {
   BridgeHistoryItem,
@@ -63,7 +63,7 @@ type AllowedActions =
   | NetworkControllerFindNetworkClientIdByChainIdAction
   | NetworkControllerGetStateAction
   | NetworkControllerGetNetworkClientByIdAction
-  | AccountsControllerGetSelectedAccountAction
+  | AccountsControllerGetSelectedMultichainAccountAction
   | TransactionControllerGetStateAction;
 
 /**

app/scripts/metamask-controller.js

@@ -1826,7 +1826,7 @@ export default class MetamaskController extends EventEmitter {
       this.controllerMessenger.getRestricted({
         name: BRIDGE_STATUS_CONTROLLER_NAME,
         allowedActions: [
-          'AccountsController:getSelectedAccount',
+          'AccountsController:getSelectedMultichainAccount',
           'NetworkController:getNetworkClientById',
           'NetworkController:findNetworkClientIdByChainId',
           'NetworkController:getState',

ui/hooks/accounts/useMultichainWalletSnapClient.ts

@@ -41,6 +41,14 @@ export class MultichainWalletSnapSender implements Sender {
   };
 }
 
+export function useMultichainWalletSnapSender(snapId: SnapId) {
+  const client = useMemo(() => {
+    return new MultichainWalletSnapSender(snapId);
+  }, [snapId]);
+
+  return client;
+}
+
 export class MultichainWalletSnapClient {
   readonly #client: KeyringClient;
 

ui/hooks/bridge/useIsTxSubmittable.ts

@@ -3,43 +3,46 @@ import { SWAPS_CHAINID_DEFAULT_TOKEN_MAP } from '../../../shared/constants/swaps
 import {
   getBridgeQuotes,
   getFromAmount,
-  getFromChain,
   getFromToken,
   getToChain,
   getValidationErrors,
   getToToken,
 } from '../../ducks/bridge/selectors';
+import { getMultichainCurrentChainId } from '../../selectors/multichain';
+import { useMultichainSelector } from '../useMultichainSelector';
+import { useIsMultichainSwap } from '../../pages/bridge/hooks/useIsMultichainSwap';
 import useLatestBalance from './useLatestBalance';
 
 export const useIsTxSubmittable = () => {
   const fromToken = useSelector(getFromToken);
   const toToken = useSelector(getToToken);
-  const fromChain = useSelector(getFromChain);
+  const fromChainId = useMultichainSelector(getMultichainCurrentChainId);
   const toChain = useSelector(getToChain);
   const fromAmount = useSelector(getFromAmount);
   const { activeQuote } = useSelector(getBridgeQuotes);
 
+  const isSwap = useIsMultichainSwap();
   const {
     isInsufficientBalance,
     isInsufficientGasBalance,
     isInsufficientGasForQuote,
   } = useSelector(getValidationErrors);
 
-  const { balanceAmount } = useLatestBalance(fromToken, fromChain?.chainId);
-  const { balanceAmount: nativeAssetBalance } = useLatestBalance(
-    fromChain?.chainId
+  const balanceAmount = useLatestBalance(fromToken, fromChainId);
+  const nativeAssetBalance = useLatestBalance(
+    fromChainId
       ? SWAPS_CHAINID_DEFAULT_TOKEN_MAP[
-          fromChain.chainId as keyof typeof SWAPS_CHAINID_DEFAULT_TOKEN_MAP
+          fromChainId as keyof typeof SWAPS_CHAINID_DEFAULT_TOKEN_MAP
         ]
       : null,
-    fromChain?.chainId,
+    fromChainId,
   );
 
   return Boolean(
     fromToken &&
       toToken &&
-      fromChain &&
-      toChain &&
+      fromChainId &&
+      (isSwap || toChain) &&
       fromAmount &&
       activeQuote &&
       !isInsufficientBalance(balanceAmount) &&

ui/hooks/bridge/useLatestBalance.test.ts

@@ -57,7 +57,7 @@ describe('useLatestBalance', () => {
     );
 
     await waitForNextUpdate();
-    expect(result.current.balanceAmount).toStrictEqual(new BigNumber('1'));
+    expect(result.current).toStrictEqual(new BigNumber('1'));
 
     expect(mockGetBalance).toHaveBeenCalledTimes(1);
     expect(mockGetBalance).toHaveBeenCalledWith(
@@ -76,7 +76,7 @@ describe('useLatestBalance', () => {
     );
 
     await waitForNextUpdate();
-    expect(result.current.balanceAmount).toStrictEqual(new BigNumber('15.39'));
+    expect(result.current).toStrictEqual(new BigNumber('15.39'));
 
     expect(mockFetchTokenBalance).toHaveBeenCalledTimes(1);
     expect(mockFetchTokenBalance).toHaveBeenCalledWith(

ui/hooks/bridge/useLatestBalance.ts

@@ -1,11 +1,16 @@
-import { useSelector } from 'react-redux';
 import { type Hex, type CaipChainId, isCaipChainId } from '@metamask/utils';
-import { Numeric } from '../../../shared/modules/Numeric';
-import { getCurrentChainId } from '../../../shared/modules/selectors/networks';
+import { useMemo } from 'react';
 import { getSelectedInternalAccount } from '../../selectors';
 import { calcLatestSrcBalance } from '../../../shared/modules/bridge-utils/balance';
 import { useAsyncResult } from '../useAsyncResult';
+import { Numeric } from '../../../shared/modules/Numeric';
 import { calcTokenAmount } from '../../../shared/lib/transactions-controller-utils';
+import { useMultichainSelector } from '../useMultichainSelector';
+import {
+  getMultichainBalances,
+  getMultichainCurrentChainId,
+} from '../../selectors/multichain';
+import { MultichainNetworks } from '../../../shared/constants/multichain/networks';
 
 /**
  * Custom hook to fetch and format the latest balance of a given token or native asset.
@@ -19,15 +24,21 @@ const useLatestBalance = (
     address: string;
     decimals: number;
     symbol: string;
+    string?: string;
   } | null,
   chainId?: Hex | CaipChainId,
 ) => {
-  const { address: selectedAddress } = useSelector(getSelectedInternalAccount);
-  const currentChainId = useSelector(getCurrentChainId);
+  const { address: selectedAddress, id } = useMultichainSelector(
+    getSelectedInternalAccount,
+  );
+  const currentChainId = useMultichainSelector(getMultichainCurrentChainId);
+
+  const nonEvmBalancesByAccountId = useMultichainSelector(
+    getMultichainBalances,
+  );
+  const nonEvmBalances = nonEvmBalancesByAccountId[id];
 
-  const { value: latestBalance } = useAsyncResult<
-    Numeric | undefined
-  >(async () => {
+  const value = useAsyncResult<Numeric | undefined>(async () => {
     if (
       token?.address &&
       // TODO check whether chainId is EVM when MultichainNetworkController is integrated
@@ -42,23 +53,43 @@ const useLatestBalance = (
         chainId,
       );
     }
+
+    // No need to fetch the balance for non-EVM tokens, use the balance provided by the
+    // multichain balances controller
+    if (
+      isCaipChainId(chainId) &&
+      chainId === MultichainNetworks.SOLANA &&
+      token?.decimals
+    ) {
+      return Numeric.from(
+        nonEvmBalances?.[token.address]?.amount ?? token?.string,
+        10,
+      ).shiftedBy(-1 * token.decimals);
+    }
+
     return undefined;
-  }, [currentChainId, token?.address, selectedAddress]);
+  }, [
+    chainId,
+    currentChainId,
+    token,
+    selectedAddress,
+    global.ethereumProvider,
+    nonEvmBalances,
+  ]);
 
   if (token && !token.decimals) {
     throw new Error(
       `Failed to calculate latest balance - ${token.symbol} token is missing "decimals" value`,
     );
   }
 
-  const tokenDecimals = token?.decimals ? Number(token.decimals) : 1;
-
-  return {
-    balanceAmount:
-      token && latestBalance
-        ? calcTokenAmount(latestBalance.toString(), tokenDecimals)
+  return useMemo(
+    () =>
+      value?.value
+        ? calcTokenAmount(value.value.toString(), token?.decimals)
         : undefined,
-  };
+    [value.value, token?.decimals],
+  );
 };
 
 export default useLatestBalance;

ui/hooks/bridge/useQuoteFetchEvents.ts

@@ -44,8 +44,8 @@ export const useQuoteFetchEvents = () => {
   const fromToken = useSelector(getFromToken);
   const fromChain = useSelector(getFromChain);
 
-  const { balanceAmount } = useLatestBalance(fromToken, fromChain?.chainId);
-  const { balanceAmount: nativeAssetBalance } = useLatestBalance(
+  const balanceAmount = useLatestBalance(fromToken, fromChain?.chainId);
+  const nativeAssetBalance = useLatestBalance(
     fromChain?.chainId
       ? SWAPS_CHAINID_DEFAULT_TOKEN_MAP[
           fromChain.chainId as keyof typeof SWAPS_CHAINID_DEFAULT_TOKEN_MAP