@metamask/bridge-status-controller 64.3.0 → 64.4.1

package/CHANGELOG.md

@@ -7,10 +7,30 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [64.4.1]
+
+### Fixed
+
+- Use `BRIDGE_PREFERRED_GAS_ESTIMATE` from `@metamask/bridge-controller` for gas price estimates to align with validation ([#7582](https://github.com/MetaMask/core/pull/7582))
+
+## [64.4.0]
+
+### Added
+
+- Add intent based transaction support ([#6547](https://github.com/MetaMask/core/pull/6547))
+
+### Changed
+
+- Bump `@metamask/transaction-controller` from `^62.7.0` to `^62.8.0` ([#7596](https://github.com/MetaMask/core/pull/7596))
+- Bump `@metamask/bridge-controller` from `^64.3.0` to `^64.4.0` ([#7596](https://github.com/MetaMask/core/pull/7596))
+- Bump `@metamask/controller-utils` from `^11.17.0` to `^11.18.0` ([#7583](https://github.com/MetaMask/core/pull/7583))
+- Bump `@metamask/network-controller` from `^27.1.0` to `^27.2.0` ([#7583](https://github.com/MetaMask/core/pull/7583))
+
 ## [64.3.0]
 
 ### Changed
 
+- **BREAKING** Use CrossChain API instead of the intent manager package for intent order submission ([#6547](https://github.com/MetaMask/core/pull/6547))
 - Bump `@metamask/snaps-controllers` from `^14.0.1` to `^17.2.0` ([#7550](https://github.com/MetaMask/core/pull/7550))
 - Upgrade `@metamask/utils` from `^11.8.1` to `^11.9.0` ([#7511](https://github.com/MetaMask/core/pull/7511))
 - Bump `@metamask/network-controller` from `^27.0.0` to `^27.1.0` ([#7534](https://github.com/MetaMask/core/pull/7534))
@@ -839,7 +859,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Initial release ([#5317](https://github.com/MetaMask/core/pull/5317))
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@64.3.0...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@64.4.1...HEAD
+[64.4.1]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@64.4.0...@metamask/bridge-status-controller@64.4.1
+[64.4.0]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@64.3.0...@metamask/bridge-status-controller@64.4.0
 [64.3.0]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@64.2.0...@metamask/bridge-status-controller@64.3.0
 [64.2.0]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@64.1.0...@metamask/bridge-status-controller@64.2.0
 [64.1.0]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@64.0.1...@metamask/bridge-status-controller@64.1.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_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_startPollingForTxId, _BridgeStatusController_getMultichainSelectedAccount, _BridgeStatusController_handleFetchFailure, _BridgeStatusController_fetchBridgeTxStatus, _BridgeStatusController_getSrcTxHash, _BridgeStatusController_updateSrcTxHash, _BridgeStatusController_wipeBridgeStatusByChainId, _BridgeStatusController_handleNonEvmTx, _BridgeStatusController_waitForHashAndReturnFinalTxMeta, _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_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");
@@ -22,8 +22,10 @@ const constants_1 = require("./constants.cjs");
 const types_1 = require("./types.cjs");
 const bridge_status_1 = require("./utils/bridge-status.cjs");
 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
@@ -180,6 +182,8 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             // We know it's in progress but not the exact status yet
             const txHistoryItem = {
                 txMetaId: bridgeTxMeta.id,
+                originalTransactionId: bridgeTxMeta
+                    .originalTransactionId || bridgeTxMeta.id, // Keep original for intent transactions
                 batchId: bridgeTxMeta.batchId,
                 quote: quoteResponse.quote,
                 startTime,
@@ -225,8 +229,9 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 return;
             }
             const { quote } = txHistoryItem;
+            const isIntent = txId.startsWith('intent:');
             const isBridgeTx = (0, bridge_controller_1.isCrossChain)(quote.srcChainId, quote.destChainId);
-            if (isBridgeTx) {
+            if (isBridgeTx || isIntent) {
                 __classPrivateFieldGet(this, _BridgeStatusController_pollingTokensByTxMetaId, "f")[txId] = this.startPolling({
                     bridgeTxMetaId: txId,
                 });
@@ -285,6 +290,11 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
         });
         _BridgeStatusController_fetchBridgeTxStatus.set(this, async ({ bridgeTxMetaId, }) => {
             const { txHistory } = this.state;
+            // Intent-based items: poll intent provider instead of Bridge API
+            if (bridgeTxMetaId.startsWith('intent:')) {
+                await __classPrivateFieldGet(this, _BridgeStatusController_fetchIntentOrderStatus, "f").call(this, { bridgeTxMetaId });
+                return;
+            }
             if ((0, bridge_status_1.shouldSkipFetchDueToFetchFailures)(txHistory[bridgeTxMetaId]?.attempts)) {
                 return;
             }
@@ -341,11 +351,38 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                     }
                 }
             }
-            catch (e) {
-                console.warn('Failed to fetch bridge tx status', e);
+            catch (error) {
+                console.warn('Failed to fetch bridge tx status', error);
                 __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
@@ -433,6 +470,35 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             }
             return finalTransactionMeta;
         });
+        // Waits until a given transaction (by id) reaches confirmed/finalized status or fails/times out.
+        _BridgeStatusController_waitForTxConfirmation.set(this, async (txId, { timeoutMs = 5 * 60000, // 5 minutes default
+        pollMs = 3000, } = {}) => {
+            /* 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) {
                 const approveTx = async () => {
@@ -486,11 +552,17 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 type: transactionType,
                 origin: 'metamask',
             };
+            // Exclude gasLimit from trade to avoid type issues (it can be null)
+            const { gasLimit: tradeGasLimit, ...tradeWithoutGasLimit } = trade;
             const transactionParams = {
-                ...trade,
+                ...tradeWithoutGasLimit,
                 chainId: hexChainId,
-                gasLimit: trade.gasLimit?.toString(),
-                gas: trade.gasLimit?.toString(),
+                // Only add gasLimit and gas if they're valid (not undefined/null/zero)
+                ...(tradeGasLimit &&
+                    tradeGasLimit !== 0 && {
+                    gasLimit: tradeGasLimit.toString(),
+                    gas: tradeGasLimit.toString(),
+                }),
             };
             const transactionParamsWithMaxGas = {
                 ...transactionParams,
@@ -508,14 +580,14 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             }
         });
         _BridgeStatusController_calculateGasFees.set(this, async (transactionParams, networkClientId, chainId, txFee) => {
-            const maxGasLimit = (0, controller_utils_1.toHex)(transactionParams.gas ?? 0);
+            const { gas } = transactionParams;
             // If txFee is provided (gasIncluded case), use the quote's gas fees
             // Convert to hex since txFee values from the quote are decimal strings
             if (txFee) {
                 return {
                     maxFeePerGas: (0, controller_utils_1.toHex)(txFee.maxFeePerGas ?? 0),
                     maxPriorityFeePerGas: (0, controller_utils_1.toHex)(txFee.maxPriorityFeePerGas ?? 0),
-                    gas: maxGasLimit,
+                    gas: gas ? (0, controller_utils_1.toHex)(gas) : undefined,
                 };
             }
             const { gasFeeEstimates } = this.messenger.call('GasFeeController:getState');
@@ -531,7 +603,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             return {
                 maxFeePerGas,
                 maxPriorityFeePerGas,
-                gas: maxGasLimit,
+                gas: gas ? (0, controller_utils_1.toHex)(gas) : undefined,
             };
         });
         /**
@@ -737,6 +809,139 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             }
             return txMeta;
         };
+        /**
+         * UI-signed intent submission (fast path): the UI generates the EIP-712 signature and calls this with the raw signature.
+         * Here we submit the order to the intent provider and create a synthetic history entry for UX.
+         *
+         * @param params - Object containing intent submission parameters
+         * @param params.quoteResponse - Quote carrying intent data
+         * @param params.signature - Hex signature produced by eth_signTypedData_v4
+         * @param params.accountAddress - The EOA submitting the order
+         * @returns A lightweight TransactionMeta-like object for history linking
+         */
+        this.submitIntent = async (params) => {
+            const { quoteResponse, signature, accountAddress } = params;
+            this.messenger.call('BridgeController:stopPollingForQuotes', bridge_controller_1.AbortReason.TransactionSubmitted);
+            // Build pre-confirmation properties for error tracking parity with submitTx
+            const account = __classPrivateFieldGet(this, _BridgeStatusController_instances, "m", _BridgeStatusController_getMultichainSelectedAccount).call(this, accountAddress);
+            const isHardwareAccount = Boolean(account) && (0, bridge_controller_1.isHardwareWallet)(account);
+            const preConfirmationProperties = (0, metrics_1.getPreConfirmationPropertiesFromQuote)(quoteResponse, false, isHardwareAccount);
+            try {
+                const { intent } = quoteResponse
+                    .quote;
+                if (!intent) {
+                    throw new Error('submitIntent: missing intent data');
+                }
+                // If backend provided an approval tx for this intent quote, submit it first (on-chain),
+                // then proceed with off-chain intent submission.
+                let approvalTxId;
+                if (quoteResponse.approval) {
+                    const isBridgeTx = (0, bridge_controller_1.isCrossChain)(quoteResponse.quote.srcChainId, quoteResponse.quote.destChainId);
+                    // Handle approval silently for better UX in intent flows
+                    const approvalTxMeta = await __classPrivateFieldGet(this, _BridgeStatusController_handleApprovalTx, "f").call(this, isBridgeTx, quoteResponse.quote.srcChainId, quoteResponse.approval && (0, bridge_controller_1.isEvmTxData)(quoteResponse.approval)
+                        ? quoteResponse.approval
+                        : undefined, quoteResponse.resetApproval, 
+                    /* requireApproval */ false);
+                    approvalTxId = approvalTxMeta?.id;
+                    if (approvalTxId) {
+                        await __classPrivateFieldGet(this, _BridgeStatusController_waitForTxConfirmation, "f").call(this, approvalTxId);
+                    }
+                }
+                const { srcChainId: chainId, requestId } = quoteResponse.quote;
+                const submissionParams = {
+                    srcChainId: chainId.toString(),
+                    quoteId: requestId,
+                    signature,
+                    order: intent.order,
+                    userAddress: accountAddress,
+                    aggregatorId: intent.protocol,
+                };
+                const intentApi = new intent_api_1.IntentApiImpl(__classPrivateFieldGet(this, _BridgeStatusController_config, "f").customBridgeApiBaseUrl, __classPrivateFieldGet(this, _BridgeStatusController_fetchFn, "f"));
+                const intentOrder = await intentApi.submitIntent(submissionParams, __classPrivateFieldGet(this, _BridgeStatusController_clientId, "f"));
+                const orderUid = intentOrder.id;
+                // Determine transaction type: swap for same-chain, bridge for cross-chain
+                const isCrossChainTx = (0, bridge_controller_1.isCrossChain)(quoteResponse.quote.srcChainId, quoteResponse.quote.destChainId);
+                const transactionType = isCrossChainTx
+                    ? transaction_controller_1.TransactionType.bridge
+                    : transaction_controller_1.TransactionType.swap;
+                // Create actual transaction in Transaction Controller first
+                const networkClientId = this.messenger.call('NetworkController:findNetworkClientIdByChainId', (0, bridge_controller_1.formatChainIdToHex)(chainId));
+                // This is a synthetic transaction whose purpose is to be able
+                // to track the order status via the history
+                const intentTransactionParams = {
+                    chainId: (0, bridge_controller_1.formatChainIdToHex)(chainId),
+                    from: accountAddress,
+                    to: intent.settlementContract ??
+                        '0x9008D19f58AAbd9eD0D60971565AA8510560ab41', // Default settlement contract
+                    data: `0x${orderUid.slice(-8)}`, // Use last 8 chars of orderUid to make each transaction unique
+                    value: '0x0',
+                    gas: '0x5208', // Minimal gas for display purposes
+                    gasPrice: '0x3b9aca00', // 1 Gwei - will be converted to EIP-1559 fees if network supports it
+                };
+                const { transactionMeta: txMetaPromise } = await __classPrivateFieldGet(this, _BridgeStatusController_addTransactionFn, "f").call(this, intentTransactionParams, {
+                    origin: 'metamask',
+                    actionId: (0, transaction_1.generateActionId)(),
+                    requireApproval: false,
+                    isStateOnly: true,
+                    networkClientId,
+                    type: transactionType,
+                });
+                const intentTxMeta = txMetaPromise;
+                // Map intent order status to TransactionController status
+                const initialTransactionStatus = (0, intent_api_1.mapIntentOrderStatusToTransactionStatus)(intentOrder.status);
+                // Update transaction with proper initial status based on intent order
+                const statusUpdatedTxMeta = {
+                    ...intentTxMeta,
+                    status: initialTransactionStatus,
+                };
+                // Update with actual transaction metadata
+                const syntheticMeta = {
+                    ...statusUpdatedTxMeta,
+                    isIntentTx: true,
+                    orderUid,
+                    intentType: isCrossChainTx ? 'bridge' : 'swap',
+                };
+                // Record in bridge history with actual transaction metadata
+                try {
+                    // 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, // Use intent: prefix for bridge history key
+                        originalTransactionId: syntheticMeta.id, // Keep original txId for TransactionController updates
+                    };
+                    const startTime = Date.now();
+                    __classPrivateFieldGet(this, _BridgeStatusController_addTxToHistory, "f").call(this, {
+                        accountAddress,
+                        bridgeTxMeta: bridgeTxMetaForHistory,
+                        statusRequest: {
+                            ...(0, transaction_1.getStatusRequestParams)(quoteResponse),
+                            srcTxHash: syntheticMeta.hash ?? '',
+                        },
+                        quoteResponse,
+                        slippagePercentage: 0,
+                        isStxEnabled: false,
+                        approvalTxId,
+                        startTime,
+                    });
+                    // Start polling using the intent: prefixed key to route to intent manager
+                    __classPrivateFieldGet(this, _BridgeStatusController_startPollingForTxId, "f").call(this, bridgeHistoryKey);
+                }
+                catch (error) {
+                    console.error('📝 [submitIntent] Failed to add to bridge history', error);
+                    // non-fatal but log the error
+                }
+                return syntheticMeta;
+            }
+            catch (error) {
+                __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Failed, undefined, {
+                    error_message: error?.message,
+                    ...preConfirmationProperties,
+                });
+                throw error;
+            }
+        };
         /**
          * Tracks post-submission events for a cross-chain swap based on the history item
          *
@@ -762,13 +967,12 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             const requestParamProperties = (0, metrics_1.getRequestParamFromHistory)(historyItem);
             // Always publish StatusValidationFailed event, regardless of featureId
             if (eventName === bridge_controller_1.UnifiedSwapBridgeEventName.StatusValidationFailed) {
-                const { chain_id_source, chain_id_destination, token_address_source, token_address_destination, } = requestParamProperties;
                 this.messenger.call('BridgeController:trackUnifiedSwapBridgeEvent', eventName, {
                     ...baseProperties,
-                    chain_id_source,
-                    chain_id_destination,
-                    token_address_source,
-                    token_address_destination,
+                    chain_id_source: requestParamProperties.chain_id_source,
+                    chain_id_destination: requestParamProperties.chain_id_destination,
+                    token_address_source: requestParamProperties.token_address_source,
+                    token_address_destination: requestParamProperties.token_address_destination,
                     refresh_count: historyItem.attempts?.counter ?? 0,
                 });
                 return;
@@ -779,8 +983,8 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             }
             const selectedAccount = this.messenger.call('AccountsController:getAccountByAddress', historyItem.account);
             const { transactions } = this.messenger.call('TransactionController:getState');
-            const txMeta = transactions?.find(({ id }) => id === txMetaId);
-            const approvalTxMeta = transactions?.find(({ id }) => id === historyItem.approvalTxId);
+            const txMeta = transactions?.find((tx) => tx.id === txMetaId);
+            const approvalTxMeta = transactions?.find((tx) => tx.id === historyItem.approvalTxId);
             const requiredEventProperties = {
                 ...baseProperties,
                 ...requestParamProperties,
@@ -807,6 +1011,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
         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));
         // Set interval
@@ -849,7 +1054,128 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
     }
 }
 exports.BridgeStatusController = BridgeStatusController;
-_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_startPollingForTxId = 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_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_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