@metamask/bridge-status-controller 71.2.0 → 72.0.0

package/dist/bridge-status-controller.mjs

@@ -9,26 +9,25 @@ 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_pollingTokensByTxMetaId, _BridgeStatusController_intentManager, _BridgeStatusController_clientId, _BridgeStatusController_fetchFn, _BridgeStatusController_config, _BridgeStatusController_addTransactionBatchFn, _BridgeStatusController_trace, _BridgeStatusController_onTransactionFailed, _BridgeStatusController_onTransactionConfirmed, _BridgeStatusController_restartPollingForIncompleteHistoryItems, _BridgeStatusController_addTxToHistory, _BridgeStatusController_rekeyHistoryItem, _BridgeStatusController_startPollingForTxId, _BridgeStatusController_handleFetchFailure, _BridgeStatusController_handleOldHistoryItem, _BridgeStatusController_fetchBridgeTxStatus, _BridgeStatusController_setAndGetSrcTxHash, _BridgeStatusController_updateHistoryItem, _BridgeStatusController_deleteHistoryItem, _BridgeStatusController_wipeBridgeStatusByChainId, _BridgeStatusController_handleApprovalTx, _BridgeStatusController_handleEvmTransactionBatch, _BridgeStatusController_trackPollingStatusUpdatedEvent, _BridgeStatusController_trackUnifiedSwapBridgeEvent;
-import { formatChainIdToHex, isNonEvmChainId, StatusTypes, getAccountHardwareType, UnifiedSwapBridgeEventName, isCrossChain, isTronChainId, isEvmTxData, MetricsActionType, MetaMetricsSwapsEventSource, isBitcoinTrade, isTronTrade, PollingStatus } from "@metamask/bridge-controller";
+var _BridgeStatusController_pollingTokensByTxMetaId, _BridgeStatusController_intentManager, _BridgeStatusController_clientId, _BridgeStatusController_fetchFn, _BridgeStatusController_config, _BridgeStatusController_addTransactionBatchFn, _BridgeStatusController_trace, _BridgeStatusController_onTransactionFailed, _BridgeStatusController_onTransactionConfirmed, _BridgeStatusController_restartPollingForIncompleteHistoryItems, _BridgeStatusController_addTxToHistory, _BridgeStatusController_rekeyHistoryItem, _BridgeStatusController_startPollingForTxId, _BridgeStatusController_handleFetchFailure, _BridgeStatusController_handleOldHistoryItem, _BridgeStatusController_fetchBridgeTxStatus, _BridgeStatusController_setAndGetSrcTxHash, _BridgeStatusController_updateHistoryItem, _BridgeStatusController_deleteHistoryItem, _BridgeStatusController_wipeBridgeStatusByChainId, _BridgeStatusController_executeSubmitStrategy, _BridgeStatusController_trackPollingStatusUpdatedEvent, _BridgeStatusController_trackUnifiedSwapBridgeEvent;
+import { isNonEvmChainId, StatusTypes, getAccountHardwareType, UnifiedSwapBridgeEventName, isCrossChain, MetricsActionType, MetaMetricsSwapsEventSource, PollingStatus, formatChainIdToHex } from "@metamask/bridge-controller";
 import { StaticIntervalPollingController } from "@metamask/polling-controller";
 import { TransactionStatus, TransactionType, TransactionController } from "@metamask/transaction-controller";
 import { numberToHex } from "@metamask/utils";
 import { IntentManager } from "./bridge-status-controller.intent.mjs";
 import { BRIDGE_PROD_API_BASE_URL, BRIDGE_STATUS_CONTROLLER_NAME, DEFAULT_BRIDGE_STATUS_CONTROLLER_STATE, MAX_ATTEMPTS, REFRESH_INTERVAL_MS } from "./constants.mjs";
+import executeSubmitStrategy from "./strategy/index.mjs";
+import { SubmitStep } from "./strategy/types.mjs";
 import { BridgeClientId } from "./types.mjs";
 import { getAccountByAddress } from "./utils/accounts.mjs";
 import { getJwt } from "./utils/authentication.mjs";
-import { stopPollingForQuotes, trackMetricsEvent } from "./utils/bridge.mjs";
+import { getBatchSellTrades, stopPollingForQuotes, trackMetricsEvent } from "./utils/bridge.mjs";
 import { fetchBridgeTxStatus, getStatusRequestWithSrcTxHash, shouldSkipFetchDueToFetchFailures, shouldWaitForFinalBridgeStatus } from "./utils/bridge-status.mjs";
 import { getInitialHistoryItem, getMatchingHistoryEntryForTxMeta, rekeyHistoryItemInState, shouldPollHistoryItem, getMatchingHistoryEntryForApprovalTxMeta } from "./utils/history.mjs";
-import { getIntentFromQuote, mapIntentOrderStatusToTransactionStatus, postSubmitOrder } from "./utils/intent-api.mjs";
-import { signTypedMessage } from "./utils/keyring.mjs";
 import { getFinalizedTxProperties, getPriceImpactFromQuote, getRequestMetadataFromHistory, getRequestParamFromHistory, getTradeDataFromHistory, getEVMTxPropertiesFromTransactionMeta, getTxStatusesFromHistory, getPreConfirmationPropertiesFromQuote, getPollingStatusUpdatedProperties } from "./utils/metrics.mjs";
