Fix gas setting impact (#1428)

vultisig · Dec 4, 2024 · 6267a52 · 6267a52
1 parent 7170640
commit 6267a52
Showing 1 changed file with 28 additions and 8 deletions.
diff --git a/app/src/main/java/com/vultisig/wallet/ui/models/send/SendFormViewModel.kt b/app/src/main/java/com/vultisig/wallet/ui/models/send/SendFormViewModel.kt
@@ -728,22 +728,26 @@ internal class SendFormViewModel @Inject constructor(
 
     private fun calculateGasFees() {
         viewModelScope.launch {
-            selectedToken
+            combine(
+                selectedToken
                 .filterNotNull()
                 .map {
                     gasFeeRepository.getGasFee(it.chain, it.address)
                 }
                 .catch {
                     // TODO handle error when querying gas fee
                     Timber.e(it)
-                }
-                .collect { gasFee ->
-                    this@SendFormViewModel.gasFee.value = gasFee
+                },
+                gasSettings,
+                specific,
+            )
+            { gasFee, gasSettings, specific ->
+                this@SendFormViewModel.gasFee.value = adjustGasFee(gasFee,gasSettings,specific)
 
 //                    uiState.update {
 //                        it.copy(gasFee = mapGasFeeToString(gasFee))
 //                    }
-                }
+            }.collect()
         }
     }
 
@@ -752,7 +756,8 @@ internal class SendFormViewModel @Inject constructor(
             combine(
                 selectedToken.filterNotNull(),
                 gasFee.filterNotNull(),
-            ) { token, gasFee ->
+                gasSettings,
+            ) { token, gasFee, gasSettings ->
                 val chain = token.chain
                 val srcAddress = token.address
                 advanceGasUiRepository.updateTokenStandard(
@@ -781,7 +786,10 @@ internal class SendFormViewModel @Inject constructor(
                     val estimatedFee = gasFeeToEstimatedFee(
                         GasFeeParams(
                             gasLimit = if (chain.standard == TokenStandard.EVM) {
-                                (specific.value?.blockChainSpecific as BlockChainSpecific.Ethereum).gasLimit
+                                if (gasSettings is GasSettings.Eth)
+                                    gasSettings.gasLimit
+                                else
+                                    (specific.value?.blockChainSpecific as BlockChainSpecific.Ethereum).gasLimit
                             } else {
                                 BigInteger.valueOf(1)
                             },
@@ -804,6 +812,17 @@ internal class SendFormViewModel @Inject constructor(
         }
     }
 
+    private fun adjustGasFee(
+        gasFee: TokenValue,
+        gasSettings: GasSettings?,
+        spec: BlockChainSpecificAndUtxo?,
+    ) = gasFee.copy(
+        value = if (gasSettings is GasSettings.UTXO && spec?.blockChainSpecific is BlockChainSpecific.UTXO) {
+            gasSettings.byteFee
+        } else
+            gasFee.value
+    )
+
     private fun loadSelectedCurrency() {
         viewModelScope.launch {
             appCurrency.collect { appCurrency ->
@@ -995,7 +1014,8 @@ internal class SendFormViewModel @Inject constructor(
                 srcAddress.address
             )
 
-            this@SendFormViewModel.gasFee.value = gasFee
+            this@SendFormViewModel.gasFee.value =
+                adjustGasFee(gasFee, gasSettings.value, specific.value)
 
 
             // Rapid toggling of isRefreshing can cause the initial true value to be skipped,