@metamask/bridge-status-controller 69.0.0 → 70.0.1

package/dist/bridge-status-controller.cjs

@@ -10,22 +10,27 @@ 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_intentManager, _BridgeStatusController_clientId, _BridgeStatusController_fetchFn, _BridgeStatusController_config, _BridgeStatusController_addTransactionFn, _BridgeStatusController_addTransactionBatchFn, _BridgeStatusController_updateTransactionFn, _BridgeStatusController_estimateGasFeeFn, _BridgeStatusController_trace, _BridgeStatusController_markTxAsFailed, _BridgeStatusController_restartPollingForIncompleteHistoryItems, _BridgeStatusController_addTxToHistory, _BridgeStatusController_rekeyHistoryItem, _BridgeStatusController_startPollingForTxId, _BridgeStatusController_shouldPollHistoryItem, _BridgeStatusController_getMultichainSelectedAccount, _BridgeStatusController_handleFetchFailure, _BridgeStatusController_fetchBridgeTxStatus, _BridgeStatusController_getJwt, _BridgeStatusController_getSrcTxHash, _BridgeStatusController_updateSrcTxHash, _BridgeStatusController_wipeBridgeStatusByChainId, _BridgeStatusController_handleNonEvmTx, _BridgeStatusController_waitForHashAndReturnFinalTxMeta, _BridgeStatusController_waitForTxConfirmation, _BridgeStatusController_handleApprovalTx, _BridgeStatusController_handleEvmTransaction, _BridgeStatusController_handleUSDTAllowanceReset, _BridgeStatusController_calculateGasFees, _BridgeStatusController_handleEvmTransactionBatch, _BridgeStatusController_trackUnifiedSwapBridgeEvent;
+var _BridgeStatusController_pollingTokensByTxMetaId, _BridgeStatusController_intentManager, _BridgeStatusController_clientId, _BridgeStatusController_fetchFn, _BridgeStatusController_config, _BridgeStatusController_addTransactionBatchFn, _BridgeStatusController_trace, _BridgeStatusController_markTxAsFailed, _BridgeStatusController_restartPollingForIncompleteHistoryItems, _BridgeStatusController_addTxToHistory, _BridgeStatusController_rekeyHistoryItem, _BridgeStatusController_startPollingForTxId, _BridgeStatusController_handleFetchFailure, _BridgeStatusController_fetchBridgeTxStatus, _BridgeStatusController_getSrcTxHash, _BridgeStatusController_updateSrcTxHash, _BridgeStatusController_wipeBridgeStatusByChainId, _BridgeStatusController_handleApprovalTx, _BridgeStatusController_handleEvmTransactionBatch, _BridgeStatusController_trackUnifiedSwapBridgeEvent;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BridgeStatusController = void 0;
 const bridge_controller_1 = require("@metamask/bridge-controller");
-const controller_utils_1 = require("@metamask/controller-utils");
-const keyring_controller_1 = require("@metamask/keyring-controller");
 const polling_controller_1 = require("@metamask/polling-controller");
 const transaction_controller_1 = require("@metamask/transaction-controller");
 const utils_1 = require("@metamask/utils");
 const bridge_status_controller_intent_1 = require("./bridge-status-controller.intent.cjs");
 const constants_1 = require("./constants.cjs");
 const types_1 = require("./types.cjs");
+const accounts_1 = require("./utils/accounts.cjs");
+const authentication_1 = require("./utils/authentication.cjs");
+const bridge_1 = require("./utils/bridge.cjs");
 const bridge_status_1 = require("./utils/bridge-status.cjs");
-const gas_1 = require("./utils/gas.cjs");
+const history_1 = require("./utils/history.cjs");
 const intent_api_1 = require("./utils/intent-api.cjs");
+const keyring_1 = require("./utils/keyring.cjs");
 const metrics_1 = require("./utils/metrics.cjs");
+const network_1 = require("./utils/network.cjs");
+const snaps_1 = require("./utils/snaps.cjs");
+const trace_1 = require("./utils/trace.cjs");
 const transaction_1 = require("./utils/transaction.cjs");
 const metadata = {
     // We want to persist the bridge status state so that we can show the proper data for the Activity list
@@ -38,7 +43,7 @@ const metadata = {
     },
 };
 class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPollingController)() {
-    constructor({ messenger, state, clientId, fetchFn, addTransactionFn, addTransactionBatchFn, updateTransactionFn, estimateGasFeeFn, config, traceFn, }) {
+    constructor({ messenger, state, clientId, fetchFn, addTransactionBatchFn, config, traceFn, }) {
         super({
             name: constants_1.BRIDGE_STATUS_CONTROLLER_NAME,
             metadata,
@@ -49,16 +54,12 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 ...state,
             },
         });
-        _BridgeStatusController_instances.add(this);
         _BridgeStatusController_pollingTokensByTxMetaId.set(this, {});
         _BridgeStatusController_intentManager.set(this, void 0);
         _BridgeStatusController_clientId.set(this, void 0);
         _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_trace.set(this, void 0);
         // Mark tx as failed in txHistory if either the approval or trade fails
         _BridgeStatusController_markTxAsFailed.set(this, ({ id: txMetaId, actionId, }) => {
@@ -93,9 +94,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 });
             }
             else {
-                const { selectedNetworkClientId } = this.messenger.call('NetworkController:getState');
-                const selectedNetworkClient = this.messenger.call('NetworkController:getNetworkClientById', selectedNetworkClientId);
-                const selectedChainId = selectedNetworkClient.configuration.chainId;
+                const selectedChainId = (0, network_1.getSelectedChainId)(this.messenger);
                 __classPrivateFieldGet(this, _BridgeStatusController_wipeBridgeStatusByChainId, "f").call(this, address, selectedChainId);
             }
         };
@@ -137,7 +136,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 }
             });
             // Restart polling if it was stopped and this tx still needs status updates
