@metamask/bridge-status-controller 68.0.2 → 69.0.0

package/dist/bridge-status-controller.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"bridge-status-controller.d.mts","sourceRoot":"","sources":["../src/bridge-status-controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"bridge-status-controller.d.mts","sourceRoot":"","sources":["../src/bridge-status-controller.ts"],"names":[],"mappings":"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"}

package/dist/bridge-status-controller.intent.cjs

@@ -30,12 +30,9 @@ class IntentManager {
          * @param clientId - The client ID.
          * @returns The intent order mapped status.
          */
-        this.getIntentTransactionStatus = async (bridgeTxMetaId, historyItem, clientId) => {
-            const { status: statusObj, quote: { srcChainId, intent }, } = historyItem;
-            const txHash = statusObj?.srcChain?.txHash ?? '';
-            const protocol = intent?.protocol ?? '';
+        this.getIntentTransactionStatus = async (bridgeTxMetaId, srcChainId, protocol, clientId, txHash = '') => {
             try {
-                const orderStatus = await this.intentApi.getOrderStatus(bridgeTxMetaId, protocol, srcChainId.toString(), clientId);
+                const orderStatus = await this.intentApi.getOrderStatus(bridgeTxMetaId, protocol, srcChainId, clientId);
                 return __classPrivateFieldGet(this, _IntentManager_instances, "m", _IntentManager_setIntentStatuses).call(this, bridgeTxMetaId, orderStatus, srcChainId, txHash.toString());
             }
             catch (error) {
@@ -121,7 +118,7 @@ class IntentManager {
 }
 exports.IntentManager = IntentManager;
 _IntentManager_messenger = new WeakMap(), _IntentManager_updateTransactionFn = new WeakMap(), _IntentManager_intentStatusesByBridgeTxMetaId = new WeakMap(), _IntentManager_instances = new WeakSet(), _IntentManager_setIntentStatuses = function _IntentManager_setIntentStatuses(bridgeTxMetaId, order, srcChainId, txHash) {
-    const bridgeStatus = (0, intent_api_1.translateIntentOrderToBridgeStatus)(order, srcChainId, txHash.toString());
+    const bridgeStatus = (0, intent_api_1.translateIntentOrderToBridgeStatus)(order, srcChainId, txHash);
     const intentStatuses = {
         orderStatus: order.status,
         bridgeStatus,

package/dist/bridge-status-controller.intent.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"bridge-status-controller.intent.cjs","sourceRoot":"","sources":["../src/bridge-status-controller.intent.ts"],"names":[],"mappings":"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","sourcesContent":["import { StatusTypes } from '@metamask/bridge-controller';\nimport type { TransactionController } from '@metamask/transaction-controller';\nimport { TransactionMeta } from '@metamask/transaction-controller';\n\nimport type { BridgeStatusControllerMessenger, FetchFunction } from './types';\nimport type { BridgeHistoryItem } from './types';\nimport {\n  GetJwtFn,\n  IntentApi,\n  IntentApiImpl,\n  IntentBridgeStatus,\n  IntentSubmissionParams,\n  translateIntentOrderToBridgeStatus,\n} from './utils/intent-api';\nimport { IntentOrder, IntentOrderStatus } from './utils/validators';\n\ntype IntentStatuses = {\n  orderStatus: IntentOrderStatus;\n  bridgeStatus: IntentBridgeStatus | null;\n};\n\nexport class IntentManager {\n  readonly #messenger: BridgeStatusControllerMessenger;\n\n  readonly #updateTransactionFn: typeof TransactionController.prototype.updateTransaction;\n\n  readonly intentApi: IntentApi;\n\n  readonly #intentStatusesByBridgeTxMetaId: Map<string, IntentStatuses> =\n    new Map();\n\n  constructor({\n    messenger,\n    updateTransactionFn,\n    customBridgeApiBaseUrl,\n    fetchFn,\n    getJwt,\n  }: {\n    messenger: BridgeStatusControllerMessenger;\n    updateTransactionFn: typeof TransactionController.prototype.updateTransaction;\n    customBridgeApiBaseUrl: string;\n    fetchFn: FetchFunction;\n    getJwt: GetJwtFn;\n  }) {\n    this.#messenger = messenger;\n    this.#updateTransactionFn = updateTransactionFn;\n    this.intentApi = new IntentApiImpl(customBridgeApiBaseUrl, fetchFn, getJwt);\n  }\n\n  /**\n   * Set the intent statuses for a given bridge transaction.\n   *\n   * @param bridgeTxMetaId - The bridge transaction meta ID (key for storage).\n   * @param order - The intent order.\n   * @param srcChainId - The source chain ID.\n   * @param txHash - The transaction hash.\n   * @returns The intent statuses.\n   */\n\n  #setIntentStatuses(\n    bridgeTxMetaId: string,\n    order: IntentOrder,\n    srcChainId: number,\n    txHash: string,\n  ): IntentStatuses {\n    const bridgeStatus = translateIntentOrderToBridgeStatus(\n      order,\n      srcChainId,\n      txHash.toString(),\n    );\n    const intentStatuses: IntentStatuses = {\n      orderStatus: order.status,\n      bridgeStatus,\n    };\n    this.#intentStatusesByBridgeTxMetaId.set(bridgeTxMetaId, intentStatuses);\n    return intentStatuses;\n  }\n\n  /**\n   * Get the status of an intent order.\n   *\n   * @param bridgeTxMetaId - The bridge transaction meta ID.\n   * @param protocol - The protocol of the intent.\n   * @param clientId - The client ID.\n   * @returns The intent order mapped status.\n   */\n\n  getIntentTransactionStatus = async (\n    bridgeTxMetaId: string,\n    historyItem: BridgeHistoryItem,\n    clientId: string,\n  ): Promise<IntentStatuses | undefined> => {\n    const {\n      status: statusObj,\n      quote: { srcChainId, intent },\n    } = historyItem;\n    const txHash = statusObj?.srcChain?.txHash ?? '';\n    const protocol = intent?.protocol ?? '';\n\n    try {\n      const orderStatus = await this.intentApi.getOrderStatus(\n        bridgeTxMetaId,\n        protocol,\n        srcChainId.toString(),\n        clientId,\n      );\n\n      return this.#setIntentStatuses(\n        bridgeTxMetaId,\n        orderStatus,\n        srcChainId,\n        txHash.toString(),\n      );\n    } catch (error: unknown) {\n      if (error instanceof Error) {\n        throw new Error(\n          `[Intent polling] Failed to get intent order status from API: ${error.message}`,\n        );\n      }\n      return undefined;\n    }\n  };\n\n  /**\n   * Sync the transaction status from the intent status.\n   *\n   * @param bridgeTxMetaId - The bridge transaction meta ID.\n   * @param historyItem - The history item.\n   */\n\n  syncTransactionFromIntentStatus = (\n    bridgeTxMetaId: string,\n    historyItem: BridgeHistoryItem,\n  ): void => {\n    // Update the actual transaction in TransactionController to sync with intent status\n    // Use the original transaction ID (not the bridge history key)\n    const originalTxId =\n      historyItem.originalTransactionId ?? historyItem.txMetaId;\n    if (!originalTxId) {\n      return;\n    }\n\n    const intentStatuses =\n      this.#intentStatusesByBridgeTxMetaId.get(bridgeTxMetaId);\n    if (!intentStatuses) {\n      return;\n    }\n\n    try {\n      // Merge with existing TransactionMeta to avoid wiping required fields\n      const { transactions } = this.#messenger.call(\n        'TransactionController:getState',\n      );\n      const existingTxMeta = transactions.find(\n        (tx: TransactionMeta) => tx.id === originalTxId,\n      );\n      if (!existingTxMeta) {\n        console.warn(\n          '[Intent polling] Skipping update, transaction not found',\n          { originalTxId, bridgeHistoryKey: bridgeTxMetaId },\n        );\n        return;\n      }\n      const { bridgeStatus, orderStatus } = intentStatuses;\n      const txHash = bridgeStatus?.txHash;\n      const isComplete = bridgeStatus?.status.status === StatusTypes.COMPLETE;\n      const isFinalStatus =\n        bridgeStatus?.status.status === StatusTypes.COMPLETE ||\n        bridgeStatus?.status.status === StatusTypes.FAILED;\n      const existingTxReceipt = (\n        existingTxMeta as { txReceipt?: Record<string, unknown> }\n      ).txReceipt;\n      const txReceiptUpdate = txHash\n        ? {\n            txReceipt: {\n              ...existingTxReceipt,\n              transactionHash: txHash,\n              status: (isComplete ? '0x1' : '0x0') as unknown as string,\n            },\n          }\n        : {};\n\n      const updatedTxMeta: TransactionMeta = {\n        ...existingTxMeta,\n        status: bridgeStatus?.transactionStatus,\n        ...(txHash ? { hash: txHash } : {}),\n        ...txReceiptUpdate,\n      } as TransactionMeta;\n\n      this.#updateTransactionFn(\n        updatedTxMeta,\n        `BridgeStatusController - Intent order status updated: ${orderStatus}`,\n      );\n\n      if (isFinalStatus) {\n        this.#intentStatusesByBridgeTxMetaId.delete(bridgeTxMetaId);\n      }\n    } catch (error) {\n      console.error('[Intent polling] Failed to update transaction status', {\n        originalTxId,\n        bridgeHistoryKey: bridgeTxMetaId,\n        error,\n      });\n    }\n  };\n\n  /**\n   * Submit an intent order.\n   *\n   * @param submissionParams - The submission parameters.\n   * @param clientId - The client ID.\n   * @returns The intent order.\n   */\n  submitIntent = async (\n    submissionParams: IntentSubmissionParams,\n    clientId: string,\n  ): Promise<IntentOrder> => {\n    return this.intentApi.submitIntent(submissionParams, clientId);\n  };\n}\n"]}
+{"version":3,"file":"bridge-status-controller.intent.cjs","sourceRoot":"","sources":["../src/bridge-status-controller.intent.ts"],"names":[],"mappings":"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","sourcesContent":["import { BridgeClientId, StatusTypes } from '@metamask/bridge-controller';\nimport type { TransactionController } from '@metamask/transaction-controller';\nimport { TransactionMeta } from '@metamask/transaction-controller';\n\nimport type { BridgeStatusControllerMessenger, FetchFunction } from './types';\nimport type { BridgeHistoryItem } from './types';\nimport {\n  GetJwtFn,\n  IntentApi,\n  IntentApiImpl,\n  IntentBridgeStatus,\n  IntentSubmissionParams,\n  translateIntentOrderToBridgeStatus,\n} from './utils/intent-api';\nimport { IntentStatusResponse, IntentOrderStatus } from './utils/validators';\n\ntype IntentStatuses = {\n  orderStatus: IntentOrderStatus;\n  bridgeStatus: IntentBridgeStatus | null;\n};\n\nexport class IntentManager {\n  readonly #messenger: BridgeStatusControllerMessenger;\n\n  readonly #updateTransactionFn: typeof TransactionController.prototype.updateTransaction;\n\n  readonly intentApi: IntentApi;\n\n  readonly #intentStatusesByBridgeTxMetaId: Map<string, IntentStatuses> =\n    new Map();\n\n  constructor({\n    messenger,\n    updateTransactionFn,\n    customBridgeApiBaseUrl,\n    fetchFn,\n    getJwt,\n  }: {\n    messenger: BridgeStatusControllerMessenger;\n    updateTransactionFn: typeof TransactionController.prototype.updateTransaction;\n    customBridgeApiBaseUrl: string;\n    fetchFn: FetchFunction;\n    getJwt: GetJwtFn;\n  }) {\n    this.#messenger = messenger;\n    this.#updateTransactionFn = updateTransactionFn;\n    this.intentApi = new IntentApiImpl(customBridgeApiBaseUrl, fetchFn, getJwt);\n  }\n\n  /**\n   * Set the intent statuses for a given bridge transaction.\n   *\n   * @param bridgeTxMetaId - The bridge transaction meta ID (key for storage).\n   * @param order - The intent order.\n   * @param srcChainId - The source chain ID.\n   * @param txHash - The transaction hash.\n   * @returns The intent statuses.\n   */\n\n  #setIntentStatuses(\n    bridgeTxMetaId: string,\n    order: IntentStatusResponse,\n    srcChainId: number,\n    txHash: string,\n  ): IntentStatuses {\n    const bridgeStatus = translateIntentOrderToBridgeStatus(\n      order,\n      srcChainId,\n      txHash,\n    );\n    const intentStatuses: IntentStatuses = {\n      orderStatus: order.status,\n      bridgeStatus,\n    };\n    this.#intentStatusesByBridgeTxMetaId.set(bridgeTxMetaId, intentStatuses);\n    return intentStatuses;\n  }\n\n  /**\n   * Get the status of an intent order.\n   *\n   * @param bridgeTxMetaId - The bridge transaction meta ID.\n   * @param protocol - The protocol of the intent.\n   * @param clientId - The client ID.\n   * @returns The intent order mapped status.\n   */\n\n  getIntentTransactionStatus = async (\n    bridgeTxMetaId: string,\n    srcChainId: number,\n    protocol: string,\n    clientId: BridgeClientId,\n    txHash: string = '',\n  ): Promise<IntentStatuses | undefined> => {\n    try {\n      const orderStatus = await this.intentApi.getOrderStatus(\n        bridgeTxMetaId,\n        protocol,\n        srcChainId,\n        clientId,\n      );\n\n      return this.#setIntentStatuses(\n        bridgeTxMetaId,\n        orderStatus,\n        srcChainId,\n        txHash.toString(),\n      );\n    } catch (error: unknown) {\n      if (error instanceof Error) {\n        throw new Error(\n          `[Intent polling] Failed to get intent order status from API: ${error.message}`,\n        );\n      }\n      return undefined;\n    }\n  };\n\n  /**\n   * Sync the transaction status from the intent status.\n   *\n   * @param bridgeTxMetaId - The bridge transaction meta ID.\n   * @param historyItem - The history item.\n   */\n\n  syncTransactionFromIntentStatus = (\n    bridgeTxMetaId: string,\n    historyItem: BridgeHistoryItem,\n  ): void => {\n    // Update the actual transaction in TransactionController to sync with intent status\n    // Use the original transaction ID (not the bridge history key)\n    const originalTxId =\n      historyItem.originalTransactionId ?? historyItem.txMetaId;\n    if (!originalTxId) {\n      return;\n    }\n\n    const intentStatuses =\n      this.#intentStatusesByBridgeTxMetaId.get(bridgeTxMetaId);\n    if (!intentStatuses) {\n      return;\n    }\n\n    try {\n      // Merge with existing TransactionMeta to avoid wiping required fields\n      const { transactions } = this.#messenger.call(\n        'TransactionController:getState',\n      );\n      const existingTxMeta = transactions.find(\n        (tx: TransactionMeta) => tx.id === originalTxId,\n      );\n      if (!existingTxMeta) {\n        console.warn(\n          '[Intent polling] Skipping update, transaction not found',\n          { originalTxId, bridgeHistoryKey: bridgeTxMetaId },\n        );\n        return;\n      }\n      const { bridgeStatus, orderStatus } = intentStatuses;\n      const txHash = bridgeStatus?.txHash;\n      const isComplete = bridgeStatus?.status.status === StatusTypes.COMPLETE;\n      const isFinalStatus =\n        bridgeStatus?.status.status === StatusTypes.COMPLETE ||\n        bridgeStatus?.status.status === StatusTypes.FAILED;\n      const existingTxReceipt = (\n        existingTxMeta as { txReceipt?: Record<string, unknown> }\n      ).txReceipt;\n      const txReceiptUpdate = txHash\n        ? {\n            txReceipt: {\n              ...existingTxReceipt,\n              transactionHash: txHash,\n              status: (isComplete ? '0x1' : '0x0') as unknown as string,\n            },\n          }\n        : {};\n\n      const updatedTxMeta: TransactionMeta = {\n        ...existingTxMeta,\n        status: bridgeStatus?.transactionStatus,\n        ...(txHash ? { hash: txHash } : {}),\n        ...txReceiptUpdate,\n      } as TransactionMeta;\n\n      this.#updateTransactionFn(\n        updatedTxMeta,\n        `BridgeStatusController - Intent order status updated: ${orderStatus}`,\n      );\n\n      if (isFinalStatus) {\n        this.#intentStatusesByBridgeTxMetaId.delete(bridgeTxMetaId);\n      }\n    } catch (error) {\n      console.error('[Intent polling] Failed to update transaction status', {\n        originalTxId,\n        bridgeHistoryKey: bridgeTxMetaId,\n        error,\n      });\n    }\n  };\n\n  /**\n   * Submit an intent order.\n   *\n   * @param submissionParams - The submission parameters.\n   * @param clientId - The client ID.\n   * @returns The intent order.\n   */\n  submitIntent = async (\n    submissionParams: IntentSubmissionParams,\n    clientId: BridgeClientId,\n  ): Promise<IntentStatusResponse> => {\n    return this.intentApi.submitIntent(submissionParams, clientId);\n  };\n}\n"]}

package/dist/bridge-status-controller.intent.d.cts

@@ -1,8 +1,9 @@
+import { BridgeClientId } from "@metamask/bridge-controller";
 import type { TransactionController } from "@metamask/transaction-controller";
 import type { BridgeStatusControllerMessenger, FetchFunction } from "./types.cjs";
 import type { BridgeHistoryItem } from "./types.cjs";
 import { GetJwtFn, IntentApi, IntentBridgeStatus, IntentSubmissionParams } from "./utils/intent-api.cjs";
-import { IntentOrder, IntentOrderStatus } from "./utils/validators.cjs";
+import { IntentStatusResponse, IntentOrderStatus } from "./utils/validators.cjs";
 type IntentStatuses = {
     orderStatus: IntentOrderStatus;
     bridgeStatus: IntentBridgeStatus | null;
@@ -25,7 +26,7 @@ export declare class IntentManager {
      * @param clientId - The client ID.
      * @returns The intent order mapped status.
      */
-    getIntentTransactionStatus: (bridgeTxMetaId: string, historyItem: BridgeHistoryItem, clientId: string) => Promise<IntentStatuses | undefined>;
+    getIntentTransactionStatus: (bridgeTxMetaId: string, srcChainId: number, protocol: string, clientId: BridgeClientId, txHash?: string) => Promise<IntentStatuses | undefined>;
     /**
      * Sync the transaction status from the intent status.
      *
@@ -40,7 +41,7 @@ export declare class IntentManager {
      * @param clientId - The client ID.
      * @returns The intent order.
      */
-    submitIntent: (submissionParams: IntentSubmissionParams, clientId: string) => Promise<IntentOrder>;
+    submitIntent: (submissionParams: IntentSubmissionParams, clientId: BridgeClientId) => Promise<IntentStatusResponse>;
 }
 export {};
 //# sourceMappingURL=bridge-status-controller.intent.d.cts.map

package/dist/bridge-status-controller.intent.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"bridge-status-controller.intent.d.cts","sourceRoot":"","sources":["../src/bridge-status-controller.intent.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,yCAAyC;AAG9E,OAAO,KAAK,EAAE,+BAA+B,EAAE,aAAa,EAAE,oBAAgB;AAC9E,OAAO,KAAK,EAAE,iBAAiB,EAAE,oBAAgB;AACjD,OAAO,EACL,QAAQ,EACR,SAAS,EAET,kBAAkB,EAClB,sBAAsB,EAEvB,+BAA2B;AAC5B,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,+BAA2B;AAEpE,KAAK,cAAc,GAAG;IACpB,WAAW,EAAE,iBAAiB,CAAC;IAC/B,YAAY,EAAE,kBAAkB,GAAG,IAAI,CAAC;CACzC,CAAC;AAEF,qBAAa,aAAa;;IAKxB,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;gBAKlB,EACV,SAAS,EACT,mBAAmB,EACnB,sBAAsB,EACtB,OAAO,EACP,MAAM,GACP,EAAE;QACD,SAAS,EAAE,+BAA+B,CAAC;QAC3C,mBAAmB,EAAE,OAAO,qBAAqB,CAAC,SAAS,CAAC,iBAAiB,CAAC;QAC9E,sBAAsB,EAAE,MAAM,CAAC;QAC/B,OAAO,EAAE,aAAa,CAAC;QACvB,MAAM,EAAE,QAAQ,CAAC;KAClB;IAmCD;;;;;;;OAOG;IAEH,0BAA0B,mBACR,MAAM,eACT,iBAAiB,YACpB,MAAM,KACf,QAAQ,cAAc,GAAG,SAAS,CAAC,CA8BpC;IAEF;;;;;OAKG;IAEH,+BAA+B,mBACb,MAAM,eACT,iBAAiB,KAC7B,IAAI,CAuEL;IAEF;;;;;;OAMG;IACH,YAAY,qBACQ,sBAAsB,YAC9B,MAAM,KACf,QAAQ,WAAW,CAAC,CAErB;CACH"}
+{"version":3,"file":"bridge-status-controller.intent.d.cts","sourceRoot":"","sources":["../src/bridge-status-controller.intent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAe,oCAAoC;AAC1E,OAAO,KAAK,EAAE,qBAAqB,EAAE,yCAAyC;AAG9E,OAAO,KAAK,EAAE,+BAA+B,EAAE,aAAa,EAAE,oBAAgB;AAC9E,OAAO,KAAK,EAAE,iBAAiB,EAAE,oBAAgB;AACjD,OAAO,EACL,QAAQ,EACR,SAAS,EAET,kBAAkB,EAClB,sBAAsB,EAEvB,+BAA2B;AAC5B,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,+BAA2B;AAE7E,KAAK,cAAc,GAAG;IACpB,WAAW,EAAE,iBAAiB,CAAC;IAC/B,YAAY,EAAE,kBAAkB,GAAG,IAAI,CAAC;CACzC,CAAC;AAEF,qBAAa,aAAa;;IAKxB,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;gBAKlB,EACV,SAAS,EACT,mBAAmB,EACnB,sBAAsB,EACtB,OAAO,EACP,MAAM,GACP,EAAE;QACD,SAAS,EAAE,+BAA+B,CAAC;QAC3C,mBAAmB,EAAE,OAAO,qBAAqB,CAAC,SAAS,CAAC,iBAAiB,CAAC;QAC9E,sBAAsB,EAAE,MAAM,CAAC;QAC/B,OAAO,EAAE,aAAa,CAAC;QACvB,MAAM,EAAE,QAAQ,CAAC;KAClB;IAmCD;;;;;;;OAOG;IAEH,0BAA0B,mBACR,MAAM,cACV,MAAM,YACR,MAAM,YACN,cAAc,WAChB,MAAM,KACb,QAAQ,cAAc,GAAG,SAAS,CAAC,CAuBpC;IAEF;;;;;OAKG;IAEH,+BAA+B,mBACb,MAAM,eACT,iBAAiB,KAC7B,IAAI,CAuEL;IAEF;;;;;;OAMG;IACH,YAAY,qBACQ,sBAAsB,YAC9B,cAAc,KACvB,QAAQ,oBAAoB,CAAC,CAE9B;CACH"}

package/dist/bridge-status-controller.intent.d.mts

@@ -1,8 +1,9 @@
+import { BridgeClientId } from "@metamask/bridge-controller";
 import type { TransactionController } from "@metamask/transaction-controller";
 import type { BridgeStatusControllerMessenger, FetchFunction } from "./types.mjs";
 import type { BridgeHistoryItem } from "./types.mjs";
 import { GetJwtFn, IntentApi, IntentBridgeStatus, IntentSubmissionParams } from "./utils/intent-api.mjs";
-import { IntentOrder, IntentOrderStatus } from "./utils/validators.mjs";
+import { IntentStatusResponse, IntentOrderStatus } from "./utils/validators.mjs";
 type IntentStatuses = {
     orderStatus: IntentOrderStatus;
     bridgeStatus: IntentBridgeStatus | null;
@@ -25,7 +26,7 @@ export declare class IntentManager {
      * @param clientId - The client ID.
      * @returns The intent order mapped status.
      */
-    getIntentTransactionStatus: (bridgeTxMetaId: string, historyItem: BridgeHistoryItem, clientId: string) => Promise<IntentStatuses | undefined>;
+    getIntentTransactionStatus: (bridgeTxMetaId: string, srcChainId: number, protocol: string, clientId: BridgeClientId, txHash?: string) => Promise<IntentStatuses | undefined>;
     /**
      * Sync the transaction status from the intent status.
      *
@@ -40,7 +41,7 @@ export declare class IntentManager {
      * @param clientId - The client ID.
      * @returns The intent order.
      */
-    submitIntent: (submissionParams: IntentSubmissionParams, clientId: string) => Promise<IntentOrder>;
+    submitIntent: (submissionParams: IntentSubmissionParams, clientId: BridgeClientId) => Promise<IntentStatusResponse>;
 }
 export {};
 //# sourceMappingURL=bridge-status-controller.intent.d.mts.map

package/dist/bridge-status-controller.intent.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"bridge-status-controller.intent.d.mts","sourceRoot":"","sources":["../src/bridge-status-controller.intent.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,yCAAyC;AAG9E,OAAO,KAAK,EAAE,+BAA+B,EAAE,aAAa,EAAE,oBAAgB;AAC9E,OAAO,KAAK,EAAE,iBAAiB,EAAE,oBAAgB;AACjD,OAAO,EACL,QAAQ,EACR,SAAS,EAET,kBAAkB,EAClB,sBAAsB,EAEvB,+BAA2B;AAC5B,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,+BAA2B;AAEpE,KAAK,cAAc,GAAG;IACpB,WAAW,EAAE,iBAAiB,CAAC;IAC/B,YAAY,EAAE,kBAAkB,GAAG,IAAI,CAAC;CACzC,CAAC;AAEF,qBAAa,aAAa;;IAKxB,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;gBAKlB,EACV,SAAS,EACT,mBAAmB,EACnB,sBAAsB,EACtB,OAAO,EACP,MAAM,GACP,EAAE;QACD,SAAS,EAAE,+BAA+B,CAAC;QAC3C,mBAAmB,EAAE,OAAO,qBAAqB,CAAC,SAAS,CAAC,iBAAiB,CAAC;QAC9E,sBAAsB,EAAE,MAAM,CAAC;QAC/B,OAAO,EAAE,aAAa,CAAC;QACvB,MAAM,EAAE,QAAQ,CAAC;KAClB;IAmCD;;;;;;;OAOG;IAEH,0BAA0B,mBACR,MAAM,eACT,iBAAiB,YACpB,MAAM,KACf,QAAQ,cAAc,GAAG,SAAS,CAAC,CA8BpC;IAEF;;;;;OAKG;IAEH,+BAA+B,mBACb,MAAM,eACT,iBAAiB,KAC7B,IAAI,CAuEL;IAEF;;;;;;OAMG;IACH,YAAY,qBACQ,sBAAsB,YAC9B,MAAM,KACf,QAAQ,WAAW,CAAC,CAErB;CACH"}
+{"version":3,"file":"bridge-status-controller.intent.d.mts","sourceRoot":"","sources":["../src/bridge-status-controller.intent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAe,oCAAoC;AAC1E,OAAO,KAAK,EAAE,qBAAqB,EAAE,yCAAyC;AAG9E,OAAO,KAAK,EAAE,+BAA+B,EAAE,aAAa,EAAE,oBAAgB;AAC9E,OAAO,KAAK,EAAE,iBAAiB,EAAE,oBAAgB;AACjD,OAAO,EACL,QAAQ,EACR,SAAS,EAET,kBAAkB,EAClB,sBAAsB,EAEvB,+BAA2B;AAC5B,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,+BAA2B;AAE7E,KAAK,cAAc,GAAG;IACpB,WAAW,EAAE,iBAAiB,CAAC;IAC/B,YAAY,EAAE,kBAAkB,GAAG,IAAI,CAAC;CACzC,CAAC;AAEF,qBAAa,aAAa;;IAKxB,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;gBAKlB,EACV,SAAS,EACT,mBAAmB,EACnB,sBAAsB,EACtB,OAAO,EACP,MAAM,GACP,EAAE;QACD,SAAS,EAAE,+BAA+B,CAAC;QAC3C,mBAAmB,EAAE,OAAO,qBAAqB,CAAC,SAAS,CAAC,iBAAiB,CAAC;QAC9E,sBAAsB,EAAE,MAAM,CAAC;QAC/B,OAAO,EAAE,aAAa,CAAC;QACvB,MAAM,EAAE,QAAQ,CAAC;KAClB;IAmCD;;;;;;;OAOG;IAEH,0BAA0B,mBACR,MAAM,cACV,MAAM,YACR,MAAM,YACN,cAAc,WAChB,MAAM,KACb,QAAQ,cAAc,GAAG,SAAS,CAAC,CAuBpC;IAEF;;;;;OAKG;IAEH,+BAA+B,mBACb,MAAM,eACT,iBAAiB,KAC7B,IAAI,CAuEL;IAEF;;;;;;OAMG;IACH,YAAY,qBACQ,sBAAsB,YAC9B,cAAc,KACvB,QAAQ,oBAAoB,CAAC,CAE9B;CACH"}

package/dist/bridge-status-controller.intent.mjs

@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _IntentManager_instances, _IntentManager_messenger, _IntentManager_updateTransactionFn, _IntentManager_intentStatusesByBridgeTxMetaId, _IntentManager_setIntentStatuses;
-import { StatusTypes } from "@metamask/bridge-controller";
+import { BridgeClientId, StatusTypes } from "@metamask/bridge-controller";
 import { IntentApiImpl, translateIntentOrderToBridgeStatus } from "./utils/intent-api.mjs";
 import { IntentOrderStatus } from "./utils/validators.mjs";
 export class IntentManager {
@@ -27,12 +27,9 @@ export class IntentManager {
          * @param clientId - The client ID.
          * @returns The intent order mapped status.
          */
-        this.getIntentTransactionStatus = async (bridgeTxMetaId, historyItem, clientId) => {
-            const { status: statusObj, quote: { srcChainId, intent }, } = historyItem;
-            const txHash = statusObj?.srcChain?.txHash ?? '';
-            const protocol = intent?.protocol ?? '';
+        this.getIntentTransactionStatus = async (bridgeTxMetaId, srcChainId, protocol, clientId, txHash = '') => {
             try {
-                const orderStatus = await this.intentApi.getOrderStatus(bridgeTxMetaId, protocol, srcChainId.toString(), clientId);
+                const orderStatus = await this.intentApi.getOrderStatus(bridgeTxMetaId, protocol, srcChainId, clientId);
                 return __classPrivateFieldGet(this, _IntentManager_instances, "m", _IntentManager_setIntentStatuses).call(this, bridgeTxMetaId, orderStatus, srcChainId, txHash.toString());
             }
             catch (error) {
@@ -117,7 +114,7 @@ export class IntentManager {
     }
 }
 _IntentManager_messenger = new WeakMap(), _IntentManager_updateTransactionFn = new WeakMap(), _IntentManager_intentStatusesByBridgeTxMetaId = new WeakMap(), _IntentManager_instances = new WeakSet(), _IntentManager_setIntentStatuses = function _IntentManager_setIntentStatuses(bridgeTxMetaId, order, srcChainId, txHash) {
-    const bridgeStatus = translateIntentOrderToBridgeStatus(order, srcChainId, txHash.toString());
+    const bridgeStatus = translateIntentOrderToBridgeStatus(order, srcChainId, txHash);
     const intentStatuses = {
         orderStatus: order.status,
         bridgeStatus,

package/dist/bridge-status-controller.intent.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"bridge-status-controller.intent.mjs","sourceRoot":"","sources":["../src/bridge-status-controller.intent.ts"],"names":[],"mappings":"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","sourcesContent":["import { StatusTypes } from '@metamask/bridge-controller';\nimport type { TransactionController } from '@metamask/transaction-controller';\nimport { TransactionMeta } from '@metamask/transaction-controller';\n\nimport type { BridgeStatusControllerMessenger, FetchFunction } from './types';\nimport type { BridgeHistoryItem } from './types';\nimport {\n  GetJwtFn,\n  IntentApi,\n  IntentApiImpl,\n  IntentBridgeStatus,\n  IntentSubmissionParams,\n  translateIntentOrderToBridgeStatus,\n} from './utils/intent-api';\nimport { IntentOrder, IntentOrderStatus } from './utils/validators';\n\ntype IntentStatuses = {\n  orderStatus: IntentOrderStatus;\n  bridgeStatus: IntentBridgeStatus | null;\n};\n\nexport class IntentManager {\n  readonly #messenger: BridgeStatusControllerMessenger;\n\n  readonly #updateTransactionFn: typeof TransactionController.prototype.updateTransaction;\n\n  readonly intentApi: IntentApi;\n\n  readonly #intentStatusesByBridgeTxMetaId: Map<string, IntentStatuses> =\n    new Map();\n\n  constructor({\n    messenger,\n    updateTransactionFn,\n    customBridgeApiBaseUrl,\n    fetchFn,\n    getJwt,\n  }: {\n    messenger: BridgeStatusControllerMessenger;\n    updateTransactionFn: typeof TransactionController.prototype.updateTransaction;\n    customBridgeApiBaseUrl: string;\n    fetchFn: FetchFunction;\n    getJwt: GetJwtFn;\n  }) {\n    this.#messenger = messenger;\n    this.#updateTransactionFn = updateTransactionFn;\n    this.intentApi = new IntentApiImpl(customBridgeApiBaseUrl, fetchFn, getJwt);\n  }\n\n  /**\n   * Set the intent statuses for a given bridge transaction.\n   *\n   * @param bridgeTxMetaId - The bridge transaction meta ID (key for storage).\n   * @param order - The intent order.\n   * @param srcChainId - The source chain ID.\n   * @param txHash - The transaction hash.\n   * @returns The intent statuses.\n   */\n\n  #setIntentStatuses(\n    bridgeTxMetaId: string,\n    order: IntentOrder,\n    srcChainId: number,\n    txHash: string,\n  ): IntentStatuses {\n    const bridgeStatus = translateIntentOrderToBridgeStatus(\n      order,\n      srcChainId,\n      txHash.toString(),\n    );\n    const intentStatuses: IntentStatuses = {\n      orderStatus: order.status,\n      bridgeStatus,\n    };\n    this.#intentStatusesByBridgeTxMetaId.set(bridgeTxMetaId, intentStatuses);\n    return intentStatuses;\n  }\n\n  /**\n   * Get the status of an intent order.\n   *\n   * @param bridgeTxMetaId - The bridge transaction meta ID.\n   * @param protocol - The protocol of the intent.\n   * @param clientId - The client ID.\n   * @returns The intent order mapped status.\n   */\n\n  getIntentTransactionStatus = async (\n    bridgeTxMetaId: string,\n    historyItem: BridgeHistoryItem,\n    clientId: string,\n  ): Promise<IntentStatuses | undefined> => {\n    const {\n      status: statusObj,\n      quote: { srcChainId, intent },\n    } = historyItem;\n    const txHash = statusObj?.srcChain?.txHash ?? '';\n    const protocol = intent?.protocol ?? '';\n\n    try {\n      const orderStatus = await this.intentApi.getOrderStatus(\n        bridgeTxMetaId,\n        protocol,\n        srcChainId.toString(),\n        clientId,\n      );\n\n      return this.#setIntentStatuses(\n        bridgeTxMetaId,\n        orderStatus,\n        srcChainId,\n        txHash.toString(),\n      );\n    } catch (error: unknown) {\n      if (error instanceof Error) {\n        throw new Error(\n          `[Intent polling] Failed to get intent order status from API: ${error.message}`,\n        );\n      }\n      return undefined;\n    }\n  };\n\n  /**\n   * Sync the transaction status from the intent status.\n   *\n   * @param bridgeTxMetaId - The bridge transaction meta ID.\n   * @param historyItem - The history item.\n   */\n\n  syncTransactionFromIntentStatus = (\n    bridgeTxMetaId: string,\n    historyItem: BridgeHistoryItem,\n  ): void => {\n    // Update the actual transaction in TransactionController to sync with intent status\n    // Use the original transaction ID (not the bridge history key)\n    const originalTxId =\n      historyItem.originalTransactionId ?? historyItem.txMetaId;\n    if (!originalTxId) {\n      return;\n    }\n\n    const intentStatuses =\n      this.#intentStatusesByBridgeTxMetaId.get(bridgeTxMetaId);\n    if (!intentStatuses) {\n      return;\n    }\n\n    try {\n      // Merge with existing TransactionMeta to avoid wiping required fields\n      const { transactions } = this.#messenger.call(\n        'TransactionController:getState',\n      );\n      const existingTxMeta = transactions.find(\n        (tx: TransactionMeta) => tx.id === originalTxId,\n      );\n      if (!existingTxMeta) {\n        console.warn(\n          '[Intent polling] Skipping update, transaction not found',\n          { originalTxId, bridgeHistoryKey: bridgeTxMetaId },\n        );\n        return;\n      }\n      const { bridgeStatus, orderStatus } = intentStatuses;\n      const txHash = bridgeStatus?.txHash;\n      const isComplete = bridgeStatus?.status.status === StatusTypes.COMPLETE;\n      const isFinalStatus =\n        bridgeStatus?.status.status === StatusTypes.COMPLETE ||\n        bridgeStatus?.status.status === StatusTypes.FAILED;\n      const existingTxReceipt = (\n        existingTxMeta as { txReceipt?: Record<string, unknown> }\n      ).txReceipt;\n      const txReceiptUpdate = txHash\n        ? {\n            txReceipt: {\n              ...existingTxReceipt,\n              transactionHash: txHash,\n              status: (isComplete ? '0x1' : '0x0') as unknown as string,\n            },\n          }\n        : {};\n\n      const updatedTxMeta: TransactionMeta = {\n        ...existingTxMeta,\n        status: bridgeStatus?.transactionStatus,\n        ...(txHash ? { hash: txHash } : {}),\n        ...txReceiptUpdate,\n      } as TransactionMeta;\n\n      this.#updateTransactionFn(\n        updatedTxMeta,\n        `BridgeStatusController - Intent order status updated: ${orderStatus}`,\n      );\n\n      if (isFinalStatus) {\n        this.#intentStatusesByBridgeTxMetaId.delete(bridgeTxMetaId);\n      }\n    } catch (error) {\n      console.error('[Intent polling] Failed to update transaction status', {\n        originalTxId,\n        bridgeHistoryKey: bridgeTxMetaId,\n        error,\n      });\n    }\n  };\n\n  /**\n   * Submit an intent order.\n   *\n   * @param submissionParams - The submission parameters.\n   * @param clientId - The client ID.\n   * @returns The intent order.\n   */\n  submitIntent = async (\n    submissionParams: IntentSubmissionParams,\n    clientId: string,\n  ): Promise<IntentOrder> => {\n    return this.intentApi.submitIntent(submissionParams, clientId);\n  };\n}\n"]}
+{"version":3,"file":"bridge-status-controller.intent.mjs","sourceRoot":"","sources":["../src/bridge-status-controller.intent.ts"],"names":[],"mappings":"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","sourcesContent":["import { BridgeClientId, StatusTypes } from '@metamask/bridge-controller';\nimport type { TransactionController } from '@metamask/transaction-controller';\nimport { TransactionMeta } from '@metamask/transaction-controller';\n\nimport type { BridgeStatusControllerMessenger, FetchFunction } from './types';\nimport type { BridgeHistoryItem } from './types';\nimport {\n  GetJwtFn,\n  IntentApi,\n  IntentApiImpl,\n  IntentBridgeStatus,\n  IntentSubmissionParams,\n  translateIntentOrderToBridgeStatus,\n} from './utils/intent-api';\nimport { IntentStatusResponse, IntentOrderStatus } from './utils/validators';\n\ntype IntentStatuses = {\n  orderStatus: IntentOrderStatus;\n  bridgeStatus: IntentBridgeStatus | null;\n};\n\nexport class IntentManager {\n  readonly #messenger: BridgeStatusControllerMessenger;\n\n  readonly #updateTransactionFn: typeof TransactionController.prototype.updateTransaction;\n\n  readonly intentApi: IntentApi;\n\n  readonly #intentStatusesByBridgeTxMetaId: Map<string, IntentStatuses> =\n    new Map();\n\n  constructor({\n    messenger,\n    updateTransactionFn,\n    customBridgeApiBaseUrl,\n    fetchFn,\n    getJwt,\n  }: {\n    messenger: BridgeStatusControllerMessenger;\n    updateTransactionFn: typeof TransactionController.prototype.updateTransaction;\n    customBridgeApiBaseUrl: string;\n    fetchFn: FetchFunction;\n    getJwt: GetJwtFn;\n  }) {\n    this.#messenger = messenger;\n    this.#updateTransactionFn = updateTransactionFn;\n    this.intentApi = new IntentApiImpl(customBridgeApiBaseUrl, fetchFn, getJwt);\n  }\n\n  /**\n   * Set the intent statuses for a given bridge transaction.\n   *\n   * @param bridgeTxMetaId - The bridge transaction meta ID (key for storage).\n   * @param order - The intent order.\n   * @param srcChainId - The source chain ID.\n   * @param txHash - The transaction hash.\n   * @returns The intent statuses.\n   */\n\n  #setIntentStatuses(\n    bridgeTxMetaId: string,\n    order: IntentStatusResponse,\n    srcChainId: number,\n    txHash: string,\n  ): IntentStatuses {\n    const bridgeStatus = translateIntentOrderToBridgeStatus(\n      order,\n      srcChainId,\n      txHash,\n    );\n    const intentStatuses: IntentStatuses = {\n      orderStatus: order.status,\n      bridgeStatus,\n    };\n    this.#intentStatusesByBridgeTxMetaId.set(bridgeTxMetaId, intentStatuses);\n    return intentStatuses;\n  }\n\n  /**\n   * Get the status of an intent order.\n   *\n   * @param bridgeTxMetaId - The bridge transaction meta ID.\n   * @param protocol - The protocol of the intent.\n   * @param clientId - The client ID.\n   * @returns The intent order mapped status.\n   */\n\n  getIntentTransactionStatus = async (\n    bridgeTxMetaId: string,\n    srcChainId: number,\n    protocol: string,\n    clientId: BridgeClientId,\n    txHash: string = '',\n  ): Promise<IntentStatuses | undefined> => {\n    try {\n      const orderStatus = await this.intentApi.getOrderStatus(\n        bridgeTxMetaId,\n        protocol,\n        srcChainId,\n        clientId,\n      );\n\n      return this.#setIntentStatuses(\n        bridgeTxMetaId,\n        orderStatus,\n        srcChainId,\n        txHash.toString(),\n      );\n    } catch (error: unknown) {\n      if (error instanceof Error) {\n        throw new Error(\n          `[Intent polling] Failed to get intent order status from API: ${error.message}`,\n        );\n      }\n      return undefined;\n    }\n  };\n\n  /**\n   * Sync the transaction status from the intent status.\n   *\n   * @param bridgeTxMetaId - The bridge transaction meta ID.\n   * @param historyItem - The history item.\n   */\n\n  syncTransactionFromIntentStatus = (\n    bridgeTxMetaId: string,\n    historyItem: BridgeHistoryItem,\n  ): void => {\n    // Update the actual transaction in TransactionController to sync with intent status\n    // Use the original transaction ID (not the bridge history key)\n    const originalTxId =\n      historyItem.originalTransactionId ?? historyItem.txMetaId;\n    if (!originalTxId) {\n      return;\n    }\n\n    const intentStatuses =\n      this.#intentStatusesByBridgeTxMetaId.get(bridgeTxMetaId);\n    if (!intentStatuses) {\n      return;\n    }\n\n    try {\n      // Merge with existing TransactionMeta to avoid wiping required fields\n      const { transactions } = this.#messenger.call(\n        'TransactionController:getState',\n      );\n      const existingTxMeta = transactions.find(\n        (tx: TransactionMeta) => tx.id === originalTxId,\n      );\n      if (!existingTxMeta) {\n        console.warn(\n          '[Intent polling] Skipping update, transaction not found',\n          { originalTxId, bridgeHistoryKey: bridgeTxMetaId },\n        );\n        return;\n      }\n      const { bridgeStatus, orderStatus } = intentStatuses;\n      const txHash = bridgeStatus?.txHash;\n      const isComplete = bridgeStatus?.status.status === StatusTypes.COMPLETE;\n      const isFinalStatus =\n        bridgeStatus?.status.status === StatusTypes.COMPLETE ||\n        bridgeStatus?.status.status === StatusTypes.FAILED;\n      const existingTxReceipt = (\n        existingTxMeta as { txReceipt?: Record<string, unknown> }\n      ).txReceipt;\n      const txReceiptUpdate = txHash\n        ? {\n            txReceipt: {\n              ...existingTxReceipt,\n              transactionHash: txHash,\n              status: (isComplete ? '0x1' : '0x0') as unknown as string,\n            },\n          }\n        : {};\n\n      const updatedTxMeta: TransactionMeta = {\n        ...existingTxMeta,\n        status: bridgeStatus?.transactionStatus,\n        ...(txHash ? { hash: txHash } : {}),\n        ...txReceiptUpdate,\n      } as TransactionMeta;\n\n      this.#updateTransactionFn(\n        updatedTxMeta,\n        `BridgeStatusController - Intent order status updated: ${orderStatus}`,\n      );\n\n      if (isFinalStatus) {\n        this.#intentStatusesByBridgeTxMetaId.delete(bridgeTxMetaId);\n      }\n    } catch (error) {\n      console.error('[Intent polling] Failed to update transaction status', {\n        originalTxId,\n        bridgeHistoryKey: bridgeTxMetaId,\n        error,\n      });\n    }\n  };\n\n  /**\n   * Submit an intent order.\n   *\n   * @param submissionParams - The submission parameters.\n   * @param clientId - The client ID.\n   * @returns The intent order.\n   */\n  submitIntent = async (\n    submissionParams: IntentSubmissionParams,\n    clientId: BridgeClientId,\n  ): Promise<IntentStatusResponse> => {\n    return this.intentApi.submitIntent(submissionParams, clientId);\n  };\n}\n"]}

package/dist/bridge-status-controller.mjs

@@ -205,7 +205,7 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
             });
         });
         _BridgeStatusController_addTxToHistory.set(this, (startPollingForBridgeTxStatusArgs, actionId) => {
-            const { bridgeTxMeta, statusRequest, quoteResponse, startTime, slippagePercentage, initialDestAssetBalance, targetContractAddress, approvalTxId, isStxEnabled, location, abTests, accountAddress: selectedAddress, } = startPollingForBridgeTxStatusArgs;
+            const { bridgeTxMeta, statusRequest, quoteResponse, startTime, slippagePercentage, initialDestAssetBalance, targetContractAddress, approvalTxId, isStxEnabled, location, abTests, activeAbTests, accountAddress: selectedAddress, } = startPollingForBridgeTxStatusArgs;
             // Determine the key for this history item:
             // - For pre-submission (non-batch EVM): use actionId
             // - For post-submission or other cases: use bridgeTxMeta.id
@@ -243,10 +243,11 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                 },
                 hasApprovalTx: Boolean(quoteResponse.approval),
                 approvalTxId,
-                isStxEnabled: isStxEnabled ?? false,
+                isStxEnabled: Boolean(isStxEnabled),
                 featureId: quoteResponse.featureId,
                 location,
                 ...(abTests && { abTests }),
+                ...(activeAbTests && { activeAbTests }),
             };
             this.update((state) => {
                 // Use actionId as key for pre-submission, or txMeta.id for post-submission
@@ -378,9 +379,8 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
             try {
                 let status;
                 let validationFailures = [];
-                const isIntent = Boolean(historyItem.quote.intent);
-                if (isIntent) {
-                    const intentTxStatus = await __classPrivateFieldGet(this, _BridgeStatusController_intentManager, "f").getIntentTransactionStatus(bridgeTxMetaId, historyItem, __classPrivateFieldGet(this, _BridgeStatusController_clientId, "f"));
+                if (historyItem.quote.intent) {
+                    const intentTxStatus = await __classPrivateFieldGet(this, _BridgeStatusController_intentManager, "f").getIntentTransactionStatus(bridgeTxMetaId, historyItem.quote.srcChainId, historyItem.quote.intent.protocol, __classPrivateFieldGet(this, _BridgeStatusController_clientId, "f"), historyItem.status.srcChain.txHash);
                     if (intentTxStatus?.bridgeStatus === null ||
                         intentTxStatus?.bridgeStatus === undefined) {
                         return;
@@ -425,7 +425,7 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                 this.update((state) => {
                     state.txHistory[bridgeTxMetaId] = newBridgeHistoryItem;
                 });
-                if (isIntent) {
+                if (historyItem.quote.intent) {
                     __classPrivateFieldGet(this, _BridgeStatusController_intentManager, "f").syncTransactionFromIntentStatus(bridgeTxMetaId, historyItem);
                 }
                 // 5. After effects
@@ -559,7 +559,7 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
             });
         });
         _BridgeStatusController_handleApprovalTx.set(this, async (isBridgeTx, srcChainId, approval, resetApproval, requireApproval) => {
-            if (approval) {
+            if (approval && isEvmTxData(approval)) {
                 const approveTx = async () => {
                     await __classPrivateFieldGet(this, _BridgeStatusController_handleUSDTAllowanceReset, "f").call(this, resetApproval);
                     const approvalTxMeta = await __classPrivateFieldGet(this, _BridgeStatusController_handleEvmTransaction, "f").call(this, {
@@ -646,8 +646,8 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
             // Convert to hex since txFee values from the quote are decimal strings
             if (txFee) {
                 return {
-                    maxFeePerGas: toHex(txFee.maxFeePerGas ?? 0),
-                    maxPriorityFeePerGas: toHex(txFee.maxPriorityFeePerGas ?? 0),
+                    maxFeePerGas: toHex(txFee.maxFeePerGas),
+                    maxPriorityFeePerGas: toHex(txFee.maxPriorityFeePerGas),
                     gas: gas ? toHex(gas) : undefined,
                 };
             }
@@ -711,10 +711,11 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
          * @param isStxEnabledOnClient - Whether smart transactions are enabled on the client, for example the getSmartTransactionsEnabled selector value from the extension
          * @param quotesReceivedContext - The context for the QuotesReceived event
          * @param location - The entry point from which the user initiated the swap or bridge (e.g. Main View, Token View, Trending Explore)
-         * @param abTests - A/B test context to attribute events to specific experiments
+         * @param abTests - Legacy A/B test context for `ab_tests` (backward compatibility)
+         * @param activeAbTests - New A/B test context for `active_ab_tests` (migration target). Attributes events to specific experiments.
          * @returns The transaction meta
          */
-        this.submitTx = async (accountAddress, quoteResponse, isStxEnabledOnClient, quotesReceivedContext, location = MetaMetricsSwapsEventSource.MainView, abTests) => {
+        this.submitTx = async (accountAddress, quoteResponse, isStxEnabledOnClient, quotesReceivedContext, location = MetaMetricsSwapsEventSource.MainView, abTests, activeAbTests) => {
             this.messenger.call('BridgeController:stopPollingForQuotes', AbortReason.TransactionSubmitted, 
             // If trade is submitted before all quotes are loaded, the QuotesReceived event is published
             // If the trade has a featureId, it means it was submitted outside of the Unified Swap and Bridge experience, so no QuotesReceived event is published
@@ -724,12 +725,13 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                 throw new Error('Failed to submit cross-chain swap transaction: undefined multichain account');
             }
             const isHardwareAccount = isHardwareWallet(selectedAccount);
-            const preConfirmationProperties = getPreConfirmationPropertiesFromQuote(quoteResponse, isStxEnabledOnClient, isHardwareAccount, location, abTests);
+            const preConfirmationProperties = getPreConfirmationPropertiesFromQuote(quoteResponse, isStxEnabledOnClient, isHardwareAccount, location, abTests, activeAbTests);
             // Emit Submitted event after submit button is clicked
             !quoteResponse.featureId &&
                 __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, UnifiedSwapBridgeEventName.Submitted, undefined, preConfirmationProperties);
             let txMeta;
             let approvalTxId;
+            let isDelegatedAccount = false;
             const startTime = Date.now();
             const isBridgeTx = isCrossChain(quoteResponse.quote.srcChainId, quoteResponse.quote.destChainId);
             const isTronTx = isTronChainId(quoteResponse.quote.srcChainId);
@@ -750,7 +752,9 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                             return quoteResponse.approval &&
                                 isTronTrade(quoteResponse.approval)
                                 ? await __classPrivateFieldGet(this, _BridgeStatusController_handleNonEvmTx, "f").call(this, quoteResponse.approval, quoteResponse, selectedAccount)
-                                : undefined;
+                                : /* c8 ignore start */
+                                    undefined;
+                            /* c8 ignore end */
                         }
                         catch (error) {
                             !quoteResponse.featureId &&
@@ -784,7 +788,7 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                     }
                     catch (error) {
                         !quoteResponse.featureId &&
-                            __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, UnifiedSwapBridgeEventName.Failed, txMeta?.id, {
+                            __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, UnifiedSwapBridgeEventName.Failed, undefined, {
                                 error_message: error?.message,
                                 ...preConfirmationProperties,
                             });
@@ -810,7 +814,25 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                     if (!isEvmTxData(quoteResponse.trade)) {
                         throw new Error('Failed to submit cross-chain swap transaction: trade is not an EVM transaction');
                     }
-                    if (isStxEnabledOnClient || quoteResponse.quote.gasIncluded7702) {
+                    // Check if the account is an EIP-7702 delegated account
+                    // Delegated accounts only allow 1 in-flight tx, so approve + swap
+                    // must be batched into a single transaction
+                    const hexChainId = formatChainIdToHex(quoteResponse.quote.srcChainId);
+                    isDelegatedAccount = await (async () => {
+                        try {
+                            const atomicBatchSupport = await this.messenger.call('TransactionController:isAtomicBatchSupported', {
+                                address: quoteResponse.trade.from,
+                                chainIds: [hexChainId],
+                            });
+                            return atomicBatchSupport.some((entry) => entry.isSupported && entry.delegationAddress);
+                        }
+                        catch {
+                            return false;
+                        }
+                    })();
+                    if (isStxEnabledOnClient ||
+                        quoteResponse.quote.gasIncluded7702 ||
+                        isDelegatedAccount) {
                         const { tradeMeta, approvalMeta } = await __classPrivateFieldGet(this, _BridgeStatusController_handleEvmTransactionBatch, "f").call(this, {
                             isBridgeTx,
                             resetApproval: quoteResponse.resetApproval,
@@ -820,6 +842,7 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                             trade: quoteResponse.trade,
                             quoteResponse,
                             requireApproval,
+                            isDelegatedAccount,
                         });
                         approvalTxId = approvalMeta?.id;
                         return tradeMeta;
@@ -847,6 +870,7 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                         approvalTxId,
                         location,
                         abTests,
+                        activeAbTests,
                     }, actionId);
                     // Pass txFee when gasIncluded is true to use the quote's gas fees
                     // instead of re-estimating (which would fail for max native token swaps)
@@ -871,7 +895,8 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                 // Only add history here for non-EVM and batch EVM transactions
                 const isNonBatchEvm = !isNonEvmChainId(quoteResponse.quote.srcChainId) &&
                     !isStxEnabledOnClient &&
-                    !quoteResponse.quote.gasIncluded7702;
+                    !quoteResponse.quote.gasIncluded7702 &&
+                    !isDelegatedAccount;
                 if (!isNonBatchEvm) {
                     // Add swap or bridge tx to history
                     __classPrivateFieldGet(this, _BridgeStatusController_addTxToHistory, "f").call(this, {
@@ -888,6 +913,7 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                         approvalTxId,
                         location,
                         abTests,
+                        activeAbTests,
                     });
                 }
                 if (isNonEvmChainId(quoteResponse.quote.srcChainId)) {
@@ -912,40 +938,36 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
          * @param params.quoteResponse - Quote carrying intent data
          * @param params.accountAddress - The EOA submitting the order
          * @param params.location - The entry point from which the user initiated the swap or bridge
-         * @param params.abTests - A/B test context to attribute events to specific experiments
+         * @param params.abTests - Legacy A/B test context for `ab_tests` (backward compatibility)
+         * @param params.activeAbTests - New A/B test context for `active_ab_tests` (migration target). Attributes events to specific experiments.
          * @returns A lightweight TransactionMeta-like object for history linking
          */
         this.submitIntent = async (params) => {
-            const { quoteResponse, accountAddress, location, abTests } = params;
+            const { quoteResponse, accountAddress, location, abTests, activeAbTests } = params;
             this.messenger.call('BridgeController:stopPollingForQuotes', 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) && isHardwareWallet(account);
-            const preConfirmationProperties = getPreConfirmationPropertiesFromQuote(quoteResponse, false, isHardwareAccount, location, abTests);
+            const preConfirmationProperties = getPreConfirmationPropertiesFromQuote(quoteResponse, false, isHardwareAccount, location, abTests, activeAbTests);
             try {
                 const intent = getIntentFromQuote(quoteResponse);
                 // If backend provided an approval tx for this intent quote, submit it first (on-chain),
                 // then proceed with off-chain intent submission.
-                let approvalTxId;
-                if (quoteResponse.approval) {
-                    const isBridgeTx = 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 && 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 isBridgeTx = isCrossChain(quoteResponse.quote.srcChainId, quoteResponse.quote.destChainId);
+                const requireApproval = isHardwareAccount && __classPrivateFieldGet(this, _BridgeStatusController_clientId, "f") === BridgeClientId.MOBILE;
+                // 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, quoteResponse.resetApproval, requireApproval);
+                const approvalTxId = approvalTxMeta?.id;
+                if (approvalTxId) {
+                    await __classPrivateFieldGet(this, _BridgeStatusController_waitForTxConfirmation, "f").call(this, approvalTxId);
                 }
-                const { srcChainId: chainId, requestId } = quoteResponse.quote;
+                const { srcChainId, requestId } = quoteResponse.quote;
                 const signature = await this.messenger.call('KeyringController:signTypedMessage', {
                     from: accountAddress,
                     data: intent.typedData,
                 }, SignTypedDataVersion.V4);
                 const submissionParams = {
-                    srcChainId: chainId.toString(),
+                    srcChainId,
                     quoteId: requestId,
                     signature,
                     order: intent.order,
@@ -955,16 +977,17 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                 const intentOrder = await __classPrivateFieldGet(this, _BridgeStatusController_intentManager, "f").submitIntent(submissionParams, __classPrivateFieldGet(this, _BridgeStatusController_clientId, "f"));
                 const orderUid = intentOrder.id;
                 // Determine transaction type: swap for same-chain, bridge for cross-chain
-                const isCrossChainTx = isCrossChain(quoteResponse.quote.srcChainId, quoteResponse.quote.destChainId);
-                const transactionType = isCrossChainTx
-                    ? TransactionType.bridge
-                    : TransactionType.swap;
+                const transactionType = isBridgeTx
+                    ? /* c8 ignore start */
+                        TransactionType.bridge
+                    : /* c8 ignore end */
+                        TransactionType.swap;
                 // Create actual transaction in Transaction Controller first
-                const networkClientId = this.messenger.call('NetworkController:findNetworkClientIdByChainId', formatChainIdToHex(chainId));
+                const networkClientId = this.messenger.call('NetworkController:findNetworkClientIdByChainId', formatChainIdToHex(srcChainId));
                 // This is a synthetic transaction whose purpose is to be able
                 // to track the order status via the history
                 const intentTransactionParams = {
-                    chainId: formatChainIdToHex(chainId),
+                    chainId: formatChainIdToHex(srcChainId),
                     from: accountAddress,
                     to: intent.settlementContract ??
                         '0x9008D19f58AAbd9eD0D60971565AA8510560ab41', // Default settlement contract
@@ -994,7 +1017,6 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                     ...statusUpdatedTxMeta,
                     isIntentTx: true,
                     orderUid,
-                    intentType: isCrossChainTx ? 'bridge' : 'swap',
                 };
                 // Record in bridge history with actual transaction metadata
                 try {
@@ -1021,6 +1043,7 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                         startTime,
                         location,
                         abTests,
+                        activeAbTests,
                     });
                     // Start polling using the orderId key to route to intent manager
                     __classPrivateFieldGet(this, _BridgeStatusController_startPollingForTxId, "f").call(this, bridgeHistoryKey);
@@ -1047,11 +1070,15 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
          * @param eventProperties - The properties for the event
          */
         _BridgeStatusController_trackUnifiedSwapBridgeEvent.set(this, (eventName, txMetaId, eventProperties) => {
-            const { ab_tests: eventAbTests } = eventProperties ?? {};
+            // Legacy/new metrics fields are intentionally kept independent during migration.
             const historyAbTests = txMetaId
                 ? this.state.txHistory?.[txMetaId]?.abTests
                 : undefined;
-            const resolvedAbTests = eventAbTests ?? historyAbTests ?? undefined;
+            const historyActiveAbTests = txMetaId
+                ? this.state.txHistory?.[txMetaId]?.activeAbTests
+                : undefined;
+            const resolvedAbTests = eventProperties?.ab_tests ?? historyAbTests;
+            const resolvedActiveAbTests = eventProperties?.active_ab_tests ?? historyActiveAbTests;
             const baseProperties = {
                 action_type: MetricsActionType.SWAPBRIDGE_V1,
                 location: eventProperties?.location ??
@@ -1062,6 +1089,10 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                     Object.keys(resolvedAbTests).length > 0 && {
                     ab_tests: resolvedAbTests,
                 }),
+                ...(resolvedActiveAbTests &&
+                    resolvedActiveAbTests.length > 0 && {
+                    active_ab_tests: resolvedActiveAbTests,
+                }),
             };
             // This will publish events for PERPS dropped tx failures as well
             if (!txMetaId) {