fix: Money Account deposit Pay flow

Three coupled fixes that together unblock Money Account deposits via
MetaMask Pay.

- getTokenAddress: prefer transactionMeta.requiredAssets[0].address
  over txParams.to. For an EIP-7702 batch txParams.to === txParams.from
  (the EOA self-call), which has no token metadata and resolves to the
  chain's native price via useTokenFiatRates. requiredAssets is the
  canonical 'what token does this transaction need' signal.
- useMoneyAccount.initiateDeposit: declare requiredAssets on the
  addTransactionBatch call so Pay's parseRequiredTokens finds the
  deposit token. The batch (approve + teller.deposit) has no nested
  transfer() for the implicit fallback to detect.
- useUpdateTransactionPayAmount: on the moneyAccountDeposit Done press,
  patch requiredAssets[0].amount before re-encoding nested calldata.
  Reads decimals from useTransactionPayRequiredTokens()[0] and encodes
  amountHuman * 10^decimals via updateTransaction(...) on the snapshot.
  Subsequent updateAtomicBatchData calls observe the new requiredAssets
  and only mutate disjoint fields, so neither write clobbers the other.

A shared deposit-asset constant (getMoneyAccountDepositAssetAddress)
is also exported from moneyAccountTransactions so the calldata
encoding and Pay's requiredAssets agree on the asset address.

Author: matthewwalsh0

app/components/UI/Money/hooks/useMoneyAccount.ts

