fix(money): make amount-update error toast persist until dismissed

Author: matthewwalsh0

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

@@ -376,7 +376,7 @@ describe('moneyAccountTransactions', () => {
 
       await expect(
         updateMoneyAccountDepositTokenAmount(mockTransactionMeta, '1.0'),
-      ).rejects.toThrow('RPC connection refused');
+      ).rejects.toThrow('Failed to preview deposit shares');
     });
   });
 
@@ -792,7 +792,7 @@ describe('moneyAccountTransactions', () => {
 
       await expect(
         getMoneyAccountDepositTransactionsData(MOCK_CHAIN_ID, '1.0'),
-      ).rejects.toThrow('RPC timeout');
+      ).rejects.toThrow('Failed to preview deposit shares');
     });
   });
 

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

@@ -87,13 +87,17 @@ async function getExpectedDepositShares({
   provider: ethers.providers.Provider;
 }): Promise<bigint> {
   const lensContract = new ethers.Contract(lensAddress, LENS_ABI, provider);
-  const shares = await lensContract.previewDeposit(
-    musdAddress,
-    amount.toString(),
-    boringVault,
-    accountantAddress,
-  );
-  return BigInt(shares.toString());
+  try {
+    const shares = await lensContract.previewDeposit(
+      musdAddress,
+      amount.toString(),
+      boringVault,
+      accountantAddress,
+    );
+    return BigInt(shares.toString());
+  } catch {
+    throw new Error('Failed to preview deposit shares');
+  }
 }
 
 function buildApproveData(boringVault: string, amount: bigint): Hex {
@@ -391,8 +395,12 @@ async function getVaultRate({
     ACCOUNTANT_ABI,
     provider,
   );
-  const rate = await accountant.getRate();
-  return BigInt(rate.toString());
+  try {
+    const rate = await accountant.getRate();
+    return BigInt(rate.toString());
+  } catch {
+    throw new Error('Failed to fetch vault rate');
+  }
 }
 
 const SHARE_DECIMALS_SCALAR = BigInt(1_000_000);

app/components/Views/confirmations/components/info/custom-amount-info/custom-amount-info.test.tsx

@@ -44,7 +44,7 @@ import { useTokenFiatRates } from '../../../hooks/tokens/useTokenFiatRates';
 import { useTransactionPayWithdraw } from '../../../hooks/pay/useTransactionPayWithdraw';
 import { useTransactionAccountOverride } from '../../../hooks/transactions/useTransactionAccountOverride';
 import { useMoneyNoFeeTokens } from '../../../hooks/pay/useMoneyNoFeeTokens';
-import Logger from '../../../../../../util/Logger';
+
 import useClearConfirmationOnBackSwipe from '../../../hooks/ui/useClearConfirmationOnBackSwipe';
 
 jest.mock('../../../hooks/ui/useClearConfirmationOnBackSwipe');
@@ -78,7 +78,7 @@ jest.mock('../../../hooks/pay/useTransactionPayWithdraw', () => ({
 jest.mock('../../../hooks/transactions/useTransactionAccountOverride');
 jest.mock('../../../hooks/pay/useMoneyNoFeeTokens');
 jest.mock('../../../../../../util/transaction-controller', () => ({}));
-jest.mock('../../../../../../util/Logger');
+
 jest.mock('../../../../../../core/Engine', () => ({
   context: {
     TransactionPayController: {
@@ -593,9 +593,6 @@ describe('CustomAmountInfo', () => {
     const error = new Error('update failed');
     const updateTokenAmountMock = jest.fn().mockRejectedValue(error);
     const mockOnAmountSubmit = jest.fn();
-    const loggerErrorMock = jest.mocked(Logger.error);
-    loggerErrorMock.mockClear();
-
     useTransactionCustomAmountMock.mockReturnValue({
       amountFiat: '123.45',
       amountHuman: '0',
@@ -626,10 +623,6 @@ describe('CustomAmountInfo', () => {
     );
     // Keyboard stays open: Done button still present
     expect(queryByText(strings('confirm.edit_amount_done'))).toBeOnTheScreen();
-    expect(loggerErrorMock).toHaveBeenCalledWith(
-      error,
-      expect.stringContaining('Failed to apply custom amount on Done press'),
-    );
   });
 
   it('renders PayAccountSelector when supportAccountSelection is true', () => {
@@ -957,7 +950,6 @@ describe('CustomAmountInfo', () => {
     it('does not fire RAMPS_ORDER_PROPOSED and shows toast when applying the amount throws on Done', async () => {
       setMoneyFlow();
       const error = new Error('update failed');
-      const loggerErrorMock = jest.mocked(Logger.error);
       useTransactionCustomAmountMock.mockReturnValue({
         ...useTransactionCustomAmountMock(),
         updateTokenAmount: jest.fn().mockRejectedValue(error),
@@ -974,10 +966,6 @@ describe('CustomAmountInfo', () => {
       // The Done handler's catch shows a toast and returns early without committing.
       expect(emittedPayloadFor('RAMPS_ORDER_PROPOSED')).toBeUndefined();
       expect(mockShowToast).toHaveBeenCalledTimes(1);
-      expect(loggerErrorMock).toHaveBeenCalledWith(
-        error,
-        expect.stringContaining('Failed to apply custom amount on Done press'),
-      );
     });
 
     // Regression guard for FIX 2 (no double emission). Renders the REAL money

app/components/Views/confirmations/components/info/custom-amount-info/custom-amount-info.tsx

@@ -71,9 +71,9 @@ import { useAccountNoFundsAlert } from '../../../hooks/alerts/useAccountNoFundsA
 import { useConfirmActions } from '../../../hooks/useConfirmActions';
 import EngineService from '../../../../../../core/EngineService';
 import Engine from '../../../../../../core/Engine';
-import Logger from '../../../../../../util/Logger';
-import { getTransactionUpdateErrorToastOptions } from '../../../../../../util/confirmation/transactions';
+import { getAmountUpdateErrorToastOptions } from '../../../../../../util/confirmation/transactions';
 import { ToastContext } from '../../../../../../component-library/components/Toast';
+import { prefixError } from '../../../../../../util/transactions/error-prefix';
 import { ConfirmationFooterSelectorIDs } from '../../../ConfirmationView.testIds';
 import { useTransactionPayToken } from '../../../hooks/pay/useTransactionPayToken';
 import { useMoneyNoFeeTokens } from '../../../hooks/pay/useMoneyNoFeeTokens';
@@ -86,6 +86,8 @@ import { CustomAmountInfoTestIds } from './custom-amount-info.testIds';
 import { useConfirmationContext } from '../../../context/confirmation-context';
 import { useFiatFunnelMetricsAdapter } from '../../../../../UI/Ramp/hooks/useFiatFunnelMetricsAdapter';
 
+const AMOUNT_UPDATE_ERROR_PREFIX = 'MetaMask Pay: Amount Update: ';
+
 export interface CustomAmountInfoProps {
   autoSelectFiatPayment?: boolean;
   children?: ReactNode;
@@ -208,39 +210,24 @@ export const CustomAmountInfo: React.FC<CustomAmountInfoProps> = memo(
 
     const handleDone = useCallback(async () => {
       try {
+        await updateTokenAmount();
         if (selectedFiatPaymentMethodId && transactionId) {
-          if (isMoneyAccountDeposit) {
-            // Update calldata first; only commit the fiat payment amount after
-            // success so Pay config does not reflect an amount whose calldata
-            // update failed.
-            await updateTokenAmount();
-            Engine.context.TransactionPayController.updateFiatPayment({
-              transactionId,
-              callback: (fp) => {
-                fp.amountFiat = amountFiat;
-              },
-            });
-          } else {
-            Engine.context.TransactionPayController.updateFiatPayment({
-              transactionId,
-              callback: (fp) => {
-                fp.amountFiat = amountFiat;
-              },
-            });
-          }
-        } else {
-          await updateTokenAmount();
+          Engine.context.TransactionPayController.updateFiatPayment({
+            transactionId,
+            callback: (fp) => {
+              fp.amountFiat = amountFiat;
+            },
+          });
         }
         // Amount committed (pre-quote) funnel event; only fires once the amount
         // has been successfully applied above (no-op for non-money flows).
         trackAmountCommitted();
       } catch (error) {
-        Logger.error(
-          error as Error,
-          'Failed to apply custom amount on Done press',
-        );
+        const prefixed = prefixError(error, AMOUNT_UPDATE_ERROR_PREFIX);
         toastRef?.current?.showToast(
-          getTransactionUpdateErrorToastOptions(error),
+          getAmountUpdateErrorToastOptions(prefixed, () =>
+            toastRef?.current?.closeToast(),
+          ),
         );
         // Keep keyboard visible so the user can retry; do not advance the flow.
         return;
@@ -250,7 +237,6 @@ export const CustomAmountInfo: React.FC<CustomAmountInfoProps> = memo(
       onAmountSubmit?.();
     }, [
       amountFiat,
-      isMoneyAccountDeposit,
       onAmountSubmit,
       selectedFiatPaymentMethodId,
       toastRef,

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

@@ -18,7 +18,7 @@ import {
 } from '@metamask/transaction-controller';
 import { useUpdateTokenAmount } from '../transactions/useUpdateTokenAmount';
 import { useTransactionAccountOverride } from '../transactions/useTransactionAccountOverride';
-import Logger from '../../../../../util/Logger';
+
 import { useTransactionPayRequiredTokens } from './useTransactionPayData';
 import { TransactionPayRequiredToken } from '@metamask/transaction-pay-controller';
 import { Hex } from '@metamask/utils';
@@ -27,7 +27,7 @@ jest.mock('../../../../../util/transaction-controller');
 jest.mock('../../../../UI/Money/utils/moneyAccountTransactions');
 jest.mock('../transactions/useUpdateTokenAmount');
 jest.mock('../transactions/useTransactionAccountOverride');
-jest.mock('../../../../../util/Logger');
+
 jest.mock('./useTransactionPayData');
 
 const moneyAccountDepositMeta: Partial<TransactionMeta> = {
@@ -81,8 +81,6 @@ describe('useUpdateTransactionPayAmount', () => {
     useTransactionPayRequiredTokens,
   );
   const updateTokenAmountMock = jest.fn();
-  const loggerErrorMock = jest.mocked(Logger.error);
-
   beforeEach(() => {
     jest.resetAllMocks();
     updateAtomicBatchDataMock.mockResolvedValue('0x0');
@@ -204,10 +202,6 @@ describe('useUpdateTransactionPayAmount', () => {
     ).rejects.toThrow('rpc failure');
 
     expect(updateAtomicBatchDataMock).not.toHaveBeenCalled();
-    expect(loggerErrorMock).toHaveBeenCalledWith(
-      error,
-      expect.stringContaining('Failed to prepare Money Account deposit'),
-    );
   });
 
   it('calls updateAtomicBatchData for each update returned from updateMoneyAccountWithdrawTokenAmount', async () => {
@@ -285,10 +279,6 @@ describe('useUpdateTransactionPayAmount', () => {
     ).rejects.toThrow('withdraw rpc failure');
 
     expect(updateAtomicBatchDataMock).not.toHaveBeenCalled();
-    expect(loggerErrorMock).toHaveBeenCalledWith(
-      error,
-      expect.stringContaining('Failed to prepare Money Account withdraw'),
-    );
   });
 
   describe('syncMoneyAccountDepositRequiredAssets', () => {
@@ -414,11 +404,6 @@ describe('useUpdateTransactionPayAmount', () => {
       await expect(
         result.current.updateTransactionPayAmount('1'),
       ).rejects.toThrow('updateTransaction failed');
-
-      expect(loggerErrorMock).toHaveBeenCalledWith(
-        error,
-        'Failed to sync Money Account deposit requiredAssets amount',
-      );
     });
 
     it('still applies money account deposit updates after syncing requiredAssets', async () => {

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

@@ -19,9 +19,12 @@ import {
 } from '../../../../UI/Money/utils/moneyAccountTransactions';
 import { UpdateTransactionPayAmountCall } from '../../types/transactions';
 import { hasTransactionType } from '../../utils/transaction';
-import Logger from '../../../../../util/Logger';
+import { prefixError } from '../../../../../util/transactions/error-prefix';
 import { useTransactionPayRequiredTokens } from './useTransactionPayData';
 
+const DEPOSIT_ERROR_PREFIX = 'Money Account Deposit: ';
+const WITHDRAW_ERROR_PREFIX = 'Money Account Withdrawal: ';
+
 type MoneyAccountAmountUpdater = (
   transactionMeta: TransactionMeta,
   amountHuman: string,
@@ -38,7 +41,7 @@ export function useUpdateTransactionPayAmount() {
     async (
       amountHuman: string,
       updater: MoneyAccountAmountUpdater,
-      preparationErrorMessage: string,
+      errorPrefix: string,
       recipientOverride?: Hex,
     ) => {
       if (!transactionMeta) {
@@ -53,19 +56,22 @@ export function useUpdateTransactionPayAmount() {
           recipientOverride,
         );
       } catch (error) {
-        Logger.error(error as Error, preparationErrorMessage);
-        throw error;
+        throw prefixError(error, errorPrefix);
       }
 
-      await Promise.all(
-        updates.map(({ nestedTransactionIndex, transactionData }) =>
-          updateAtomicBatchData({
-            transactionId: transactionMeta.id,
-            transactionIndex: nestedTransactionIndex,
-            transactionData,
-          }),
-        ),
-      );
+      try {
+        await Promise.all(
+          updates.map(({ nestedTransactionIndex, transactionData }) =>
+            updateAtomicBatchData({
+              transactionId: transactionMeta.id,
+              transactionIndex: nestedTransactionIndex,
+              transactionData,
+            }),
+          ),
+        );
+      } catch (error) {
+        throw prefixError(error, errorPrefix);
+      }
     },
     [transactionMeta],
   );
@@ -89,7 +95,7 @@ export function useUpdateTransactionPayAmount() {
         await applyMoneyAccountAmountUpdates(
           amountHuman,
           updateMoneyAccountDepositTokenAmount,
-          'Failed to prepare Money Account deposit amount update',
+          DEPOSIT_ERROR_PREFIX,
         );
         return;
       }
@@ -102,7 +108,7 @@ export function useUpdateTransactionPayAmount() {
         await applyMoneyAccountAmountUpdates(
           amountHuman,
           updateMoneyAccountWithdrawTokenAmount,
-          'Failed to prepare Money Account withdraw amount update',
+          WITHDRAW_ERROR_PREFIX,
           accountOverride,
         );
         return;
@@ -147,10 +153,6 @@ function syncMoneyAccountDepositRequiredAssets(
       'Money Account deposit: sync requiredAssets amount',
     );
   } catch (error) {
-    Logger.error(
-      error as Error,
-      'Failed to sync Money Account deposit requiredAssets amount',
-    );
-    throw error;
+    throw prefixError(error, DEPOSIT_ERROR_PREFIX);
   }
 }

app/util/confirmation/transactions.test.ts

@@ -10,6 +10,7 @@ import {
 import { strings } from '../../../locales/i18n';
 import {
   buildTransactionParams,
+  getAmountUpdateErrorToastOptions,
   getTransactionUpdateErrorToastOptions,
   resolveTransactionUpdateErrorMessage,
 } from './transactions';
@@ -180,7 +181,6 @@ describe('Confirmation Transactions Utils', () => {
             },
           ],
           descriptionOptions: { description: 'boom' },
-          hasNoTimeout: false,
         }),
       );
     });
@@ -204,4 +204,27 @@ describe('Confirmation Transactions Utils', () => {
       ).toBeUndefined();
     });
   });
+
+  describe('getAmountUpdateErrorToastOptions', () => {
+    const onClose = jest.fn();
+
+    it('returns a persistent toast with a close button', () => {
+      expect(
+        getAmountUpdateErrorToastOptions(new Error('boom'), onClose),
+      ).toEqual(
+        expect.objectContaining({
+          variant: ToastVariants.Icon,
+          descriptionOptions: { description: 'boom' },
+          hasNoTimeout: true,
+          closeButtonOptions: expect.objectContaining({ onPress: onClose }),
+        }),
+      );
+    });
+
+    it('omits description when no message is available', () => {
+      expect(
+        getAmountUpdateErrorToastOptions(undefined, onClose).descriptionOptions,
+      ).toBeUndefined();
+    });
+  });
 });