@metamask/bridge-status-controller 70.0.5 → 71.1.0

package/dist/bridge-status-controller.mjs

@@ -9,8 +9,8 @@ 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_handleApprovalTx, _BridgeStatusController_handleEvmTransactionBatch, _BridgeStatusController_trackUnifiedSwapBridgeEvent;
-import { formatChainIdToHex, isNonEvmChainId, StatusTypes, UnifiedSwapBridgeEventName, isCrossChain, isTronChainId, isEvmTxData, isHardwareWallet, 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_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";
 import { StaticIntervalPollingController } from "@metamask/polling-controller";
 import { TransactionStatus, TransactionType, TransactionController } from "@metamask/transaction-controller";
 import { numberToHex } from "@metamask/utils";
@@ -20,15 +20,15 @@ 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 { fetchBridgeTxStatus, getStatusRequestWithSrcTxHash, shouldSkipFetchDueToFetchFailures } from "./utils/bridge-status.mjs";
-import { getInitialHistoryItem, rekeyHistoryItemInState, shouldPollHistoryItem } from "./utils/history.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 } from "./utils/metrics.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 } from "./utils/transaction.mjs";
+import { getAddTransactionBatchParams, handleApprovalDelay, handleMobileHardwareWalletDelay, generateActionId, waitForTxConfirmation, getTransactionMetaById, addTransactionBatch, addSyntheticTransaction, getTransactions, submitEvmTransaction, checkIsDelegatedAccount, isCrossChainTx } 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
@@ -39,6 +39,15 @@ const metadata = {
         usedInUi: true,
     },
 };
