fixup! feat: extend reporting for 'canceled' event in sendform

Author: peter-sanderson

Diff for: packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/CancelTransaction/CancelTransactionModal.tsx

@@ -71,10 +71,7 @@ export const CancelTransactionModal = ({
         dispatch(composeCancelTransactionThunk({ account, tx, chainedTxs }))
             .unwrap()
             .then(precomposed => {
-                setComposedCancelTx({
-                    ...precomposed,
-                    prevTxToBeCanceledId: tx.txid,
-                });
+                setComposedCancelTx({ ...precomposed, rbfType: 'cancel', prevTxid: tx.txid });
             })
             .catch(setError);
     }, [account, tx, dispatch, chainedTxs]);

Diff for: packages/suite/src/middlewares/wallet/replaceByFeeErrorMiddleware.ts

@@ -1,25 +1,12 @@
 import { MiddlewareAPI } from 'redux';
 
 import { transactionsActions } from '@suite-common/wallet-core/';
-import { GeneralPrecomposedTransactionFinal } from '@suite-common/wallet-types';
-import { isRbfBumpFeeTransaction, isRbfCancelTransaction } from '@suite-common/wallet-utils';
+import { isRbfTransaction } from '@suite-common/wallet-utils';
 
 import { Action, AppState, Dispatch } from 'src/types/suite';
 
 import { replaceByFeeErrorThunk } from '../../actions/wallet/send/replaceByFeeErrorThunk';
 
-const getPrevTxid = (tx: GeneralPrecomposedTransactionFinal) => {
-    if (isRbfBumpFeeTransaction(tx)) {
-        return tx.prevTxid;
-    }
-
-    if (isRbfCancelTransaction(tx)) {
-        return tx.prevTxToBeCanceledId;
-    }
-
-    return null;
-};
-
 export const replaceByFeeErrorMiddleware =
     (api: MiddlewareAPI<Dispatch, AppState>) =>
     (next: Dispatch) =>
@@ -37,12 +24,11 @@ export const replaceByFeeErrorMiddleware =
             return action;
         }
 
-        const prevTxId = getPrevTxid(precomposedTx);
-        if (prevTxId === null) {
+        if (!isRbfTransaction(precomposedTx)) {
             return action;
         }
 
-        const addedTransaction = transactions.find(tx => tx.txid === prevTxId);
+        const addedTransaction = transactions.find(tx => tx.txid === precomposedTx.prevTxid);
 
         if (addedTransaction !== undefined && addedTransaction.blockHeight !== undefined) {
             api.dispatch(replaceByFeeErrorThunk());

Diff for: suite-common/wallet-core/src/send/sendFormThunks.ts

@@ -533,27 +533,26 @@ export const enhancePrecomposedTransactionThunk = createThunk<
             (!hasDecreasedOutput && nativeRbfAvailable) ||
             (hasDecreasedOutput && decreaseOutputAvailable);
 
-        const enhancedPrecomposedTransaction: GeneralPrecomposedTransactionFinal = {
-            ...precomposedTransaction,
+        const createGeneralPrecomposedTransactionFinal = (): GeneralPrecomposedTransactionFinal => {
+            if (!isCardanoTx(selectedAccount, precomposedTransaction) && formValues.rbfParams) {
+                const enhancedRbfPrecomposedTx: PrecomposedTransactionFinalBumpFeeRbf = {
+                    ...precomposedTransaction,
+                    rbfType: 'bump-fee',
+                    prevTxid: formValues.rbfParams.txid,
+                    feeDifference: new BigNumber(precomposedTransaction.fee)
+                        .minus(formValues.rbfParams.baseFee)
+                        .toFixed(),
+                    useNativeRbf: !!useNativeRbf,
+                    useDecreaseOutput: !!hasDecreasedOutput,
+                };
+
+                return enhancedRbfPrecomposedTx;
+            }
+
+            return precomposedTransaction;
         };
 
-        if (!isCardanoTx(selectedAccount, enhancedPrecomposedTransaction)) {
-            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
-                ).useDecreaseOutput = !!hasDecreasedOutput;
-            }
-        }
+        const enhancedPrecomposedTransaction = createGeneralPrecomposedTransactionFinal();
 
         if (
             !isCardanoTx(selectedAccount, enhancedPrecomposedTransaction) &&

Diff for: suite-common/wallet-types/src/transaction.ts

@@ -103,7 +103,7 @@ export type PrecomposedTransactionNonFinal = PrecomposedTransactionConnectRespon
 };
 
 // base of PrecomposedTransactionFinal
-type TxFinal = PrecomposedTransactionConnectResponseFinal & {
+type PrecomposedTransactionBase = PrecomposedTransactionConnectResponseFinal & {
     max?: string;
     feeLimit?: string;
     estimatedFeeLimit?: string;
@@ -120,21 +120,23 @@ export type PrecomposedTransactionCardanoFinal =
         token?: TokenInfo;
     };
 
-export type PrecomposedTransactionFinalBumpFeeRbf = TxFinal & {
+export type PrecomposedTransactionFinalBumpFeeRbf = PrecomposedTransactionBase & {
+    rbfType: 'bump-fee';
     prevTxid: string;
     feeDifference: string;
     // Native RBF is a firmware feature to recognize an RBF transaction and simplify transaction review flow.
     useNativeRbf: boolean;
     useDecreaseOutput: boolean;
 };
 
-export type PrecomposedTransactionFinalCancelRbf = TxFinal & {
-    prevTxToBeCanceledId: string;
+export type PrecomposedTransactionFinalCancelRbf = PrecomposedTransactionBase & {
+    rbfType: 'cancel';
+    prevTxid: string;
 };
 
 // Strict distinction between Normal-Tx and Bump-Fee-Tx / Cancel-Tx
 export type PrecomposedTransactionFinal =
-    | TxFinal
+    | PrecomposedTransactionBase
     | PrecomposedTransactionFinalBumpFeeRbf
     | PrecomposedTransactionFinalCancelRbf;
 

Diff for: suite-common/wallet-utils/src/transactionUtils.ts

@@ -63,14 +63,18 @@ export const isPending = (tx: WalletAccountTransaction | AccountTransaction) =>
     return !!tx && (!tx.blockHeight || tx.blockHeight < 0);
 };
 
+export const isRbfTransaction = (
+    tx: GeneralPrecomposedTransactionFinal,
+): tx is PrecomposedTransactionFinalBumpFeeRbf | PrecomposedTransactionFinalCancelRbf =>
+    'rbfType' in tx;
+
 export const isRbfBumpFeeTransaction = (
     tx: GeneralPrecomposedTransactionFinal,
-): tx is PrecomposedTransactionFinalBumpFeeRbf => 'prevTxid' in tx && tx.prevTxid !== undefined;
+): tx is PrecomposedTransactionFinalBumpFeeRbf => isRbfTransaction(tx) && tx.rbfType === 'bump-fee';
 
 export const isRbfCancelTransaction = (
     tx: GeneralPrecomposedTransactionFinal,
-): tx is PrecomposedTransactionFinalCancelRbf =>
-    'prevTxToBeCanceledId' in tx && tx.prevTxToBeCanceledId !== undefined;
+): tx is PrecomposedTransactionFinalCancelRbf => isRbfTransaction(tx) && tx.rbfType === 'cancel';
 
 /* Convert date to string in YYYY-MM-DD format */
 const generateTransactionDateKey = (d: Date) =>