fix (cherry-pick): "Transaction Finalized" metrics event on transacti…

…on confirmation (#24338) (#24353) Cherry-picks 9a7f82a (#24338) to v11.14.5
MetaMask · May 2, 2024 · 2d9f5f7 · 2d9f5f7
1 parent 8c9ed8f
commit 2d9f5f7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/app/scripts/lib/transaction/metrics.test.ts b/app/scripts/lib/transaction/metrics.test.ts
@@ -571,7 +571,7 @@ describe('Transaction metrics', () => {
       mockTransactionMeta.submittedTime = 123;
 
       await handleTransactionConfirmed(mockTransactionMetricsRequest, {
-        transactionMeta: mockTransactionMeta,
+        ...mockTransactionMeta,
         actionId: mockActionId,
       } as any);
 
@@ -627,7 +627,7 @@ describe('Transaction metrics', () => {
       mockTransactionMetaWithBlockaid.submittedTime = 123;
 
       await handleTransactionConfirmed(mockTransactionMetricsRequest, {
-        transactionMeta: mockTransactionMetaWithBlockaid,
+        ...mockTransactionMetaWithBlockaid,
         actionId: mockActionId,
       } as any);
 

diff --git a/app/scripts/lib/transaction/metrics.ts b/app/scripts/lib/transaction/metrics.ts
@@ -92,6 +92,11 @@ export type TransactionEventPayload = {
   error?: string;
 };
 
+export type TransactionMetaEventPayload = TransactionMeta & {
+  actionId?: string;
+  error?: string;
+};
+
 /**
  * This function is called when a transaction is added to the controller.
  *
@@ -185,14 +190,14 @@ export const handleTransactionFailed = async (
  */
 export const handleTransactionConfirmed = async (
   transactionMetricsRequest: TransactionMetricsRequest,
-  transactionEventPayload: TransactionEventPayload,
+  transactionEventPayload: TransactionMetaEventPayload,
 ) => {
-  if (!transactionEventPayload.transactionMeta) {
+  if (Object.keys(transactionEventPayload).length === 0) {
     return;
   }
 
   const extraParams = {} as Record<string, any>;
-  const { transactionMeta } = transactionEventPayload;
+  const transactionMeta = { ...transactionEventPayload };
   const { txReceipt } = transactionMeta;
 
   extraParams.gas_used = txReceipt?.gasUsed;
@@ -209,7 +214,10 @@ export const handleTransactionConfirmed = async (
   await createUpdateFinalizeTransactionEventFragment({
     eventName: TransactionMetaMetricsEvent.finalized,
     extraParams,
-    transactionEventPayload,
+    transactionEventPayload: {
+      actionId: transactionMeta.actionId,
+      transactionMeta,
+    },
     transactionMetricsRequest,
   });
 };