+const MESSENGER_EXPOSED_METHODS = [
+    'startPollingForBridgeTxStatus',
+    'wipeBridgeStatus',
+    'resetState',
+    'submitTx',
+    'submitIntent',
+    'restartPollingForFailedAttempts',
+    'getBridgeHistoryItemByTxMetaId',
+];
 export class BridgeStatusController extends StaticIntervalPollingController() {
     constructor({ messenger, state, clientId, fetchFn, addTransactionBatchFn, config, traceFn, }) {
         super({
@@ -58,25 +67,55 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
         _BridgeStatusController_config.set(this, void 0);
         _BridgeStatusController_addTransactionBatchFn.set(this, void 0);
         _BridgeStatusController_trace.set(this, void 0);
-        // Mark tx as failed in txHistory if either the approval or trade fails
-        _BridgeStatusController_markTxAsFailed.set(this, ({ id: txMetaId, actionId, }) => {
-            // Look up by txMetaId first
-            let txHistoryKey = this.state.txHistory[txMetaId]
-                ? txMetaId
-                : undefined;
-            // If not found by txMetaId, try looking up by actionId (for pre-submission failures)
-            if (!txHistoryKey && actionId && this.state.txHistory[actionId]) {
-                txHistoryKey = actionId;
+        _BridgeStatusController_onTransactionFailed.set(this, ({ txMeta, historyKey, isApprovalTxMeta, }) => {
+            // Check if the history item is already marked as a failure
+            const isHistoryItemAlreadyFailed = historyKey
+                ? this.state.txHistory[historyKey]?.status.status === StatusTypes.FAILED
+                : false;
+            __classPrivateFieldGet(this, _BridgeStatusController_updateHistoryItem, "f").call(this, {
+                historyKey,
+                status: StatusTypes.FAILED,
+                txHash: isApprovalTxMeta ? undefined : txMeta.hash,
+            });
+            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) {
+                return;
             }
-            // If still not found, try looking up by approvalTxId
-            txHistoryKey ?? (txHistoryKey = Object.keys(this.state.txHistory).find((key) => this.state.txHistory[key].approvalTxId === txMetaId));
-            if (!txHistoryKey) {
+            __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, UnifiedSwapBridgeEventName.Failed, historyKey, getEVMTxPropertiesFromTransactionMeta(txMeta));
+        });
+        // Only EVM txs
+        _BridgeStatusController_onTransactionConfirmed.set(this, ({ txMeta, historyKey, isApprovalTxMeta, }) => {
+            // Return early if the confirmed txMeta is for an approval since we
+            // still need to wait for the trade to be confirmed
+            if (isApprovalTxMeta) {
                 return;
             }
-            const key = txHistoryKey;
-            this.update((statusState) => {
-                statusState.txHistory[key].status.status = StatusTypes.FAILED;
+            __classPrivateFieldGet(this, _BridgeStatusController_updateHistoryItem, "f").call(this, {
+                historyKey,
+                txHash: txMeta.hash,
             });
+            switch (txMeta.type) {
+                case TransactionType.swap:
+                    __classPrivateFieldGet(this, _BridgeStatusController_updateHistoryItem, "f").call(this, {
+                        historyKey,
+                        status: StatusTypes.COMPLETE,
+                    });
+                    __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, UnifiedSwapBridgeEventName.Completed, historyKey);
+                    break;
+                default:
+                    if (historyKey) {
+                        __classPrivateFieldGet(this, _BridgeStatusController_startPollingForTxId, "f").call(this, historyKey);
+                    }
+                    break;
+            }
         });
         this.resetState = () => {
             this.update((state) => {
@@ -177,30 +216,31 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
         _BridgeStatusController_restartPollingForIncompleteHistoryItems.set(this, () => {
             // Check for historyItems that do not have a status of complete and restart polling
             const { txHistory } = this.state;
-            const historyItems = Object.values(txHistory);
+            const historyItems = Object.entries(txHistory);
             const incompleteHistoryItems = historyItems
-                .filter((historyItem) => historyItem.status.status === StatusTypes.PENDING ||
+                .filter(([_, historyItem]) => historyItem.status.status === StatusTypes.PENDING ||
                 historyItem.status.status === StatusTypes.UNKNOWN)
                 // Only poll items with txMetaId (post-submission items)
-                .filter((historyItem) => Boolean(historyItem.txMetaId))
-                .filter((historyItem) => {
+                .filter(([_, historyItem]) => {
+                if (!historyItem.txMetaId) {
+                    return false;
+                }
                 // Check if we are already polling this tx, if so, skip restarting polling for that
                 const pollingToken = __classPrivateFieldGet(this, _BridgeStatusController_pollingTokensByTxMetaId, "f")[historyItem.txMetaId];
                 return !pollingToken;
             })
                 // Only restart polling for items that still require status updates
-                .filter((historyItem) => {
+                .filter(([_, historyItem]) => {
                 return shouldPollHistoryItem(historyItem);
             });
-            incompleteHistoryItems.forEach((historyItem) => {
-                const bridgeTxMetaId = historyItem.txMetaId;
+            incompleteHistoryItems.forEach(([historyKey, historyItem]) => {
                 const shouldSkipFetch = shouldSkipFetchDueToFetchFailures(historyItem.attempts);
                 if (shouldSkipFetch) {
                     return;
                 }
                 // We manually call startPolling() here rather than go through startPollingForBridgeTxStatus()
                 // because we don't want to overwrite the existing historyItem in state
-                __classPrivateFieldGet(this, _BridgeStatusController_startPollingForTxId, "f").call(this, bridgeTxMetaId);
+                __classPrivateFieldGet(this, _BridgeStatusController_startPollingForTxId, "f").call(this, historyKey);
             });
         });
         _BridgeStatusController_addTxToHistory.set(this, (...args) => {
@@ -209,6 +249,7 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                 // Use actionId as key for pre-submission, or txMeta.id for post-submission
                 state.txHistory[historyKey] = txHistoryItem;
             });
+            return historyKey;
         });
         /**
          * Rekeys a history item from actionId to txMeta.id after successful submission.
@@ -231,10 +272,7 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                 this.stopPollingByPollingToken(existingPollingToken);
             }
             const txHistoryItem = this.state.txHistory[txId];
-            if (!txHistoryItem) {
-                return;
-            }
-            if (shouldPollHistoryItem(txHistoryItem)) {
+            if (txHistoryItem && shouldPollHistoryItem(txHistoryItem)) {
                 __classPrivateFieldGet(this, _BridgeStatusController_pollingTokensByTxMetaId, "f")[txId] = this.startPolling({
                     bridgeTxMetaId: txId,
                 });
@@ -255,8 +293,8 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
             if (!bridgeTxMeta?.id) {
                 throw new Error('Cannot start polling: bridgeTxMeta.id is required for polling');
             }
-            __classPrivateFieldGet(this, _BridgeStatusController_addTxToHistory, "f").call(this, txHistoryMeta);
-            __classPrivateFieldGet(this, _BridgeStatusController_startPollingForTxId, "f").call(this, bridgeTxMeta.id);
+            const historyKey = __classPrivateFieldGet(this, _BridgeStatusController_addTxToHistory, "f").call(this, txHistoryMeta);
+            __classPrivateFieldGet(this, _BridgeStatusController_startPollingForTxId, "f").call(this, historyKey);
         };
         // This will be called after you call this.startPolling()
         // The args passed in are the args you passed in to startPolling()
@@ -291,29 +329,38 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                 // Track max polling reached event
                 const historyItem = this.state.txHistory[bridgeTxMetaId];
                 if (historyItem && !historyItem.featureId) {
-                    const selectedAccount = getAccountByAddress(this.messenger, historyItem.account);
-                    const requestParams = getRequestParamFromHistory(historyItem);
-                    const requestMetadata = getRequestMetadataFromHistory(historyItem, selectedAccount);
-                    const { security_warnings: _, ...metadataWithoutWarnings } = requestMetadata;
-                    __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, UnifiedSwapBridgeEventName.PollingStatusUpdated, bridgeTxMetaId, {
-                        ...getTradeDataFromHistory(historyItem),
-                        ...getPriceImpactFromQuote(historyItem.quote),
-                        ...metadataWithoutWarnings,
-                        chain_id_source: requestParams.chain_id_source,
-                        chain_id_destination: requestParams.chain_id_destination,
-                        token_symbol_source: requestParams.token_symbol_source,
-                        token_symbol_destination: requestParams.token_symbol_destination,
-                        action_type: MetricsActionType.SWAPBRIDGE_V1,
-                        polling_status: PollingStatus.MaxPollingReached,
-                        retry_attempts: newAttempts.counter,
-                    });
+                    // Track polling status updated event
+                    __classPrivateFieldGet(this, _BridgeStatusController_trackPollingStatusUpdatedEvent, "f").call(this, bridgeTxMetaId, PollingStatus.MaxPollingReached);
                 }
             }
             // Update the attempts counter
-            this.update((state) => {
-                state.txHistory[bridgeTxMetaId].attempts = newAttempts;
+            __classPrivateFieldGet(this, _BridgeStatusController_updateHistoryItem, "f").call(this, {
+                historyKey: bridgeTxMetaId,
+                attempts: newAttempts,
             });
         });
+        /**
+         * Checks if the history item should be preserved so its status can be fetched.
+         *
+         * @param bridgeTxMetaId - The txMetaId of the bridge tx
+         */
+        _BridgeStatusController_handleOldHistoryItem.set(this, async (bridgeTxMetaId) => {
+            // Continue polling on next restart if the history item is valid
+            if (this.state.txHistory[bridgeTxMetaId] &&
+                (await shouldWaitForFinalBridgeStatus(this.messenger, this.state.txHistory[bridgeTxMetaId]))) {
+                return;
+            }
+            const pollingToken = __classPrivateFieldGet(this, _BridgeStatusController_pollingTokensByTxMetaId, "f")[bridgeTxMetaId];
+            // Track polling status updated event
+            __classPrivateFieldGet(this, _BridgeStatusController_trackPollingStatusUpdatedEvent, "f").call(this, bridgeTxMetaId, PollingStatus.InvalidTransactionHash);
+            // If we've failed too many times, stop polling for the tx
+            if (pollingToken) {
+                this.stopPollingByPollingToken(pollingToken);
+                delete __classPrivateFieldGet(this, _BridgeStatusController_pollingTokensByTxMetaId, "f")[bridgeTxMetaId];
+            }
+            // Delete the history item so polling doesn't start over on the next restart
+            __classPrivateFieldGet(this, _BridgeStatusController_deleteHistoryItem, "f").call(this, bridgeTxMetaId);
+        });
         _BridgeStatusController_fetchBridgeTxStatus.set(this, async ({ bridgeTxMetaId, }) => {
             // 1. Check for history item
             const { txHistory } = this.state;
@@ -325,7 +372,7 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
             if (shouldSkipFetchDueToFetchFailures(historyItem.attempts)) {
                 return;
             }
-            // 3. Fetch transcation status
+            // 3. Fetch transaction status
             try {
                 let status;
                 let validationFailures = [];
@@ -341,11 +388,10 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                     // We try here because we receive 500 errors from Bridge API if we try to fetch immediately after submitting the source tx
                     // Oddly mostly happens on Optimism, never on Arbitrum. By the 2nd fetch, the Bridge API responds properly.
                     // Also srcTxHash may not be available immediately for STX, so we don't want to fetch in those cases
-                    const srcTxHash = __classPrivateFieldGet(this, _BridgeStatusController_getSrcTxHash, "f").call(this, bridgeTxMetaId);
+                    const srcTxHash = __classPrivateFieldGet(this, _BridgeStatusController_setAndGetSrcTxHash, "f").call(this, bridgeTxMetaId);
                     if (!srcTxHash) {
                         return;
                     }
-                    __classPrivateFieldGet(this, _BridgeStatusController_updateSrcTxHash, "f").call(this, bridgeTxMetaId, srcTxHash);
                     const statusRequest = getStatusRequestWithSrcTxHash(historyItem.quote, srcTxHash);
                     const response = await fetchBridgeTxStatus(statusRequest, __classPrivateFieldGet(this, _BridgeStatusController_clientId, "f"), await getJwt(this.messenger), __classPrivateFieldGet(this, _BridgeStatusController_fetchFn, "f"), __classPrivateFieldGet(this, _BridgeStatusController_config, "f").customBridgeApiBaseUrl);
                     status = response.status;
@@ -402,26 +448,65 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                 console.warn('Failed to fetch bridge tx status', error);
                 __classPrivateFieldGet(this, _BridgeStatusController_handleFetchFailure, "f").call(this, bridgeTxMetaId);
             }
+            finally {
+                await __classPrivateFieldGet(this, _BridgeStatusController_handleOldHistoryItem, "f").call(this, bridgeTxMetaId);
+            }
         });
-        _BridgeStatusController_getSrcTxHash.set(this, (bridgeTxMetaId) => {
+        /**
+         * Returns the srcTxHash for a non-STX EVM tx, the hash from the bridge status api,
+         * or the local hash from the TransactionController if the tx is in a finalized state
+         *
+         * @param bridgeTxMetaId - The bridge tx meta id
+         * @returns The srcTxHash
+         */
+        _BridgeStatusController_setAndGetSrcTxHash.set(this, (bridgeTxMetaId) => {
             const { txHistory } = this.state;
-            // Prefer the srcTxHash from bridgeStatusState so we don't have to l ook up in TransactionController
+            // Prefer the srcTxHash from bridgeStatusState so we don't have to look up in TransactionController
             // But it is possible to have bridgeHistoryItem in state without the srcTxHash yet when it is an STX
             const srcTxHash = txHistory[bridgeTxMetaId].status.srcChain.txHash;
-            if (srcTxHash) {
+            if (srcTxHash ||
+                isNonEvmChainId(txHistory[bridgeTxMetaId].quote.srcChainId)) {
                 return srcTxHash;
             }
-            // Look up in TransactionController if txMeta has been updated with the srcTxHash
+            // Update history with TransactionController's hash if it has been updated
             const txMeta = getTransactionMetaById(this.messenger, bridgeTxMetaId);
-            return txMeta?.hash;
+            if (!txMeta) {
+                return undefined;
+            }
+            // Wait for finalized status before updating the history item
+            const localTxHash = [
+                TransactionStatus.confirmed,
+                TransactionStatus.dropped,
+                TransactionStatus.rejected,
+                TransactionStatus.failed,
+            ].includes(txMeta.status)
+                ? txMeta.hash
+                : undefined;
+            __classPrivateFieldGet(this, _BridgeStatusController_updateHistoryItem, "f").call(this, {
+                historyKey: bridgeTxMetaId,
+                txHash: localTxHash,
+            });
+            return localTxHash;
         });
-        _BridgeStatusController_updateSrcTxHash.set(this, (bridgeTxMetaId, srcTxHash) => {
-            const { txHistory } = this.state;
-            if (txHistory[bridgeTxMetaId].status.srcChain.txHash) {
+        _BridgeStatusController_updateHistoryItem.set(this, ({ historyKey, status, txHash, attempts, }) => {
+            if (!historyKey) {
                 return;
             }
-            this.update((state) => {
-                state.txHistory[bridgeTxMetaId].status.srcChain.txHash = srcTxHash;
+            this.update((currentState) => {
+                if (status) {
+                    currentState.txHistory[historyKey].status.status = status;
+                }
+                if (txHash) {
+                    currentState.txHistory[historyKey].status.srcChain.txHash = txHash;
+                }
+                if (attempts) {
+                    currentState.txHistory[historyKey].attempts = attempts;
+                }
+            });
+        });
+        _BridgeStatusController_deleteHistoryItem.set(this, (historyKey) => {
+            this.update((currentState) => {
+                delete currentState.txHistory[historyKey];
             });
         });
         // Wipes the bridge status for the given address and chainId
@@ -437,6 +522,7 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                 const pollingToken = __classPrivateFieldGet(this, _BridgeStatusController_pollingTokensByTxMetaId, "f")[sourceTxMetaId];
                 if (pollingToken) {
                     this.stopPollingByPollingToken(__classPrivateFieldGet(this, _BridgeStatusController_pollingTokensByTxMetaId, "f")[sourceTxMetaId]);
+                    delete __classPrivateFieldGet(this, _BridgeStatusController_pollingTokensByTxMetaId, "f")[sourceTxMetaId];
                 }
             });
             this.update((state) => {
@@ -506,16 +592,17 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
          * @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.
          * @returns The transaction meta
          */
-        this.submitTx = async (accountAddress, quoteResponse, isStxEnabledOnClient, quotesReceivedContext, location = MetaMetricsSwapsEventSource.MainView, abTests, activeAbTests) => {
+        this.submitTx = async (accountAddress, quoteResponse, isStxEnabledOnClient, quotesReceivedContext, location = MetaMetricsSwapsEventSource.MainView, abTests, activeAbTests, tokenSecurityTypeDestination) => {
             stopPollingForQuotes(this.messenger, quoteResponse.featureId, quotesReceivedContext);
             const selectedAccount = getAccountByAddress(this.messenger, accountAddress);
             if (!selectedAccount) {
                 throw new Error('Failed to submit cross-chain swap transaction: undefined multichain account');
             }
-            const isHardwareAccount = isHardwareWallet(selectedAccount);
-            const preConfirmationProperties = getPreConfirmationPropertiesFromQuote(quoteResponse, isStxEnabledOnClient, isHardwareAccount, location, abTests, activeAbTests);
+            const accountHardwareType = getAccountHardwareType(selectedAccount);
+            const preConfirmationProperties = getPreConfirmationPropertiesFromQuote(quoteResponse, isStxEnabledOnClient, accountHardwareType, location, abTests, activeAbTests, tokenSecurityTypeDestination);
             let txMeta;
             let approvalTxId;
             let isDelegatedAccount = false;
@@ -555,7 +642,8 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                     // 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;
+                    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)) {
@@ -602,7 +690,7 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                         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, {
+                        const historyKey = __classPrivateFieldGet(this, _BridgeStatusController_addTxToHistory, "f").call(this, {
                             accountAddress: selectedAccount.address,
                             quoteResponse,
                             slippagePercentage: 0,
@@ -613,6 +701,7 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                             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)
@@ -629,7 +718,7 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                             actionId,
                         });
                         // On success, rekey from actionId to txMeta.id and update srcTxHash
-                        __classPrivateFieldGet(this, _BridgeStatusController_rekeyHistoryItem, "f").call(this, actionId, tradeTxMeta);
+                        __classPrivateFieldGet(this, _BridgeStatusController_rekeyHistoryItem, "f").call(this, historyKey, tradeTxMeta);
                         return tradeTxMeta;
                     });
                 }
@@ -649,11 +738,12 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                     !isStxEnabledOnClient &&
                     !quoteResponse.quote.gasIncluded7702 &&
                     !isDelegatedAccount;
+                let historyKey = txMeta.id;
                 if (!isNonBatchEvm) {
                     // Add swap or bridge tx to history
-                    __classPrivateFieldGet(this, _BridgeStatusController_addTxToHistory, "f").call(this, {
+                    historyKey = __classPrivateFieldGet(this, _BridgeStatusController_addTxToHistory, "f").call(this, {
                         accountAddress: selectedAccount.address,
-                        bridgeTxMeta: txMeta, // Only the id field is used by the BridgeStatusController
+                        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,
@@ -662,14 +752,15 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                         location,
                         abTests,
                         activeAbTests,
+                        tokenSecurityTypeDestination,
                     });
                 }
                 if (isNonEvmChainId(quoteResponse.quote.srcChainId)) {
                     // Start polling for bridge tx status
-                    __classPrivateFieldGet(this, _BridgeStatusController_startPollingForTxId, "f").call(this, txMeta.id);
+                    __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, txMeta.id);
+                        __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, UnifiedSwapBridgeEventName.Completed, historyKey);
                     }
                 }
             }
@@ -688,23 +779,25 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
          * @param params.location - The entry point from which the user initiated the swap or bridge
          * @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.
          * @returns A lightweight TransactionMeta-like object for history linking
          */
         this.submitIntent = async (params) => {
-            const { quoteResponse, accountAddress, location, abTests, activeAbTests } = params;
+            const { quoteResponse, accountAddress, location, abTests, activeAbTests, tokenSecurityTypeDestination, } = 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 isHardwareAccount = Boolean(account) && isHardwareWallet(account);
-            const preConfirmationProperties = getPreConfirmationPropertiesFromQuote(quoteResponse, false, isHardwareAccount, location, abTests, activeAbTests);
+            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 = isHardwareAccount && __classPrivateFieldGet(this, _BridgeStatusController_clientId, "f") === BridgeClientId.MOBILE;
+                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;
@@ -767,15 +860,14 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                 };
                 // Record in bridge history with actual transaction metadata
                 try {
-                    // Use orderId as the history key for intent transactions
-                    const bridgeHistoryKey = orderUid;
                     // Create a bridge transaction metadata that includes the original txId
                     const bridgeTxMetaForHistory = {
                         ...syntheticMeta,
-                        id: bridgeHistoryKey,
+                        id: orderUid,
                         originalTransactionId: syntheticMeta.id, // Keep original txId for TransactionController updates
                     };
-                    __classPrivateFieldGet(this, _BridgeStatusController_addTxToHistory, "f").call(this, {
+                    // Use orderId as the history key for intent transactions
+                    const historyKey = __classPrivateFieldGet(this, _BridgeStatusController_addTxToHistory, "f").call(this, {
                         accountAddress,
                         bridgeTxMeta: bridgeTxMetaForHistory,
                         quoteResponse,
@@ -786,9 +878,10 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                         location,
                         abTests,
                         activeAbTests,
+                        tokenSecurityTypeDestination,
                     });
                     // Start polling using the orderId key to route to intent manager
-                    __classPrivateFieldGet(this, _BridgeStatusController_startPollingForTxId, "f").call(this, bridgeHistoryKey);
+                    __classPrivateFieldGet(this, _BridgeStatusController_startPollingForTxId, "f").call(this, historyKey);
                 }
                 catch (error) {
                     console.error('📝 [submitIntent] Failed to add to bridge history', error);
@@ -804,6 +897,13 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                 throw error;
             }
         };
+        _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));
+            }
+        });
         /**
          * Tracks post-submission events for a cross-chain swap based on the history item
          *
@@ -867,6 +967,7 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                         chain_id_destination: requestParamProperties.chain_id_destination,
                         token_address_source: requestParamProperties.token_address_source,
                         token_address_destination: requestParamProperties.token_address_destination,
+                        token_security_type_destination: requestParamProperties.token_security_type_destination,
                         refresh_count: historyItem.attempts?.counter ?? 0,
                     },
                 });
@@ -908,53 +1009,46 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
             fetchFn: __classPrivateFieldGet(this, _BridgeStatusController_fetchFn, "f"),
         }), "f");
         // Register action handlers
-        this.messenger.registerActionHandler(`${BRIDGE_STATUS_CONTROLLER_NAME}:startPollingForBridgeTxStatus`, this.startPollingForBridgeTxStatus.bind(this));
-        this.messenger.registerActionHandler(`${BRIDGE_STATUS_CONTROLLER_NAME}:wipeBridgeStatus`, this.wipeBridgeStatus.bind(this));
-        this.messenger.registerActionHandler(`${BRIDGE_STATUS_CONTROLLER_NAME}:resetState`, this.resetState.bind(this));
-        this.messenger.registerActionHandler(`${BRIDGE_STATUS_CONTROLLER_NAME}:submitTx`, this.submitTx.bind(this));
-        this.messenger.registerActionHandler(`${BRIDGE_STATUS_CONTROLLER_NAME}:submitIntent`, this.submitIntent.bind(this));
-        this.messenger.registerActionHandler(`${BRIDGE_STATUS_CONTROLLER_NAME}:restartPollingForFailedAttempts`, this.restartPollingForFailedAttempts.bind(this));
-        this.messenger.registerActionHandler(`${BRIDGE_STATUS_CONTROLLER_NAME}:getBridgeHistoryItemByTxMetaId`, this.getBridgeHistoryItemByTxMetaId.bind(this));
+        this.messenger.registerMethodActionHandlers(this, MESSENGER_EXPOSED_METHODS);
         // Set interval
         this.setIntervalLength(REFRESH_INTERVAL_MS);
-        this.messenger.subscribe('TransactionController:transactionFailed', ({ transactionMeta }) => {
-            const { type, status, id: txMetaId, actionId } = transactionMeta;
-            if (type &&
-                [
-                    TransactionType.bridge,
-                    TransactionType.swap,
-                    TransactionType.bridgeApproval,
-                    TransactionType.swapApproval,
-                ].includes(type) &&
-                [
-                    TransactionStatus.failed,
-                    TransactionStatus.dropped,
-                    TransactionStatus.rejected,
-                ].includes(status)) {
-                // Mark tx as failed in txHistory
-                __classPrivateFieldGet(this, _BridgeStatusController_markTxAsFailed, "f").call(this, transactionMeta);
-                // Track failed event
-                if (status !== TransactionStatus.rejected) {
-                    // Look up history by txMetaId first, then by actionId (for pre-submission failures)
-                    let historyKey;
-                    if (this.state.txHistory[txMetaId]) {
-                        historyKey = txMetaId;
-                    }
-                    else if (actionId && this.state.txHistory[actionId]) {
-                        historyKey = actionId;
-                    }
-                    __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, UnifiedSwapBridgeEventName.Failed, historyKey ?? txMetaId, getEVMTxPropertiesFromTransactionMeta(transactionMeta));
-                }
+        this.messenger.subscribe('TransactionController:transactionStatusUpdated', ({ txMeta, historyKey, historyItem, isApprovalTxMeta }) => {
+            if (!txMeta) {
+                return;
             }
-        });
-        this.messenger.subscribe('TransactionController:transactionConfirmed', (transactionMeta) => {
-            const { type, id: txMetaId, chainId } = transactionMeta;
-            if (type === TransactionType.swap) {
-                __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, UnifiedSwapBridgeEventName.Completed, txMetaId);
+            const { type, status } = txMeta;
+            // Allow event publishing if the txMeta is a swap/bridge OR if the
+            // corresponding history item exists
+            const isSwapOrBridgeTransaction = type && isCrossChainTx(type);
+            if (!isSwapOrBridgeTransaction && !historyKey && !historyItem) {
+                return;
             }
-            if (type === TransactionType.bridge && !isNonEvmChainId(chainId)) {
-                __classPrivateFieldGet(this, _BridgeStatusController_startPollingForTxId, "f").call(this, txMetaId);
+            switch (status) {
+                case TransactionStatus.confirmed:
+                    __classPrivateFieldGet(this, _BridgeStatusController_onTransactionConfirmed, "f").call(this, {
+                        txMeta,
+                        historyKey,
+                        isApprovalTxMeta,
+                    });
+                    break;
+                case TransactionStatus.failed:
+                case TransactionStatus.dropped:
+                case TransactionStatus.rejected:
+                    __classPrivateFieldGet(this, _BridgeStatusController_onTransactionFailed, "f").call(this, { txMeta, historyKey, isApprovalTxMeta });
+                    break;
+                default:
+                    break;
             }
+        }, ({ transactionMeta }) => {
+            const entry = getMatchingHistoryEntryForTxMeta(this.state.txHistory, transactionMeta);
+            const approvalEntry = getMatchingHistoryEntryForApprovalTxMeta(this.state.txHistory, transactionMeta);
+            const entryToUse = entry ?? approvalEntry;
+            return {
+                historyKey: entryToUse?.[0],
+                historyItem: entryToUse?.[1],
+                txMeta: transactionMeta,
+                isApprovalTxMeta: entryToUse?.[1]?.approvalTxId === transactionMeta.id,
+            };
         });
         // If you close the extension, but keep the browser open, the polling continues
         // If you close the browser, the polling stops
@@ -962,5 +1056,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_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();
+_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();
 //# sourceMappingURL=bridge-status-controller.mjs.map