@@ -87,6 +87,13 @@ export function useMoneyAccountDeposit() {
         disableHook: true,
         disableSequential: true,
         transactions: [approveTx, depositTx],
+        requiredAssets: [
+          {
+            address: getMoneyAccountDepositAssetAddress(chainIdHex),
+            amount: '0x0' as Hex,
+            standard: 'erc20',
+          },
+        ],
       });
     } catch (error) {
       Logger.error(error as Error, `${LOG_TAG} Deposit transaction failed`);

app/components/UI/Money/utils/moneyAccountTransactions.ts

@@ -15,6 +15,25 @@ import { selectMoneyAccountVaultConfig } from '../../../../selectors/featureFlag
 import ReduxService from '../../../../core/redux';
 import type { RootState } from '../../../../reducers';
 
+/**
+ * Returns the deposit asset address (the token the user pays in) for a given chain.
+ * TODO: Replace with mUSD address once deployed; until then, USDC mainnet is used.
+ *
+ * Single source of truth for the deposit asset so both calldata encoding
+ * (`buildMoneyAccountDepositBatch`) and Pay's `requiredAssets` agree.
+ */
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export function getMoneyAccountDepositAssetAddress(_chainId: Hex): Hex {
+  // TODO: uncomment when mUSD is deployed
+  // const musdAddress = MUSD_TOKEN_ADDRESS_BY_CHAIN[_chainId];
+  // if (!musdAddress) {
+  //   throw new Error(`mUSD not deployed on chain ${_chainId}`);
+  // }
+  // return musdAddress;
+  // TODO: remove when mUSD is deployed - temporarily hardcoded USDC
+  return '0xaf88d065e77c8cC2239327C5EDb3A432268e5831';
+}
+
 const LENS_ABI = [
   'function previewDeposit(address depositAsset, uint256 depositAmount, address boringVault, address accountant) view returns (uint256 shares)',
 ];
@@ -131,13 +150,7 @@ export async function buildMoneyAccountDepositBatch({
   lensAddress: string;
   provider: ethers.providers.Provider;
 }): Promise<MoneyAccountDepositBatchResult> {
-  // TODO: uncomment when mUSD is deployed
-  // const musdAddress = MUSD_TOKEN_ADDRESS_BY_CHAIN[chainId];
-  // if (!musdAddress) {
-  //   throw new Error(`mUSD not deployed on chain ${chainId}`);
-  // }
-  // TODO: remove when mUSD is deployed - temporarily hardcoded USDC
-  const musdAddress = '0xaf88d065e77c8cC2239327C5EDb3A432268e5831';
+  const musdAddress = getMoneyAccountDepositAssetAddress(chainId);
 
   // Skip the RPC call for zero-amount placeholder batches (e.g. initial deposit submission).
   const minimumMint =

app/components/Views/confirmations/hooks/pay/useUpdateTransactionPayAmount.ts

@@ -1,18 +1,25 @@
 import { useCallback } from 'react';
+import { BigNumber } from 'bignumber.js';
+import { toHex } from '@metamask/controller-utils';
 import {
   TransactionMeta,
   TransactionType,
 } from '@metamask/transaction-controller';
+import { Hex } from '@metamask/utils';
 import { useTransactionMetadataRequest } from '../transactions/useTransactionMetadataRequest';
 import { useUpdateTokenAmount } from '../transactions/useUpdateTokenAmount';
-import { updateAtomicBatchData } from '../../../../../util/transaction-controller';
+import {
+  updateAtomicBatchData,
+  updateTransaction,
+} from '../../../../../util/transaction-controller';
 import {
   updateMoneyAccountDepositTokenAmount,
   updateMoneyAccountWithdrawTokenAmount,
 } from '../../../../UI/Money/utils/moneyAccountTransactions';
 import { UpdateTransactionPayAmountCall } from '../../types/transactions';
 import { hasTransactionType } from '../../utils/transaction';
 import Logger from '../../../../../util/Logger';
+import { useTransactionPayRequiredTokens } from './useTransactionPayData';
 
 type MoneyAccountAmountUpdater = (
   transactionMeta: TransactionMeta,
@@ -22,6 +29,7 @@ type MoneyAccountAmountUpdater = (
 export function useUpdateTransactionPayAmount() {
   const transactionMeta = useTransactionMetadataRequest();
   const { updateTokenAmount } = useUpdateTokenAmount();
+  const requiredTokens = useTransactionPayRequiredTokens();
 
   const applyMoneyAccountAmountUpdates = useCallback(
     async (
@@ -72,6 +80,11 @@ export function useUpdateTransactionPayAmount() {
           TransactionType.moneyAccountDeposit,
         ])
       ) {
+        syncMoneyAccountDepositRequiredAssets(
+          transactionMeta,
+          amountHuman,
+          requiredTokens?.[0]?.decimals,
+        );
         await applyMoneyAccountAmountUpdates(
           amountHuman,
           updateMoneyAccountDepositTokenAmount,
@@ -95,8 +108,45 @@ export function useUpdateTransactionPayAmount() {
 
       updateTokenAmount(amountHuman);
     },
-    [transactionMeta, applyMoneyAccountAmountUpdates, updateTokenAmount],
+    [
+      transactionMeta,
+      applyMoneyAccountAmountUpdates,
+      updateTokenAmount,
+      requiredTokens,
+    ],
   );
 
   return { updateTransactionPayAmount };
 }
+
+function syncMoneyAccountDepositRequiredAssets(
+  transactionMeta: TransactionMeta,
+  amountHuman: string,
+  decimals: number | undefined,
+): void {
+  const existing = transactionMeta.requiredAssets;
+  if (!existing?.length || decimals === undefined) return;
+
+  try {
+    const amount = toHex(
+      new BigNumber(amountHuman)
+        .shiftedBy(decimals)
+        .decimalPlaces(0, BigNumber.ROUND_UP)
+        .toFixed(0),
+    ) as Hex;
+    if (existing[0].amount === amount) return;
+
+    updateTransaction(
+      {
+        ...transactionMeta,
+        requiredAssets: [{ ...existing[0], amount }, ...existing.slice(1)],
+      },
+      'Money Account deposit: sync requiredAssets amount',
+    );
+  } catch (error) {
+    Logger.error(
+      error as Error,
+      'Failed to sync Money Account deposit requiredAssets amount',
+    );
+  }
+}

app/components/Views/confirmations/utils/transaction-pay.ts

@@ -85,6 +85,11 @@ export function getTokenAddress(
     return nestedCall.to;
   }
 
+  const requiredAssetAddress = transactionMeta?.requiredAssets?.[0]?.address;
+  if (requiredAssetAddress) {
+    return requiredAssetAddress;
+  }
+
   return transactionMeta?.txParams?.to as Hex;
 }