@metamask/bridge-status-controller 70.0.0 → 70.0.1

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

@@ -1,8 +1,8 @@
 import { BridgeClientId } from "@metamask/bridge-controller";
 import type { BridgeStatusControllerMessenger, FetchFunction } from "./types.cjs";
 import type { BridgeHistoryItem } from "./types.cjs";
-import { IntentApi, IntentBridgeStatus, IntentSubmissionParams } from "./utils/intent-api.cjs";
-import { IntentStatusResponse, IntentOrderStatus } from "./utils/validators.cjs";
+import { IntentApi, IntentBridgeStatus } from "./utils/intent-api.cjs";
+import { IntentOrderStatus } from "./utils/validators.cjs";
 type IntentStatuses = {
     orderStatus: IntentOrderStatus;
     bridgeStatus: IntentBridgeStatus | null;
@@ -31,14 +31,6 @@ export declare class IntentManager {
      * @param historyItem - The history item.
      */
     syncTransactionFromIntentStatus: (bridgeTxMetaId: string, historyItem: BridgeHistoryItem) => void;
-    /**
-     * Submit an intent order.
-     *
-     * @param submissionParams - The submission parameters.
-     * @param clientId - The client ID.
-     * @returns The intent order.
-     */
-    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":"AAAA,OAAO,EAAE,cAAc,EAAe,oCAAoC;AAG1E,OAAO,KAAK,EAAE,+BAA+B,EAAE,aAAa,EAAE,oBAAgB;AAC9E,OAAO,KAAK,EAAE,iBAAiB,EAAE,oBAAgB;AAEjD,OAAO,EACL,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;;IAGxB,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;gBAKlB,EACV,SAAS,EACT,sBAAsB,EACtB,OAAO,GACR,EAAE;QACD,SAAS,EAAE,+BAA+B,CAAC;QAC3C,sBAAsB,EAAE,MAAM,CAAC;QAC/B,OAAO,EAAE,aAAa,CAAC;KACxB;IAsCD;;;;;;;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,CAwEL;IAEF;;;;;;OAMG;IACH,YAAY,qBACQ,sBAAsB,YAC9B,cAAc,KACvB,QAAQ,oBAAoB,CAAC,CAE9B;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;AAE1E,OAAO,KAAK,EAAE,+BAA+B,EAAE,aAAa,EAAE,oBAAgB;AAC9E,OAAO,KAAK,EAAE,iBAAiB,EAAE,oBAAgB;AAEjD,OAAO,EACL,SAAS,EAET,kBAAkB,EAEnB,+BAA2B;AAE5B,OAAO,EAAwB,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;;IAGxB,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;gBAKlB,EACV,SAAS,EACT,sBAAsB,EACtB,OAAO,GACR,EAAE;QACD,SAAS,EAAE,+BAA+B,CAAC;QAC3C,sBAAsB,EAAE,MAAM,CAAC;QAC/B,OAAO,EAAE,aAAa,CAAC;KACxB;IAsCD;;;;;;;OAOG;IAEH,0BAA0B,mBACR,MAAM,cACV,MAAM,YACR,MAAM,YACN,cAAc,WACf,MAAM,KACd,QAAQ,cAAc,GAAG,SAAS,CAAC,CAuBpC;IAEF;;;;;OAKG;IAEH,+BAA+B,mBACb,MAAM,eACT,iBAAiB,KAC7B,IAAI,CAqEL;CACH"}

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

@@ -1,8 +1,8 @@
 import { BridgeClientId } from "@metamask/bridge-controller";
 import type { BridgeStatusControllerMessenger, FetchFunction } from "./types.mjs";
 import type { BridgeHistoryItem } from "./types.mjs";
-import { IntentApi, IntentBridgeStatus, IntentSubmissionParams } from "./utils/intent-api.mjs";
-import { IntentStatusResponse, IntentOrderStatus } from "./utils/validators.mjs";
+import { IntentApi, IntentBridgeStatus } from "./utils/intent-api.mjs";
+import { IntentOrderStatus } from "./utils/validators.mjs";
 type IntentStatuses = {
     orderStatus: IntentOrderStatus;
     bridgeStatus: IntentBridgeStatus | null;
@@ -31,14 +31,6 @@ export declare class IntentManager {
      * @param historyItem - The history item.
      */
     syncTransactionFromIntentStatus: (bridgeTxMetaId: string, historyItem: BridgeHistoryItem) => void;
-    /**
-     * Submit an intent order.
-     *
-     * @param submissionParams - The submission parameters.
-     * @param clientId - The client ID.
-     * @returns The intent order.
-     */
-    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":"AAAA,OAAO,EAAE,cAAc,EAAe,oCAAoC;AAG1E,OAAO,KAAK,EAAE,+BAA+B,EAAE,aAAa,EAAE,oBAAgB;AAC9E,OAAO,KAAK,EAAE,iBAAiB,EAAE,oBAAgB;AAEjD,OAAO,EACL,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;;IAGxB,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;gBAKlB,EACV,SAAS,EACT,sBAAsB,EACtB,OAAO,GACR,EAAE;QACD,SAAS,EAAE,+BAA+B,CAAC;QAC3C,sBAAsB,EAAE,MAAM,CAAC;QAC/B,OAAO,EAAE,aAAa,CAAC;KACxB;IAsCD;;;;;;;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,CAwEL;IAEF;;;;;;OAMG;IACH,YAAY,qBACQ,sBAAsB,YAC9B,cAAc,KACvB,QAAQ,oBAAoB,CAAC,CAE9B;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;AAE1E,OAAO,KAAK,EAAE,+BAA+B,EAAE,aAAa,EAAE,oBAAgB;AAC9E,OAAO,KAAK,EAAE,iBAAiB,EAAE,oBAAgB;AAEjD,OAAO,EACL,SAAS,EAET,kBAAkB,EAEnB,+BAA2B;AAE5B,OAAO,EAAwB,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;;IAGxB,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;gBAKlB,EACV,SAAS,EACT,sBAAsB,EACtB,OAAO,GACR,EAAE;QACD,SAAS,EAAE,+BAA+B,CAAC;QAC3C,sBAAsB,EAAE,MAAM,CAAC;QAC/B,OAAO,EAAE,aAAa,CAAC;KACxB;IAsCD;;;;;;;OAOG;IAEH,0BAA0B,mBACR,MAAM,cACV,MAAM,YACR,MAAM,YACN,cAAc,WACf,MAAM,KACd,QAAQ,cAAc,GAAG,SAAS,CAAC,CAuBpC;IAEF;;;;;OAKG;IAEH,+BAA+B,mBACb,MAAM,eACT,iBAAiB,KAC7B,IAAI,CAqEL;CACH"}

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

@@ -13,6 +13,7 @@ var _IntentManager_instances, _IntentManager_messenger, _IntentManager_intentSta
 import { BridgeClientId, StatusTypes } from "@metamask/bridge-controller";
 import { getJwt } from "./utils/authentication.mjs";
 import { IntentApiImpl, translateIntentOrderToBridgeStatus } from "./utils/intent-api.mjs";
+import { getTransactionMetaById, updateTransaction } from "./utils/transaction.mjs";
 import { IntentOrderStatus } from "./utils/validators.mjs";
 export class IntentManager {
     constructor({ messenger, customBridgeApiBaseUrl, fetchFn, }) {
@@ -27,10 +28,10 @@ export class IntentManager {
          * @param clientId - The client ID.
          * @returns The intent order mapped status.
          */
-        this.getIntentTransactionStatus = async (bridgeTxMetaId, srcChainId, protocol, clientId, txHash = '') => {
+        this.getIntentTransactionStatus = async (bridgeTxMetaId, srcChainId, protocol, clientId, txHash) => {
             try {
                 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());
+                return __classPrivateFieldGet(this, _IntentManager_instances, "m", _IntentManager_setIntentStatuses).call(this, bridgeTxMetaId, orderStatus, srcChainId, txHash);
             }
             catch (error) {
                 if (error instanceof Error) {
@@ -58,8 +59,7 @@ export class IntentManager {
             }
             try {
                 // Merge with existing TransactionMeta to avoid wiping required fields
-                const { transactions } = __classPrivateFieldGet(this, _IntentManager_messenger, "f").call('TransactionController:getState');
-                const existingTxMeta = transactions.find((tx) => tx.id === originalTxId);
+                const existingTxMeta = getTransactionMetaById(__classPrivateFieldGet(this, _IntentManager_messenger, "f"), originalTxId);
                 if (!existingTxMeta) {
                     console.warn('[Intent polling] Skipping update, transaction not found', { originalTxId, bridgeHistoryKey: bridgeTxMetaId });
                     return;
@@ -75,17 +75,15 @@ export class IntentManager {
                         txReceipt: {
                             ...existingTxReceipt,
                             transactionHash: txHash,
-                            status: (isComplete ? '0x1' : '0x0'),
+                            status: isComplete ? '0x1' : '0x0',
                         },
                     }
                     : {};
-                const updatedTxMeta = {
-                    ...existingTxMeta,
+                updateTransaction(__classPrivateFieldGet(this, _IntentManager_messenger, "f"), existingTxMeta, {
                     status: bridgeStatus?.transactionStatus,
                     ...(txHash ? { hash: txHash } : {}),
                     ...txReceiptUpdate,
-                };
-                __classPrivateFieldGet(this, _IntentManager_messenger, "f").call('TransactionController:updateTransaction', updatedTxMeta, `BridgeStatusController - Intent order status updated: ${orderStatus}`);
+                }, `BridgeStatusController - Intent order status updated: ${orderStatus}`);
                 if (isFinalStatus) {
                     __classPrivateFieldGet(this, _IntentManager_intentStatusesByBridgeTxMetaId, "f").delete(bridgeTxMetaId);
                 }
@@ -98,16 +96,6 @@ export class IntentManager {
                 });
             }
         };
-        /**
-         * Submit an intent order.
-         *
-         * @param submissionParams - The submission parameters.
-         * @param clientId - The client ID.
-         * @returns The intent order.
-         */
-        this.submitIntent = async (submissionParams, clientId) => {
-            return this.intentApi.submitIntent(submissionParams, clientId);
-        };
         __classPrivateFieldSet(this, _IntentManager_messenger, messenger, "f");
         this.intentApi = new IntentApiImpl(customBridgeApiBaseUrl, fetchFn, async () => await getJwt(messenger));
     }

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 { BridgeClientId, StatusTypes } from '@metamask/bridge-controller';\nimport type { TransactionMeta } from '@metamask/transaction-controller';\n\nimport type { BridgeStatusControllerMessenger, FetchFunction } from './types';\nimport type { BridgeHistoryItem } from './types';\nimport { getJwt } from './utils/authentication';\nimport {\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 intentApi: IntentApi;\n\n  readonly #intentStatusesByBridgeTxMetaId: Map<string, IntentStatuses> =\n    new Map();\n\n  constructor({\n    messenger,\n    customBridgeApiBaseUrl,\n    fetchFn,\n  }: {\n    messenger: BridgeStatusControllerMessenger;\n    customBridgeApiBaseUrl: string;\n    fetchFn: FetchFunction;\n  }) {\n    this.#messenger = messenger;\n    this.intentApi = new IntentApiImpl(\n      customBridgeApiBaseUrl,\n      fetchFn,\n      async () => await getJwt(messenger),\n    );\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.#messenger.call(\n        'TransactionController:updateTransaction',\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"]}
+{"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';\n\nimport type { BridgeStatusControllerMessenger, FetchFunction } from './types';\nimport type { BridgeHistoryItem } from './types';\nimport { getJwt } from './utils/authentication';\nimport {\n  IntentApi,\n  IntentApiImpl,\n  IntentBridgeStatus,\n  translateIntentOrderToBridgeStatus,\n} from './utils/intent-api';\nimport { getTransactionMetaById, updateTransaction } from './utils/transaction';\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 intentApi: IntentApi;\n\n  readonly #intentStatusesByBridgeTxMetaId: Map<string, IntentStatuses> =\n    new Map();\n\n  constructor({\n    messenger,\n    customBridgeApiBaseUrl,\n    fetchFn,\n  }: {\n    messenger: BridgeStatusControllerMessenger;\n    customBridgeApiBaseUrl: string;\n    fetchFn: FetchFunction;\n  }) {\n    this.#messenger = messenger;\n    this.intentApi = new IntentApiImpl(\n      customBridgeApiBaseUrl,\n      fetchFn,\n      async () => await getJwt(messenger),\n    );\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,\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 existingTxMeta = getTransactionMetaById(\n        this.#messenger,\n        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\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 as `0x${string}` | undefined,\n              status: isComplete ? '0x1' : '0x0',\n            },\n          }\n        : {};\n\n      updateTransaction(\n        this.#messenger,\n        existingTxMeta,\n        {\n          status: bridgeStatus?.transactionStatus,\n          ...(txHash ? { hash: txHash } : {}),\n          ...txReceiptUpdate,\n        },\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"]}

package/dist/bridge-status-controller.mjs

@@ -9,11 +9,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _BridgeStatusController_pollingTokensByTxMetaId, _BridgeStatusController_intentManager, _BridgeStatusController_clientId, _BridgeStatusController_fetchFn, _BridgeStatusController_config, _BridgeStatusController_addTransactionBatchFn, _BridgeStatusController_trace, _BridgeStatusController_markTxAsFailed, _BridgeStatusController_restartPollingForIncompleteHistoryItems, _BridgeStatusController_addTxToHistory, _BridgeStatusController_rekeyHistoryItem, _BridgeStatusController_startPollingForTxId, _BridgeStatusController_handleFetchFailure, _BridgeStatusController_fetchBridgeTxStatus, _BridgeStatusController_getSrcTxHash, _BridgeStatusController_updateSrcTxHash, _BridgeStatusController_wipeBridgeStatusByChainId, _BridgeStatusController_waitForHashAndReturnFinalTxMeta, _BridgeStatusController_waitForTxConfirmation, _BridgeStatusController_handleApprovalTx, _BridgeStatusController_handleEvmTransaction, _BridgeStatusController_handleUSDTAllowanceReset, _BridgeStatusController_calculateGasFees, _BridgeStatusController_handleEvmTransactionBatch, _BridgeStatusController_trackUnifiedSwapBridgeEvent;
+var _BridgeStatusController_pollingTokensByTxMetaId, _BridgeStatusController_intentManager, _BridgeStatusController_clientId, _BridgeStatusController_fetchFn, _BridgeStatusController_config, _BridgeStatusController_addTransactionBatchFn, _BridgeStatusController_trace, _BridgeStatusController_markTxAsFailed, _BridgeStatusController_restartPollingForIncompleteHistoryItems, _BridgeStatusController_addTxToHistory, _BridgeStatusController_rekeyHistoryItem, _BridgeStatusController_startPollingForTxId, _BridgeStatusController_handleFetchFailure, _BridgeStatusController_fetchBridgeTxStatus, _BridgeStatusController_getSrcTxHash, _BridgeStatusController_updateSrcTxHash, _BridgeStatusController_wipeBridgeStatusByChainId, _BridgeStatusController_handleApprovalTx, _BridgeStatusController_handleEvmTransactionBatch, _BridgeStatusController_trackUnifiedSwapBridgeEvent;
 import { formatChainIdToHex, isNonEvmChainId, StatusTypes, UnifiedSwapBridgeEventName, isCrossChain, isTronChainId, isEvmTxData, isHardwareWallet, MetricsActionType, MetaMetricsSwapsEventSource, isBitcoinTrade, isTronTrade, PollingStatus } from "@metamask/bridge-controller";
-import { toHex } from "@metamask/controller-utils";
 import { StaticIntervalPollingController } from "@metamask/polling-controller";
-import { TransactionStatus, TransactionType } from "@metamask/transaction-controller";
+import { TransactionStatus, TransactionType, TransactionController } from "@metamask/transaction-controller";
 import { numberToHex } from "@metamask/utils";
 import { IntentManager } from "./bridge-status-controller.intent.mjs";
 import { BRIDGE_PROD_API_BASE_URL, BRIDGE_STATUS_CONTROLLER_NAME, DEFAULT_BRIDGE_STATUS_CONTROLLER_STATE, MAX_ATTEMPTS, REFRESH_INTERVAL_MS } from "./constants.mjs";
@@ -22,15 +21,14 @@ import { getAccountByAddress } from "./utils/accounts.mjs";
 import { getJwt } from "./utils/authentication.mjs";
 import { stopPollingForQuotes, trackMetricsEvent } from "./utils/bridge.mjs";
 import { fetchBridgeTxStatus, getStatusRequestWithSrcTxHash, shouldSkipFetchDueToFetchFailures } from "./utils/bridge-status.mjs";
-import { getTxGasEstimates } from "./utils/gas.mjs";
 import { getInitialHistoryItem, rekeyHistoryItemInState, shouldPollHistoryItem } from "./utils/history.mjs";
-import { getIntentFromQuote, mapIntentOrderStatusToTransactionStatus } from "./utils/intent-api.mjs";
+import { getIntentFromQuote, mapIntentOrderStatusToTransactionStatus, postSubmitOrder } from "./utils/intent-api.mjs";
 import { signTypedMessage } from "./utils/keyring.mjs";
 import { getFinalizedTxProperties, getPriceImpactFromQuote, getRequestMetadataFromHistory, getRequestParamFromHistory, getTradeDataFromHistory, getEVMTxPropertiesFromTransactionMeta, getTxStatusesFromHistory, getPreConfirmationPropertiesFromQuote } from "./utils/metrics.mjs";
 import { getNetworkClientIdByChainId, getSelectedChainId } from "./utils/network.mjs";
 import { handleNonEvmTx } from "./utils/snaps.mjs";
 import { getApprovalTraceParams, getTraceParams } from "./utils/trace.mjs";
-import { findAndUpdateTransactionsInBatch, getAddTransactionBatchParams, getStatusRequestParams, handleApprovalDelay, handleMobileHardwareWalletDelay, generateActionId, waitForTxConfirmation } from "./utils/transaction.mjs";
+import { getAddTransactionBatchParams, handleApprovalDelay, handleMobileHardwareWalletDelay, generateActionId, waitForTxConfirmation, getTransactionMetaById, addTransactionBatch, addSyntheticTransaction, getTransactions, submitEvmTransaction, checkIsDelegatedAccount } from "./utils/transaction.mjs";
 const metadata = {
     // We want to persist the bridge status state so that we can show the proper data for the Activity list
     // basically match the behavior of TransactionController
@@ -414,8 +412,7 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                 return srcTxHash;
             }
             // Look up in TransactionController if txMeta has been updated with the srcTxHash
-            const txControllerState = this.messenger.call('TransactionController:getState');
-            const txMeta = txControllerState.transactions.find((tx) => tx.id === bridgeTxMetaId);
+            const txMeta = getTransactionMetaById(this.messenger, bridgeTxMetaId);
             return txMeta?.hash;
         });
         _BridgeStatusController_updateSrcTxHash.set(this, (bridgeTxMetaId, srcTxHash) => {
@@ -454,29 +451,18 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
          * TX SUBMISSION HANDLING
          *******************************************************
          */
-        _BridgeStatusController_waitForHashAndReturnFinalTxMeta.set(this, async (hashPromise) => {
-            const transactionHash = await hashPromise;
-            const finalTransactionMeta = this.messenger
-                .call('TransactionController:getState')
-                .transactions.find((tx) => tx.hash === transactionHash);
-            if (!finalTransactionMeta) {
-                throw new Error('Failed to submit cross-chain swap tx: txMeta for txHash was not found');
-            }
-            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, } = {}) => {
-            return await waitForTxConfirmation(this.messenger, txId, {
-                timeoutMs,
-                pollMs,
-            });
-        });
         _BridgeStatusController_handleApprovalTx.set(this, async (quoteResponse, isBridgeTx, srcChainId, approval, resetApproval, requireApproval) => {
             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, {
+                    if (resetApproval) {
+                        await submitEvmTransaction({
+                            messenger: this.messenger,
+                            transactionType: TransactionType.bridgeApproval,
+                            trade: resetApproval,
+                        });
+                    }
+                    const approvalTxMeta = await submitEvmTransaction({
+                        messenger: this.messenger,
                         transactionType: isBridgeTx
                             ? TransactionType.bridgeApproval
                             : TransactionType.swapApproval,
@@ -490,85 +476,7 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
             }
             return undefined;
         });
-        /**
-         * Submits an EVM transaction to the TransactionController
-         *
-         * @param params - The parameters for the transaction
-         * @param params.transactionType - The type of transaction to submit
-         * @param params.trade - The trade data to confirm
-         * @param params.requireApproval - Whether to require approval for the transaction
-         * @param params.txFee - Optional gas fee parameters from the quote (used when gasIncluded is true)
-         * @param params.txFee.maxFeePerGas - The maximum fee per gas from the quote
-         * @param params.txFee.maxPriorityFeePerGas - The maximum priority fee per gas from the quote
-         * @param params.actionId - Optional actionId for pre-submission history (if not provided, one is generated)
-         * @returns The transaction meta
-         */
-        _BridgeStatusController_handleEvmTransaction.set(this, async ({ transactionType, trade, requireApproval = false, txFee, actionId: providedActionId, }) => {
-            // Use provided actionId (for pre-submission history) or generate one
-            const actionId = providedActionId ?? generateActionId();
-            const selectedAccount = getAccountByAddress(this.messenger, trade.from);
-            if (!selectedAccount) {
-                throw new Error('Failed to submit cross-chain swap transaction: unknown account in trade data');
-            }
-            const hexChainId = formatChainIdToHex(trade.chainId);
-            const networkClientId = getNetworkClientIdByChainId(this.messenger, hexChainId);
-            const requestOptions = {
-                actionId,
-                networkClientId,
-                requireApproval,
-                type: transactionType,
-                origin: 'metamask',
-            };
-            // Exclude gasLimit from trade to avoid type issues (it can be null)
-            const { gasLimit: tradeGasLimit, ...tradeWithoutGasLimit } = trade;
-            const transactionParams = {
-                ...tradeWithoutGasLimit,
-                chainId: hexChainId,
-                // 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,
-                ...(await __classPrivateFieldGet(this, _BridgeStatusController_calculateGasFees, "f").call(this, transactionParams, networkClientId, hexChainId, txFee)),
-            };
-            const { result } = await this.messenger.call('TransactionController:addTransaction', transactionParamsWithMaxGas, requestOptions);
-            return await __classPrivateFieldGet(this, _BridgeStatusController_waitForHashAndReturnFinalTxMeta, "f").call(this, result);
-        });
-        _BridgeStatusController_handleUSDTAllowanceReset.set(this, async (resetApproval) => {
-            if (resetApproval) {
-                await __classPrivateFieldGet(this, _BridgeStatusController_handleEvmTransaction, "f").call(this, {
-                    transactionType: TransactionType.bridgeApproval,
-                    trade: resetApproval,
-                });
-            }
-        });
-        _BridgeStatusController_calculateGasFees.set(this, async (transactionParams, networkClientId, chainId, txFee) => {
-            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: toHex(txFee.maxFeePerGas),
-                    maxPriorityFeePerGas: toHex(txFee.maxPriorityFeePerGas),
-                    gas: gas ? toHex(gas) : undefined,
-                };
-            }
-            const { gasFeeEstimates } = this.messenger.call('GasFeeController:getState');
-            const { estimates: txGasFeeEstimates } = await this.messenger.call('TransactionController:estimateGasFee', { transactionParams, chainId, networkClientId });
-            const { maxFeePerGas, maxPriorityFeePerGas } = getTxGasEstimates({
-                networkGasFeeEstimates: gasFeeEstimates,
-                txGasFeeEstimates,
-            });
-            return {
-                maxFeePerGas,
-                maxPriorityFeePerGas,
-                gas: gas ? toHex(gas) : undefined,
-            };
-        });
+        // TODO simplify and make more readable
         /**
          * Submits batched EVM transactions to the TransactionController
          *
@@ -586,22 +494,7 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                 messenger: this.messenger,
                 ...args,
             });
-            const txDataByType = {
-                [TransactionType.bridgeApproval]: transactionParams.transactions.find(({ type }) => type === TransactionType.bridgeApproval)?.params.data,
-                [TransactionType.swapApproval]: transactionParams.transactions.find(({ type }) => type === TransactionType.swapApproval)?.params.data,
-                [TransactionType.bridge]: transactionParams.transactions.find(({ type }) => type === TransactionType.bridge)?.params.data,
-                [TransactionType.swap]: transactionParams.transactions.find(({ type }) => type === TransactionType.swap)?.params.data,
-            };
-            const { batchId } = await __classPrivateFieldGet(this, _BridgeStatusController_addTransactionBatchFn, "f").call(this, transactionParams);
-            const { approvalMeta, tradeMeta } = findAndUpdateTransactionsInBatch({
-                messenger: this.messenger,
-                batchId,
-                txDataByType,
-            });
-            if (!tradeMeta) {
-                throw new Error('Failed to update cross-chain swap transaction batch: tradeMeta not found');
-            }
-            return { approvalMeta, tradeMeta };
+            return await addTransactionBatch(this.messenger, __classPrivateFieldGet(this, _BridgeStatusController_addTransactionBatchFn, "f"), transactionParams);
         });
         /**
          * Submits a cross-chain swap transaction
@@ -691,19 +584,7 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                     // 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;
-                        }
-                    })();
+                    isDelegatedAccount = await checkIsDelegatedAccount(this.messenger, quoteResponse.trade.from, [hexChainId]);
                     if (isStxEnabledOnClient ||
                         quoteResponse.quote.gasIncluded7702 ||
                         isDelegatedAccount) {
@@ -726,17 +607,21 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                         ? quoteResponse.approval
                         : undefined, quoteResponse.resetApproval, requireApproval);
                     approvalTxId = approvalTxMeta?.id;
-                    await handleMobileHardwareWalletDelay(requireApproval);
+                    // Hardware-wallet delay first (Ledger second-prompt spacing), then wait for
+                    // on-chain approval confirmation so swap gas estimation runs after allowance is set.
+                    if (requireApproval && approvalTxMeta) {
+                        await handleMobileHardwareWalletDelay(requireApproval);
+                        await waitForTxConfirmation(this.messenger, approvalTxMeta.id);
+                    }
+                    else {
+                        await handleMobileHardwareWalletDelay(requireApproval);
+                    }
                     // Generate actionId for pre-submission history (non-batch EVM only)
                     const actionId = generateActionId().toString();
                     // Add pre-submission history keyed by actionId
                     // This ensures we have quote data available if transaction fails during submission
                     __classPrivateFieldGet(this, _BridgeStatusController_addTxToHistory, "f").call(this, {
                         accountAddress: selectedAccount.address,
-                        statusRequest: {
-                            ...getStatusRequestParams(quoteResponse),
-                            srcTxHash: '', // Not available yet
-                        },
                         quoteResponse,
                         slippagePercentage: 0,
                         isStxEnabled: isStxEnabledOnClient,
@@ -745,10 +630,12 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                         location,
                         abTests,
                         activeAbTests,
-                    }, actionId);
+                        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)
-                    const tradeTxMeta = await __classPrivateFieldGet(this, _BridgeStatusController_handleEvmTransaction, "f").call(this, {
+                    const tradeTxMeta = await submitEvmTransaction({
+                        messenger: this.messenger,
                         transactionType: isBridgeTx
                             ? TransactionType.bridge
                             : TransactionType.swap,
@@ -776,10 +663,6 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                     __classPrivateFieldGet(this, _BridgeStatusController_addTxToHistory, "f").call(this, {
                         accountAddress: selectedAccount.address,
                         bridgeTxMeta: txMeta, // Only the id field is used by the BridgeStatusController
-                        statusRequest: {
-                            ...getStatusRequestParams(quoteResponse),
-                            srcTxHash: txMeta.hash,
-                        },
                         quoteResponse,
                         slippagePercentage: 0, // TODO include slippage provided by quote if using dynamic slippage, or slippage from quote request
                         isStxEnabled: isStxEnabledOnClient,
@@ -820,6 +703,7 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
             const { quoteResponse, accountAddress, location, abTests, activeAbTests } = params;
             // TODO add metrics context
             stopPollingForQuotes(this.messenger);
+            const startTime = Date.now();
             // Build pre-confirmation properties for error tracking parity with submitTx
             const account = getAccountByAddress(this.messenger, accountAddress);
             const isHardwareAccount = Boolean(account) && isHardwareWallet(account);
@@ -834,7 +718,7 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                 const approvalTxMeta = await __classPrivateFieldGet(this, _BridgeStatusController_handleApprovalTx, "f").call(this, quoteResponse, isBridgeTx, quoteResponse.quote.srcChainId, quoteResponse.approval, quoteResponse.resetApproval, requireApproval);
                 const approvalTxId = approvalTxMeta?.id;
                 if (approvalTxId) {
-                    await __classPrivateFieldGet(this, _BridgeStatusController_waitForTxConfirmation, "f").call(this, approvalTxId);
+                    await waitForTxConfirmation(this.messenger, approvalTxId);
                 }
                 const { srcChainId, requestId } = quoteResponse.quote;
                 const signature = await signTypedMessage({
@@ -850,8 +734,13 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                     userAddress: accountAddress,
                     aggregatorId: intent.protocol,
                 };
-                const intentOrder = await __classPrivateFieldGet(this, _BridgeStatusController_intentManager, "f").submitIntent(submissionParams, __classPrivateFieldGet(this, _BridgeStatusController_clientId, "f"));
-                const orderUid = intentOrder.id;
+                const { id: orderUid, status } = await postSubmitOrder({
+                    params: submissionParams,
+                    clientId: __classPrivateFieldGet(this, _BridgeStatusController_clientId, "f"),
+                    jwt: await getJwt(this.messenger),
+                    fetchFn: __classPrivateFieldGet(this, _BridgeStatusController_fetchFn, "f"),
+                    bridgeApiBaseUrl: __classPrivateFieldGet(this, _BridgeStatusController_config, "f").customBridgeApiBaseUrl,
+                });
                 // Determine transaction type: swap for same-chain, bridge for cross-chain
                 const transactionType = isBridgeTx
                     ? /* c8 ignore start */
@@ -872,25 +761,16 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                     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 this.messenger.call('TransactionController:addTransaction', intentTransactionParams, {
-                    origin: 'metamask',
-                    actionId: generateActionId(),
+                const initialTxMeta = await addSyntheticTransaction(this.messenger, intentTransactionParams, {
                     requireApproval: false,
-                    isStateOnly: true,
                     networkClientId,
                     type: transactionType,
                 });
-                const intentTxMeta = txMetaPromise;
-                // Map intent order status to TransactionController status
-                const initialTransactionStatus = mapIntentOrderStatusToTransactionStatus(intentOrder.status);
-                // Update transaction with proper initial status based on intent order
-                const statusUpdatedTxMeta = {
-                    ...intentTxMeta,
-                    status: initialTransactionStatus,
-                };
-                // Update with actual transaction metadata
+                // Update txHistory with actual transaction metadata
                 const syntheticMeta = {
-                    ...statusUpdatedTxMeta,
+                    ...initialTxMeta,
+                    // Map intent order status to TransactionController status
+                    status: mapIntentOrderStatusToTransactionStatus(status),
                     isIntentTx: true,
                     orderUid,
                 };
@@ -904,14 +784,9 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                         id: bridgeHistoryKey,
                         originalTransactionId: syntheticMeta.id, // Keep original txId for TransactionController updates
                     };
-                    const startTime = Date.now();
                     __classPrivateFieldGet(this, _BridgeStatusController_addTxToHistory, "f").call(this, {
                         accountAddress,
                         bridgeTxMeta: bridgeTxMetaForHistory,
-                        statusRequest: {
-                            ...getStatusRequestParams(quoteResponse),
-                            srcTxHash: syntheticMeta.hash ?? '',
-                        },
                         quoteResponse,
                         slippagePercentage: 0,
                         isStxEnabled: false,
@@ -988,6 +863,7 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                 });
                 return;
             }
+            const { featureId, approvalTxId, quote } = historyItem;
             const requestParamProperties = getRequestParamFromHistory(historyItem);
             // Always publish StatusValidationFailed event, regardless of featureId
             if (eventName === UnifiedSwapBridgeEventName.StatusValidationFailed) {
@@ -1006,13 +882,13 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                 return;
             }
             // Skip tracking all other events when featureId is set (i.e. PERPS)
-            if (historyItem.featureId) {
+            if (featureId) {
                 return;
             }
             const selectedAccount = getAccountByAddress(this.messenger, historyItem.account);
-            const { transactions } = this.messenger.call('TransactionController:getState');
-            const txMeta = transactions?.find((tx) => tx.id === txMetaId);
-            const approvalTxMeta = transactions?.find((tx) => tx.id === historyItem.approvalTxId);
+            const transactions = getTransactions(this.messenger);
+            const txMeta = transactions.find((tx) => tx.id === txMetaId);
+            const approvalTxMeta = transactions.find((tx) => tx.id === approvalTxId);
             const requiredEventProperties = {
                 ...baseProperties,
                 ...requestParamProperties,
@@ -1020,7 +896,7 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                 ...getTradeDataFromHistory(historyItem),
                 ...getTxStatusesFromHistory(historyItem),
                 ...getFinalizedTxProperties(historyItem, txMeta, approvalTxMeta),
-                ...getPriceImpactFromQuote(historyItem.quote),
+                ...getPriceImpactFromQuote(quote),
             };
             trackMetricsEvent({
                 messenger: this.messenger,
@@ -1095,5 +971,5 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
         __classPrivateFieldGet(this, _BridgeStatusController_restartPollingForIncompleteHistoryItems, "f").call(this);
     }
 }
-_BridgeStatusController_pollingTokensByTxMetaId = new WeakMap(), _BridgeStatusController_intentManager = new WeakMap(), _BridgeStatusController_clientId = new WeakMap(), _BridgeStatusController_fetchFn = new WeakMap(), _BridgeStatusController_config = new WeakMap(), _BridgeStatusController_addTransactionBatchFn = new WeakMap(), _BridgeStatusController_trace = new WeakMap(), _BridgeStatusController_markTxAsFailed = new WeakMap(), _BridgeStatusController_restartPollingForIncompleteHistoryItems = new WeakMap(), _BridgeStatusController_addTxToHistory = new WeakMap(), _BridgeStatusController_rekeyHistoryItem = new WeakMap(), _BridgeStatusController_startPollingForTxId = new WeakMap(), _BridgeStatusController_handleFetchFailure = new WeakMap(), _BridgeStatusController_fetchBridgeTxStatus = new WeakMap(), _BridgeStatusController_getSrcTxHash = new WeakMap(), _BridgeStatusController_updateSrcTxHash = new WeakMap(), _BridgeStatusController_wipeBridgeStatusByChainId = new WeakMap(), _BridgeStatusController_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_pollingTokensByTxMetaId = new WeakMap(), _BridgeStatusController_intentManager = new WeakMap(), _BridgeStatusController_clientId = new WeakMap(), _BridgeStatusController_fetchFn = new WeakMap(), _BridgeStatusController_config = new WeakMap(), _BridgeStatusController_addTransactionBatchFn = new WeakMap(), _BridgeStatusController_trace = new WeakMap(), _BridgeStatusController_markTxAsFailed = new WeakMap(), _BridgeStatusController_restartPollingForIncompleteHistoryItems = new WeakMap(), _BridgeStatusController_addTxToHistory = new WeakMap(), _BridgeStatusController_rekeyHistoryItem = new WeakMap(), _BridgeStatusController_startPollingForTxId = new WeakMap(), _BridgeStatusController_handleFetchFailure = new WeakMap(), _BridgeStatusController_fetchBridgeTxStatus = new WeakMap(), _BridgeStatusController_getSrcTxHash = new WeakMap(), _BridgeStatusController_updateSrcTxHash = new WeakMap(), _BridgeStatusController_wipeBridgeStatusByChainId = new WeakMap(), _BridgeStatusController_handleApprovalTx = new WeakMap(), _BridgeStatusController_handleEvmTransactionBatch = new WeakMap(), _BridgeStatusController_trackUnifiedSwapBridgeEvent = new WeakMap();
 //# sourceMappingURL=bridge-status-controller.mjs.map