feat: extend reporting for 'canceled' event in sendform

trezor · Feb 10, 2025 · 5a88230 · 5a88230
1 parent ecd6561
commit 5a88230
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 10 deletions.
diff --git a/packages/suite-analytics/src/types/events.ts b/packages/suite-analytics/src/types/events.ts
@@ -201,7 +201,7 @@ export type SuiteAnalyticsEvent =
     | {
           type: EventType.TransactionCreated;
           payload: {
-              action: 'sent' | 'copied' | 'downloaded' | 'replaced';
+              action: 'sent' | 'copied' | 'downloaded' | 'replaced' | 'canceled';
               symbol: string;
               tokens: string;
               outputsCount: number;

diff --git a/...mponents/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewModalContent.tsx b/...mponents/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewModalContent.tsx
@@ -127,7 +127,9 @@ export const TransactionReviewModalContent = ({
 
     const isBroadcastEnabled = options.includes('broadcast');
 
-    const reportTransactionCreatedEvent = (action: 'sent' | 'copied' | 'downloaded' | 'replaced') =>
+    const reportTransactionCreatedEvent = (
+        action: 'sent' | 'copied' | 'downloaded' | 'replaced' | 'canceled',
+    ) =>
         analytics.report({
             type: EventType.TransactionCreated,
             payload: {
@@ -155,7 +157,10 @@ export const TransactionReviewModalContent = ({
         }
         if (decision) {
             decision.resolve(true);
-            reportTransactionCreatedEvent(isBumpFeeRbfAction ? 'replaced' : 'sent');
+            reportTransactionCreatedEvent(
+                // eslint-disable-next-line no-nested-ternary
+                isBumpFeeRbfAction ? 'replaced' : isCancelRbfAction ? 'canceled' : 'sent',
+            );
         }
     };
 

diff --git a/suite-common/wallet-core/src/send/sendFormThunks.ts b/suite-common/wallet-core/src/send/sendFormThunks.ts
@@ -541,12 +541,14 @@ export const enhancePrecomposedTransactionThunk = createThunk<
             if (formValues.rbfParams) {
                 (enhancedPrecomposedTransaction as PrecomposedTransactionFinalBumpFeeRbf).prevTxid =
                     formValues.rbfParams.txid;
-                (enhancedPrecomposedTransaction as PrecomposedTransactionFinalBumpFeeRbf).feeDifference =
-                    new BigNumber(precomposedTransaction.fee)
-                        .minus(formValues.rbfParams.baseFee)
-                        .toFixed();
-                (enhancedPrecomposedTransaction as PrecomposedTransactionFinalBumpFeeRbf).useNativeRbf =
-                    !!useNativeRbf;
+                (
+                    enhancedPrecomposedTransaction as PrecomposedTransactionFinalBumpFeeRbf
+                ).feeDifference = new BigNumber(precomposedTransaction.fee)
+                    .minus(formValues.rbfParams.baseFee)
+                    .toFixed();
+                (
+                    enhancedPrecomposedTransaction as PrecomposedTransactionFinalBumpFeeRbf
+                ).useNativeRbf = !!useNativeRbf;
                 (
                     enhancedPrecomposedTransaction as PrecomposedTransactionFinalBumpFeeRbf
                 ).useDecreaseOutput = !!hasDecreasedOutput;

diff --git a/suite-native/module-send/src/selectors.ts b/suite-native/module-send/src/selectors.ts
@@ -30,7 +30,9 @@ export const selectTransactionReviewOutputs = (
     const precomposedTx = selectSendPrecomposedTx(state);
 
     const decreaseOutputId =
-        precomposedTx !== undefined && isRbfBumpFeeTransaction(precomposedTx) && precomposedTx.useNativeRbf
+        precomposedTx !== undefined &&
+        isRbfBumpFeeTransaction(precomposedTx) &&
+        precomposedTx.useNativeRbf
             ? precomposedForm?.setMaxOutputId
             : undefined;