@metamask/bridge-status-controller 70.0.0 → 70.0.2

package/CHANGELOG.md

@@ -7,6 +7,33 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [70.0.2]
+
+### Changed
+
+- Bump `@metamask/accounts-controller` from `^37.0.0` to `^37.1.0` ([#8317](https://github.com/MetaMask/core/pull/8317))
+- Bump `@metamask/base-controller` from `^9.0.0` to `^9.0.1` ([#8317](https://github.com/MetaMask/core/pull/8317))
+- Bump `@metamask/bridge-controller` from `^69.2.1` to `^69.2.2` ([#8317](https://github.com/MetaMask/core/pull/8317))
+- Bump `@metamask/gas-fee-controller` from `^26.1.0` to `^26.1.1` ([#8317](https://github.com/MetaMask/core/pull/8317))
+- Bump `@metamask/keyring-controller` from `^25.1.0` to `^25.1.1` ([#8317](https://github.com/MetaMask/core/pull/8317))
+- Bump `@metamask/network-controller` from `^30.0.0` to `^30.0.1` ([#8317](https://github.com/MetaMask/core/pull/8317))
+- Bump `@metamask/polling-controller` from `^16.0.3` to `^16.0.4` ([#8317](https://github.com/MetaMask/core/pull/8317))
+- Bump `@metamask/profile-sync-controller` from `^28.0.0` to `^28.0.1` ([#8317](https://github.com/MetaMask/core/pull/8317))
+- Bump `@metamask/transaction-controller` from `^63.1.0` to `^63.3.1` ([#8301](https://github.com/MetaMask/core/pull/8301), [#8313](https://github.com/MetaMask/core/pull/8313), [#8317](https://github.com/MetaMask/core/pull/8317))
+
+## [70.0.1]
+
+### Changed
+
+- Bump `@metamask/bridge-controller` from `^69.1.1` to `^69.2.1` ([#8265](https://github.com/MetaMask/core/pull/8265), [#8288](https://github.com/MetaMask/core/pull/8288))
+- Bump `@metamask/transaction-controller` from `^63.0.0` to `^63.1.0` ([#8272](https://github.com/MetaMask/core/pull/8272))
+
+### Fixed
+
+- Publish UnifiedSwapBridge Failed event for any exception thrown during `submitTx`. Previously the Failed event was only getting published for EVM txs after tx submission ([#8277](https://github.com/MetaMask/core/pull/8277))
+- Keep EIP-7702 batching disabled for gasless transactions that use smart transactions / `eth_sendBundle` when the quote is gas-included but not gas-included-7702 even when the account is a smart account ([#8275](https://github.com/MetaMask/core/pull/8275))
+- For hardware wallets on MetaMask Mobile, non-batch EVM flows with ERC-20 approval now run the hardware-wallet delay before waiting for approval confirmation, preserving Ledger second-prompt spacing while gas estimation still runs after allowance is set on-chain ([#8268](https://github.com/MetaMask/core/pull/8268))
+
 ## [70.0.0]
 
 ### Changed
@@ -1047,7 +1074,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Initial release ([#5317](https://github.com/MetaMask/core/pull/5317))
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@70.0.0...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@70.0.2...HEAD
+[70.0.2]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@70.0.1...@metamask/bridge-status-controller@70.0.2
+[70.0.1]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@70.0.0...@metamask/bridge-status-controller@70.0.1
 [70.0.0]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@69.0.0...@metamask/bridge-status-controller@70.0.0
 [69.0.0]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@68.1.0...@metamask/bridge-status-controller@69.0.0
 [68.1.0]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@68.0.2...@metamask/bridge-status-controller@68.1.0

package/dist/bridge-status-controller.cjs

@@ -10,11 +10,10 @@ 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_markTxAsFailed, _BridgeStatusController_restartPollingForIncompleteHistoryItems, _BridgeStatusController_addTxToHistory, _BridgeStatusController_rekeyHistoryItem, _BridgeStatusController_startPollingForTxId, _BridgeStatusController_handleFetchFailure, _BridgeStatusController_fetchBridgeTxStatus, _BridgeStatusController_getSrcTxHash, _BridgeStatusController_updateSrcTxHash, _BridgeStatusController_wipeBridgeStatusByChainId, _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 polling_controller_1 = require("@metamask/polling-controller");
 const transaction_controller_1 = require("@metamask/transaction-controller");
 const utils_1 = require("@metamask/utils");
@@ -25,7 +24,6 @@ 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");
@@ -417,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) => {
@@ -457,29 +454,18 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
          * TX SUBMISSION HANDLING
          *******************************************************
          */
-        _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 (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,
@@ -493,85 +479,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             }
             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)();
-            const selectedAccount = (0, accounts_1.getAccountByAddress)(this.messenger, 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 = (0, network_1.getNetworkClientIdByChainId)(this.messenger, 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 this.messenger.call('TransactionController:addTransaction', 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 this.messenger.call('TransactionController:estimateGasFee', { 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
          *
@@ -589,22 +497,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 messenger: this.messenger,
                 ...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,
-                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
@@ -626,146 +519,131 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             }
             const isHardwareAccount = (0, bridge_controller_1.isHardwareWallet)(selectedAccount);
             const preConfirmationProperties = (0, metrics_1.getPreConfirmationPropertiesFromQuote)(quoteResponse, isStxEnabledOnClient, isHardwareAccount, location, abTests, activeAbTests);
-            // Emit Submitted event after submit button is clicked
-            !quoteResponse.featureId &&
-                __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Submitted, undefined, preConfirmationProperties);
             let txMeta;
             let approvalTxId;
             let isDelegatedAccount = false;
             const startTime = Date.now();
             const isBridgeTx = (0, bridge_controller_1.isCrossChain)(quoteResponse.quote.srcChainId, quoteResponse.quote.destChainId);
             const isTronTx = (0, bridge_controller_1.isTronChainId)(quoteResponse.quote.srcChainId);
-            // Submit non-EVM tx (Solana, BTC, Tron)
-            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, (0, trace_1.getApprovalTraceParams)(quoteResponse, false), async () => {
-                        try {
+            try {
+                // Emit Submitted event after submit button is clicked
+                !quoteResponse.featureId &&
+                    __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Submitted, undefined, preConfirmationProperties);
+                // Submit non-EVM tx (Solana, BTC, Tron)
+                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, (0, trace_1.getApprovalTraceParams)(quoteResponse, false), async () => {
                             return quoteResponse.approval &&
                                 (0, bridge_controller_1.isTronTrade)(quoteResponse.approval)
                                 ? await (0, snaps_1.handleNonEvmTx)(this.messenger, quoteResponse.approval, quoteResponse, selectedAccount)
                                 : /* c8 ignore start */
                                     undefined;
                             /* c8 ignore end */
-                        }
-                        catch (error) {
-                            !quoteResponse.featureId &&
-                                __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Failed, undefined, {
-                                    error_message: error?.message,
-                                    ...preConfirmationProperties,
-                                });
-                            throw error;
-                        }
-                    });
-                    approvalTxId = approvalTxMeta?.id;
-                    // 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, (0, trace_1.getTraceParams)(quoteResponse, false), async () => {
-                    try {
+                        });
+                        approvalTxId = approvalTxMeta?.id;
+                        // 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, (0, trace_1.getTraceParams)(quoteResponse, false), async () => {
                         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 (0, snaps_1.handleNonEvmTx)(this.messenger, quoteResponse.trade, quoteResponse, selectedAccount);
-                    }
-                    catch (error) {
-                        !quoteResponse.featureId &&
-                            __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Failed, undefined, {
-                                error_message: error?.message,
-                                ...preConfirmationProperties,
-                            });
-                        throw error;
-                    }
-                });
-            }
-            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") === types_1.BridgeClientId.MOBILE && isHardwareAccount;
-                // Handle smart transactions if enabled
-                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');
-                    }
-                    // 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 = (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],
+                    });
+                }
+                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") === types_1.BridgeClientId.MOBILE && isHardwareAccount;
+                    // Handle smart transactions if enabled
+                    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');
+                        }
+                        // 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 = (0, bridge_controller_1.formatChainIdToHex)(quoteResponse.quote.srcChainId);
+                        isDelegatedAccount = await (0, transaction_1.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 &&
+                                    (0, bridge_controller_1.isEvmTxData)(quoteResponse.approval)
+                                    ? quoteResponse.approval
+                                    : undefined,
+                                trade: quoteResponse.trade,
+                                quoteResponse,
+                                requireApproval,
+                                isDelegatedAccount,
                             });
-                            return atomicBatchSupport.some((entry) => entry.isSupported && entry.delegationAddress);
+                            approvalTxId = approvalMeta?.id;
+                            return tradeMeta;
                         }
-                        catch {
-                            return false;
+                        // 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 && (0, bridge_controller_1.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 (0, transaction_1.handleMobileHardwareWalletDelay)(requireApproval);
+                            await (0, transaction_1.waitForTxConfirmation)(this.messenger, approvalTxMeta.id);
                         }
-                    })();
-                    if (isStxEnabledOnClient ||
-                        quoteResponse.quote.gasIncluded7702 ||
-                        isDelegatedAccount) {
-                        const { tradeMeta, approvalMeta } = await __classPrivateFieldGet(this, _BridgeStatusController_handleEvmTransactionBatch, "f").call(this, {
-                            isBridgeTx,
-                            resetApproval: quoteResponse.resetApproval,
-                            approval: quoteResponse.approval && (0, bridge_controller_1.isEvmTxData)(quoteResponse.approval)
-                                ? quoteResponse.approval
-                                : undefined,
-                            trade: quoteResponse.trade,
+                        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,
                             quoteResponse,
+                            slippagePercentage: 0,
+                            isStxEnabled: isStxEnabledOnClient,
+                            startTime,
+                            approvalTxId,
+                            location,
+                            abTests,
+                            activeAbTests,
+                            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 (0, transaction_1.submitEvmTransaction)({
+                            messenger: this.messenger,
+                            transactionType: isBridgeTx
+                                ? transaction_controller_1.TransactionType.bridge
+                                : transaction_controller_1.TransactionType.swap,
+                            trade: quoteResponse.trade,
                             requireApproval,
-                            isDelegatedAccount,
+                            txFee: quoteResponse.quote.gasIncluded
+                                ? quoteResponse.quote.feeData.txFee
+                                : undefined,
+                            actionId,
                         });
-                        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 && (0, bridge_controller_1.isEvmTxData)(quoteResponse.approval)
-                        ? quoteResponse.approval
-                        : undefined, quoteResponse.resetApproval, requireApproval);
-                    approvalTxId = approvalTxMeta?.id;
-                    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,
-                        startTime,
-                        approvalTxId,
-                        location,
-                        abTests,
-                        activeAbTests,
-                    }, 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, {
-                        transactionType: isBridgeTx
-                            ? transaction_controller_1.TransactionType.bridge
-                            : transaction_controller_1.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, actionId, tradeTxMeta);
+                        return tradeTxMeta;
                     });
-                    // On success, rekey from actionId to txMeta.id and update srcTxHash
-                    __classPrivateFieldGet(this, _BridgeStatusController_rekeyHistoryItem, "f").call(this, actionId, tradeTxMeta);
-                    return tradeTxMeta;
-                });
+                }
+            }
+            catch (error) {
+                !quoteResponse.featureId &&
+                    __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Failed, undefined, {
+                        error_message: error?.message,
+                        ...preConfirmationProperties,
+                    });
+                throw error;
             }
             try {
                 // For non-batch EVM transactions, history was already added/rekeyed above
@@ -779,10 +657,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,
@@ -823,6 +697,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             const { quoteResponse, accountAddress, location, abTests, activeAbTests } = params;
             // 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 = (0, accounts_1.getAccountByAddress)(this.messenger, accountAddress);
             const isHardwareAccount = Boolean(account) && (0, bridge_controller_1.isHardwareWallet)(account);
@@ -837,7 +712,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 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 (0, keyring_1.signTypedMessage)({
@@ -853,8 +728,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 */
@@ -875,25 +755,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 this.messenger.call('TransactionController:addTransaction', 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,
                 };
@@ -907,14 +778,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,
@@ -991,6 +857,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 });
                 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) {
@@ -1009,13 +876,13 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 return;
             }
             // Skip tracking all other events when featureId is set (i.e. PERPS)
-            if (historyItem.featureId) {
+            if (featureId) {
                 return;
             }
             const selectedAccount = (0, accounts_1.getAccountByAddress)(this.messenger, 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 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,
@@ -1023,7 +890,7 @@ 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),
             };
             (0, bridge_1.trackMetricsEvent)({
                 messenger: this.messenger,
@@ -1099,5 +966,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_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_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_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