@metamask/bridge-status-controller 33.0.0 → 34.0.0

package/CHANGELOG.md

@@ -7,6 +7,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [34.0.0]
+
+### Added
+
+- Add `batchId` to BridgeHistoryItem to enable querying history by batchId ([#6058](https://github.com/MetaMask/core/pull/6058))
+
+### Changed
+
+- **BREAKING** Add tx batching functionality, which requires an `addTransactionBatchFn` handler to be passed to the BridgeStatusController's constructor ([#6058](https://github.com/MetaMask/core/pull/6058))
+- **BREAKING** Update batched txs after signing with correct tx types, which requires an `updateTransactionFn` handler to be passed to the BridgeStatusController's constructor ([#6058](https://github.com/MetaMask/core/pull/6058))
+- Add approvalTxId to txHistoryItem after signing batched transaction ([#6058](https://github.com/MetaMask/core/pull/6058))
+- Remove `addUserOperationFromTransaction` tx submission code and constructor arg since it is unsupported ([#6057](https://github.com/MetaMask/core/pull/6057))
+- Remove @metamask/user-operation-controller dependency ([#6057](https://github.com/MetaMask/core/pull/6057))
+- **BREAKING:** Bump peer dependency `@metamask/snaps-controllers` from `^12.0.0` to `^14.0.0` ([#6035](https://github.com/MetaMask/core/pull/6035))
+
+### Fixed
+
+- Wait until a bridge transaction is confirmed before polling for its status. This reduces (or fully removes) premature `getTxStatus` calls, and enables adding batched bridge txs to history before its transaction Id is available ([#6052](https://github.com/MetaMask/core/pull/6052))
+
 ## [33.0.0]
 
 ### Changed
@@ -377,7 +396,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Initial release ([#5317](https://github.com/MetaMask/core/pull/5317))
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@33.0.0...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@34.0.0...HEAD
+[34.0.0]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@33.0.0...@metamask/bridge-status-controller@34.0.0
 [33.0.0]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@32.0.0...@metamask/bridge-status-controller@33.0.0
 [32.0.0]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@31.0.0...@metamask/bridge-status-controller@32.0.0
 [31.0.0]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@30.0.0...@metamask/bridge-status-controller@31.0.0

package/dist/bridge-status-controller.cjs

@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _BridgeStatusController_instances, _BridgeStatusController_pollingTokensByTxMetaId, _BridgeStatusController_clientId, _BridgeStatusController_fetchFn, _BridgeStatusController_config, _BridgeStatusController_addTransactionFn, _BridgeStatusController_estimateGasFeeFn, _BridgeStatusController_addUserOperationFromTransactionFn, _BridgeStatusController_trace, _BridgeStatusController_restartPollingForIncompleteHistoryItems, _BridgeStatusController_addTxToHistory, _BridgeStatusController_getMultichainSelectedAccount, _BridgeStatusController_getMultichainSelectedAccountAddress, _BridgeStatusController_fetchBridgeTxStatus, _BridgeStatusController_getSrcTxHash, _BridgeStatusController_updateSrcTxHash, _BridgeStatusController_wipeBridgeStatusByChainId, _BridgeStatusController_handleSolanaTx, _BridgeStatusController_waitForHashAndReturnFinalTxMeta, _BridgeStatusController_handleApprovalTx, _BridgeStatusController_handleEvmSmartTransaction, _BridgeStatusController_handleEvmTransaction, _BridgeStatusController_handleUSDTAllowanceReset, _BridgeStatusController_calculateGasFees, _BridgeStatusController_trackUnifiedSwapBridgeEvent;
+var _BridgeStatusController_instances, _BridgeStatusController_pollingTokensByTxMetaId, _BridgeStatusController_clientId, _BridgeStatusController_fetchFn, _BridgeStatusController_config, _BridgeStatusController_addTransactionFn, _BridgeStatusController_addTransactionBatchFn, _BridgeStatusController_updateTransactionFn, _BridgeStatusController_estimateGasFeeFn, _BridgeStatusController_trace, _BridgeStatusController_markTxAsFailed, _BridgeStatusController_restartPollingForIncompleteHistoryItems, _BridgeStatusController_addTxToHistory, _BridgeStatusController_startPollingForTxId, _BridgeStatusController_getMultichainSelectedAccount, _BridgeStatusController_getMultichainSelectedAccountAddress, _BridgeStatusController_fetchBridgeTxStatus, _BridgeStatusController_getSrcTxHash, _BridgeStatusController_updateSrcTxHash, _BridgeStatusController_wipeBridgeStatusByChainId, _BridgeStatusController_handleSolanaTx, _BridgeStatusController_waitForHashAndReturnFinalTxMeta, _BridgeStatusController_handleApprovalTx, _BridgeStatusController_handleEvmTransaction, _BridgeStatusController_handleUSDTAllowanceReset, _BridgeStatusController_calculateGasFees, _BridgeStatusController_handleEvmTransactionBatch, _BridgeStatusController_trackUnifiedSwapBridgeEvent;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BridgeStatusController = void 0;
 const bridge_controller_1 = require("@metamask/bridge-controller");
@@ -19,7 +19,6 @@ const keyring_api_1 = require("@metamask/keyring-api");
 const polling_controller_1 = require("@metamask/polling-controller");
 const transaction_controller_1 = require("@metamask/transaction-controller");
 const utils_1 = require("@metamask/utils");
-const bignumber_js_1 = require("bignumber.js");
 const constants_1 = require("./constants.cjs");
 const types_1 = require("./types.cjs");
 const bridge_status_1 = require("./utils/bridge-status.cjs");
@@ -36,7 +35,7 @@ const metadata = {
     },
 };
 class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPollingController)() {
-    constructor({ messenger, state, clientId, fetchFn, addTransactionFn, addUserOperationFromTransactionFn, estimateGasFeeFn, config, traceFn, }) {
+    constructor({ messenger, state, clientId, fetchFn, addTransactionFn, addTransactionBatchFn, updateTransactionFn, estimateGasFeeFn, config, traceFn, }) {
         super({
             name: constants_1.BRIDGE_STATUS_CONTROLLER_NAME,
             metadata,
@@ -53,9 +52,22 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
         _BridgeStatusController_fetchFn.set(this, void 0);
         _BridgeStatusController_config.set(this, void 0);
         _BridgeStatusController_addTransactionFn.set(this, void 0);
+        _BridgeStatusController_addTransactionBatchFn.set(this, void 0);
+        _BridgeStatusController_updateTransactionFn.set(this, void 0);
         _BridgeStatusController_estimateGasFeeFn.set(this, void 0);
-        _BridgeStatusController_addUserOperationFromTransactionFn.set(this, void 0);
         _BridgeStatusController_trace.set(this, void 0);
+        // Mark tx as failed in txHistory if either the approval or trade fails
+        _BridgeStatusController_markTxAsFailed.set(this, ({ id }) => {
+            const txHistoryKey = this.state.txHistory[id]
+                ? id
+                : Object.keys(this.state.txHistory).find((key) => this.state.txHistory[key].approvalTxId === id);
+            if (!txHistoryKey) {
+                return;
+            }
+            this.update((statusState) => {
+                statusState.txHistory[txHistoryKey].status.status = bridge_controller_1.StatusTypes.FAILED;
+            });
+        });
         this.resetState = () => {
             this.update((state) => {
                 state.txHistory = constants_1.DEFAULT_BRIDGE_STATUS_CONTROLLER_STATE.txHistory;
@@ -84,8 +96,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 historyItem.status.status === bridge_controller_1.StatusTypes.UNKNOWN)
                 .filter((historyItem) => {
                 // Check if we are already polling this tx, if so, skip restarting polling for that
-                const srcTxMetaId = historyItem.txMetaId;
-                const pollingToken = __classPrivateFieldGet(this, _BridgeStatusController_pollingTokensByTxMetaId, "f")[srcTxMetaId];
+                const pollingToken = __classPrivateFieldGet(this, _BridgeStatusController_pollingTokensByTxMetaId, "f")[historyItem.txMetaId];
                 return !pollingToken;
             })
                 // Swap txs don't need to have their statuses polled
@@ -97,9 +108,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 const bridgeTxMetaId = historyItem.txMetaId;
                 // We manually call startPolling() here rather than go through startPollingForBridgeTxStatus()
                 // because we don't want to overwrite the existing historyItem in state
-                __classPrivateFieldGet(this, _BridgeStatusController_pollingTokensByTxMetaId, "f")[bridgeTxMetaId] = this.startPolling({
-                    bridgeTxMetaId,
-                });
+                __classPrivateFieldGet(this, _BridgeStatusController_startPollingForTxId, "f").call(this, bridgeTxMetaId);
             });
         });
         _BridgeStatusController_addTxToHistory.set(this, (startPollingForBridgeTxStatusArgs) => {
@@ -109,6 +118,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             // We know it's in progress but not the exact status yet
             const txHistoryItem = {
                 txMetaId: bridgeTxMeta.id,
+                batchId: bridgeTxMeta.batchId,
                 quote: quoteResponse.quote,
                 startTime,
                 estimatedProcessingTimeInSeconds: quoteResponse.estimatedProcessingTimeInSeconds,
@@ -140,20 +150,33 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 state.txHistory[bridgeTxMeta.id] = txHistoryItem;
             });
         });
+        _BridgeStatusController_startPollingForTxId.set(this, (txId) => {
+            // If we are already polling for this tx, stop polling for it before restarting
+            const existingPollingToken = __classPrivateFieldGet(this, _BridgeStatusController_pollingTokensByTxMetaId, "f")[txId];
+            if (existingPollingToken) {
+                this.stopPollingByPollingToken(existingPollingToken);
+            }
+            const txHistoryItem = this.state.txHistory[txId];
+            if (!txHistoryItem) {
+                return;
+            }
+            const { quote } = txHistoryItem;
+            const isBridgeTx = (0, bridge_controller_1.isCrossChain)(quote.srcChainId, quote.destChainId);
+            if (isBridgeTx) {
+                __classPrivateFieldGet(this, _BridgeStatusController_pollingTokensByTxMetaId, "f")[txId] = this.startPolling({
+                    bridgeTxMetaId: txId,
+                });
+            }
+        });
         /**
-         * Starts polling for the bridge tx status
+         * Adds tx to history and starts polling for the bridge tx status
          *
          * @param txHistoryMeta - The parameters for creating the history item
          */
         this.startPollingForBridgeTxStatus = (txHistoryMeta) => {
-            const { quoteResponse, bridgeTxMeta } = txHistoryMeta;
+            const { bridgeTxMeta } = txHistoryMeta;
             __classPrivateFieldGet(this, _BridgeStatusController_addTxToHistory, "f").call(this, txHistoryMeta);
-            const isBridgeTx = (0, bridge_controller_1.isCrossChain)(quoteResponse.quote.srcChainId, quoteResponse.quote.destChainId);
-            if (isBridgeTx) {
-                __classPrivateFieldGet(this, _BridgeStatusController_pollingTokensByTxMetaId, "f")[bridgeTxMeta.id] = this.startPolling({
-                    bridgeTxMetaId: bridgeTxMeta.id,
-                });
-            }
+            __classPrivateFieldGet(this, _BridgeStatusController_startPollingForTxId, "f").call(this, bridgeTxMeta.id);
         };
         // This will be called after you call this.startPolling()
         // The args passed in are the args you passed in to startPolling()
@@ -294,7 +317,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             }
             return finalTransactionMeta;
         });
-        _BridgeStatusController_handleApprovalTx.set(this, async (isBridgeTx, quoteResponse, requireApproval = false) => {
+        _BridgeStatusController_handleApprovalTx.set(this, async (isBridgeTx, quoteResponse) => {
             const { approval } = quoteResponse;
             if (approval) {
                 const approveTx = async () => {
@@ -304,8 +327,6 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                             ? transaction_controller_1.TransactionType.bridgeApproval
                             : transaction_controller_1.TransactionType.swapApproval,
                         trade: approval,
-                        quoteResponse,
-                        requireApproval,
                     });
                     await (0, transaction_1.handleLineaDelay)(quoteResponse);
                     return approvalTxMeta;
@@ -322,31 +343,16 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             }
             return undefined;
         });
-        _BridgeStatusController_handleEvmSmartTransaction.set(this, async ({ isBridgeTx, trade, quoteResponse, approvalTxId, requireApproval = false, }) => {
-            return await __classPrivateFieldGet(this, _BridgeStatusController_handleEvmTransaction, "f").call(this, {
-                transactionType: isBridgeTx
-                    ? transaction_controller_1.TransactionType.bridge
-                    : transaction_controller_1.TransactionType.swap,
-                trade,
-                quoteResponse,
-                approvalTxId,
-                shouldWaitForHash: false,
-                requireApproval,
-            });
-        });
         /**
          * Submits an EVM transaction to the TransactionController
          *
          * @param params - The parameters for the transaction
          * @param params.transactionType - The type of transaction to submit
          * @param params.trade - The trade data to confirm
-         * @param params.quoteResponse - The quote response
-         * @param params.approvalTxId - The tx id of the approval tx
-         * @param params.shouldWaitForHash - Whether to wait for the hash of the transaction
          * @param params.requireApproval - Whether to require approval for the transaction
          * @returns The transaction meta
          */
-        _BridgeStatusController_handleEvmTransaction.set(this, async ({ transactionType, trade, quoteResponse, approvalTxId, shouldWaitForHash = true, requireApproval = false, }) => {
+        _BridgeStatusController_handleEvmTransaction.set(this, async ({ transactionType, trade, requireApproval = false, }) => {
             const actionId = (0, transaction_2.generateActionId)().toString();
             const selectedAccount = this.messagingSystem.call('AccountsController:getAccountByAddress', trade.from);
             if (!selectedAccount) {
@@ -371,47 +377,16 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 ...transactionParams,
                 ...(await __classPrivateFieldGet(this, _BridgeStatusController_calculateGasFees, "f").call(this, transactionParams, networkClientId, hexChainId)),
             };
-            let result;
-            let transactionMeta;
-            const isSmartContractAccount = selectedAccount.type === keyring_api_1.EthAccountType.Erc4337;
-            if (isSmartContractAccount && __classPrivateFieldGet(this, _BridgeStatusController_addUserOperationFromTransactionFn, "f")) {
-                const smartAccountTxResult = await __classPrivateFieldGet(this, _BridgeStatusController_addUserOperationFromTransactionFn, "f").call(this, transactionParamsWithMaxGas, requestOptions);
-                result = smartAccountTxResult.transactionHash;
-                transactionMeta = {
-                    ...requestOptions,
-                    chainId: hexChainId,
-                    txParams: transactionParamsWithMaxGas,
-                    time: Date.now(),
-                    id: smartAccountTxResult.id,
-                    status: transaction_controller_1.TransactionStatus.confirmed,
-                };
-            }
-            else {
-                const addTransactionResult = await __classPrivateFieldGet(this, _BridgeStatusController_addTransactionFn, "f").call(this, transactionParamsWithMaxGas, requestOptions);
-                result = addTransactionResult.result;
-                transactionMeta = addTransactionResult.transactionMeta;
-            }
-            if (shouldWaitForHash) {
-                return await __classPrivateFieldGet(this, _BridgeStatusController_waitForHashAndReturnFinalTxMeta, "f").call(this, result);
-            }
-            return {
-                ...(0, transaction_1.getTxMetaFields)(quoteResponse, approvalTxId),
-                ...transactionMeta,
-            };
+            const { result } = await __classPrivateFieldGet(this, _BridgeStatusController_addTransactionFn, "f").call(this, transactionParamsWithMaxGas, requestOptions);
+            return await __classPrivateFieldGet(this, _BridgeStatusController_waitForHashAndReturnFinalTxMeta, "f").call(this, result);
         });
         _BridgeStatusController_handleUSDTAllowanceReset.set(this, async (quoteResponse) => {
-            const hexChainId = (0, bridge_controller_1.formatChainIdToHex)(quoteResponse.quote.srcChainId);
-            if (quoteResponse.approval &&
-                (0, bridge_controller_1.isEthUsdt)(hexChainId, quoteResponse.quote.srcAsset.address)) {
-                const allowance = new bignumber_js_1.BigNumber(await this.messagingSystem.call('BridgeController:getBridgeERC20Allowance', quoteResponse.quote.srcAsset.address, hexChainId));
-                const shouldResetApproval = allowance.lt(quoteResponse.sentAmount.amount) && allowance.gt(0);
-                if (shouldResetApproval) {
-                    await __classPrivateFieldGet(this, _BridgeStatusController_handleEvmTransaction, "f").call(this, {
-                        transactionType: transaction_controller_1.TransactionType.bridgeApproval,
-                        trade: { ...quoteResponse.approval, data: (0, bridge_controller_1.getEthUsdtResetData)() },
-                        quoteResponse,
-                    });
-                }
+            const resetApproval = await (0, transaction_1.getUSDTAllowanceResetTx)(this.messagingSystem, quoteResponse);
+            if (resetApproval) {
+                await __classPrivateFieldGet(this, _BridgeStatusController_handleEvmTransaction, "f").call(this, {
+                    transactionType: transaction_controller_1.TransactionType.bridgeApproval,
+                    trade: resetApproval,
+                });
             }
         });
         _BridgeStatusController_calculateGasFees.set(this, async (transactionParams, networkClientId, chainId) => {
@@ -432,6 +407,42 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 gas: maxGasLimit,
             };
         });
+        /**
+         * Submits batched EVM transactions to the TransactionController
+         *
+         * @param args - The parameters for the transaction
+         * @param args.isBridgeTx - Whether the transaction is a bridge transaction
+         * @param args.trade - The trade data to confirm
+         * @param args.approval - The approval data to confirm
+         * @param args.resetApproval - The ethereum:USDT reset approval data to confirm
+         * @param args.quoteResponse - The quote response
+         * @param args.requireApproval - Whether to require approval for the transaction
+         * @returns The approvalMeta and tradeMeta for the batched transaction
+         */
+        _BridgeStatusController_handleEvmTransactionBatch.set(this, async (args) => {
+            const transactionParams = await (0, transaction_1.getAddTransactionBatchParams)({
+                messagingSystem: this.messagingSystem,
+                estimateGasFeeFn: __classPrivateFieldGet(this, _BridgeStatusController_estimateGasFeeFn, "f"),
+                ...args,
+            });
+            const txDataByType = {
+                [transaction_controller_1.TransactionType.bridgeApproval]: transactionParams.transactions.find(({ type }) => type === transaction_controller_1.TransactionType.bridgeApproval)?.params.data,
+                [transaction_controller_1.TransactionType.swapApproval]: transactionParams.transactions.find(({ type }) => type === transaction_controller_1.TransactionType.swapApproval)?.params.data,
+                [transaction_controller_1.TransactionType.bridge]: transactionParams.transactions.find(({ type }) => type === transaction_controller_1.TransactionType.bridge)?.params.data,
+                [transaction_controller_1.TransactionType.swap]: transactionParams.transactions.find(({ type }) => type === transaction_controller_1.TransactionType.swap)?.params.data,
+            };
+            const { batchId } = await __classPrivateFieldGet(this, _BridgeStatusController_addTransactionBatchFn, "f").call(this, transactionParams);
+            const { approvalMeta, tradeMeta } = (0, transaction_1.findAndUpdateTransactionsInBatch)({
+                messagingSystem: this.messagingSystem,
+                updateTransactionFn: __classPrivateFieldGet(this, _BridgeStatusController_updateTransactionFn, "f"),
+                batchId,
+                txDataByType,
+            });
+            if (!tradeMeta) {
+                throw new Error('Failed to update cross-chain swap transaction batch: tradeMeta not found');
+            }
+            return { approvalMeta, tradeMeta };
+        });
         /**
          * Submits a cross-chain swap transaction
          *
@@ -454,7 +465,8 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             // Emit Submitted event after submit button is clicked
             __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Submitted, undefined, preConfirmationProperties);
             let txMeta;
-            let approvalTime, approvalTxId;
+            let approvalTxId;
+            const startTime = Date.now();
             const isBridgeTx = (0, bridge_controller_1.isCrossChain)(quoteResponse.quote.srcChainId, quoteResponse.quote.destChainId);
             // Submit SOLANA tx
             if ((0, bridge_controller_1.isSolanaChainId)(quoteResponse.quote.srcChainId) &&
@@ -486,10 +498,6 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 // Extension does not have this issue
                 const requireApproval = __classPrivateFieldGet(this, _BridgeStatusController_clientId, "f") === types_1.BridgeClientId.MOBILE &&
                     (0, bridge_controller_1.isHardwareWallet)(__classPrivateFieldGet(this, _BridgeStatusController_instances, "m", _BridgeStatusController_getMultichainSelectedAccount).call(this));
-                // Set approval time and id if an approval tx is needed
-                const approvalTxMeta = await __classPrivateFieldGet(this, _BridgeStatusController_handleApprovalTx, "f").call(this, isBridgeTx, quoteResponse, requireApproval);
-                approvalTime = approvalTxMeta?.time;
-                approvalTxId = approvalTxMeta?.id;
                 // Handle smart transactions if enabled
                 txMeta = await __classPrivateFieldGet(this, _BridgeStatusController_trace, "f").call(this, {
                     name: isBridgeTx
@@ -499,27 +507,34 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                         srcChainId: (0, bridge_controller_1.formatChainIdToCaip)(quoteResponse.quote.srcChainId),
                         stxEnabled: isStxEnabledOnClient,
                     },
-                }, async () => isStxEnabledOnClient
-                    ? await __classPrivateFieldGet(this, _BridgeStatusController_handleEvmSmartTransaction, "f").call(this, {
-                        isBridgeTx,
-                        trade: quoteResponse.trade,
-                        quoteResponse,
-                        approvalTxId,
-                        requireApproval,
-                    })
-                    : await __classPrivateFieldGet(this, _BridgeStatusController_handleEvmTransaction, "f").call(this, {
+                }, async () => {
+                    if (isStxEnabledOnClient) {
+                        const { tradeMeta, approvalMeta } = await __classPrivateFieldGet(this, _BridgeStatusController_handleEvmTransactionBatch, "f").call(this, {
+                            isBridgeTx,
+                            resetApproval: await (0, transaction_1.getUSDTAllowanceResetTx)(this.messagingSystem, quoteResponse),
+                            approval: quoteResponse.approval,
+                            trade: quoteResponse.trade,
+                            quoteResponse,
+                            requireApproval,
+                        });
+                        approvalTxId = approvalMeta?.id;
+                        return tradeMeta;
+                    }
+                    // Set approval time and id if an approval tx is needed
+                    const approvalTxMeta = await __classPrivateFieldGet(this, _BridgeStatusController_handleApprovalTx, "f").call(this, isBridgeTx, quoteResponse);
+                    approvalTxId = approvalTxMeta?.id;
+                    return await __classPrivateFieldGet(this, _BridgeStatusController_handleEvmTransaction, "f").call(this, {
                         transactionType: isBridgeTx
                             ? transaction_controller_1.TransactionType.bridge
                             : transaction_controller_1.TransactionType.swap,
                         trade: quoteResponse.trade,
-                        quoteResponse,
-                        approvalTxId,
                         requireApproval,
-                    }));
+                    });
+                });
             }
             try {
-                // Start polling for bridge tx status
-                this.startPollingForBridgeTxStatus({
+                // Add swap or bridge tx to history
+                __classPrivateFieldGet(this, _BridgeStatusController_addTxToHistory, "f").call(this, {
                     bridgeTxMeta: txMeta,
                     statusRequest: {
                         ...(0, transaction_1.getStatusRequestParams)(quoteResponse),
@@ -528,12 +543,16 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                     quoteResponse,
                     slippagePercentage: 0,
                     isStxEnabled: isStxEnabledOnClient,
-                    startTime: approvalTime ?? Date.now(),
+                    startTime,
                     approvalTxId,
                 });
-                // Track Solana Swap completed event
-                if ((0, bridge_controller_1.isSolanaChainId)(quoteResponse.quote.srcChainId) && !isBridgeTx) {
-                    __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Completed, txMeta.id);
+                if ((0, bridge_controller_1.isSolanaChainId)(quoteResponse.quote.srcChainId)) {
+                    // Start polling for bridge tx status
+                    __classPrivateFieldGet(this, _BridgeStatusController_startPollingForTxId, "f").call(this, txMeta.id);
+                    // Track Solana Swap completed event
+                    if (!isBridgeTx) {
+                        __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Completed, txMeta.id);
+                    }
                 }
             }
             catch {
@@ -574,7 +593,8 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
         __classPrivateFieldSet(this, _BridgeStatusController_clientId, clientId, "f");
         __classPrivateFieldSet(this, _BridgeStatusController_fetchFn, fetchFn, "f");
         __classPrivateFieldSet(this, _BridgeStatusController_addTransactionFn, addTransactionFn, "f");
-        __classPrivateFieldSet(this, _BridgeStatusController_addUserOperationFromTransactionFn, addUserOperationFromTransactionFn, "f");
+        __classPrivateFieldSet(this, _BridgeStatusController_addTransactionBatchFn, addTransactionBatchFn, "f");
+        __classPrivateFieldSet(this, _BridgeStatusController_updateTransactionFn, updateTransactionFn, "f");
         __classPrivateFieldSet(this, _BridgeStatusController_estimateGasFeeFn, estimateGasFeeFn, "f");
         __classPrivateFieldSet(this, _BridgeStatusController_config, {
             customBridgeApiBaseUrl: config?.customBridgeApiBaseUrl ?? constants_1.BRIDGE_PROD_API_BASE_URL,
@@ -590,16 +610,33 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
         this.messagingSystem.subscribe('TransactionController:transactionFailed', ({ transactionMeta }) => {
             const { type, status, id } = transactionMeta;
             if (type &&
-                [transaction_controller_1.TransactionType.bridge, transaction_controller_1.TransactionType.swap].includes(type) &&
-                ![transaction_controller_1.TransactionStatus.signed, transaction_controller_1.TransactionStatus.approved].includes(status)) {
-                __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Failed, id, (0, metrics_1.getEVMTxPropertiesFromTransactionMeta)(transactionMeta));
+                [
+                    transaction_controller_1.TransactionType.bridge,
+                    transaction_controller_1.TransactionType.swap,
+                    transaction_controller_1.TransactionType.bridgeApproval,
+                    transaction_controller_1.TransactionType.swapApproval,
+                ].includes(type) &&
+                [
+                    transaction_controller_1.TransactionStatus.failed,
+                    transaction_controller_1.TransactionStatus.dropped,
+                    transaction_controller_1.TransactionStatus.rejected,
+                ].includes(status)) {
+                // Mark tx as failed in txHistory
+                __classPrivateFieldGet(this, _BridgeStatusController_markTxAsFailed, "f").call(this, transactionMeta);
+                // Track failed event
+                if (status !== transaction_controller_1.TransactionStatus.rejected) {
+                    __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Failed, id, (0, metrics_1.getEVMTxPropertiesFromTransactionMeta)(transactionMeta));
+                }
             }
         });
         this.messagingSystem.subscribe('TransactionController:transactionConfirmed', (transactionMeta) => {
-            const { type, id } = transactionMeta;
+            const { type, id, chainId } = transactionMeta;
             if (type === transaction_controller_1.TransactionType.swap) {
                 __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Completed, id, (0, metrics_1.getEVMTxPropertiesFromTransactionMeta)(transactionMeta));
             }
+            if (type === transaction_controller_1.TransactionType.bridge && !(0, bridge_controller_1.isSolanaChainId)(chainId)) {
+                __classPrivateFieldGet(this, _BridgeStatusController_startPollingForTxId, "f").call(this, id);
+            }
         });
         // If you close the extension, but keep the browser open, the polling continues
         // If you close the browser, the polling stops
@@ -608,7 +645,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
     }
 }
 exports.BridgeStatusController = BridgeStatusController;
-_BridgeStatusController_pollingTokensByTxMetaId = new WeakMap(), _BridgeStatusController_clientId = new WeakMap(), _BridgeStatusController_fetchFn = new WeakMap(), _BridgeStatusController_config = new WeakMap(), _BridgeStatusController_addTransactionFn = new WeakMap(), _BridgeStatusController_estimateGasFeeFn = new WeakMap(), _BridgeStatusController_addUserOperationFromTransactionFn = new WeakMap(), _BridgeStatusController_trace = new WeakMap(), _BridgeStatusController_restartPollingForIncompleteHistoryItems = new WeakMap(), _BridgeStatusController_addTxToHistory = new WeakMap(), _BridgeStatusController_fetchBridgeTxStatus = new WeakMap(), _BridgeStatusController_getSrcTxHash = new WeakMap(), _BridgeStatusController_updateSrcTxHash = new WeakMap(), _BridgeStatusController_wipeBridgeStatusByChainId = new WeakMap(), _BridgeStatusController_handleSolanaTx = new WeakMap(), _BridgeStatusController_waitForHashAndReturnFinalTxMeta = new WeakMap(), _BridgeStatusController_handleApprovalTx = new WeakMap(), _BridgeStatusController_handleEvmSmartTransaction = new WeakMap(), _BridgeStatusController_handleEvmTransaction = new WeakMap(), _BridgeStatusController_handleUSDTAllowanceReset = new WeakMap(), _BridgeStatusController_calculateGasFees = new WeakMap(), _BridgeStatusController_trackUnifiedSwapBridgeEvent = new WeakMap(), _BridgeStatusController_instances = new WeakSet(), _BridgeStatusController_getMultichainSelectedAccount = function _BridgeStatusController_getMultichainSelectedAccount() {
+_BridgeStatusController_pollingTokensByTxMetaId = new WeakMap(), _BridgeStatusController_clientId = new WeakMap(), _BridgeStatusController_fetchFn = new WeakMap(), _BridgeStatusController_config = new WeakMap(), _BridgeStatusController_addTransactionFn = new WeakMap(), _BridgeStatusController_addTransactionBatchFn = new WeakMap(), _BridgeStatusController_updateTransactionFn = new WeakMap(), _BridgeStatusController_estimateGasFeeFn = new WeakMap(), _BridgeStatusController_trace = new WeakMap(), _BridgeStatusController_markTxAsFailed = new WeakMap(), _BridgeStatusController_restartPollingForIncompleteHistoryItems = new WeakMap(), _BridgeStatusController_addTxToHistory = new WeakMap(), _BridgeStatusController_startPollingForTxId = new WeakMap(), _BridgeStatusController_fetchBridgeTxStatus = new WeakMap(), _BridgeStatusController_getSrcTxHash = new WeakMap(), _BridgeStatusController_updateSrcTxHash = new WeakMap(), _BridgeStatusController_wipeBridgeStatusByChainId = new WeakMap(), _BridgeStatusController_handleSolanaTx = new WeakMap(), _BridgeStatusController_waitForHashAndReturnFinalTxMeta = new WeakMap(), _BridgeStatusController_handleApprovalTx = new WeakMap(), _BridgeStatusController_handleEvmTransaction = new WeakMap(), _BridgeStatusController_handleUSDTAllowanceReset = new WeakMap(), _BridgeStatusController_calculateGasFees = new WeakMap(), _BridgeStatusController_handleEvmTransactionBatch = new WeakMap(), _BridgeStatusController_trackUnifiedSwapBridgeEvent = new WeakMap(), _BridgeStatusController_instances = new WeakSet(), _BridgeStatusController_getMultichainSelectedAccount = function _BridgeStatusController_getMultichainSelectedAccount() {
     return this.messagingSystem.call('AccountsController:getSelectedMultichainAccount');
 }, _BridgeStatusController_getMultichainSelectedAccountAddress = function _BridgeStatusController_getMultichainSelectedAccountAddress() {
     return __classPrivateFieldGet(this, _BridgeStatusController_instances, "m", _BridgeStatusController_getMultichainSelectedAccount).call(this)?.address ?? '';