-            if (__classPrivateFieldGet(this, _BridgeStatusController_shouldPollHistoryItem, "f").call(this, historyItem)) {
+            if ((0, history_1.shouldPollHistoryItem)(historyItem)) {
                 // Check if polling was stopped (no active polling token)
                 const existingPollingToken = __classPrivateFieldGet(this, _BridgeStatusController_pollingTokensByTxMetaId, "f")[targetTxMetaId];
                 if (!existingPollingToken) {
@@ -145,7 +144,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                     __classPrivateFieldGet(this, _BridgeStatusController_startPollingForTxId, "f").call(this, targetTxMetaId);
                     // Track polling manually restarted event
                     if (!historyItem.featureId) {
-                        const selectedAccount = this.messenger.call('AccountsController:getAccountByAddress', historyItem.account);
+                        const selectedAccount = (0, accounts_1.getAccountByAddress)(this.messenger, historyItem.account);
                         const requestParams = (0, metrics_1.getRequestParamFromHistory)(historyItem);
                         const requestMetadata = (0, metrics_1.getRequestMetadataFromHistory)(historyItem, selectedAccount);
                         const { security_warnings: _, ...metadataWithoutWarnings } = requestMetadata;
@@ -194,7 +193,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             })
                 // Only restart polling for items that still require status updates
                 .filter((historyItem) => {
-                return __classPrivateFieldGet(this, _BridgeStatusController_shouldPollHistoryItem, "f").call(this, historyItem);
+                return (0, history_1.shouldPollHistoryItem)(historyItem);
             });
             incompleteHistoryItems.forEach((historyItem) => {
                 const bridgeTxMetaId = historyItem.txMetaId;
@@ -207,51 +206,8 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 __classPrivateFieldGet(this, _BridgeStatusController_startPollingForTxId, "f").call(this, bridgeTxMetaId);
             });
         });
