@metamask-previews/bridge-status-controller 65.0.1-preview-ce3ee897a → 65.0.1-preview-e4aa1532

package/CHANGELOG.md

@@ -9,12 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- Bump `@metamask/transaction-controller` from `^62.11.0` to `^62.14.0` ([#7775](https://github.com/MetaMask/core/pull/7775), [#7802](https://github.com/MetaMask/core/pull/7802), [#7832](https://github.com/MetaMask/core/pull/7832))
-- Bump `@metamask/bridge-controller` from `^65.1.0` to `^65.2.0` ([#7802](https://github.com/MetaMask/core/pull/7802))
-
-### Fixed
-
-- Fix Tron same-chain swap polling and Completed event tracking ([#7697](https://github.com/MetaMask/core/pull/7697))
+- Bump `@metamask/transaction-controller` from `^62.11.0` to `^62.12.0` ([#7775](https://github.com/MetaMask/core/pull/7775))
 
 ## [65.0.1]
 
@@ -45,10 +40,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Bump `@metamask/bridge-controller` from `^64.5.1` to `^64.8.1` ([#7667](https://github.com/MetaMask/core/pull/7667), [#7672](https://github.com/MetaMask/core/pull/7672), [#7694](https://github.com/MetaMask/core/pull/7694), [#7700](https://github.com/MetaMask/core/pull/7700), [#7704](https://github.com/MetaMask/core/pull/7704))
 
-### Fixed
-
-- Fix Tron same-chain swap polling and Completed event tracking ([#7697](https://github.com/MetaMask/core/pull/7697))
-
 ## [64.4.3]
 
 ### Changed

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_instances, _BridgeStatusController_pollingTokensByTxMetaId, _BridgeStatusController_intentStatusManager, _BridgeStatusController_clientId, _BridgeStatusController_fetchFn, _BridgeStatusController_config, _BridgeStatusController_addTransactionFn, _BridgeStatusController_addTransactionBatchFn, _BridgeStatusController_updateTransactionFn, _BridgeStatusController_estimateGasFeeFn, _BridgeStatusController_trace, _BridgeStatusController_markTxAsFailed, _BridgeStatusController_restartPollingForIncompleteHistoryItems, _BridgeStatusController_addTxToHistory, _BridgeStatusController_rekeyHistoryItem, _BridgeStatusController_startPollingForTxId, _BridgeStatusController_shouldPollHistoryItem, _BridgeStatusController_getMultichainSelectedAccount, _BridgeStatusController_handleFetchFailure, _BridgeStatusController_fetchBridgeTxStatus, _BridgeStatusController_getSrcTxHash, _BridgeStatusController_updateSrcTxHash, _BridgeStatusController_wipeBridgeStatusByChainId, _BridgeStatusController_handleNonEvmTx, _BridgeStatusController_waitForHashAndReturnFinalTxMeta, _BridgeStatusController_waitForTxConfirmation, _BridgeStatusController_handleApprovalTx, _BridgeStatusController_handleEvmTransaction, _BridgeStatusController_handleUSDTAllowanceReset, _BridgeStatusController_calculateGasFees, _BridgeStatusController_handleEvmTransactionBatch, _BridgeStatusController_trackUnifiedSwapBridgeEvent;
+var _BridgeStatusController_instances, _BridgeStatusController_pollingTokensByTxMetaId, _BridgeStatusController_clientId, _BridgeStatusController_fetchFn, _BridgeStatusController_config, _BridgeStatusController_addTransactionFn, _BridgeStatusController_addTransactionBatchFn, _BridgeStatusController_updateTransactionFn, _BridgeStatusController_estimateGasFeeFn, _BridgeStatusController_trace, _BridgeStatusController_markTxAsFailed, _BridgeStatusController_restartPollingForIncompleteHistoryItems, _BridgeStatusController_addTxToHistory, _BridgeStatusController_rekeyHistoryItem, _BridgeStatusController_startPollingForTxId, _BridgeStatusController_getMultichainSelectedAccount, _BridgeStatusController_handleFetchFailure, _BridgeStatusController_fetchBridgeTxStatus, _BridgeStatusController_fetchIntentOrderStatus, _BridgeStatusController_updateBridgeHistoryFromIntentOrder, _BridgeStatusController_getSrcTxHash, _BridgeStatusController_updateSrcTxHash, _BridgeStatusController_wipeBridgeStatusByChainId, _BridgeStatusController_handleNonEvmTx, _BridgeStatusController_waitForHashAndReturnFinalTxMeta, _BridgeStatusController_waitForTxConfirmation, _BridgeStatusController_handleApprovalTx, _BridgeStatusController_handleEvmTransaction, _BridgeStatusController_handleUSDTAllowanceReset, _BridgeStatusController_calculateGasFees, _BridgeStatusController_handleEvmTransactionBatch, _BridgeStatusController_trackUnifiedSwapBridgeEvent;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BridgeStatusController = void 0;
 const bridge_controller_1 = require("@metamask/bridge-controller");
@@ -18,7 +18,6 @@ const controller_utils_1 = require("@metamask/controller-utils");
 const polling_controller_1 = require("@metamask/polling-controller");
 const transaction_controller_1 = require("@metamask/transaction-controller");
 const utils_1 = require("@metamask/utils");
-const bridge_status_controller_intent_1 = require("./bridge-status-controller.intent.cjs");
 const constants_1 = require("./constants.cjs");
 const types_1 = require("./types.cjs");
 const bridge_status_1 = require("./utils/bridge-status.cjs");
@@ -26,6 +25,7 @@ const gas_1 = require("./utils/gas.cjs");
 const intent_api_1 = require("./utils/intent-api.cjs");
 const metrics_1 = require("./utils/metrics.cjs");
 const transaction_1 = require("./utils/transaction.cjs");
+const validators_1 = require("./utils/validators.cjs");
 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
@@ -50,7 +50,6 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
         });
         _BridgeStatusController_instances.add(this);
         _BridgeStatusController_pollingTokensByTxMetaId.set(this, {});
-        _BridgeStatusController_intentStatusManager.set(this, void 0);
         _BridgeStatusController_clientId.set(this, void 0);
         _BridgeStatusController_fetchFn.set(this, void 0);
         _BridgeStatusController_config.set(this, void 0);
@@ -133,8 +132,9 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                     state.txHistory[targetTxMetaId].attempts = undefined;
                 }
             });
-            // Restart polling if it was stopped and this tx still needs status updates
-            if (__classPrivateFieldGet(this, _BridgeStatusController_shouldPollHistoryItem, "f").call(this, historyItem)) {
+            // Restart polling if it was stopped and this is a bridge transaction
+            const isBridgeTx = (0, bridge_controller_1.isCrossChain)(historyItem.quote.srcChainId, historyItem.quote.destChainId);
+            if (isBridgeTx) {
                 // Check if polling was stopped (no active polling token)
                 const existingPollingToken = __classPrivateFieldGet(this, _BridgeStatusController_pollingTokensByTxMetaId, "f")[targetTxMetaId];
                 if (!existingPollingToken) {
@@ -170,9 +170,10 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 const pollingToken = __classPrivateFieldGet(this, _BridgeStatusController_pollingTokensByTxMetaId, "f")[historyItem.txMetaId];
                 return !pollingToken;
             })
-                // Only restart polling for items that still require status updates
+                // Swap txs don't need to have their statuses polled
                 .filter((historyItem) => {
-                return __classPrivateFieldGet(this, _BridgeStatusController_shouldPollHistoryItem, "f").call(this, historyItem);
+                const isBridgeTx = (0, bridge_controller_1.isCrossChain)(historyItem.quote.srcChainId, historyItem.quote.destChainId);
+                return isBridgeTx;
             });
             incompleteHistoryItems.forEach((historyItem) => {
                 const bridgeTxMetaId = historyItem.txMetaId;
@@ -242,8 +243,28 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
          * @param txMeta.hash - The transaction hash to set on the history item
          */
         _BridgeStatusController_rekeyHistoryItem.set(this, (actionId, txMeta) => {
+            const historyItem = this.state.txHistory[actionId];
+            if (!historyItem) {
+                return;
+            }
             this.update((state) => {
-                (0, transaction_1.rekeyHistoryItemInState)(state, actionId, txMeta);
+                // Update fields that weren't available pre-submission
+                const updatedItem = {
+                    ...historyItem,
+                    txMetaId: txMeta.id,
+                    originalTransactionId: historyItem.originalTransactionId ?? txMeta.id,
+                    status: {
+                        ...historyItem.status,
+                        srcChain: {
+                            ...historyItem.status.srcChain,
+                            txHash: txMeta.hash ?? historyItem.status.srcChain?.txHash,
+                        },
+                    },
+                };
+                // Add under new key (txMeta.id)
+                state.txHistory[txMeta.id] = updatedItem;
+                // Remove old key (actionId)
+                delete state.txHistory[actionId];
             });
         });
         _BridgeStatusController_startPollingForTxId.set(this, (txId) => {
@@ -256,18 +277,15 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             if (!txHistoryItem) {
                 return;
             }
-            if (__classPrivateFieldGet(this, _BridgeStatusController_shouldPollHistoryItem, "f").call(this, txHistoryItem)) {
+            const { quote } = txHistoryItem;
+            const isIntent = txId.startsWith('intent:');
+            const isBridgeTx = (0, bridge_controller_1.isCrossChain)(quote.srcChainId, quote.destChainId);
+            if (isBridgeTx || isIntent) {
                 __classPrivateFieldGet(this, _BridgeStatusController_pollingTokensByTxMetaId, "f")[txId] = this.startPolling({
                     bridgeTxMetaId: txId,
                 });
             }
         });
-        _BridgeStatusController_shouldPollHistoryItem.set(this, (historyItem) => {
-            const isIntent = Boolean(historyItem?.quote?.intent);
-            const isBridgeTx = (0, bridge_controller_1.isCrossChain)(historyItem.quote.srcChainId, historyItem.quote.destChainId);
-            const isTronTx = (0, bridge_controller_1.isTronChainId)(historyItem.quote.srcChainId);
-            return [isBridgeTx, isIntent, isTronTx].some(Boolean);
-        });
         /**
          * @deprecated For EVM/Solana swap/bridge txs we add tx to history in submitTx()
          * For Solana swap/bridge we start polling in submitTx()
@@ -323,52 +341,33 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             });
         });
         _BridgeStatusController_fetchBridgeTxStatus.set(this, async ({ bridgeTxMetaId, }) => {
-            // 1. Check for history item
             const { txHistory } = this.state;
-            const historyItem = txHistory[bridgeTxMetaId];
-            if (!historyItem) {
+            // Intent-based items: poll intent provider instead of Bridge API
+            if (bridgeTxMetaId.startsWith('intent:')) {
+                await __classPrivateFieldGet(this, _BridgeStatusController_fetchIntentOrderStatus, "f").call(this, { bridgeTxMetaId });
                 return;
             }
-            // 2. Check for previous failures
-            if ((0, bridge_status_1.shouldSkipFetchDueToFetchFailures)(historyItem.attempts)) {
+            if ((0, bridge_status_1.shouldSkipFetchDueToFetchFailures)(txHistory[bridgeTxMetaId]?.attempts)) {
                 return;
             }
-            // 3. Fetch transcation status
             try {
-                let status;
-                let validationFailures = [];
-                let intentTranslation = null;
-                let intentOrderStatus;
-                const isIntent = Boolean(historyItem.quote.intent);
-                if (isIntent) {
-                    const { srcChainId } = historyItem.quote;
-                    const intentApi = new intent_api_1.IntentApiImpl(__classPrivateFieldGet(this, _BridgeStatusController_config, "f").customBridgeApiBaseUrl, __classPrivateFieldGet(this, _BridgeStatusController_fetchFn, "f"));
-                    const intentOrder = await intentApi.getOrderStatus(bridgeTxMetaId, historyItem.quote.intent?.protocol ?? '', srcChainId.toString(), __classPrivateFieldGet(this, _BridgeStatusController_clientId, "f"));
-                    intentOrderStatus = intentOrder.status;
-                    intentTranslation = (0, intent_api_1.translateIntentOrderToBridgeStatus)(intentOrder, srcChainId, historyItem.status.srcChain.txHash);
-                    status = intentTranslation.status;
-                }
-                else {
-                    // 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);
-                    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"), __classPrivateFieldGet(this, _BridgeStatusController_fetchFn, "f"), __classPrivateFieldGet(this, _BridgeStatusController_config, "f").customBridgeApiBaseUrl);
-                    status = response.status;
-                    validationFailures = response.validationFailures;
+                // 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 historyItem = txHistory[bridgeTxMetaId];
+                const srcTxHash = __classPrivateFieldGet(this, _BridgeStatusController_getSrcTxHash, "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 { status, validationFailures } = await (0, bridge_status_1.fetchBridgeTxStatus)(statusRequest, __classPrivateFieldGet(this, _BridgeStatusController_clientId, "f"), __classPrivateFieldGet(this, _BridgeStatusController_fetchFn, "f"), __classPrivateFieldGet(this, _BridgeStatusController_config, "f").customBridgeApiBaseUrl);
                 if (validationFailures.length > 0) {
                     __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.StatusValidationFailed, bridgeTxMetaId, {
                         failures: validationFailures,
                     });
                     throw new Error(`Bridge status validation failed: ${validationFailures.join(', ')}`);
                 }
-                // 4. Create bridge history item
                 const newBridgeHistoryItem = {
                     ...historyItem,
                     status,
@@ -385,10 +384,6 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 this.update((state) => {
                     state.txHistory[bridgeTxMetaId] = newBridgeHistoryItem;
                 });
-                if (isIntent && intentTranslation && intentOrderStatus) {
-                    __classPrivateFieldGet(this, _BridgeStatusController_intentStatusManager, "f").syncTransactionFromIntentStatus(bridgeTxMetaId, historyItem, intentTranslation, intentOrderStatus);
-                }
-                // 5. After effects
                 const pollingToken = __classPrivateFieldGet(this, _BridgeStatusController_pollingTokensByTxMetaId, "f")[bridgeTxMetaId];
                 const isFinalStatus = status.status === bridge_controller_1.StatusTypes.COMPLETE ||
                     status.status === bridge_controller_1.StatusTypes.FAILED;
@@ -413,6 +408,33 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 __classPrivateFieldGet(this, _BridgeStatusController_handleFetchFailure, "f").call(this, bridgeTxMetaId);
             }
         });
+        _BridgeStatusController_fetchIntentOrderStatus.set(this, async ({ bridgeTxMetaId, }) => {
+            /* c8 ignore start */
+            const { txHistory } = this.state;
+            const historyItem = txHistory[bridgeTxMetaId];
+            if (!historyItem) {
+                return;
+            }
+            // Backoff handling
+            if ((0, bridge_status_1.shouldSkipFetchDueToFetchFailures)(historyItem.attempts)) {
+                return;
+            }
+            try {
+                const orderId = bridgeTxMetaId.replace(/^intent:/u, '');
+                const { srcChainId } = historyItem.quote;
+                // Extract provider name from order metadata or default to empty
+                const providerName = historyItem.quote.intent?.protocol ?? '';
+                const intentApi = new intent_api_1.IntentApiImpl(__classPrivateFieldGet(this, _BridgeStatusController_config, "f").customBridgeApiBaseUrl, __classPrivateFieldGet(this, _BridgeStatusController_fetchFn, "f"));
+                const intentOrder = await intentApi.getOrderStatus(orderId, providerName, srcChainId.toString(), __classPrivateFieldGet(this, _BridgeStatusController_clientId, "f"));
+                // Update bridge history with intent order status
+                __classPrivateFieldGet(this, _BridgeStatusController_instances, "m", _BridgeStatusController_updateBridgeHistoryFromIntentOrder).call(this, bridgeTxMetaId, intentOrder, historyItem);
+            }
+            catch (error) {
+                console.error('Failed to fetch intent order status:', error);
+                __classPrivateFieldGet(this, _BridgeStatusController_handleFetchFailure, "f").call(this, bridgeTxMetaId);
+            }
+            /* c8 ignore stop */
+        });
         _BridgeStatusController_getSrcTxHash.set(this, (bridgeTxMetaId) => {
             const { txHistory } = this.state;
             // Prefer the srcTxHash from bridgeStatusState so we don't have to l ook up in TransactionController
@@ -503,10 +525,31 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
         // Waits until a given transaction (by id) reaches confirmed/finalized status or fails/times out.
         _BridgeStatusController_waitForTxConfirmation.set(this, async (txId, { timeoutMs = 5 * 60000, // 5 minutes default
         pollMs = 3000, } = {}) => {
-            return await (0, transaction_1.waitForTxConfirmation)(this.messenger, txId, {
-                timeoutMs,
-                pollMs,
-            });
+            /* c8 ignore start */
+            const start = Date.now();
+            // Poll the TransactionController state for status changes
+            // We intentionally keep this simple to avoid extra wiring/subscriptions in this controller
+            // and because we only need it for the rare intent+approval path.
+            while (true) {
+                const { transactions } = this.messenger.call('TransactionController:getState');
+                const meta = transactions.find((tx) => tx.id === txId);
+                if (meta) {
+                    // Treat both 'confirmed' and 'finalized' as success to match TC lifecycle
+                    if (meta.status === transaction_controller_1.TransactionStatus.confirmed) {
+                        return meta;
+                    }
+                    if (meta.status === transaction_controller_1.TransactionStatus.failed ||
+                        meta.status === transaction_controller_1.TransactionStatus.dropped ||
+                        meta.status === transaction_controller_1.TransactionStatus.rejected) {
+                        throw new Error('Approval transaction did not confirm');
+                    }
+                }
+                if (Date.now() - start > timeoutMs) {
+                    throw new Error('Timed out waiting for approval confirmation');
+                }
+                await new Promise((resolve) => setTimeout(resolve, pollMs));
+            }
+            /* c8 ignore stop */
         });
         _BridgeStatusController_handleApprovalTx.set(this, async (isBridgeTx, srcChainId, approval, resetApproval, requireApproval) => {
             if (approval) {
@@ -680,7 +723,6 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             let approvalTxId;
             const startTime = Date.now();
             const isBridgeTx = (0, bridge_controller_1.isCrossChain)(quoteResponse.quote.srcChainId, quoteResponse.quote.destChainId);
-            const isTronTx = (0, bridge_controller_1.isTronChainId)(quoteResponse.quote.srcChainId);
             // Submit non-EVM tx (Solana, BTC, Tron)
             if ((0, bridge_controller_1.isNonEvmChainId)(quoteResponse.quote.srcChainId)) {
                 // Handle non-EVM approval if present (e.g., Tron token approvals)
@@ -838,7 +880,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                     // Start polling for bridge tx status
                     __classPrivateFieldGet(this, _BridgeStatusController_startPollingForTxId, "f").call(this, txMeta.id);
                     // Track non-EVM Swap completed event
-                    if (!(isBridgeTx || isTronTx)) {
+                    if (!isBridgeTx) {
                         __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Completed, txMeta.id);
                     }
                 }
@@ -938,12 +980,12 @@ 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;
+                    // Use 'intent:' prefix for intent transactions
+                    const bridgeHistoryKey = `intent:${orderUid}`;
                     // Create a bridge transaction metadata that includes the original txId
                     const bridgeTxMetaForHistory = {
                         ...syntheticMeta,
-                        id: bridgeHistoryKey,
+                        id: bridgeHistoryKey, // Use intent: prefix for bridge history key
                         originalTransactionId: syntheticMeta.id, // Keep original txId for TransactionController updates
                     };
                     const startTime = Date.now();
@@ -960,7 +1002,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                         approvalTxId,
                         startTime,
                     });
-                    // Start polling using the orderId key to route to intent manager
+                    // Start polling using the intent: prefixed key to route to intent manager
                     __classPrivateFieldGet(this, _BridgeStatusController_startPollingForTxId, "f").call(this, bridgeHistoryKey);
                 }
                 catch (error) {
@@ -1041,10 +1083,6 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             customBridgeApiBaseUrl: config?.customBridgeApiBaseUrl ?? constants_1.BRIDGE_PROD_API_BASE_URL,
         }, "f");
         __classPrivateFieldSet(this, _BridgeStatusController_trace, traceFn ?? ((_request, fn) => fn?.()), "f");
-        __classPrivateFieldSet(this, _BridgeStatusController_intentStatusManager, new bridge_status_controller_intent_1.IntentStatusManager({
-            messenger: this.messenger,
-            updateTransactionFn: __classPrivateFieldGet(this, _BridgeStatusController_updateTransactionFn, "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));
@@ -1101,7 +1139,128 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
     }
 }
 exports.BridgeStatusController = BridgeStatusController;
-_BridgeStatusController_pollingTokensByTxMetaId = new WeakMap(), _BridgeStatusController_intentStatusManager = new WeakMap(), _BridgeStatusController_clientId = new WeakMap(), _BridgeStatusController_fetchFn = new WeakMap(), _BridgeStatusController_config = new WeakMap(), _BridgeStatusController_addTransactionFn = new WeakMap(), _BridgeStatusController_addTransactionBatchFn = new WeakMap(), _BridgeStatusController_updateTransactionFn = new WeakMap(), _BridgeStatusController_estimateGasFeeFn = 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_shouldPollHistoryItem = new WeakMap(), _BridgeStatusController_handleFetchFailure = new WeakMap(), _BridgeStatusController_fetchBridgeTxStatus = new WeakMap(), _BridgeStatusController_getSrcTxHash = new WeakMap(), _BridgeStatusController_updateSrcTxHash = new WeakMap(), _BridgeStatusController_wipeBridgeStatusByChainId = new WeakMap(), _BridgeStatusController_handleNonEvmTx = new WeakMap(), _BridgeStatusController_waitForHashAndReturnFinalTxMeta = new WeakMap(), _BridgeStatusController_waitForTxConfirmation = new WeakMap(), _BridgeStatusController_handleApprovalTx = new WeakMap(), _BridgeStatusController_handleEvmTransaction = new WeakMap(), _BridgeStatusController_handleUSDTAllowanceReset = new WeakMap(), _BridgeStatusController_calculateGasFees = new WeakMap(), _BridgeStatusController_handleEvmTransactionBatch = new WeakMap(), _BridgeStatusController_trackUnifiedSwapBridgeEvent = new WeakMap(), _BridgeStatusController_instances = new WeakSet(), _BridgeStatusController_getMultichainSelectedAccount = function _BridgeStatusController_getMultichainSelectedAccount(accountAddress) {
+_BridgeStatusController_pollingTokensByTxMetaId = new WeakMap(), _BridgeStatusController_clientId = new WeakMap(), _BridgeStatusController_fetchFn = new WeakMap(), _BridgeStatusController_config = new WeakMap(), _BridgeStatusController_addTransactionFn = new WeakMap(), _BridgeStatusController_addTransactionBatchFn = new WeakMap(), _BridgeStatusController_updateTransactionFn = new WeakMap(), _BridgeStatusController_estimateGasFeeFn = 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_fetchIntentOrderStatus = new WeakMap(), _BridgeStatusController_getSrcTxHash = new WeakMap(), _BridgeStatusController_updateSrcTxHash = new WeakMap(), _BridgeStatusController_wipeBridgeStatusByChainId = new WeakMap(), _BridgeStatusController_handleNonEvmTx = new WeakMap(), _BridgeStatusController_waitForHashAndReturnFinalTxMeta = new WeakMap(), _BridgeStatusController_waitForTxConfirmation = new WeakMap(), _BridgeStatusController_handleApprovalTx = new WeakMap(), _BridgeStatusController_handleEvmTransaction = new WeakMap(), _BridgeStatusController_handleUSDTAllowanceReset = new WeakMap(), _BridgeStatusController_calculateGasFees = new WeakMap(), _BridgeStatusController_handleEvmTransactionBatch = new WeakMap(), _BridgeStatusController_trackUnifiedSwapBridgeEvent = new WeakMap(), _BridgeStatusController_instances = new WeakSet(), _BridgeStatusController_getMultichainSelectedAccount = function _BridgeStatusController_getMultichainSelectedAccount(accountAddress) {
     return this.messenger.call('AccountsController:getAccountByAddress', accountAddress);
+}, _BridgeStatusController_updateBridgeHistoryFromIntentOrder = function _BridgeStatusController_updateBridgeHistoryFromIntentOrder(bridgeTxMetaId, intentOrder, historyItem) {
+    const { srcChainId } = historyItem.quote;
+    // Map intent order status to bridge status using enum values
+    let statusType;
+    const isComplete = [
+        validators_1.IntentOrderStatus.CONFIRMED,
+        validators_1.IntentOrderStatus.COMPLETED,
+    ].includes(intentOrder.status);
+    const isFailed = [
+        validators_1.IntentOrderStatus.FAILED,
+        validators_1.IntentOrderStatus.EXPIRED,
+        validators_1.IntentOrderStatus.CANCELLED,
+    ].includes(intentOrder.status);
+    const isPending = [validators_1.IntentOrderStatus.PENDING].includes(intentOrder.status);
+    const isSubmitted = [validators_1.IntentOrderStatus.SUBMITTED].includes(intentOrder.status);
+    if (isComplete) {
+        statusType = bridge_controller_1.StatusTypes.COMPLETE;
+    }
+    else if (isFailed) {
+        statusType = bridge_controller_1.StatusTypes.FAILED;
+    }
+    else if (isPending) {
+        statusType = bridge_controller_1.StatusTypes.PENDING;
+    }
+    else if (isSubmitted) {
+        statusType = bridge_controller_1.StatusTypes.SUBMITTED;
+    }
+    else {
+        statusType = bridge_controller_1.StatusTypes.UNKNOWN;
+    }
+    // Extract transaction hashes from intent order
+    const txHash = intentOrder.txHash ?? '';
+    // Check metadata for additional transaction hashes
+    const metadataTxHashes = Array.isArray(intentOrder.metadata.txHashes)
+        ? intentOrder.metadata.txHashes
+        : [];
+    let allHashes;
+    if (metadataTxHashes.length > 0) {
+        allHashes = metadataTxHashes;
+    }
+    else if (txHash) {
+        allHashes = [txHash];
+    }
+    else {
+        allHashes = [];
+    }
+    const newStatus = {
+        status: statusType,
+        srcChain: {
+            chainId: srcChainId,
+            txHash: txHash ?? historyItem.status.srcChain.txHash ?? '',
+        },
+    };
+    const newBridgeHistoryItem = {
+        ...historyItem,
+        status: newStatus,
+        completionTime: newStatus.status === bridge_controller_1.StatusTypes.COMPLETE ||
+            newStatus.status === bridge_controller_1.StatusTypes.FAILED
+            ? Date.now()
+            : undefined,
+        attempts: undefined,
+        srcTxHashes: allHashes.length > 0
+            ? Array.from(new Set([...(historyItem.srcTxHashes ?? []), ...allHashes]))
+            : historyItem.srcTxHashes,
+    };
+    this.update((state) => {
+        state.txHistory[bridgeTxMetaId] = newBridgeHistoryItem;
+    });
+    // Update the actual transaction in TransactionController to sync with intent status
+    // Use the original transaction ID (not the intent: prefixed bridge history key)
+    const originalTxId = historyItem.originalTransactionId ?? historyItem.txMetaId;
+    if (originalTxId && !originalTxId.startsWith('intent:')) {
+        try {
+            const transactionStatus = (0, intent_api_1.mapIntentOrderStatusToTransactionStatus)(intentOrder.status);
+            // Merge with existing TransactionMeta to avoid wiping required fields
+            const { transactions } = this.messenger.call('TransactionController:getState');
+            const existingTxMeta = transactions.find((tx) => tx.id === originalTxId);
+            if (existingTxMeta) {
+                const updatedTxMeta = {
+                    ...existingTxMeta,
+                    status: transactionStatus,
+                    ...(txHash ? { hash: txHash } : {}),
+                    ...(txHash
+                        ? {
+                            txReceipt: {
+                                ...existingTxMeta.txReceipt,
+                                transactionHash: txHash,
+                                status: (isComplete ? '0x1' : '0x0'),
+                            },
+                        }
+                        : {}),
+                };
+                __classPrivateFieldGet(this, _BridgeStatusController_updateTransactionFn, "f").call(this, updatedTxMeta, `BridgeStatusController - Intent order status updated: ${intentOrder.status}`);
+            }
+            else {
+                console.warn('📝 [fetchIntentOrderStatus] Skipping update; transaction not found', { originalTxId, bridgeHistoryKey: bridgeTxMetaId });
+            }
+        }
+        catch (error) {
+            /* c8 ignore start */
+            console.error('📝 [fetchIntentOrderStatus] Failed to update transaction status', {
+                originalTxId,
+                bridgeHistoryKey: bridgeTxMetaId,
+                error,
+            });
+        }
+        /* c8 ignore stop */
+    }
+    const pollingToken = __classPrivateFieldGet(this, _BridgeStatusController_pollingTokensByTxMetaId, "f")[bridgeTxMetaId];
+    const isFinal = newStatus.status === bridge_controller_1.StatusTypes.COMPLETE ||
+        newStatus.status === bridge_controller_1.StatusTypes.FAILED;
+    if (isFinal && pollingToken) {
+        this.stopPollingByPollingToken(pollingToken);
+        delete __classPrivateFieldGet(this, _BridgeStatusController_pollingTokensByTxMetaId, "f")[bridgeTxMetaId];
+        if (newStatus.status === bridge_controller_1.StatusTypes.COMPLETE) {
+            __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Completed, bridgeTxMetaId);
+        }
+        else if (newStatus.status === bridge_controller_1.StatusTypes.FAILED) {
+            __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Failed, bridgeTxMetaId);
+        }
+    }
 };
 //# sourceMappingURL=bridge-status-controller.cjs.map