@metamask/bridge-status-controller 70.0.4 → 71.0.0

package/dist/bridge-status-controller.cjs

@@ -10,7 +10,7 @@ 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;
+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;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BridgeStatusController = void 0;
 const bridge_controller_1 = require("@metamask/bridge-controller");
@@ -42,6 +42,15 @@ const metadata = {
         usedInUi: true,
     },
 };
+const MESSENGER_EXPOSED_METHODS = [
+    'startPollingForBridgeTxStatus',
+    'wipeBridgeStatus',
+    'resetState',
+    'submitTx',
+    'submitIntent',
+    'restartPollingForFailedAttempts',
+    'getBridgeHistoryItemByTxMetaId',
+];
 class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPollingController)() {
     constructor({ messenger, state, clientId, fetchFn, addTransactionBatchFn, config, traceFn, }) {
         super({
@@ -61,25 +70,55 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
         _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 === bridge_controller_1.StatusTypes.FAILED
+                : false;
+            __classPrivateFieldGet(this, _BridgeStatusController_updateHistoryItem, "f").call(this, {
+                historyKey,
+                status: bridge_controller_1.StatusTypes.FAILED,
+                txHash: isApprovalTxMeta ? undefined : txMeta.hash,
+            });
+            if (txMeta.status === transaction_controller_1.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, bridge_controller_1.UnifiedSwapBridgeEventName.Failed, historyKey, (0, metrics_1.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 = bridge_controller_1.StatusTypes.FAILED;
+            __classPrivateFieldGet(this, _BridgeStatusController_updateHistoryItem, "f").call(this, {
+                historyKey,
+                txHash: txMeta.hash,
             });
+            switch (txMeta.type) {
+                case transaction_controller_1.TransactionType.swap:
+                    __classPrivateFieldGet(this, _BridgeStatusController_updateHistoryItem, "f").call(this, {
+                        historyKey,
+                        status: bridge_controller_1.StatusTypes.COMPLETE,
+                    });
+                    __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Completed, historyKey);
+                    break;
+                default:
+                    if (historyKey) {
+                        __classPrivateFieldGet(this, _BridgeStatusController_startPollingForTxId, "f").call(this, historyKey);
+                    }
+                    break;
+            }
         });
         this.resetState = () => {
             this.update((state) => {
@@ -180,30 +219,31 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
         _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 === bridge_controller_1.StatusTypes.PENDING ||
+                .filter(([_, historyItem]) => historyItem.status.status === bridge_controller_1.StatusTypes.PENDING ||
                 historyItem.status.status === bridge_controller_1.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 (0, history_1.shouldPollHistoryItem)(historyItem);
             });
-            incompleteHistoryItems.forEach((historyItem) => {
-                const bridgeTxMetaId = historyItem.txMetaId;
+            incompleteHistoryItems.forEach(([historyKey, historyItem]) => {
                 const shouldSkipFetch = (0, bridge_status_1.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) => {
@@ -212,6 +252,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 // 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.
@@ -234,10 +275,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 this.stopPollingByPollingToken(existingPollingToken);
             }
             const txHistoryItem = this.state.txHistory[txId];
-            if (!txHistoryItem) {
-                return;
-            }
-            if ((0, history_1.shouldPollHistoryItem)(txHistoryItem)) {
+            if (txHistoryItem && (0, history_1.shouldPollHistoryItem)(txHistoryItem)) {
                 __classPrivateFieldGet(this, _BridgeStatusController_pollingTokensByTxMetaId, "f")[txId] = this.startPolling({
                     bridgeTxMetaId: txId,
                 });
@@ -258,8 +296,8 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             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()
@@ -294,29 +332,38 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 // Track max polling reached event
                 const historyItem = this.state.txHistory[bridgeTxMetaId];
                 if (historyItem && !historyItem.featureId) {
-                    const selectedAccount = (0, accounts_1.getAccountByAddress)(this.messenger, historyItem.account);
-                    const requestParams = (0, metrics_1.getRequestParamFromHistory)(historyItem);
-                    const requestMetadata = (0, metrics_1.getRequestMetadataFromHistory)(historyItem, selectedAccount);
-                    const { security_warnings: _, ...metadataWithoutWarnings } = requestMetadata;
-                    __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.PollingStatusUpdated, bridgeTxMetaId, {
-                        ...(0, metrics_1.getTradeDataFromHistory)(historyItem),
-                        ...(0, metrics_1.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: bridge_controller_1.MetricsActionType.SWAPBRIDGE_V1,
-                        polling_status: bridge_controller_1.PollingStatus.MaxPollingReached,
-                        retry_attempts: newAttempts.counter,
-                    });
+                    // Track polling status updated event
+                    __classPrivateFieldGet(this, _BridgeStatusController_trackPollingStatusUpdatedEvent, "f").call(this, bridgeTxMetaId, bridge_controller_1.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 (0, bridge_status_1.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, bridge_controller_1.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;
@@ -328,7 +375,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             if ((0, bridge_status_1.shouldSkipFetchDueToFetchFailures)(historyItem.attempts)) {
                 return;
             }
-            // 3. Fetch transcation status
+            // 3. Fetch transaction status
             try {
                 let status;
                 let validationFailures = [];
@@ -344,11 +391,10 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                     // 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 = (0, bridge_status_1.getStatusRequestWithSrcTxHash)(historyItem.quote, srcTxHash);
                     const response = await (0, bridge_status_1.fetchBridgeTxStatus)(statusRequest, __classPrivateFieldGet(this, _BridgeStatusController_clientId, "f"), await (0, authentication_1.getJwt)(this.messenger), __classPrivateFieldGet(this, _BridgeStatusController_fetchFn, "f"), __classPrivateFieldGet(this, _BridgeStatusController_config, "f").customBridgeApiBaseUrl);
                     status = response.status;
@@ -405,26 +451,65 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 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 ||
+                (0, bridge_controller_1.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 = (0, transaction_1.getTransactionMetaById)(this.messenger, bridgeTxMetaId);
-            return txMeta?.hash;
+            if (!txMeta) {
+                return undefined;
+            }
+            // Wait for finalized status before updating the history item
+            const localTxHash = [
+                transaction_controller_1.TransactionStatus.confirmed,
+                transaction_controller_1.TransactionStatus.dropped,
+                transaction_controller_1.TransactionStatus.rejected,
+                transaction_controller_1.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
@@ -440,6 +525,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 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) => {
@@ -517,8 +603,8 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             if (!selectedAccount) {
                 throw new Error('Failed to submit cross-chain swap transaction: undefined multichain account');
             }
-            const isHardwareAccount = (0, bridge_controller_1.isHardwareWallet)(selectedAccount);
-            const preConfirmationProperties = (0, metrics_1.getPreConfirmationPropertiesFromQuote)(quoteResponse, isStxEnabledOnClient, isHardwareAccount, location, abTests, activeAbTests);
+            const accountHardwareType = (0, bridge_controller_1.getAccountHardwareType)(selectedAccount);
+            const preConfirmationProperties = (0, metrics_1.getPreConfirmationPropertiesFromQuote)(quoteResponse, isStxEnabledOnClient, accountHardwareType, location, abTests, activeAbTests);
             let txMeta;
             let approvalTxId;
             let isDelegatedAccount = false;
@@ -558,7 +644,8 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                     // 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;
+                    const requireApproval = __classPrivateFieldGet(this, _BridgeStatusController_clientId, "f") === types_1.BridgeClientId.MOBILE &&
+                        accountHardwareType !== null;
                     // 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)) {
@@ -605,7 +692,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                         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, {
+                        const historyKey = __classPrivateFieldGet(this, _BridgeStatusController_addTxToHistory, "f").call(this, {
                             accountAddress: selectedAccount.address,
                             quoteResponse,
                             slippagePercentage: 0,
@@ -632,7 +719,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                             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;
                     });
                 }
@@ -652,11 +739,12 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                     !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,
@@ -669,10 +757,10 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 }
                 if ((0, bridge_controller_1.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, bridge_controller_1.UnifiedSwapBridgeEventName.Completed, txMeta.id);
+                        __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Completed, historyKey);
                     }
                 }
             }
@@ -700,14 +788,15 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             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);
-            const preConfirmationProperties = (0, metrics_1.getPreConfirmationPropertiesFromQuote)(quoteResponse, false, isHardwareAccount, location, abTests, activeAbTests);
+            const accountHardwareType = (0, bridge_controller_1.getAccountHardwareType)(account);
+            const preConfirmationProperties = (0, metrics_1.getPreConfirmationPropertiesFromQuote)(quoteResponse, false, accountHardwareType, location, abTests, activeAbTests);
             try {
                 const intent = (0, intent_api_1.getIntentFromQuote)(quoteResponse);
                 // If backend provided an approval tx for this intent quote, submit it first (on-chain),
                 // then proceed with off-chain intent submission.
                 const isBridgeTx = (0, bridge_controller_1.isCrossChain)(quoteResponse.quote.srcChainId, quoteResponse.quote.destChainId);
-                const requireApproval = isHardwareAccount && __classPrivateFieldGet(this, _BridgeStatusController_clientId, "f") === types_1.BridgeClientId.MOBILE;
+                const requireApproval = __classPrivateFieldGet(this, _BridgeStatusController_clientId, "f") === types_1.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;
@@ -770,15 +859,14 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 };
                 // 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,
@@ -791,7 +879,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                         activeAbTests,
                     });
                     // 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);
@@ -807,6 +895,13 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 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, bridge_controller_1.UnifiedSwapBridgeEventName.PollingStatusUpdated, historyKey, (0, metrics_1.getPollingStatusUpdatedProperties)(this.messenger, pollingStatus, historyItem));
+            }
+        });
         /**
          * Tracks post-submission events for a cross-chain swap based on the history item
          *
@@ -911,53 +1006,46 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             fetchFn: __classPrivateFieldGet(this, _BridgeStatusController_fetchFn, "f"),
         }), "f");
         // Register action handlers
-        this.messenger.registerActionHandler(`${constants_1.BRIDGE_STATUS_CONTROLLER_NAME}:startPollingForBridgeTxStatus`, this.startPollingForBridgeTxStatus.bind(this));
-        this.messenger.registerActionHandler(`${constants_1.BRIDGE_STATUS_CONTROLLER_NAME}:wipeBridgeStatus`, this.wipeBridgeStatus.bind(this));
-        this.messenger.registerActionHandler(`${constants_1.BRIDGE_STATUS_CONTROLLER_NAME}:resetState`, this.resetState.bind(this));
-        this.messenger.registerActionHandler(`${constants_1.BRIDGE_STATUS_CONTROLLER_NAME}:submitTx`, this.submitTx.bind(this));
-        this.messenger.registerActionHandler(`${constants_1.BRIDGE_STATUS_CONTROLLER_NAME}:submitIntent`, this.submitIntent.bind(this));
-        this.messenger.registerActionHandler(`${constants_1.BRIDGE_STATUS_CONTROLLER_NAME}:restartPollingForFailedAttempts`, this.restartPollingForFailedAttempts.bind(this));
-        this.messenger.registerActionHandler(`${constants_1.BRIDGE_STATUS_CONTROLLER_NAME}:getBridgeHistoryItemByTxMetaId`, this.getBridgeHistoryItemByTxMetaId.bind(this));
+        this.messenger.registerMethodActionHandlers(this, MESSENGER_EXPOSED_METHODS);
         // Set interval
         this.setIntervalLength(constants_1.REFRESH_INTERVAL_MS);
-        this.messenger.subscribe('TransactionController:transactionFailed', ({ transactionMeta }) => {
-            const { type, status, id: txMetaId, actionId } = transactionMeta;
-            if (type &&
-                [
-                    transaction_controller_1.TransactionType.bridge,
-                    transaction_controller_1.TransactionType.swap,
-                    transaction_controller_1.TransactionType.bridgeApproval,
-                    transaction_controller_1.TransactionType.swapApproval,
-                ].includes(type) &&
-                [
-                    transaction_controller_1.TransactionStatus.failed,
-                    transaction_controller_1.TransactionStatus.dropped,
-                    transaction_controller_1.TransactionStatus.rejected,
-                ].includes(status)) {
-                // Mark tx as failed in txHistory
-                __classPrivateFieldGet(this, _BridgeStatusController_markTxAsFailed, "f").call(this, transactionMeta);
-                // Track failed event
-                if (status !== transaction_controller_1.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, bridge_controller_1.UnifiedSwapBridgeEventName.Failed, historyKey ?? txMetaId, (0, metrics_1.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 === transaction_controller_1.TransactionType.swap) {
-                __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.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 && (0, transaction_1.isCrossChainTx)(type);
+            if (!isSwapOrBridgeTransaction && !historyKey && !historyItem) {
+                return;
             }
-            if (type === transaction_controller_1.TransactionType.bridge && !(0, bridge_controller_1.isNonEvmChainId)(chainId)) {
-                __classPrivateFieldGet(this, _BridgeStatusController_startPollingForTxId, "f").call(this, txMetaId);
+            switch (status) {
+                case transaction_controller_1.TransactionStatus.confirmed:
+                    __classPrivateFieldGet(this, _BridgeStatusController_onTransactionConfirmed, "f").call(this, {
+                        txMeta,
+                        historyKey,
+                        isApprovalTxMeta,
+                    });
+                    break;
+                case transaction_controller_1.TransactionStatus.failed:
+                case transaction_controller_1.TransactionStatus.dropped:
+                case transaction_controller_1.TransactionStatus.rejected:
+                    __classPrivateFieldGet(this, _BridgeStatusController_onTransactionFailed, "f").call(this, { txMeta, historyKey, isApprovalTxMeta });
+                    break;
+                default:
+                    break;
             }
+        }, ({ transactionMeta }) => {
+            const entry = (0, history_1.getMatchingHistoryEntryForTxMeta)(this.state.txHistory, transactionMeta);
+            const approvalEntry = (0, history_1.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
@@ -966,5 +1054,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_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.cjs.map