-        _BridgeStatusController_addTxToHistory.set(this, (startPollingForBridgeTxStatusArgs, actionId) => {
-            const { bridgeTxMeta, statusRequest, quoteResponse, startTime, slippagePercentage, initialDestAssetBalance, targetContractAddress, approvalTxId, isStxEnabled, location, abTests, activeAbTests, accountAddress: selectedAddress, } = startPollingForBridgeTxStatusArgs;
-            // Determine the key for this history item:
-            // - For pre-submission (non-batch EVM): use actionId
-            // - For post-submission or other cases: use bridgeTxMeta.id
-            const historyKey = (0, transaction_1.getHistoryKey)(actionId, bridgeTxMeta?.id);
-            // 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
-            const txHistoryItem = {
-                txMetaId: bridgeTxMeta?.id,
-                actionId,
-                originalTransactionId: bridgeTxMeta
-                    ?.originalTransactionId || bridgeTxMeta?.id, // Keep original for intent transactions
-                batchId: bridgeTxMeta?.batchId,
-                quote: quoteResponse.quote,
-                startTime,
-                estimatedProcessingTimeInSeconds: quoteResponse.estimatedProcessingTimeInSeconds,
-                slippagePercentage,
-                pricingData: {
-                    amountSent: quoteResponse.sentAmount?.amount ?? '0',
-                    amountSentInUsd: quoteResponse.sentAmount?.usd ?? undefined,
-                    quotedGasInUsd: quoteResponse.gasFee?.effective?.usd ?? undefined,
-                    quotedReturnInUsd: quoteResponse.toTokenAmount?.usd ?? undefined,
-                    quotedGasAmount: quoteResponse.gasFee?.effective?.amount ?? undefined,
-                },
-                initialDestAssetBalance,
-                targetContractAddress,
-                account: selectedAddress,
-                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
-                    status: bridge_controller_1.StatusTypes.PENDING,
-                    srcChain: {
-                        chainId: statusRequest.srcChainId,
-                        txHash: statusRequest.srcTxHash,
-                    },
-                },
-                hasApprovalTx: Boolean(quoteResponse.approval),
-                approvalTxId,
-                isStxEnabled: Boolean(isStxEnabled),
-                featureId: quoteResponse.featureId,
-                location,
-                ...(abTests && { abTests }),
-                ...(activeAbTests && { activeAbTests }),
-            };
+        _BridgeStatusController_addTxToHistory.set(this, (...args) => {
+            const { historyKey, txHistoryItem } = (0, history_1.getInitialHistoryItem)(...args);
             this.update((state) => {
                 // Use actionId as key for pre-submission, or txMeta.id for post-submission
                 state.txHistory[historyKey] = txHistoryItem;
@@ -268,7 +224,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
          */
         _BridgeStatusController_rekeyHistoryItem.set(this, (actionId, txMeta) => {
             this.update((state) => {
-                (0, transaction_1.rekeyHistoryItemInState)(state, actionId, txMeta);
+                (0, history_1.rekeyHistoryItemInState)(state, actionId, txMeta);
             });
         });
         _BridgeStatusController_startPollingForTxId.set(this, (txId) => {
@@ -281,18 +237,12 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             if (!txHistoryItem) {
                 return;
             }
-            if (__classPrivateFieldGet(this, _BridgeStatusController_shouldPollHistoryItem, "f").call(this, txHistoryItem)) {
+            if ((0, history_1.shouldPollHistoryItem)(txHistoryItem)) {
                 __classPrivateFieldGet(this, _BridgeStatusController_pollingTokensByTxMetaId, "f")[txId] = this.startPolling({
                     bridgeTxMetaId: txId,
                 });
             }
         });
-        _BridgeStatusController_shouldPollHistoryItem.set(this, (historyItem) => {
-            const isIntent = Boolean(historyItem?.quote?.intent);
-            const isBridgeTx = (0, bridge_controller_1.isCrossChain)(historyItem.quote.srcChainId, historyItem.quote.destChainId);
-            const isTronTx = (0, bridge_controller_1.isTronChainId)(historyItem.quote.srcChainId);
-            return [isBridgeTx, isIntent, isTronTx].some(Boolean);
-        });
         /**
          * @deprecated For EVM/Solana swap/bridge txs we add tx to history in submitTx()
          * For Solana swap/bridge we start polling in submitTx()
@@ -344,7 +294,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 // Track max polling reached event
                 const historyItem = this.state.txHistory[bridgeTxMetaId];
                 if (historyItem && !historyItem.featureId) {
-                    const selectedAccount = this.messenger.call('AccountsController:getAccountByAddress', historyItem.account);
+                    const selectedAccount = (0, accounts_1.getAccountByAddress)(this.messenger, historyItem.account);
                     const requestParams = (0, metrics_1.getRequestParamFromHistory)(historyItem);
                     const requestMetadata = (0, metrics_1.getRequestMetadataFromHistory)(historyItem, selectedAccount);
                     const { security_warnings: _, ...metadataWithoutWarnings } = requestMetadata;
@@ -400,7 +350,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                     }
                     __classPrivateFieldGet(this, _BridgeStatusController_updateSrcTxHash, "f").call(this, bridgeTxMetaId, srcTxHash);
                     const statusRequest = (0, bridge_status_1.getStatusRequestWithSrcTxHash)(historyItem.quote, srcTxHash);
-                    const response = await (0, bridge_status_1.fetchBridgeTxStatus)(statusRequest, __classPrivateFieldGet(this, _BridgeStatusController_clientId, "f"), await __classPrivateFieldGet(this, _BridgeStatusController_getJwt, "f").call(this), __classPrivateFieldGet(this, _BridgeStatusController_fetchFn, "f"), __classPrivateFieldGet(this, _BridgeStatusController_config, "f").customBridgeApiBaseUrl);
+                    const response = await (0, bridge_status_1.fetchBridgeTxStatus)(statusRequest, __classPrivateFieldGet(this, _BridgeStatusController_clientId, "f"), await (0, authentication_1.getJwt)(this.messenger), __classPrivateFieldGet(this, _BridgeStatusController_fetchFn, "f"), __classPrivateFieldGet(this, _BridgeStatusController_config, "f").customBridgeApiBaseUrl);
                     status = response.status;
                     validationFailures = response.validationFailures;
                 }
@@ -456,16 +406,6 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 __classPrivateFieldGet(this, _BridgeStatusController_handleFetchFailure, "f").call(this, bridgeTxMetaId);
             }
         });
-        _BridgeStatusController_getJwt.set(this, async () => {
-            try {
-                const token = await this.messenger.call('AuthenticationController:getBearerToken');
-                return token;
-            }
-            catch (error) {
-                console.error('Error getting JWT token for bridge-api request', error);
-                return undefined;
-            }
-        });
         _BridgeStatusController_getSrcTxHash.set(this, (bridgeTxMetaId) => {
             const { txHistory } = this.state;
             // Prefer the srcTxHash from bridgeStatusState so we don't have to l ook up in TransactionController
@@ -475,8 +415,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 return srcTxHash;
             }
             // Look up in TransactionController if txMeta has been updated with the srcTxHash
-            const txControllerState = this.messenger.call('TransactionController:getState');
-            const txMeta = txControllerState.transactions.find((tx) => tx.id === bridgeTxMetaId);
+            const txMeta = (0, transaction_1.getTransactionMetaById)(this.messenger, bridgeTxMetaId);
             return txMeta?.hash;
         });
         _BridgeStatusController_updateSrcTxHash.set(this, (bridgeTxMetaId, srcTxHash) => {
@@ -515,57 +454,18 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
          * TX SUBMISSION HANDLING
          *******************************************************
          */
-        /**
-         * Submits the transaction to the snap using the new unified ClientRequest interface
-         * Works for all non-EVM chains (Solana, BTC, Tron)
-         * This adds an approval tx to the ApprovalsController in the background
-         * The client needs to handle the approval tx by redirecting to the confirmation page with the approvalTxId in the URL
-         *
-         * @param trade - The trade data (can be approval or main trade)
-         * @param quoteResponse - The quote response containing metadata
-         * @param selectedAccount - The account to submit the transaction for
-         * @returns The transaction meta
-         */
-        _BridgeStatusController_handleNonEvmTx.set(this, async (trade, quoteResponse, selectedAccount) => {
-            if (!selectedAccount.metadata?.snap?.id) {
-                throw new Error('Failed to submit cross-chain swap transaction: undefined snap id');
-            }
-            const request = (0, transaction_1.getClientRequest)(trade, quoteResponse.quote.srcChainId, selectedAccount);
-            const requestResponse = (await this.messenger.call('SnapController:handleRequest', request));
-            // Create quote response with the specified trade
-            // This allows the same method to handle both approvals and main trades
-            const txQuoteResponse = {
-                ...quoteResponse,
-                trade,
-            };
-            const txMeta = (0, transaction_1.handleNonEvmTxResponse)(requestResponse, txQuoteResponse, selectedAccount);
-            // TODO remove this eventually, just returning it now to match extension behavior
-            // OR if the snap can propagate the snapRequestId or keyringReqId to the ApprovalsController, this can return the approvalTxId instead and clients won't need to subscribe to the ApprovalsController state to redirect
-            return txMeta;
-        });
-        _BridgeStatusController_waitForHashAndReturnFinalTxMeta.set(this, async (hashPromise) => {
-            const transactionHash = await hashPromise;
-            const finalTransactionMeta = this.messenger
-                .call('TransactionController:getState')
-                .transactions.find((tx) => tx.hash === transactionHash);
-            if (!finalTransactionMeta) {
-                throw new Error('Failed to submit cross-chain swap tx: txMeta for txHash was not found');
-            }
-            return finalTransactionMeta;
-        });
-        // Waits until a given transaction (by id) reaches confirmed/finalized status or fails/times out.
-        _BridgeStatusController_waitForTxConfirmation.set(this, async (txId, { timeoutMs = 5 * 60000, // 5 minutes default
-        pollMs = 3000, } = {}) => {
-            return await (0, transaction_1.waitForTxConfirmation)(this.messenger, txId, {
-                timeoutMs,
-                pollMs,
-            });
-        });
-        _BridgeStatusController_handleApprovalTx.set(this, async (isBridgeTx, srcChainId, approval, resetApproval, requireApproval) => {
+        _BridgeStatusController_handleApprovalTx.set(this, async (quoteResponse, isBridgeTx, srcChainId, approval, resetApproval, requireApproval) => {
             if (approval && (0, bridge_controller_1.isEvmTxData)(approval)) {
                 const approveTx = async () => {
-                    await __classPrivateFieldGet(this, _BridgeStatusController_handleUSDTAllowanceReset, "f").call(this, resetApproval);
-                    const approvalTxMeta = await __classPrivateFieldGet(this, _BridgeStatusController_handleEvmTransaction, "f").call(this, {
+                    if (resetApproval) {
+                        await (0, transaction_1.submitEvmTransaction)({
+                            messenger: this.messenger,
+                            transactionType: transaction_controller_1.TransactionType.bridgeApproval,
+                            trade: resetApproval,
+                        });
+                    }
+                    const approvalTxMeta = await (0, transaction_1.submitEvmTransaction)({
+                        messenger: this.messenger,
                         transactionType: isBridgeTx
                             ? transaction_controller_1.TransactionType.bridgeApproval
                             : transaction_controller_1.TransactionType.swapApproval,
@@ -575,101 +475,11 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                     await (0, transaction_1.handleApprovalDelay)(srcChainId);
                     return approvalTxMeta;
                 };
-                return await __classPrivateFieldGet(this, _BridgeStatusController_trace, "f").call(this, {
-                    name: isBridgeTx
-                        ? constants_1.TraceName.BridgeTransactionApprovalCompleted
-                        : constants_1.TraceName.SwapTransactionApprovalCompleted,
-                    data: {
-                        srcChainId: (0, bridge_controller_1.formatChainIdToCaip)(srcChainId),
-                        stxEnabled: false,
-                    },
-                }, approveTx);
+                return await __classPrivateFieldGet(this, _BridgeStatusController_trace, "f").call(this, (0, trace_1.getApprovalTraceParams)(quoteResponse, false), approveTx);
             }
             return undefined;
         });
-        /**
-         * 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.requireApproval - Whether to require approval for the transaction
-         * @param params.txFee - Optional gas fee parameters from the quote (used when gasIncluded is true)
-         * @param params.txFee.maxFeePerGas - The maximum fee per gas from the quote
-         * @param params.txFee.maxPriorityFeePerGas - The maximum priority fee per gas from the quote
-         * @param params.actionId - Optional actionId for pre-submission history (if not provided, one is generated)
-         * @returns The transaction meta
-         */
-        _BridgeStatusController_handleEvmTransaction.set(this, async ({ transactionType, trade, requireApproval = false, txFee, actionId: providedActionId, }) => {
-            // Use provided actionId (for pre-submission history) or generate one
-            const actionId = providedActionId ?? (0, transaction_1.generateActionId)().toString();
-            const selectedAccount = this.messenger.call('AccountsController:getAccountByAddress', trade.from);
-            if (!selectedAccount) {
-                throw new Error('Failed to submit cross-chain swap transaction: unknown account in trade data');
-            }
-            const hexChainId = (0, bridge_controller_1.formatChainIdToHex)(trade.chainId);
-            const networkClientId = this.messenger.call('NetworkController:findNetworkClientIdByChainId', hexChainId);
-            const requestOptions = {
-                actionId,
-                networkClientId,
-                requireApproval,
-                type: transactionType,
-                origin: 'metamask',
-            };
-            // Exclude gasLimit from trade to avoid type issues (it can be null)
-            const { gasLimit: tradeGasLimit, ...tradeWithoutGasLimit } = trade;
-            const transactionParams = {
-                ...tradeWithoutGasLimit,
-                chainId: hexChainId,
-                // Only add gasLimit and gas if they're valid (not undefined/null/zero)
-                ...(tradeGasLimit &&
-                    tradeGasLimit !== 0 && {
-                    gasLimit: tradeGasLimit.toString(),
-                    gas: tradeGasLimit.toString(),
-                }),
-            };
-            const transactionParamsWithMaxGas = {
-                ...transactionParams,
-                ...(await __classPrivateFieldGet(this, _BridgeStatusController_calculateGasFees, "f").call(this, transactionParams, networkClientId, hexChainId, txFee)),
-            };
-            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 (resetApproval) => {
-            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, txFee) => {
-            const { gas } = transactionParams;
-            // If txFee is provided (gasIncluded case), use the quote's gas fees
-            // Convert to hex since txFee values from the quote are decimal strings
-            if (txFee) {
-                return {
-                    maxFeePerGas: (0, controller_utils_1.toHex)(txFee.maxFeePerGas),
-                    maxPriorityFeePerGas: (0, controller_utils_1.toHex)(txFee.maxPriorityFeePerGas),
-                    gas: gas ? (0, controller_utils_1.toHex)(gas) : undefined,
-                };
-            }
-            const { gasFeeEstimates } = this.messenger.call('GasFeeController:getState');
-            const { estimates: txGasFeeEstimates } = await __classPrivateFieldGet(this, _BridgeStatusController_estimateGasFeeFn, "f").call(this, {
-                transactionParams,
-                chainId,
-                networkClientId,
-            });
-            const { maxFeePerGas, maxPriorityFeePerGas } = (0, gas_1.getTxGasEstimates)({
-                networkGasFeeEstimates: gasFeeEstimates,
-                txGasFeeEstimates,
-            });
-            return {
-                maxFeePerGas,
-                maxPriorityFeePerGas,
-                gas: gas ? (0, controller_utils_1.toHex)(gas) : undefined,
-            };
-        });
+        // TODO simplify and make more readable
         /**
          * Submits batched EVM transactions to the TransactionController
          *
@@ -685,26 +495,9 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
         _BridgeStatusController_handleEvmTransactionBatch.set(this, async (args) => {
             const transactionParams = await (0, transaction_1.getAddTransactionBatchParams)({
                 messenger: this.messenger,
-                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)({
-                messenger: this.messenger,
-                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 };
+            return await (0, transaction_1.addTransactionBatch)(this.messenger, __classPrivateFieldGet(this, _BridgeStatusController_addTransactionBatchFn, "f"), transactionParams);
         });
         /**
          * Submits a cross-chain swap transaction
@@ -719,11 +512,8 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
          * @returns The transaction meta
          */
         this.submitTx = async (accountAddress, quoteResponse, isStxEnabledOnClient, quotesReceivedContext, location = bridge_controller_1.MetaMetricsSwapsEventSource.MainView, abTests, activeAbTests) => {
-            this.messenger.call('BridgeController:stopPollingForQuotes', bridge_controller_1.AbortReason.TransactionSubmitted, 
-            // If trade is submitted before all quotes are loaded, the QuotesReceived event is published
-            // If the trade has a featureId, it means it was submitted outside of the Unified Swap and Bridge experience, so no QuotesReceived event is published
-            quoteResponse.featureId ? undefined : quotesReceivedContext);
-            const selectedAccount = __classPrivateFieldGet(this, _BridgeStatusController_instances, "m", _BridgeStatusController_getMultichainSelectedAccount).call(this, accountAddress);
+            (0, bridge_1.stopPollingForQuotes)(this.messenger, quoteResponse.featureId, quotesReceivedContext);
+            const selectedAccount = (0, accounts_1.getAccountByAddress)(this.messenger, accountAddress);
             if (!selectedAccount) {
                 throw new Error('Failed to submit cross-chain swap transaction: undefined multichain account');
             }
@@ -742,19 +532,11 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             if ((0, bridge_controller_1.isNonEvmChainId)(quoteResponse.quote.srcChainId)) {
                 // Handle non-EVM approval if present (e.g., Tron token approvals)
                 if (quoteResponse.approval && (0, bridge_controller_1.isTronTrade)(quoteResponse.approval)) {
-                    const approvalTxMeta = await __classPrivateFieldGet(this, _BridgeStatusController_trace, "f").call(this, {
-                        name: isBridgeTx
-                            ? constants_1.TraceName.BridgeTransactionApprovalCompleted
-                            : constants_1.TraceName.SwapTransactionApprovalCompleted,
-                        data: {
-                            srcChainId: (0, bridge_controller_1.formatChainIdToCaip)(quoteResponse.quote.srcChainId),
-                            stxEnabled: false,
-                        },
-                    }, async () => {
+                    const approvalTxMeta = await __classPrivateFieldGet(this, _BridgeStatusController_trace, "f").call(this, (0, trace_1.getApprovalTraceParams)(quoteResponse, false), async () => {
                         try {
                             return quoteResponse.approval &&
                                 (0, bridge_controller_1.isTronTrade)(quoteResponse.approval)
-                                ? await __classPrivateFieldGet(this, _BridgeStatusController_handleNonEvmTx, "f").call(this, quoteResponse.approval, quoteResponse, selectedAccount)
+                                ? await (0, snaps_1.handleNonEvmTx)(this.messenger, quoteResponse.approval, quoteResponse, selectedAccount)
                                 : /* c8 ignore start */
                                     undefined;
                             /* c8 ignore end */
@@ -772,22 +554,14 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                     // Add delay after approval similar to EVM flow
                     await (0, transaction_1.handleApprovalDelay)(quoteResponse.quote.srcChainId);
                 }
-                txMeta = await __classPrivateFieldGet(this, _BridgeStatusController_trace, "f").call(this, {
-                    name: isBridgeTx
-                        ? constants_1.TraceName.BridgeTransactionCompleted
-                        : constants_1.TraceName.SwapTransactionCompleted,
-                    data: {
-                        srcChainId: (0, bridge_controller_1.formatChainIdToCaip)(quoteResponse.quote.srcChainId),
-                        stxEnabled: false,
-                    },
-                }, async () => {
+                txMeta = await __classPrivateFieldGet(this, _BridgeStatusController_trace, "f").call(this, (0, trace_1.getTraceParams)(quoteResponse, false), async () => {
                     try {
                         if (!((0, bridge_controller_1.isTronTrade)(quoteResponse.trade) ||
                             (0, bridge_controller_1.isBitcoinTrade)(quoteResponse.trade) ||
                             typeof quoteResponse.trade === 'string')) {
                             throw new Error('Failed to submit cross-chain swap transaction: trade is not a non-EVM transaction');
                         }
-                        return await __classPrivateFieldGet(this, _BridgeStatusController_handleNonEvmTx, "f").call(this, quoteResponse.trade, quoteResponse, selectedAccount);
+                        return await (0, snaps_1.handleNonEvmTx)(this.messenger, quoteResponse.trade, quoteResponse, selectedAccount);
                     }
                     catch (error) {
                         !quoteResponse.featureId &&
@@ -805,15 +579,7 @@ 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 && isHardwareAccount;
                 // Handle smart transactions if enabled
-                txMeta = await __classPrivateFieldGet(this, _BridgeStatusController_trace, "f").call(this, {
-                    name: isBridgeTx
-                        ? constants_1.TraceName.BridgeTransactionCompleted
-                        : constants_1.TraceName.SwapTransactionCompleted,
-                    data: {
-                        srcChainId: (0, bridge_controller_1.formatChainIdToCaip)(quoteResponse.quote.srcChainId),
-                        stxEnabled: isStxEnabledOnClient,
-                    },
-                }, async () => {
+                txMeta = await __classPrivateFieldGet(this, _BridgeStatusController_trace, "f").call(this, (0, trace_1.getTraceParams)(quoteResponse, isStxEnabledOnClient), async () => {
                     if (!(0, bridge_controller_1.isEvmTxData)(quoteResponse.trade)) {
                         throw new Error('Failed to submit cross-chain swap transaction: trade is not an EVM transaction');
                     }
@@ -821,18 +587,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                     // Delegated accounts only allow 1 in-flight tx, so approve + swap
                     // must be batched into a single transaction
                     const hexChainId = (0, bridge_controller_1.formatChainIdToHex)(quoteResponse.quote.srcChainId);
-                    isDelegatedAccount = await (async () => {
-                        try {
-                            const atomicBatchSupport = await this.messenger.call('TransactionController:isAtomicBatchSupported', {
-                                address: quoteResponse.trade.from,
-                                chainIds: [hexChainId],
-                            });
-                            return atomicBatchSupport.some((entry) => entry.isSupported && entry.delegationAddress);
-                        }
-                        catch {
-                            return false;
-                        }
-                    })();
+                    isDelegatedAccount = await (0, transaction_1.checkIsDelegatedAccount)(this.messenger, quoteResponse.trade.from, [hexChainId]);
                     if (isStxEnabledOnClient ||
                         quoteResponse.quote.gasIncluded7702 ||
                         isDelegatedAccount) {
@@ -851,21 +606,25 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                         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.quote.srcChainId, quoteResponse.approval && (0, bridge_controller_1.isEvmTxData)(quoteResponse.approval)
+                    const approvalTxMeta = await __classPrivateFieldGet(this, _BridgeStatusController_handleApprovalTx, "f").call(this, quoteResponse, isBridgeTx, quoteResponse.quote.srcChainId, quoteResponse.approval && (0, bridge_controller_1.isEvmTxData)(quoteResponse.approval)
                         ? quoteResponse.approval
                         : undefined, quoteResponse.resetApproval, requireApproval);
                     approvalTxId = approvalTxMeta?.id;
-                    await (0, transaction_1.handleMobileHardwareWalletDelay)(requireApproval);
+                    // Hardware-wallet delay first (Ledger second-prompt spacing), then wait for
+                    // on-chain approval confirmation so swap gas estimation runs after allowance is set.
+                    if (requireApproval && approvalTxMeta) {
+                        await (0, transaction_1.handleMobileHardwareWalletDelay)(requireApproval);
+                        await (0, transaction_1.waitForTxConfirmation)(this.messenger, approvalTxMeta.id);
+                    }
+                    else {
+                        await (0, transaction_1.handleMobileHardwareWalletDelay)(requireApproval);
+                    }
                     // Generate actionId for pre-submission history (non-batch EVM only)
                     const actionId = (0, transaction_1.generateActionId)().toString();
                     // Add pre-submission history keyed by actionId
                     // This ensures we have quote data available if transaction fails during submission
                     __classPrivateFieldGet(this, _BridgeStatusController_addTxToHistory, "f").call(this, {
                         accountAddress: selectedAccount.address,
-                        statusRequest: {
-                            ...(0, transaction_1.getStatusRequestParams)(quoteResponse),
-                            srcTxHash: '', // Not available yet
-                        },
                         quoteResponse,
                         slippagePercentage: 0,
                         isStxEnabled: isStxEnabledOnClient,
@@ -874,10 +633,12 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                         location,
                         abTests,
                         activeAbTests,
-                    }, actionId);
+                        actionId,
+                    });
                     // Pass txFee when gasIncluded is true to use the quote's gas fees
                     // instead of re-estimating (which would fail for max native token swaps)
-                    const tradeTxMeta = await __classPrivateFieldGet(this, _BridgeStatusController_handleEvmTransaction, "f").call(this, {
+                    const tradeTxMeta = await (0, transaction_1.submitEvmTransaction)({
+                        messenger: this.messenger,
                         transactionType: isBridgeTx
                             ? transaction_controller_1.TransactionType.bridge
                             : transaction_controller_1.TransactionType.swap,
@@ -905,10 +666,6 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                     __classPrivateFieldGet(this, _BridgeStatusController_addTxToHistory, "f").call(this, {
                         accountAddress: selectedAccount.address,
                         bridgeTxMeta: txMeta, // Only the id field is used by the BridgeStatusController
-                        statusRequest: {
-                            ...(0, transaction_1.getStatusRequestParams)(quoteResponse),
-                            srcTxHash: txMeta.hash,
-                        },
                         quoteResponse,
                         slippagePercentage: 0, // TODO include slippage provided by quote if using dynamic slippage, or slippage from quote request
                         isStxEnabled: isStxEnabledOnClient,
@@ -947,28 +704,31 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
          */
         this.submitIntent = async (params) => {
             const { quoteResponse, accountAddress, location, abTests, activeAbTests } = params;
-            this.messenger.call('BridgeController:stopPollingForQuotes', bridge_controller_1.AbortReason.TransactionSubmitted);
+            // TODO add metrics context
+            (0, bridge_1.stopPollingForQuotes)(this.messenger);
+            const startTime = Date.now();
             // Build pre-confirmation properties for error tracking parity with submitTx
-            const account = __classPrivateFieldGet(this, _BridgeStatusController_instances, "m", _BridgeStatusController_getMultichainSelectedAccount).call(this, accountAddress);
+            const account = (0, accounts_1.getAccountByAddress)(this.messenger, accountAddress);
             const isHardwareAccount = Boolean(account) && (0, bridge_controller_1.isHardwareWallet)(account);
             const preConfirmationProperties = (0, metrics_1.getPreConfirmationPropertiesFromQuote)(quoteResponse, false, isHardwareAccount, location, abTests, activeAbTests);
             try {
-                const intent = (0, transaction_1.getIntentFromQuote)(quoteResponse);
+                const intent = (0, intent_api_1.getIntentFromQuote)(quoteResponse);
                 // If backend provided an approval tx for this intent quote, submit it first (on-chain),
                 // then proceed with off-chain intent submission.
                 const isBridgeTx = (0, bridge_controller_1.isCrossChain)(quoteResponse.quote.srcChainId, quoteResponse.quote.destChainId);
                 const requireApproval = isHardwareAccount && __classPrivateFieldGet(this, _BridgeStatusController_clientId, "f") === types_1.BridgeClientId.MOBILE;
                 // Handle approval silently for better UX in intent flows
-                const approvalTxMeta = await __classPrivateFieldGet(this, _BridgeStatusController_handleApprovalTx, "f").call(this, isBridgeTx, quoteResponse.quote.srcChainId, quoteResponse.approval, quoteResponse.resetApproval, requireApproval);
+                const approvalTxMeta = await __classPrivateFieldGet(this, _BridgeStatusController_handleApprovalTx, "f").call(this, quoteResponse, isBridgeTx, quoteResponse.quote.srcChainId, quoteResponse.approval, quoteResponse.resetApproval, requireApproval);
                 const approvalTxId = approvalTxMeta?.id;
                 if (approvalTxId) {
-                    await __classPrivateFieldGet(this, _BridgeStatusController_waitForTxConfirmation, "f").call(this, approvalTxId);
+                    await (0, transaction_1.waitForTxConfirmation)(this.messenger, approvalTxId);
                 }
                 const { srcChainId, requestId } = quoteResponse.quote;
-                const signature = await this.messenger.call('KeyringController:signTypedMessage', {
-                    from: accountAddress,
-                    data: intent.typedData,
-                }, keyring_controller_1.SignTypedDataVersion.V4);
+                const signature = await (0, keyring_1.signTypedMessage)({
+                    messenger: this.messenger,
+                    accountAddress,
+                    typedData: intent.typedData,
+                });
                 const submissionParams = {
                     srcChainId,
                     quoteId: requestId,
@@ -977,8 +737,13 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                     userAddress: accountAddress,
                     aggregatorId: intent.protocol,
                 };
-                const intentOrder = await __classPrivateFieldGet(this, _BridgeStatusController_intentManager, "f").submitIntent(submissionParams, __classPrivateFieldGet(this, _BridgeStatusController_clientId, "f"));
-                const orderUid = intentOrder.id;
+                const { id: orderUid, status } = await (0, intent_api_1.postSubmitOrder)({
+                    params: submissionParams,
+                    clientId: __classPrivateFieldGet(this, _BridgeStatusController_clientId, "f"),
+                    jwt: await (0, authentication_1.getJwt)(this.messenger),
+                    fetchFn: __classPrivateFieldGet(this, _BridgeStatusController_fetchFn, "f"),
+                    bridgeApiBaseUrl: __classPrivateFieldGet(this, _BridgeStatusController_config, "f").customBridgeApiBaseUrl,
+                });
                 // Determine transaction type: swap for same-chain, bridge for cross-chain
                 const transactionType = isBridgeTx
                     ? /* c8 ignore start */
@@ -986,7 +751,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                     : /* c8 ignore end */
                         transaction_controller_1.TransactionType.swap;
                 // Create actual transaction in Transaction Controller first
-                const networkClientId = this.messenger.call('NetworkController:findNetworkClientIdByChainId', (0, bridge_controller_1.formatChainIdToHex)(srcChainId));
+                const networkClientId = (0, network_1.getNetworkClientIdByChainId)(this.messenger, srcChainId);
                 // This is a synthetic transaction whose purpose is to be able
                 // to track the order status via the history
                 const intentTransactionParams = {
@@ -999,25 +764,16 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                     gas: '0x5208', // Minimal gas for display purposes
                     gasPrice: '0x3b9aca00', // 1 Gwei - will be converted to EIP-1559 fees if network supports it
                 };
-                const { transactionMeta: txMetaPromise } = await __classPrivateFieldGet(this, _BridgeStatusController_addTransactionFn, "f").call(this, intentTransactionParams, {
-                    origin: 'metamask',
-                    actionId: (0, transaction_1.generateActionId)(),
+                const initialTxMeta = await (0, transaction_1.addSyntheticTransaction)(this.messenger, intentTransactionParams, {
                     requireApproval: false,
-                    isStateOnly: true,
                     networkClientId,
                     type: transactionType,
                 });
-                const intentTxMeta = txMetaPromise;
-                // Map intent order status to TransactionController status
-                const initialTransactionStatus = (0, intent_api_1.mapIntentOrderStatusToTransactionStatus)(intentOrder.status);
-                // Update transaction with proper initial status based on intent order
-                const statusUpdatedTxMeta = {
-                    ...intentTxMeta,
-                    status: initialTransactionStatus,
-                };
-                // Update with actual transaction metadata
+                // Update txHistory with actual transaction metadata
                 const syntheticMeta = {
-                    ...statusUpdatedTxMeta,
+                    ...initialTxMeta,
+                    // Map intent order status to TransactionController status
+                    status: (0, intent_api_1.mapIntentOrderStatusToTransactionStatus)(status),
                     isIntentTx: true,
                     orderUid,
                 };
@@ -1031,14 +787,9 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                         id: bridgeHistoryKey,
                         originalTransactionId: syntheticMeta.id, // Keep original txId for TransactionController updates
                     };
-                    const startTime = Date.now();
                     __classPrivateFieldGet(this, _BridgeStatusController_addTxToHistory, "f").call(this, {
                         accountAddress,
                         bridgeTxMeta: bridgeTxMetaForHistory,
-                        statusRequest: {
-                            ...(0, transaction_1.getStatusRequestParams)(quoteResponse),
-                            srcTxHash: syntheticMeta.hash ?? '',
-                        },
                         quoteResponse,
                         slippagePercentage: 0,
                         isStxEnabled: false,
@@ -1099,35 +850,48 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             };
             // This will publish events for PERPS dropped tx failures as well
             if (!txMetaId) {
-                this.messenger.call('BridgeController:trackUnifiedSwapBridgeEvent', eventName, baseProperties);
+                (0, bridge_1.trackMetricsEvent)({
+                    messenger: this.messenger,
+                    eventName,
+                    properties: baseProperties,
+                });
                 return;
             }
             const historyItem = this.state.txHistory[txMetaId];
             if (!historyItem) {
-                this.messenger.call('BridgeController:trackUnifiedSwapBridgeEvent', eventName, baseProperties);
+                (0, bridge_1.trackMetricsEvent)({
+                    messenger: this.messenger,
+                    eventName,
+                    properties: baseProperties,
+                });
                 return;
             }
+            const { featureId, approvalTxId, quote } = historyItem;
             const requestParamProperties = (0, metrics_1.getRequestParamFromHistory)(historyItem);
             // Always publish StatusValidationFailed event, regardless of featureId
             if (eventName === bridge_controller_1.UnifiedSwapBridgeEventName.StatusValidationFailed) {
-                this.messenger.call('BridgeController:trackUnifiedSwapBridgeEvent', eventName, {
-                    ...baseProperties,
-                    chain_id_source: requestParamProperties.chain_id_source,
-                    chain_id_destination: requestParamProperties.chain_id_destination,
-                    token_address_source: requestParamProperties.token_address_source,
-                    token_address_destination: requestParamProperties.token_address_destination,
-                    refresh_count: historyItem.attempts?.counter ?? 0,
+                (0, bridge_1.trackMetricsEvent)({
+                    messenger: this.messenger,
+                    eventName,
+                    properties: {
+                        ...baseProperties,
+                        chain_id_source: requestParamProperties.chain_id_source,
+                        chain_id_destination: requestParamProperties.chain_id_destination,
+                        token_address_source: requestParamProperties.token_address_source,
+                        token_address_destination: requestParamProperties.token_address_destination,
+                        refresh_count: historyItem.attempts?.counter ?? 0,
+                    },
                 });
                 return;
             }
             // Skip tracking all other events when featureId is set (i.e. PERPS)
-            if (historyItem.featureId) {
+            if (featureId) {
                 return;
             }
-            const selectedAccount = this.messenger.call('AccountsController:getAccountByAddress', historyItem.account);
-            const { transactions } = this.messenger.call('TransactionController:getState');
-            const txMeta = transactions?.find((tx) => tx.id === txMetaId);
-            const approvalTxMeta = transactions?.find((tx) => tx.id === historyItem.approvalTxId);
+            const selectedAccount = (0, accounts_1.getAccountByAddress)(this.messenger, historyItem.account);
+            const transactions = (0, transaction_1.getTransactions)(this.messenger);
+            const txMeta = transactions.find((tx) => tx.id === txMetaId);
+            const approvalTxMeta = transactions.find((tx) => tx.id === approvalTxId);
             const requiredEventProperties = {
                 ...baseProperties,
                 ...requestParamProperties,
@@ -1135,26 +899,25 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 ...(0, metrics_1.getTradeDataFromHistory)(historyItem),
                 ...(0, metrics_1.getTxStatusesFromHistory)(historyItem),
                 ...(0, metrics_1.getFinalizedTxProperties)(historyItem, txMeta, approvalTxMeta),
-                ...(0, metrics_1.getPriceImpactFromQuote)(historyItem.quote),
+                ...(0, metrics_1.getPriceImpactFromQuote)(quote),
             };
-            this.messenger.call('BridgeController:trackUnifiedSwapBridgeEvent', eventName, requiredEventProperties);
+            (0, bridge_1.trackMetricsEvent)({
+                messenger: this.messenger,
+                eventName,
+                properties: requiredEventProperties,
+            });
         });
         __classPrivateFieldSet(this, _BridgeStatusController_clientId, clientId, "f");
         __classPrivateFieldSet(this, _BridgeStatusController_fetchFn, fetchFn, "f");
-        __classPrivateFieldSet(this, _BridgeStatusController_addTransactionFn, addTransactionFn, "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,
         }, "f");
         __classPrivateFieldSet(this, _BridgeStatusController_trace, traceFn ?? ((_request, fn) => fn?.()), "f");
         __classPrivateFieldSet(this, _BridgeStatusController_intentManager, new bridge_status_controller_intent_1.IntentManager({
             messenger: this.messenger,
-            updateTransactionFn: __classPrivateFieldGet(this, _BridgeStatusController_updateTransactionFn, "f"),
             customBridgeApiBaseUrl: __classPrivateFieldGet(this, _BridgeStatusController_config, "f").customBridgeApiBaseUrl,
             fetchFn: __classPrivateFieldGet(this, _BridgeStatusController_fetchFn, "f"),
-            getJwt: __classPrivateFieldGet(this, _BridgeStatusController_getJwt, "f"),
         }), "f");
         // Register action handlers
         this.messenger.registerActionHandler(`${constants_1.BRIDGE_STATUS_CONTROLLER_NAME}:startPollingForBridgeTxStatus`, this.startPollingForBridgeTxStatus.bind(this));
@@ -1212,7 +975,5 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
     }
 }
 exports.BridgeStatusController = BridgeStatusController;
-_BridgeStatusController_pollingTokensByTxMetaId = new WeakMap(), _BridgeStatusController_intentManager = 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_rekeyHistoryItem = new WeakMap(), _BridgeStatusController_startPollingForTxId = new WeakMap(), _BridgeStatusController_shouldPollHistoryItem = new WeakMap(), _BridgeStatusController_handleFetchFailure = new WeakMap(), _BridgeStatusController_fetchBridgeTxStatus = new WeakMap(), _BridgeStatusController_getJwt = new WeakMap(), _BridgeStatusController_getSrcTxHash = new WeakMap(), _BridgeStatusController_updateSrcTxHash = new WeakMap(), _BridgeStatusController_wipeBridgeStatusByChainId = new WeakMap(), _BridgeStatusController_handleNonEvmTx = new WeakMap(), _BridgeStatusController_waitForHashAndReturnFinalTxMeta = new WeakMap(), _BridgeStatusController_waitForTxConfirmation = 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(accountAddress) {
-    return this.messenger.call('AccountsController:getAccountByAddress', accountAddress);
-};
+_BridgeStatusController_pollingTokensByTxMetaId = new WeakMap(), _BridgeStatusController_intentManager = new WeakMap(), _BridgeStatusController_clientId = new WeakMap(), _BridgeStatusController_fetchFn = new WeakMap(), _BridgeStatusController_config = new WeakMap(), _BridgeStatusController_addTransactionBatchFn = new WeakMap(), _BridgeStatusController_trace = new WeakMap(), _BridgeStatusController_markTxAsFailed = new WeakMap(), _BridgeStatusController_restartPollingForIncompleteHistoryItems = new WeakMap(), _BridgeStatusController_addTxToHistory = new WeakMap(), _BridgeStatusController_rekeyHistoryItem = new WeakMap(), _BridgeStatusController_startPollingForTxId = new WeakMap(), _BridgeStatusController_handleFetchFailure = new WeakMap(), _BridgeStatusController_fetchBridgeTxStatus = new WeakMap(), _BridgeStatusController_getSrcTxHash = new WeakMap(), _BridgeStatusController_updateSrcTxHash = new WeakMap(), _BridgeStatusController_wipeBridgeStatusByChainId = new WeakMap(), _BridgeStatusController_handleApprovalTx = new WeakMap(), _BridgeStatusController_handleEvmTransactionBatch = new WeakMap(), _BridgeStatusController_trackUnifiedSwapBridgeEvent = new WeakMap();
 //# sourceMappingURL=bridge-status-controller.cjs.map