diff --git a/packages/suite-analytics/src/types/events.ts b/packages/suite-analytics/src/types/events.ts index 623ed1778fb..4fdaddf0f04 100644 --- 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/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewModalContent.tsx b/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewModalContent.tsx index 90b20340934..160bde5718b 100644 --- a/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewModalContent.tsx +++ b/packages/suite/src/components/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 index bf8b60893d6..a27028a6fe2 100644 --- 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 index 23e8ef27c15..9fd5adba5d7 100644 --- 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;