Fix gas setting impact

vultisig · Nov 30, 2024 · d3d3571 · d3d3571
1 parent 31d7d0b
commit d3d3571
Showing 1 changed file with 22 additions and 6 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 = updatedGasFee(gasFee,gasSettings,specific)
 
 //                    uiState.update {
 //                        it.copy(gasFee = mapGasFeeToString(gasFee))
 //                    }
-                }
+            }.collect()
         }
     }
 
@@ -804,6 +808,17 @@ internal class SendFormViewModel @Inject constructor(
         }
     }
 
+    private fun updatedGasFee(
+        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 +1010,8 @@ internal class SendFormViewModel @Inject constructor(
                 srcAddress.address
             )
 
-            this@SendFormViewModel.gasFee.value = gasFee
+            this@SendFormViewModel.gasFee.value =
+                updatedGasFee(gasFee, gasSettings.value, specific.value)
 
 
             // Rapid toggling of isRefreshing can cause the initial true value to be skipped,