chore: add actionId and originalTransactionId to polling args

history

Author: micaelae

packages/bridge-status-controller/src/bridge-status-controller.ts

@@ -1142,20 +1142,18 @@ export class BridgeStatusController extends StaticIntervalPollingController<Brid
 
           // Add pre-submission history keyed by actionId
           // This ensures we have quote data available if transaction fails during submission
-          this.#addTxToHistory(
-            {
-              accountAddress: selectedAccount.address,
-              quoteResponse,
-              slippagePercentage: 0,
-              isStxEnabled: isStxEnabledOnClient,
-              startTime,
-              approvalTxId,
-              location,
-              abTests,
-              activeAbTests,
-            },
+          this.#addTxToHistory({
+            accountAddress: selectedAccount.address,
+            quoteResponse,
+            slippagePercentage: 0,
+            isStxEnabled: isStxEnabledOnClient,
+            startTime,
+            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)

packages/bridge-status-controller/src/types.ts

@@ -109,6 +109,9 @@ export type RefuelStatusResponse = object & StatusResponse;
 export type BridgeHistoryItem = {
   txMetaId?: string; // Optional: not available pre-submission or on sync failure
   actionId?: string; // Only for non-batch EVM transactions
+  /**
+   * @deprecated the txMeta or orderUid should be used instead
+   */
   originalTransactionId?: string; // Keep original transaction ID for intent transactions
   batchId?: string;
   quote: Quote;
@@ -211,7 +214,12 @@ export type QuoteMetadataSerialized = {
 };
 
 export type StartPollingForBridgeTxStatusArgs = {
-  bridgeTxMeta?: TransactionMeta;
+  bridgeTxMeta?: Pick<TransactionMeta, 'id' | 'hash' | 'batchId'>;
+  actionId?: string;
+  /**
+   * @deprecated the txMeta or orderUid should be used instead
+   */
+  originalTransactionId?: string;
   quoteResponse: QuoteResponse & QuoteMetadata;
   startTime?: BridgeHistoryItem['startTime'];
   slippagePercentage: BridgeHistoryItem['slippagePercentage'];

packages/bridge-status-controller/src/utils/history.ts

@@ -42,14 +42,16 @@ export const rekeyHistoryItemInState = (
  *
  * @param actionId - The action ID used for pre-submission tracking
  * @param bridgeTxMetaId - The transaction meta ID from bridgeTxMeta
+ * @param syntheticTransactionId - The transactionId of the intent's placeholder transaction
  * @returns The key to use for the history item
  * @throws Error if neither actionId nor bridgeTxMetaId is provided
  */
 export function getHistoryKey(
   actionId: string | undefined,
   bridgeTxMetaId: string | undefined,
+  syntheticTransactionId?: string,
 ): string {
-  const historyKey = actionId ?? bridgeTxMetaId;
+  const historyKey = actionId ?? bridgeTxMetaId ?? syntheticTransactionId;
   if (!historyKey) {
     throw new Error(
       'Cannot add tx to history: either actionId or bridgeTxMeta.id must be provided',
@@ -59,7 +61,12 @@ export function getHistoryKey(
 }
 
 export const getInitialHistoryItem = (
-  {
+  args: StartPollingForBridgeTxStatusArgsSerialized,
+): {
+  historyKey: string;
+  txHistoryItem: BridgeHistoryItem;
+} => {
+  const {
     bridgeTxMeta,
     quoteResponse,
     startTime,
@@ -72,25 +79,24 @@ export const getInitialHistoryItem = (
     abTests,
     activeAbTests,
     accountAddress: selectedAddress,
-  }: StartPollingForBridgeTxStatusArgsSerialized,
-  actionId?: string,
-): {
-  historyKey: string;
-  txHistoryItem: BridgeHistoryItem;
-} => {
+    originalTransactionId,
+    actionId,
+  } = args;
   // Determine the key for this history item:
   // - For pre-submission (non-batch EVM): use actionId
   // - For post-submission or other cases: use bridgeTxMeta.id
-  const historyKey = getHistoryKey(actionId, bridgeTxMeta?.id);
+  const historyKey = getHistoryKey(
+    actionId,
+    bridgeTxMeta?.id,
+    originalTransactionId,
+  );
 
   // Write all non-status fields to state so we can reference the quote in Activity list without the Bridge API
   // We know it's in progress but not the exact status yet
   const txHistoryItem = {
     txMetaId: bridgeTxMeta?.id,
     actionId,
-    originalTransactionId:
-      (bridgeTxMeta as unknown as { originalTransactionId: string })
-        ?.originalTransactionId || bridgeTxMeta?.id, // Keep original for intent transactions
+    originalTransactionId: originalTransactionId ?? bridgeTxMeta?.id, // Keep original for intent transactions
     batchId: bridgeTxMeta?.batchId,
     quote: quoteResponse.quote,
     startTime,