problem: change fee for restored tx

emeraldpay · Dec 29, 2023 · 198f756 · 198f756
1 parent 35c19ff
commit 198f756
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/packages/core/src/transaction/workflow/TxBuilder.ts b/packages/core/src/transaction/workflow/TxBuilder.ts
@@ -148,24 +148,33 @@ export class TxBuilder implements BuilderOrigin {
             return this.convertEthereumTx(createTx);
           }
 
+          this.mergeEthereumFee(createTx);
           this.mergeEthereumTx(transaction, createTx);
         }
 
-        if (isChanged) {
-          if (isErc20ApproveCreateTx(createTx)) {
+        if (isErc20ApproveCreateTx(createTx)) {
+          if (isChanged) {
             return this.transformErc20ApproveTx(createTx);
           }
 
-          if (isErc20ConvertCreateTx(createTx)) {
+          this.mergeEthereumFee(createTx);
+        }
+
+        if (isErc20ConvertCreateTx(createTx)) {
+          if (isChanged) {
             return this.transformErc20ConvertTx(createTx);
           }
 
-          if (isEtherRecoveryCreateTx(createTx) || isErc20RecoveryCreateTx(createTx)) {
+          this.mergeEthereumFee(createTx);
+        }
+
+        if (isEtherRecoveryCreateTx(createTx) || isErc20RecoveryCreateTx(createTx)) {
+          if (isChanged) {
             return this.convertEthereumRecoveryTx(createTx);
           }
-        }
 
-        this.mergeEthereumFee(createTx);
+          this.mergeEthereumFee(createTx);
+        }
       }
     }