-import { getNetworkClientIdByChainId, getSelectedChainId } from "./utils/network.mjs";
-import { handleNonEvmTx } from "./utils/snaps.mjs";
-import { getApprovalTraceParams, getTraceParams } from "./utils/trace.mjs";
-import { getAddTransactionBatchParams, handleApprovalDelay, handleMobileHardwareWalletDelay, generateActionId, waitForTxConfirmation, getTransactionMetaById, addTransactionBatch, addSyntheticTransaction, getTransactions, submitEvmTransaction, checkIsDelegatedAccount, isCrossChainTx } from "./utils/transaction.mjs";
+import { getSelectedChainId } from "./utils/network.mjs";
+import { getTraceParams } from "./utils/trace.mjs";
+import { getTransactionMetaById, getTransactions, checkIsDelegatedAccount, isCrossChainTx, updateTransactionsInBatch, hasNestedSwapTransactions } from "./utils/transaction.mjs";
 const metadata = {
     // We want to persist the bridge status state so that we can show the proper data for the Activity list
     // basically match the behavior of TransactionController
@@ -45,6 +44,7 @@ const MESSENGER_EXPOSED_METHODS = [
     'resetState',
     'submitTx',
     'submitIntent',
+    'submitBatchSell',
     'restartPollingForFailedAttempts',
     'getBridgeHistoryItemByTxMetaId',
 ];
@@ -76,14 +76,11 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                 historyKey,
                 status: StatusTypes.FAILED,
                 txHash: isApprovalTxMeta ? undefined : txMeta.hash,
+                completionTime: Date.now(),
             });
             if (txMeta.status === TransactionStatus.rejected) {
                 return;
             }
-            // Skip account lookup and tracking when featureId is set (e.g. PERPS)
-            if (historyKey && this.state.txHistory[historyKey]?.featureId) {
-                return;
-            }
             // Skip tracking if this is a duplicate failed event for the same history item
             // This can happen if the transaction includes an approval tx that fails
             if (isHistoryItemAlreadyFailed) {
@@ -102,11 +99,13 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                 historyKey,
                 txHash: txMeta.hash,
             });
-            switch (txMeta.type) {
-                case TransactionType.swap:
+            const isSwap = txMeta.type === TransactionType.swap || hasNestedSwapTransactions(txMeta);
+            switch (isSwap) {
+                case true:
                     __classPrivateFieldGet(this, _BridgeStatusController_updateHistoryItem, "f").call(this, {
                         historyKey,
                         status: StatusTypes.COMPLETE,
+                        completionTime: Date.now(),
                     });
                     __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, UnifiedSwapBridgeEventName.Completed, historyKey);
                     break;
@@ -243,10 +242,9 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                 __classPrivateFieldGet(this, _BridgeStatusController_startPollingForTxId, "f").call(this, historyKey);
             });
         });
