From 5e4d8a9113866bb2ac867b73cf74409b923cf422 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Tue, 30 May 2023 14:44:10 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../java/com/tangem/tap/features/demo/DemoHelper.kt    | 10 +++++++---
 .../products/wallet/saltPay/GnosisRegistrator.kt       |  3 ++-
 .../tap/features/send/redux/reducers/FeeReducer.kt     |  6 ++++--
 .../com/tangem/tap/proxy/TransactionManagerImpl.kt     |  3 ++-
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/tangem/tap/features/demo/DemoHelper.kt b/app/src/main/java/com/tangem/tap/features/demo/DemoHelper.kt
index 8191c1016f..56a60b96a3 100644
--- a/app/src/main/java/com/tangem/tap/features/demo/DemoHelper.kt
+++ b/app/src/main/java/com/tangem/tap/features/demo/DemoHelper.kt
@@ -89,9 +89,9 @@ class DemoTransactionSender(private val walletManager: WalletManager) : Transact
         val blockchain = walletManager.wallet.blockchain
         return Result.Success(
             TransactionFee.Choosable(
-                minimum = Amount(0.0001.toBigDecimal(), blockchain),
-                normal = Amount(0.0002.toBigDecimal(), blockchain),
-                priority = Amount(0.0003.toBigDecimal(), blockchain)
+                minimum = Amount(minimumFee, blockchain),
+                normal = Amount(normalFee, blockchain),
+                priority = Amount(priorityFee, blockchain)
             )
         )
     }
@@ -121,5 +121,9 @@ class DemoTransactionSender(private val walletManager: WalletManager) : Transact
 
     companion object {
         val ID = DemoTransactionSender::class.java.simpleName
+
+        private val minimumFee = 0.0001.toBigDecimal()
+        private val normalFee = 0.0002.toBigDecimal()
+        private val priorityFee = 0.0003.toBigDecimal()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/GnosisRegistrator.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/GnosisRegistrator.kt
index 4eab5e464d..fb513d2e11 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/GnosisRegistrator.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/GnosisRegistrator.kt
@@ -214,7 +214,8 @@ class GnosisRegistrator(
                         Result.Failure(BlockchainSdkError.FailedToLoadFee)
                     }
                     is TransactionFee.Choosable -> {
-                        Result.Success((data as TransactionFee.Choosable).normal)
+                        val normalFee = (data as TransactionFee.Choosable).normal
+                        Result.Success(normalFee)
                     }
                 }
             }
diff --git a/app/src/main/java/com/tangem/tap/features/send/redux/reducers/FeeReducer.kt b/app/src/main/java/com/tangem/tap/features/send/redux/reducers/FeeReducer.kt
index b7f943a4e4..0c285c2fa9 100644
--- a/app/src/main/java/com/tangem/tap/features/send/redux/reducers/FeeReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/send/redux/reducers/FeeReducer.kt
@@ -41,6 +41,7 @@ class FeeReducer : SendInternalReducer {
     }
 
     private fun handleAction(action: FeeAction, sendState: SendState, state: FeeState): SendState {
+
         val result = when (action) {
             is FeeAction.RequestFee -> {
                 state.copy(progressState = ProgressState.Loading)
@@ -54,8 +55,7 @@ class FeeReducer : SendInternalReducer {
                 )
             }
             is FeeAction.FeeCalculation.SetFeeResult -> {
-                val fees = action.fee
-                when (fees) {
+                when (val fees = action.fee) {
                     is TransactionFee.Single -> {
                         val feeType = FeeType.SINGLE
                         val currentFee = createValueOfFeeAmount(feeType, fees)
@@ -120,4 +120,6 @@ class FeeReducer : SendInternalReducer {
     private fun getCurrentFeeType(state: FeeState): FeeType {
         return if (state.selectedFeeType == FeeType.SINGLE) FeeType.NORMAL else state.selectedFeeType
     }
+
+ 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/proxy/TransactionManagerImpl.kt b/app/src/main/java/com/tangem/tap/proxy/TransactionManagerImpl.kt
index 9ff4ceecd2..3d489d18fe 100644
--- a/app/src/main/java/com/tangem/tap/proxy/TransactionManagerImpl.kt
+++ b/app/src/main/java/com/tangem/tap/proxy/TransactionManagerImpl.kt
@@ -200,9 +200,10 @@ class TransactionManagerImpl(
                 // for not EVM blockchains set gasLimit ZERO for now
                 when (fee.data) {
                     is TransactionFee.Single -> {
+                        val amount = (fee.data as TransactionFee.Single).value
                         val singleFee = ProxyFee(
                             gasLimit = BigInteger.ZERO,
-                            fee = convertToProxyAmount(amount = (fee.data as TransactionFee.Single).value),
+                            fee = convertToProxyAmount(amount = amount),
                         )
                         ProxyFees(
                             minFee = singleFee,