@metamask/bridge-status-controller 70.0.1 → 70.0.3

package/dist/bridge-status-controller.mjs

@@ -516,140 +516,131 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
             }
             const isHardwareAccount = isHardwareWallet(selectedAccount);
             const preConfirmationProperties = getPreConfirmationPropertiesFromQuote(quoteResponse, isStxEnabledOnClient, isHardwareAccount, location, abTests, activeAbTests);
-            // Emit Submitted event after submit button is clicked
-            !quoteResponse.featureId &&
-                __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, UnifiedSwapBridgeEventName.Submitted, undefined, preConfirmationProperties);
             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);
-            // 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 () => {
-                        try {
+            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 */
-                        }
-                        catch (error) {
-                            !quoteResponse.featureId &&
-                                __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, UnifiedSwapBridgeEventName.Failed, undefined, {
-                                    error_message: error?.message,
-                                    ...preConfirmationProperties,
-                                });
-                            throw error;
-                        }
-                    });
-                    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 () => {
-                    try {
+                        });
+                        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);
-                    }
-                    catch (error) {
-                        !quoteResponse.featureId &&
-                            __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, UnifiedSwapBridgeEventName.Failed, undefined, {
-                                error_message: error?.message,
-                                ...preConfirmationProperties,
+                    });
+                }
+                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 && isHardwareAccount;
+                    // 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,
                             });
-                        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") === BridgeClientId.MOBILE && isHardwareAccount;
-                // 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,
+                            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
+                        __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 submitEvmTransaction({
+                            messenger: this.messenger,
+                            transactionType: isBridgeTx
+                                ? TransactionType.bridge
+                                : 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 && 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
-                    __classPrivateFieldGet(this, _BridgeStatusController_addTxToHistory, "f").call(this, {
-                        accountAddress: selectedAccount.address,
-                        quoteResponse,
-                        slippagePercentage: 0,
-                        isStxEnabled: isStxEnabledOnClient,
-                        startTime,
-                        approvalTxId,
-                        location,
-                        abTests,
-                        activeAbTests,
-                        actionId,
+                        // On success, rekey from actionId to txMeta.id and update srcTxHash
+                        __classPrivateFieldGet(this, _BridgeStatusController_rekeyHistoryItem, "f").call(this, actionId, tradeTxMeta);
+                        return tradeTxMeta;
                     });
-                    // 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,
+                }
+            }
+            catch (error) {
+                !quoteResponse.featureId &&
+                    __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, UnifiedSwapBridgeEventName.Failed, undefined, {
+                        error_message: error?.message,
+                        ...preConfirmationProperties,
                     });
-                    // On success, rekey from actionId to txMeta.id and update srcTxHash
-                    __classPrivateFieldGet(this, _BridgeStatusController_rekeyHistoryItem, "f").call(this, actionId, tradeTxMeta);
-                    return tradeTxMeta;
-                });
+                throw error;
             }
             try {
                 // For non-batch EVM transactions, history was already added/rekeyed above