-        _BridgeStatusController_addTxToHistory.set(this, (...args) => {
-            const { historyKey, txHistoryItem } = getInitialHistoryItem(...args);
+        _BridgeStatusController_addTxToHistory.set(this, (historyKey, ...args) => {
+            const txHistoryItem = getInitialHistoryItem(...args);
             this.update((state) => {
-                // Use actionId as key for pre-submission, or txMeta.id for post-submission
                 state.txHistory[historyKey] = txHistoryItem;
             });
             return historyKey;
@@ -255,14 +253,15 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
          * Rekeys a history item from actionId to txMeta.id after successful submission.
          * Also updates txMetaId and srcTxHash which weren't available pre-submission.
          *
-         * @param actionId - The actionId used as the temporary key for the history item
+         * @param oldKey - The temporary key to use for the history item, usually the actionId
+         * @param newKey - The new key to use, typcally the txmeta.id
          * @param txMeta - The transaction meta from the successful submission
          * @param txMeta.id - The transaction meta id to use as the new key
          * @param txMeta.hash - The transaction hash to set on the history item
          */
-        _BridgeStatusController_rekeyHistoryItem.set(this, (actionId, txMeta) => {
+        _BridgeStatusController_rekeyHistoryItem.set(this, (oldKey, newKey, txMeta) => {
             this.update((state) => {
-                rekeyHistoryItemInState(state, actionId, txMeta);
+                rekeyHistoryItemInState(state, oldKey, newKey, txMeta);
             });
         });
         _BridgeStatusController_startPollingForTxId.set(this, (txId) => {
@@ -293,7 +292,7 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
             if (!bridgeTxMeta?.id) {
                 throw new Error('Cannot start polling: bridgeTxMeta.id is required for polling');
             }
-            const historyKey = __classPrivateFieldGet(this, _BridgeStatusController_addTxToHistory, "f").call(this, txHistoryMeta);
+            const historyKey = __classPrivateFieldGet(this, _BridgeStatusController_addTxToHistory, "f").call(this, bridgeTxMeta.id, txHistoryMeta);
             __classPrivateFieldGet(this, _BridgeStatusController_startPollingForTxId, "f").call(this, historyKey);
         };
         // This will be called after you call this.startPolling()
@@ -488,7 +487,7 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
             });
             return localTxHash;
         });
-        _BridgeStatusController_updateHistoryItem.set(this, ({ historyKey, status, txHash, attempts, }) => {
+        _BridgeStatusController_updateHistoryItem.set(this, ({ historyKey, status, txHash, attempts, completionTime, }) => {
             if (!historyKey) {
                 return;
             }
@@ -502,6 +501,9 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                 if (attempts) {
                     currentState.txHistory[historyKey].attempts = attempts;
                 }
+                if (completionTime) {
+                    currentState.txHistory[historyKey].completionTime = completionTime;
+                }
             });
         });
         _BridgeStatusController_deleteHistoryItem.set(this, (historyKey) => {
@@ -537,237 +539,134 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
          * TX SUBMISSION HANDLING
          *******************************************************
          */
-        _BridgeStatusController_handleApprovalTx.set(this, async (quoteResponse, isBridgeTx, srcChainId, approval, resetApproval, requireApproval) => {
-            if (approval && isEvmTxData(approval)) {
-                const approveTx = async () => {
-                    if (resetApproval) {
-                        await submitEvmTransaction({
-                            messenger: this.messenger,
-                            transactionType: TransactionType.bridgeApproval,
-                            trade: resetApproval,
-                        });
+        _BridgeStatusController_executeSubmitStrategy.set(this, async (params, sharedHistoryItemProperties) => {
+            let tradeTxMeta;
+            const steps = executeSubmitStrategy(params);
+            // Each submission strategy determines when to execute step, which means these actions can happen in any order
+            for await (const { type, payload } of steps) {
+                try {
+                    switch (type) {
+                        case SubmitStep.RekeyHistoryItem:
+                            __classPrivateFieldGet(this, _BridgeStatusController_rekeyHistoryItem, "f").call(this, payload.oldHistoryKey, payload.newHistoryKey, payload.tradeMeta);
+                            break;
+                        case SubmitStep.UpdateBatchTransactions:
+                            updateTransactionsInBatch({
+                                messenger: this.messenger,
+                                allTradesWithMetadata: payload.quoteAndTxMetas,
+                            });
+                            break;
+                        case SubmitStep.SetTradeMeta:
+                            tradeTxMeta = payload.tradeMeta;
+                            break;
+                        case SubmitStep.AddHistoryItem:
+                            __classPrivateFieldGet(this, _BridgeStatusController_addTxToHistory, "f").call(this, payload.historyKey, {
+                                ...payload,
+                                ...sharedHistoryItemProperties,
+                                quoteResponse: payload.quoteResponse,
+                                accountAddress: params.selectedAccount.address,
+                                isStxEnabled: params.isStxEnabled,
+                                slippagePercentage: 0, // TODO include slippage provided by quote if using dynamic slippage, or slippage from quote request
+                            });
+                            break;
+                        case SubmitStep.StartPolling:
+                            __classPrivateFieldGet(this, _BridgeStatusController_startPollingForTxId, "f").call(this, payload.historyKey);
+                            break;
+                        case SubmitStep.PublishCompletedEvent:
+                            __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, UnifiedSwapBridgeEventName.Completed, payload.historyKey);
+                            break;
+                        /* c8 ignore start */
+                        default:
+                            throw new Error(`Unknown submit step type: ${String(type)}`);
+                        /* c8 ignore end */
                     }
-                    const approvalTxMeta = await submitEvmTransaction({
-                        messenger: this.messenger,
-                        transactionType: isBridgeTx
-                            ? TransactionType.bridgeApproval
-                            : TransactionType.swapApproval,
-                        trade: approval,
-                        requireApproval,
-                    });
-                    await handleApprovalDelay(srcChainId);
-                    return approvalTxMeta;
-                };
-                return await __classPrivateFieldGet(this, _BridgeStatusController_trace, "f").call(this, getApprovalTraceParams(quoteResponse, false), approveTx);
+                }
+                catch (error) {
+                    console.error('Failed to add to bridge history and start polling.', error);
+                }
             }
-            return undefined;
-        });
-        // TODO simplify and make more readable
-        /**
-         * 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 getAddTransactionBatchParams({
-                messenger: this.messenger,
-                ...args,
-            });
-            return await addTransactionBatch(this.messenger, __classPrivateFieldGet(this, _BridgeStatusController_addTransactionBatchFn, "f"), transactionParams);
+            return tradeTxMeta;
         });
         /**
          * Submits a cross-chain swap transaction
          *
          * @param accountAddress - The address of the account to submit the transaction for
-         * @param quoteResponse - The quote response
-         * @param isStxEnabledOnClient - Whether smart transactions are enabled on the client, for example the getSmartTransactionsEnabled selector value from the extension
+         * @param maybeQuoteResponses - A single quote response or an array of quote responses
+         * @param isStxEnabled - Whether smart transactions are enabled on the client, for example the getSmartTransactionsEnabled selector value from the extension
          * @param quotesReceivedContext - The context for the QuotesReceived event
          * @param location - The entry point from which the user initiated the swap or bridge (e.g. Main View, Token View, Trending Explore)
          * @param abTests - Legacy A/B test context for `ab_tests` (backward compatibility)
          * @param activeAbTests - New A/B test context for `active_ab_tests` (migration target). Attributes events to specific experiments.
          * @param tokenSecurityTypeDestination - The security classification of the destination token, supplied by the client (e.g. from token security/scanning data). Pass `null` when no security data is available.
+         * @param batchSellTrades - Contains transaction data for the quotes, provided by the obtainGaslessBatch API
          * @returns The transaction meta
+         * @throws An error if transaction submission fails before it gets published
          */
-        this.submitTx = async (accountAddress, quoteResponse, isStxEnabledOnClient, quotesReceivedContext, location = MetaMetricsSwapsEventSource.MainView, abTests, activeAbTests, tokenSecurityTypeDestination) => {
-            stopPollingForQuotes(this.messenger, quoteResponse.featureId, quotesReceivedContext);
+        this.submitTx = async (accountAddress, maybeQuoteResponses, isStxEnabled, quotesReceivedContext, location = MetaMetricsSwapsEventSource.MainView, abTests, activeAbTests, tokenSecurityTypeDestination, batchSellTrades) => {
+            /**
+             * If there are multiple quote responses, we assume that they all originate from the same src chain
+             * and the same account. In this case its safe to use the first quote response's properties for
+             * metrics and other pre-submission logic
+             */
+            const quoteResponses = Array.isArray(maybeQuoteResponses)
+                ? maybeQuoteResponses
+                : [maybeQuoteResponses];
+            const quoteResponse = quoteResponses[0];
+            const { featureId, quote } = quoteResponse;
+            const startTime = Date.now();
+            stopPollingForQuotes(this.messenger, featureId, quotesReceivedContext);
             const selectedAccount = getAccountByAddress(this.messenger, accountAddress);
             if (!selectedAccount) {
                 throw new Error('Failed to submit cross-chain swap transaction: undefined multichain account');
             }
             const accountHardwareType = getAccountHardwareType(selectedAccount);
-            const preConfirmationProperties = getPreConfirmationPropertiesFromQuote(quoteResponse, isStxEnabledOnClient, accountHardwareType, location, abTests, activeAbTests, tokenSecurityTypeDestination);
-            let txMeta;
-            let approvalTxId;
-            let isDelegatedAccount = false;
-            const startTime = Date.now();
-            const isBridgeTx = isCrossChain(quoteResponse.quote.srcChainId, quoteResponse.quote.destChainId);
-            const isTronTx = isTronChainId(quoteResponse.quote.srcChainId);
+            /**
+             * For hardware wallets on Mobile, this is fixes an issue where the Ledger does not get prompted for the 2nd approval.
+             * Extension does not have this issue
+             */
+            const requireApproval = __classPrivateFieldGet(this, _BridgeStatusController_clientId, "f") === BridgeClientId.MOBILE && accountHardwareType !== null;
+            const isBridgeTx = isCrossChain(quote.srcChainId, quote.destChainId);
+            const preConfirmationProperties = getPreConfirmationPropertiesFromQuote(quoteResponse, isStxEnabled, accountHardwareType, location, abTests, activeAbTests, tokenSecurityTypeDestination, batchSellTrades);
             try {
                 // Emit Submitted event after submit button is clicked
-                !quoteResponse.featureId &&
-                    __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, UnifiedSwapBridgeEventName.Submitted, undefined, preConfirmationProperties);
-                // Submit non-EVM tx (Solana, BTC, Tron)
-                if (isNonEvmChainId(quoteResponse.quote.srcChainId)) {
-                    // Handle non-EVM approval if present (e.g., Tron token approvals)
-                    if (quoteResponse.approval && isTronTrade(quoteResponse.approval)) {
-                        const approvalTxMeta = await __classPrivateFieldGet(this, _BridgeStatusController_trace, "f").call(this, getApprovalTraceParams(quoteResponse, false), async () => {
-                            return quoteResponse.approval &&
-                                isTronTrade(quoteResponse.approval)
-                                ? await handleNonEvmTx(this.messenger, quoteResponse.approval, quoteResponse, selectedAccount)
-                                : /* c8 ignore start */
-                                    undefined;
-                            /* c8 ignore end */
-                        });
-                        approvalTxId = approvalTxMeta?.id;
-                        // Add delay after approval similar to EVM flow
-                        await handleApprovalDelay(quoteResponse.quote.srcChainId);
-                    }
-                    txMeta = await __classPrivateFieldGet(this, _BridgeStatusController_trace, "f").call(this, getTraceParams(quoteResponse, false), async () => {
-                        if (!(isTronTrade(quoteResponse.trade) ||
-                            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 handleNonEvmTx(this.messenger, quoteResponse.trade, quoteResponse, selectedAccount);
-                    });
-                }
-                else {
-                    // Submit EVM tx
-                    // For hardware wallets on Mobile, this is fixes an issue where the Ledger does not get prompted for the 2nd approval
-                    // Extension does not have this issue
-                    const requireApproval = __classPrivateFieldGet(this, _BridgeStatusController_clientId, "f") === BridgeClientId.MOBILE &&
-                        accountHardwareType !== null;
-                    // Handle smart transactions if enabled
-                    txMeta = await __classPrivateFieldGet(this, _BridgeStatusController_trace, "f").call(this, getTraceParams(quoteResponse, isStxEnabledOnClient), async () => {
-                        if (!isEvmTxData(quoteResponse.trade)) {
-                            throw new Error('Failed to submit cross-chain swap transaction: trade is not an EVM transaction');
-                        }
-                        // Check if the account is an EIP-7702 delegated account
-                        // Delegated accounts only allow 1 in-flight tx, so approve + swap
-                        // must be batched into a single transaction
-                        const hexChainId = formatChainIdToHex(quoteResponse.quote.srcChainId);
-                        isDelegatedAccount = await checkIsDelegatedAccount(this.messenger, quoteResponse.trade.from, [hexChainId]);
-                        if (isStxEnabledOnClient ||
-                            quoteResponse.quote.gasIncluded7702 ||
-                            isDelegatedAccount) {
-                            const { tradeMeta, approvalMeta } = await __classPrivateFieldGet(this, _BridgeStatusController_handleEvmTransactionBatch, "f").call(this, {
-                                isBridgeTx,
-                                resetApproval: quoteResponse.resetApproval,
-                                approval: quoteResponse.approval &&
-                                    isEvmTxData(quoteResponse.approval)
-                                    ? quoteResponse.approval
-                                    : undefined,
-                                trade: quoteResponse.trade,
-                                quoteResponse,
-                                requireApproval,
-                                isDelegatedAccount,
-                            });
-                            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, quoteResponse, isBridgeTx, quoteResponse.quote.srcChainId, quoteResponse.approval && isEvmTxData(quoteResponse.approval)
-                            ? quoteResponse.approval
-                            : undefined, quoteResponse.resetApproval, requireApproval);
-                        approvalTxId = approvalTxMeta?.id;
-                        // 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 handleMobileHardwareWalletDelay(requireApproval);
-                            await waitForTxConfirmation(this.messenger, approvalTxMeta.id);
-                        }
-                        else {
-                            await handleMobileHardwareWalletDelay(requireApproval);
-                        }
-                        // Generate actionId for pre-submission history (non-batch EVM only)
-                        const actionId = generateActionId().toString();
-                        // Add pre-submission history keyed by actionId
-                        // This ensures we have quote data available if transaction fails during submission
-                        const historyKey = __classPrivateFieldGet(this, _BridgeStatusController_addTxToHistory, "f").call(this, {
-                            accountAddress: selectedAccount.address,
-                            quoteResponse,
-                            slippagePercentage: 0,
-                            isStxEnabled: isStxEnabledOnClient,
-                            startTime,
-                            approvalTxId,
-                            location,
-                            abTests,
-                            activeAbTests,
-                            actionId,
-                            tokenSecurityTypeDestination,
-                        });
-                        // 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 submitEvmTransaction({
-                            messenger: this.messenger,
-                            transactionType: isBridgeTx
-                                ? TransactionType.bridge
-                                : TransactionType.swap,
-                            trade: quoteResponse.trade,
-                            requireApproval,
-                            txFee: quoteResponse.quote.gasIncluded
-                                ? quoteResponse.quote.feeData.txFee
-                                : undefined,
-                            actionId,
-                        });
-                        // On success, rekey from actionId to txMeta.id and update srcTxHash
-                        __classPrivateFieldGet(this, _BridgeStatusController_rekeyHistoryItem, "f").call(this, historyKey, tradeTxMeta);
-                        return tradeTxMeta;
-                    });
-                }
+                __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, UnifiedSwapBridgeEventName.Submitted, undefined, preConfirmationProperties, featureId);
+                /**
+                 * Check if the account is an EIP-7702 delegated account.
+                 * Delegated accounts only allow 1 in-flight tx, so approve + swap
+                 * must be batched into a single transaction
+                 */
+                const isDelegatedAccount = isNonEvmChainId(quote.srcChainId)
+                    ? false
+                    : await checkIsDelegatedAccount(this.messenger, selectedAccount.address, [formatChainIdToHex(quote.srcChainId)]);
+                const strategyParams = {
+                    messenger: this.messenger,
+                    quoteResponses,
+                    batchSellTrades,
+                    isStxEnabled,
+                    isBridgeTx,
+                    isDelegatedAccount,
+                    selectedAccount,
+                    requireApproval,
+                    clientId: __classPrivateFieldGet(this, _BridgeStatusController_clientId, "f"),
+                    bridgeApiBaseUrl: __classPrivateFieldGet(this, _BridgeStatusController_config, "f").customBridgeApiBaseUrl,
+                    addTransactionBatchFn: __classPrivateFieldGet(this, _BridgeStatusController_addTransactionBatchFn, "f"),
+                    fetchFn: __classPrivateFieldGet(this, _BridgeStatusController_fetchFn, "f"),
+                    traceFn: __classPrivateFieldGet(this, _BridgeStatusController_trace, "f"),
+                };
+                return await __classPrivateFieldGet(this, _BridgeStatusController_trace, "f").call(this, getTraceParams(quoteResponse, isStxEnabled), async () => await __classPrivateFieldGet(this, _BridgeStatusController_executeSubmitStrategy, "f").call(this, strategyParams, {
+                    startTime,
+                    location,
+                    abTests,
+                    activeAbTests,
+                    tokenSecurityTypeDestination,
+                }));
             }
             catch (error) {
-                !quoteResponse.featureId &&
-                    __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, UnifiedSwapBridgeEventName.Failed, undefined, {
-                        error_message: error?.message,
-                        ...preConfirmationProperties,
-                    });
+                __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, UnifiedSwapBridgeEventName.Failed, undefined, {
+                    error_message: error?.message,
+                    ...preConfirmationProperties,
+                }, featureId);
                 throw error;
             }
-            try {
-                // For non-batch EVM transactions, history was already added/rekeyed above
-                // Only add history here for non-EVM and batch EVM transactions
-                const isNonBatchEvm = !isNonEvmChainId(quoteResponse.quote.srcChainId) &&
-                    !isStxEnabledOnClient &&
-                    !quoteResponse.quote.gasIncluded7702 &&
-                    !isDelegatedAccount;
-                let historyKey = txMeta.id;
-                if (!isNonBatchEvm) {
-                    // Add swap or bridge tx to history
-                    historyKey = __classPrivateFieldGet(this, _BridgeStatusController_addTxToHistory, "f").call(this, {
-                        accountAddress: selectedAccount.address,
-                        bridgeTxMeta: txMeta, // Only the id and hash fields are used by the BridgeStatusController
-                        quoteResponse,
-                        slippagePercentage: 0, // TODO include slippage provided by quote if using dynamic slippage, or slippage from quote request
-                        isStxEnabled: isStxEnabledOnClient,
-                        startTime,
-                        approvalTxId,
-                        location,
-                        abTests,
-                        activeAbTests,
-                        tokenSecurityTypeDestination,
-                    });
-                }
-                if (isNonEvmChainId(quoteResponse.quote.srcChainId)) {
-                    // Start polling for bridge tx status
-                    __classPrivateFieldGet(this, _BridgeStatusController_startPollingForTxId, "f").call(this, historyKey);
-                    // Track non-EVM Swap completed event
-                    if (!(isBridgeTx || isTronTx)) {
-                        __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, UnifiedSwapBridgeEventName.Completed, historyKey);
-                    }
-                }
-            }
-            catch {
-                // Ignore errors here, we don't want to crash the app if this fails and tx submission succeeds
-            }
-            return txMeta;
         };
         /**
          * Submits an intent order and creates a synthetic history entry for UX.
@@ -780,135 +679,28 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
          * @param params.abTests - Legacy A/B test context for `ab_tests` (backward compatibility)
          * @param params.activeAbTests - New A/B test context for `active_ab_tests` (migration target). Attributes events to specific experiments.
          * @param params.tokenSecurityTypeDestination - The security classification of the destination token, supplied by the client (e.g. from token security/scanning data). Pass `null` when no security data is available.
+         * @param params.isStxEnabled - Whether smart transactions are enabled on the client, for example the getSmartTransactionsEnabled selector value from the extension
+         * @param params.quotesReceivedContext - The context for the QuotesReceived event
          * @returns A lightweight TransactionMeta-like object for history linking
+         * @throws An error if intent or transaction submission fails before they get published
          */
         this.submitIntent = async (params) => {
-            const { quoteResponse, accountAddress, location, abTests, activeAbTests, tokenSecurityTypeDestination, } = params;
+            const { quoteResponse, accountAddress, location, abTests, activeAbTests, tokenSecurityTypeDestination, isStxEnabled = false, quotesReceivedContext, } = params;
             // TODO add metrics context
-            stopPollingForQuotes(this.messenger);
-            const startTime = Date.now();
-            // Build pre-confirmation properties for error tracking parity with submitTx
-            const account = getAccountByAddress(this.messenger, accountAddress);
-            const accountHardwareType = getAccountHardwareType(account);
-            const preConfirmationProperties = getPreConfirmationPropertiesFromQuote(quoteResponse, false, accountHardwareType, location, abTests, activeAbTests, tokenSecurityTypeDestination);
-            try {
-                const intent = 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 = isCrossChain(quoteResponse.quote.srcChainId, quoteResponse.quote.destChainId);
-                const requireApproval = __classPrivateFieldGet(this, _BridgeStatusController_clientId, "f") === BridgeClientId.MOBILE &&
-                    accountHardwareType !== null;
-                // Handle approval silently for better UX in intent flows
-                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 waitForTxConfirmation(this.messenger, approvalTxId);
-                }
-                const { srcChainId, requestId } = quoteResponse.quote;
-                const signature = await signTypedMessage({
-                    messenger: this.messenger,
-                    accountAddress,
-                    typedData: intent.typedData,
-                });
-                const submissionParams = {
-                    srcChainId,
-                    quoteId: requestId,
-                    signature,
-                    order: intent.order,
-                    userAddress: accountAddress,
-                    aggregatorId: intent.protocol,
-                };
-                const { id: orderUid, status } = await postSubmitOrder({
-                    params: submissionParams,
-                    clientId: __classPrivateFieldGet(this, _BridgeStatusController_clientId, "f"),
-                    jwt: await 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 */
-                        TransactionType.bridge
-                    : /* c8 ignore end */
-                        TransactionType.swap;
-                // Create actual transaction in Transaction Controller first
-                const networkClientId = 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 = {
-                    chainId: formatChainIdToHex(srcChainId),
-                    from: accountAddress,
-                    to: intent.settlementContract ??
-                        '0x9008D19f58AAbd9eD0D60971565AA8510560ab41', // Default settlement contract
-                    data: `0x${orderUid.slice(-8)}`, // Use last 8 chars of orderUid to make each transaction unique
-                    value: '0x0',
-                    gas: '0x5208', // Minimal gas for display purposes
-                    gasPrice: '0x3b9aca00', // 1 Gwei - will be converted to EIP-1559 fees if network supports it
-                };
-                const initialTxMeta = await addSyntheticTransaction(this.messenger, intentTransactionParams, {
-                    requireApproval: false,
-                    networkClientId,
-                    type: transactionType,
-                });
-                // Update txHistory with actual transaction metadata
-                const syntheticMeta = {
-                    ...initialTxMeta,
-                    // Map intent order status to TransactionController status
-                    status: mapIntentOrderStatusToTransactionStatus(status),
-                    isIntentTx: true,
-                    orderUid,
-                };
-                // Record in bridge history with actual transaction metadata
-                try {
-                    // Create a bridge transaction metadata keyed by orderUid for intent polling
-                    const bridgeTxMetaForHistory = {
-                        ...syntheticMeta,
-                        id: orderUid,
-                    };
-                    // Use orderId as the history key for intent transactions
-                    // IMPORTANT: pass originalTransactionId as a top-level argument so
-                    // `getInitialHistoryItem` reads it. Setting it on `bridgeTxMeta` is a no-op
-                    // because `getInitialHistoryItem` destructures `originalTransactionId` from
-                    // the top-level args, not from `bridgeTxMeta`. Without this, the field
-                    // falls back to `bridgeTxMeta.id` (the orderUid), severing the link between
-                    // the bridge history record and the synthetic TransactionController entry.
-                    const historyKey = __classPrivateFieldGet(this, _BridgeStatusController_addTxToHistory, "f").call(this, {
-                        accountAddress,
-                        bridgeTxMeta: bridgeTxMetaForHistory,
-                        originalTransactionId: syntheticMeta.id,
-                        quoteResponse,
-                        slippagePercentage: 0,
-                        isStxEnabled: false,
-                        approvalTxId,
-                        startTime,
-                        location,
-                        abTests,
-                        activeAbTests,
-                        tokenSecurityTypeDestination,
-                    });
-                    // Start polling using the orderId key to route to intent manager
-                    __classPrivateFieldGet(this, _BridgeStatusController_startPollingForTxId, "f").call(this, historyKey);
-                }
-                catch (error) {
-                    console.error('📝 [submitIntent] Failed to add to bridge history', error);
-                    // non-fatal but log the error
-                }
-                return syntheticMeta;
-            }
-            catch (error) {
-                __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, UnifiedSwapBridgeEventName.Failed, undefined, {
-                    error_message: error?.message,
-                    ...preConfirmationProperties,
-                });
-                throw error;
-            }
+            return await this.submitTx(accountAddress, quoteResponse, isStxEnabled, quotesReceivedContext, location, abTests, activeAbTests, tokenSecurityTypeDestination);
+        };
+        this.submitBatchSell = async (params) => {
+            /**
+             * Retrieve the batch sell trades from the BridgeController's state to ensure we submit
+             * the original response data from the bridge-api
+             */
+            const batchSellTrades = getBatchSellTrades(this.messenger);
+            return await this.submitTx(params.accountAddress, params.quoteResponses.filter((quoteResponse) => quoteResponse !== null), params.isStxEnabled ?? false, params.quotesReceivedContext, params.location, params.abTests, params.activeAbTests, params.tokenSecurityTypeDestination, batchSellTrades);
         };
         _BridgeStatusController_trackPollingStatusUpdatedEvent.set(this, (historyKey, pollingStatus) => {
             // Track polling status updated event
             const historyItem = this.state.txHistory[historyKey];
-            if (historyItem && !historyItem.featureId) {
-                __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, UnifiedSwapBridgeEventName.PollingStatusUpdated, historyKey, getPollingStatusUpdatedProperties(this.messenger, pollingStatus, historyItem));
-            }
+            __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, UnifiedSwapBridgeEventName.PollingStatusUpdated, historyKey, getPollingStatusUpdatedProperties(this.messenger, pollingStatus, historyItem));
         });
         /**
          * Tracks post-submission events for a cross-chain swap based on the history item
@@ -916,8 +708,22 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
          * @param eventName - The name of the event to track
          * @param txMetaId - The txMetaId of the history item to track the event for
          * @param eventProperties - The properties for the event
+         * @param featureIdOverride - The featureId to use when the history item is not available. Should
+         * only be provided for events that are not associated with a history item yet, such as Submitted or Failed
          */
-        _BridgeStatusController_trackUnifiedSwapBridgeEvent.set(this, (eventName, txMetaId, eventProperties) => {
+        _BridgeStatusController_trackUnifiedSwapBridgeEvent.set(this, (eventName, txMetaId, eventProperties, featureIdOverride) => {
+            const historyItem = txMetaId
+                ? this.state.txHistory[txMetaId]
+                : undefined;
+            const featureId = featureIdOverride ?? historyItem?.featureId;
+            const shouldSkipMetrics = 
+            // Skip tracking all other events when featureId is set (i.e. PERPS)
+            featureId &&
+                // Always publish StatusValidationFailed event, regardless of featureId
+                eventName !== UnifiedSwapBridgeEventName.StatusValidationFailed;
+            if (shouldSkipMetrics) {
+                return;
+            }
             // Legacy/new metrics fields are intentionally kept independent during migration.
             const historyAbTests = txMetaId
                 ? this.state.txHistory?.[txMetaId]?.abTests
@@ -927,12 +733,12 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                 : undefined;
             const resolvedAbTests = eventProperties?.ab_tests ?? historyAbTests;
             const resolvedActiveAbTests = eventProperties?.active_ab_tests ?? historyActiveAbTests;
+            const location = (txMetaId ? this.state.txHistory?.[txMetaId]?.location : undefined) ??
+                MetaMetricsSwapsEventSource.MainView;
             const baseProperties = {
                 action_type: MetricsActionType.SWAPBRIDGE_V1,
-                location: eventProperties?.location ??
-                    (txMetaId ? this.state.txHistory?.[txMetaId]?.location : undefined) ??
-                    MetaMetricsSwapsEventSource.MainView,
                 ...(eventProperties ?? {}),
+                location,
                 ...(resolvedAbTests &&
                     Object.keys(resolvedAbTests).length > 0 && {
                     ab_tests: resolvedAbTests,
@@ -943,15 +749,6 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                 }),
             };
             // This will publish events for PERPS dropped tx failures as well
-            if (!txMetaId) {
-                trackMetricsEvent({
-                    messenger: this.messenger,
-                    eventName,
-                    properties: baseProperties,
-                });
-                return;
-            }
-            const historyItem = this.state.txHistory[txMetaId];
             if (!historyItem) {
                 trackMetricsEvent({
                     messenger: this.messenger,
@@ -960,9 +757,8 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                 });
                 return;
             }
-            const { featureId, approvalTxId, quote } = historyItem;
+            const { approvalTxId, quote } = historyItem;
             const requestParamProperties = getRequestParamFromHistory(historyItem);
-            // Always publish StatusValidationFailed event, regardless of featureId
             if (eventName === UnifiedSwapBridgeEventName.StatusValidationFailed) {
                 trackMetricsEvent({
                     messenger: this.messenger,
@@ -979,10 +775,6 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                 });
                 return;
             }
-            // Skip tracking all other events when featureId is set (i.e. PERPS)
-            if (featureId) {
-                return;
-            }
             const selectedAccount = getAccountByAddress(this.messenger, historyItem.account);
             const transactions = getTransactions(this.messenger);
             const txMeta = transactions.find((tx) => tx.id === txMetaId);
@@ -1062,5 +854,5 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
         __classPrivateFieldGet(this, _BridgeStatusController_restartPollingForIncompleteHistoryItems, "f").call(this);
     }
 }
-_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_onTransactionFailed = new WeakMap(), _BridgeStatusController_onTransactionConfirmed = new WeakMap(), _BridgeStatusController_restartPollingForIncompleteHistoryItems = new WeakMap(), _BridgeStatusController_addTxToHistory = new WeakMap(), _BridgeStatusController_rekeyHistoryItem = new WeakMap(), _BridgeStatusController_startPollingForTxId = new WeakMap(), _BridgeStatusController_handleFetchFailure = new WeakMap(), _BridgeStatusController_handleOldHistoryItem = new WeakMap(), _BridgeStatusController_fetchBridgeTxStatus = new WeakMap(), _BridgeStatusController_setAndGetSrcTxHash = new WeakMap(), _BridgeStatusController_updateHistoryItem = new WeakMap(), _BridgeStatusController_deleteHistoryItem = new WeakMap(), _BridgeStatusController_wipeBridgeStatusByChainId = new WeakMap(), _BridgeStatusController_handleApprovalTx = new WeakMap(), _BridgeStatusController_handleEvmTransactionBatch = new WeakMap(), _BridgeStatusController_trackPollingStatusUpdatedEvent = new WeakMap(), _BridgeStatusController_trackUnifiedSwapBridgeEvent = new WeakMap();
+_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_onTransactionFailed = new WeakMap(), _BridgeStatusController_onTransactionConfirmed = new WeakMap(), _BridgeStatusController_restartPollingForIncompleteHistoryItems = new WeakMap(), _BridgeStatusController_addTxToHistory = new WeakMap(), _BridgeStatusController_rekeyHistoryItem = new WeakMap(), _BridgeStatusController_startPollingForTxId = new WeakMap(), _BridgeStatusController_handleFetchFailure = new WeakMap(), _BridgeStatusController_handleOldHistoryItem = new WeakMap(), _BridgeStatusController_fetchBridgeTxStatus = new WeakMap(), _BridgeStatusController_setAndGetSrcTxHash = new WeakMap(), _BridgeStatusController_updateHistoryItem = new WeakMap(), _BridgeStatusController_deleteHistoryItem = new WeakMap(), _BridgeStatusController_wipeBridgeStatusByChainId = new WeakMap(), _BridgeStatusController_executeSubmitStrategy = new WeakMap(), _BridgeStatusController_trackPollingStatusUpdatedEvent = new WeakMap(), _BridgeStatusController_trackUnifiedSwapBridgeEvent = new WeakMap();
 //# sourceMappingURL=bridge-status-controller.mjs.map