Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix UXO network rate text state #1415

Merged
merged 1 commit into from
Nov 28, 2024
+18 −14
Merged

Fix UXO network rate text state #1415

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 18 additions & 14 deletions app/src/main/java/com/vultisig/wallet/ui/models/send/GasSettingsViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import androidx.compose.foundation.text.input.TextFieldState
import androidx.compose.foundation.text.input.setTextAndPlaceCursorAtEnd
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import androidx.lifecycle.viewmodel.compose.viewModel
import com.vultisig.wallet.data.api.BlockChairApi
import com.vultisig.wallet.data.api.EvmApi
import com.vultisig.wallet.data.api.EvmApiFactory
Expand All @@ -21,7 +20,6 @@ import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.mapNotNull
import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch
import timber.log.Timber
Expand Down Expand Up @@ -84,19 +82,17 @@ internal class GasSettingsViewModel @Inject constructor(
}.collect()
}

private fun collectUTXOData() = viewModelScope.launch {
state.map { it.selectedPriorityFee }.onEach {
val fee = when (it) {
PriorityFee.LOW -> state.value.defaultByteFee
.multiply(BigInteger("2")).divide(BigInteger("3"))
private fun updateByteFee(priorityFee: PriorityFee) {
val fee = when (priorityFee) {
PriorityFee.LOW -> state.value.defaultByteFee
.multiply(BigInteger("2")).divide(BigInteger("3"))

PriorityFee.NORMAL -> state.value.defaultByteFee
PriorityFee.NORMAL -> state.value.defaultByteFee

PriorityFee.FAST -> state.value.defaultByteFee
.multiply(BigInteger("5")).divide(BigInteger("2"))
}
byteFeeState.setTextAndPlaceCursorAtEnd(fee.toString())
}.collect()
PriorityFee.FAST -> state.value.defaultByteFee
.multiply(BigInteger("5")).divide(BigInteger("2"))
}
byteFeeState.setTextAndPlaceCursorAtEnd(fee.toString())
}

fun loadData(chain: Chain, spec: BlockChainSpecificAndUtxo) {
Expand All @@ -115,7 +111,6 @@ internal class GasSettingsViewModel @Inject constructor(
loadEthData(chain, spec)
}
is BlockChainSpecific.UTXO -> {
collectUTXOData()
loadUTXOData(chain, spec)
}
else -> {}
Expand Down Expand Up @@ -154,6 +149,8 @@ internal class GasSettingsViewModel @Inject constructor(
private fun loadUTXOData(chain: Chain, spec: BlockChainSpecificAndUtxo){

viewModelScope.launch {
if (byteFeeState.text.toBigInteger() > BigInteger.ZERO)
return@launch
try {
val stats = blockChairApi.getBlockChairStats(chain)
val byte = stats.multiply(BigInteger("5")).divide(BigInteger("2"))
Expand All @@ -173,6 +170,7 @@ internal class GasSettingsViewModel @Inject constructor(
state.update {
it.copy(selectedPriorityFee = priorityFee)
}
updateByteFee(priorityFee)
}

fun save(): GasSettings {
Expand Down Expand Up @@ -206,4 +204,10 @@ internal class GasSettingsViewModel @Inject constructor(
)
}
}

private fun CharSequence.toBigInteger() = try {
BigInteger(toString())
} catch (e: Exception) {
BigInteger.ZERO
}
}