fix: crashing after bridge tx in Firefox

MetaMask · Jan 10, 2025 · cdca73e · cdca73e
1 parent 3ff4aba
commit cdca73e
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 9 deletions.
diff --git a/shared/types/bridge-status.ts b/shared/types/bridge-status.ts
@@ -146,9 +146,8 @@ export enum BridgeStatusAction {
   GET_STATE = 'getState',
 }
 
-// The BigNumber values are serialized to strings
 export type QuoteMetadataSerialized = {
-  sentAmount: { amount: string; fiat: string | null };
+  sentAmount: { amount: string; valueInCurrency: string | null };
 };
 
 export type StartPollingForBridgeTxStatusArgs = {
@@ -161,6 +160,11 @@ export type StartPollingForBridgeTxStatusArgs = {
   targetContractAddress?: BridgeHistoryItem['targetContractAddress'];
 };
 
+/**
+ * Chrome: The BigNumber values are automatically serialized to strings when sent to the background
+ * Firefox: The BigNumber values are not serialized to strings when sent to the background,
+ * so we force the ui to do it manually, by using StartPollingForBridgeTxStatusArgsSerialized type on the startPollingForBridgeTxStatus action
+ */
 export type StartPollingForBridgeTxStatusArgsSerialized = Omit<
   StartPollingForBridgeTxStatusArgs,
   'quoteResponse'

diff --git a/ui/ducks/bridge-status/actions.ts b/ui/ducks/bridge-status/actions.ts
@@ -1,6 +1,6 @@
 import {
-  StartPollingForBridgeTxStatusArgs,
   BridgeStatusAction,
+  StartPollingForBridgeTxStatusArgsSerialized,
 } from '../../../shared/types/bridge-status';
 import { forceUpdateMetamaskState } from '../../store/actions';
 import { submitRequestToBackground } from '../../store/background-connection';
@@ -17,14 +17,15 @@ const callBridgeStatusControllerMethod = <T extends unknown[]>(
 };
 
 export const startPollingForBridgeTxStatus = (
-  startPollingForBridgeTxStatusArgs: StartPollingForBridgeTxStatusArgs,
+  startPollingForBridgeTxStatusArgs: StartPollingForBridgeTxStatusArgsSerialized,
 ) => {
   return async (dispatch: MetaMaskReduxDispatch) => {
     return dispatch(
-      callBridgeStatusControllerMethod<[StartPollingForBridgeTxStatusArgs]>(
-        BridgeStatusAction.START_POLLING_FOR_BRIDGE_TX_STATUS,
-        [startPollingForBridgeTxStatusArgs],
-      ),
+      callBridgeStatusControllerMethod<
+        [StartPollingForBridgeTxStatusArgsSerialized]
+      >(BridgeStatusAction.START_POLLING_FOR_BRIDGE_TX_STATUS, [
+        startPollingForBridgeTxStatusArgs,
+      ]),
     );
   };
 };
diff --git a/ui/pages/bridge/hooks/useSubmitBridgeTransaction.ts b/ui/pages/bridge/hooks/useSubmitBridgeTransaction.ts
@@ -137,7 +137,15 @@ export default function useSubmitBridgeTransaction() {
       startPollingForBridgeTxStatus({
         bridgeTxMeta,
         statusRequest,
-        quoteResponse,
+        quoteResponse: {
+          ...quoteResponse,
+          sentAmount: {
+            amount: quoteResponse.sentAmount.amount.toString(),
+            valueInCurrency: quoteResponse.sentAmount.valueInCurrency
+              ? quoteResponse.sentAmount.valueInCurrency.toString()
+              : null,
+          },
+        },
         slippagePercentage: slippage ?? 0,
         startTime: bridgeTxMeta.time,
       }),