Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import com.wallet.core.primitives.FiatProviderName
import uniffi.gemstone.GemFiatSuggestedAmount

internal sealed interface FiatAction {
data class SetAmount(val amount: String) : FiatAction
data class SelectAmount(val amount: GemFiatSuggestedAmount) : FiatAction
data class SelectProvider(val provider: FiatProviderName) : FiatAction
data object RetryQuote : FiatAction
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.text.input.TextFieldState
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
import androidx.compose.material3.Icon
Expand Down Expand Up @@ -75,7 +76,7 @@ internal fun FiatScene(
selectedProvider: GemFiatQuoteRow?,
providerListItem: ListItemModel?,
rateRow: GemListRow?,
fiatAmount: String,
amount: TextFieldState,
suggestedAmounts: List<GemFiatSuggestedAmount>,
snackbar: SnackbarHostState,
titleContent: @Composable () -> Unit,
Expand Down Expand Up @@ -110,11 +111,10 @@ internal fun FiatScene(
Spacer16()
AmountField(
modifier = Modifier.testTag("amountInputField"),
amount = fiatAmount,
state = amount,
symbol = viewState.amountField.amountSymbol(),
equivalent = selectedProvider?.let { it.cryptoEstimateText(it.cryptoAmount.text()) } ?: " ",
error = viewState.amountError?.string(LocalContext.current).orEmpty(),
onValueChange = { onAction(FiatAction.SetAmount(it)) },
keyboardType = viewState.amountField.keyboard.keyboardType(),
maximumFractionDigits = 0,
textStyle = MaterialTheme.typography.displayMedium,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ fun FiatScreen(cancelAction: CancelAction, onFiatTransactions: () -> Unit, viewM
val type by viewModel.type.collectAsStateWithLifecycle()
val viewState by viewModel.viewState.collectAsStateWithLifecycle()
val asset by viewModel.assetInfoUIModel.collectAsStateWithLifecycle()
val amount by viewModel.amount.collectAsStateWithLifecycle()
val providers by viewModel.providers.collectAsStateWithLifecycle()
val selectedProvider by viewModel.selectedProvider.collectAsStateWithLifecycle()
val providerListItem by viewModel.providerListItem.collectAsStateWithLifecycle()
Expand All @@ -80,7 +79,7 @@ fun FiatScreen(cancelAction: CancelAction, onFiatTransactions: () -> Unit, viewM
selectedProvider = selectedProvider,
providerListItem = providerListItem,
rateRow = rateRow,
fiatAmount = amount,
amount = viewModel.amount,
suggestedAmounts = viewModel.suggestedAmounts,
titleContent = {
FiatTitle(
Expand All @@ -92,8 +91,6 @@ fun FiatScreen(cancelAction: CancelAction, onFiatTransactions: () -> Unit, viewM
},
) { action ->
when (action) {
is FiatAction.SetAmount -> viewModel.updateAmount(action.amount)

is FiatAction.SelectAmount -> viewModel.selectAmount(action.amount)

is FiatAction.SelectProvider -> viewModel.setProvider(action.provider)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ package com.gemwallet.android.features.fiat_connect.viewmodels

import android.content.Context
import android.util.Log
import androidx.compose.foundation.text.input.TextFieldState
import androidx.compose.foundation.text.input.setTextAndPlaceCursorAtEnd
import androidx.compose.runtime.snapshotFlow
import androidx.lifecycle.SavedStateHandle
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
Expand Down Expand Up @@ -54,6 +57,7 @@ import kotlinx.coroutines.withContext
import uniffi.gemstone.GemAssetBalanceScope
import uniffi.gemstone.GemFiatQuoteRequest
import uniffi.gemstone.GemFiatQuoteServiceInterface
import uniffi.gemstone.GemFiatSession
import uniffi.gemstone.GemFiatSuggestedAmount
import uniffi.gemstone.GemFiatViewState
import uniffi.gemstone.GemInfoTopic
Expand Down Expand Up @@ -103,8 +107,7 @@ class FiatViewModel @Inject constructor(
session.viewState(priceUsd, isUrlLoading, assetInfo?.metadata?.isSellEnabled == true)
}.stateIn(viewModelScope, SharingStarted.Eagerly, session.value.viewState(null, false, false))

val amount: StateFlow<String> = viewState.map { it.amount }
.stateIn(viewModelScope, SharingStarted.Eagerly, viewState.value.amount)
val amount = TextFieldState(session.value.amountText)

val assetInfoUIModel = assetInfo
.mapNotNull { it }
Expand Down Expand Up @@ -150,13 +153,18 @@ class FiatViewModel @Inject constructor(
init {
assetInfo.filterNotNull()
.onEach { data ->
session.update {
it.onBalanceChanged(data.balance.available)
.onSellEnabledChanged(data.metadata.isSellEnabled)
}
showSession(
session.value
.onBalanceChanged(data.balance.available)
.onSellEnabledChanged(data.metadata.isSellEnabled),
)
}
.launchIn(viewModelScope)

snapshotFlow { amount.text.toString() }
.onEach { text -> session.update { if (it.amountText == text) it else it.onAmountChanged(text) } }
.launchIn(viewModelScope)

combine(
session.map { it.quoteRequest() }.distinctUntilChanged().debounce(GemConstants.fiatQuoteDebounce),
assetInfo.filterNotNull().map { it.asset.id }.distinctUntilChanged(),
Expand All @@ -173,20 +181,23 @@ class FiatViewModel @Inject constructor(
session.update { it.onQuoteResults(results) }
}

fun updateAmount(newAmount: String) {
session.update { it.onAmountChanged(newAmount) }
}

fun selectAmount(suggestion: GemFiatSuggestedAmount) {
updateAmount(suggestion.amount.toString())
amount.setTextAndPlaceCursorAtEnd(suggestion.amount.toString())
}

fun setProvider(provider: FiatProviderName) {
session.update { it.onProviderSelected(provider.toGem()) }
}

fun setType(type: FiatQuoteType) {
session.update { it.onTypeChanged(type.toGem()) }
showSession(session.value.onTypeChanged(type.toGem()))
}

private fun showSession(next: GemFiatSession) {
session.value = next
if (amount.text.toString() != next.amountText) {
amount.setTextAndPlaceCursorAtEnd(next.amountText)
}
}

fun retry() {
Expand Down Expand Up @@ -226,3 +237,9 @@ class FiatViewModel @Inject constructor(

private data class QuoteFetch(val request: GemFiatQuoteRequest, val assetId: AssetId)
}

private val GemFiatSession.amountText: String
get() = when (quoteType.toPrimitives()) {
FiatQuoteType.Buy -> buy.amount
FiatQuoteType.Sell -> sell.amount
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ package com.gemwallet.android.features.fiat_connect.viewmodels.integration

import android.content.Context
import android.util.Log
import androidx.compose.foundation.text.input.setTextAndPlaceCursorAtEnd
import androidx.compose.runtime.snapshots.Snapshot
import androidx.lifecycle.SavedStateHandle
import androidx.lifecycle.viewModelScope
import androidx.test.ext.junit.runners.AndroidJUnit4
Expand Down Expand Up @@ -211,7 +213,7 @@ class FiatViewModelTest {
advanceTimeBy(DebounceSettleMs)
runCurrent()

assertEquals("10", viewModel.amount.value)
assertEquals("10", viewModel.amount.text.toString())
coVerify(exactly = 1) {
service.quotes(GemFiatQuoteRequest(FiatQuoteType.Buy.toGem(), 10.0), asset.id.toIdentifier())
}
Expand Down Expand Up @@ -239,7 +241,7 @@ class FiatViewModelTest {
advanceTimeBy(DebounceSettleMs)
runCurrent()

assertEquals(MockSellAmount.toString(), viewModel.amount.value)
assertEquals(MockSellAmount.toString(), viewModel.amount.text.toString())
coVerify(exactly = 0) {
service.quotes(GemFiatQuoteRequest(FiatQuoteType.Sell.toGem(), MockBuyAmount.toDouble()), asset.id.toIdentifier())
}
Expand All @@ -261,7 +263,7 @@ class FiatViewModelTest {
assertTrue(viewModel.providers.value.isNotEmpty())
assertEquals(ButtonState.Enabled, viewModel.viewState.value.buttonState.buttonState())

viewModel.updateAmount("75")
viewModel.setAmount("75")
runCurrent()

assertTrue(viewModel.providers.value.isEmpty())
Expand All @@ -281,9 +283,9 @@ class FiatViewModelTest {
advanceTimeBy(DebounceSettleMs)
runCurrent()

viewModel.updateAmount("200")
viewModel.setAmount("200")
advanceTimeBy(DebounceSettleMs / 2)
viewModel.updateAmount(MockBuyAmount.toString())
viewModel.setAmount(MockBuyAmount.toString())
advanceTimeBy(DebounceSettleMs)
runCurrent()

Expand Down Expand Up @@ -340,7 +342,7 @@ class FiatViewModelTest {
val viewModel = createViewModel()

try {
viewModel.updateAmount("")
viewModel.setAmount("")
runCurrent()

assertEquals("string:${R.string.input_enter_amount_to}", viewModel.viewState.value.quotesMessage(context))
Expand Down Expand Up @@ -536,7 +538,7 @@ class FiatViewModelTest {
advanceTimeBy(DebounceSettleMs)
runCurrent()
assertEquals(FiatQuoteType.Sell, viewModel.type.value)
assertEquals("25", viewModel.amount.value)
assertEquals("25", viewModel.amount.text.toString())

assetInfoFlow.value =
mockAssetData(
Expand All @@ -549,7 +551,7 @@ class FiatViewModelTest {
runCurrent()
assertFalse(viewModel.showsTypePicker.value)
assertEquals(FiatQuoteType.Buy, viewModel.type.value)
assertEquals("25", viewModel.amount.value)
assertEquals("25", viewModel.amount.text.toString())
coVerify(exactly = 1) {
service.quotes(GemFiatQuoteRequest(FiatQuoteType.Buy.toGem(), 25.0), asset.id.toIdentifier())
}
Expand Down Expand Up @@ -622,7 +624,7 @@ class FiatViewModelTest {
runCurrent()
coVerify(exactly = 1) { service.quotes(any(), any()) }

viewModel.updateAmount("75")
viewModel.setAmount("75")
advanceTimeBy(DebounceSettleMs)
runCurrent()
coVerify(exactly = 1) { service.quotes(GemFiatQuoteRequest(FiatQuoteType.Buy.toGem(), 75.0), any()) }
Expand Down Expand Up @@ -696,6 +698,11 @@ class FiatViewModelTest {
)
}

private fun FiatViewModel.setAmount(value: String) {
amount.setTextAndPlaceCursorAtEnd(value)
Snapshot.sendApplyNotifications()
}

private companion object {
val OneBitcoin: BigInteger = BigInteger("100000000")
const val MockBuyAmount = 20u
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package com.gemwallet.android.features.transfer.presents.amount

internal sealed interface AmountAction {
data object Next : AmountAction
data class SetAmount(val amount: String) : AmountAction
data object SwitchInputType : AmountAction
data object SetMaxAmount : AmountAction
data object Buy : AmountAction
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.text.input.TextFieldState
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
Expand Down Expand Up @@ -51,7 +52,7 @@ import uniffi.gemstone.assetText
@Composable
internal fun AmountScene(
title: String,
amount: String,
amount: TextFieldState,
field: GemAmountField?,
asset: Asset,
icon: GemAssetIcon?,
Expand Down Expand Up @@ -82,8 +83,8 @@ internal fun AmountScene(
item {
Spacer16()
AmountField(
modifier = Modifier.fillMaxWidth().focusRequester(focusRequester).testTag("amountInputField"),
amount = amount,
modifier = Modifier.focusRequester(focusRequester).testTag("amountInputField"),
state = amount,
symbol = field?.amountSymbol() ?: AmountSymbolUIModel("", AmountSymbolPlacement.Trailing),
onInputTypeClick = if (canSwitchInputType) {
{ onAction(AmountAction.SwitchInputType) }
Expand All @@ -95,7 +96,6 @@ internal fun AmountScene(
keyboardType = field?.keyboard?.keyboardType() ?: KeyboardType.Decimal,
error = error,
errorInfo = errorTopic?.let { { showsErrorInfo = true } },
onValueChange = { onAction(AmountAction.SetAmount(it)) },
onNext = { onAction(AmountAction.Next) },
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ fun AmountScreen(onCancel: () -> Unit, onConfirm: (ConfirmTransferInput) -> Unit
onAction = { action ->
when (action) {
AmountAction.Next -> viewModel.onNext()
is AmountAction.SetAmount -> viewModel.updateAmount(action.amount)
AmountAction.SwitchInputType -> viewModel.switchInputType()
AmountAction.SetMaxAmount -> viewModel.onMaxAmount()
AmountAction.Buy -> onBuy(asset.id)
Expand All @@ -94,7 +93,7 @@ fun AmountScreen(onCancel: () -> Unit, onConfirm: (ConfirmTransferInput) -> Unit
onSelectResource = viewModel::selectResource,
onSelectLeverage = viewModel::selectLeverage,
onOpenAutoclose = {
viewModel.perpetualProvider?.onAutocloseOpened(viewModel.amount)
viewModel.perpetualProvider?.onAutocloseOpened(viewModel.amount.text.toString())
showsAutoclose = true
},
)
Expand All @@ -107,7 +106,7 @@ fun AmountScreen(onCancel: () -> Unit, onConfirm: (ConfirmTransferInput) -> Unit
AmountAutocloseSheet(
isVisible = showsAutoclose,
provider = perpetual,
amount = viewModel.amount,
amount = viewModel.amount.text.toString(),
onDismiss = { showsAutoclose = false },
)
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.gemwallet.android.features.transfer.viewmodels.amount

import android.content.Context
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.setValue
import androidx.compose.foundation.text.input.TextFieldState
import androidx.compose.foundation.text.input.setTextAndPlaceCursorAtEnd
import androidx.compose.runtime.snapshotFlow
import androidx.lifecycle.SavedStateHandle
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
Expand Down Expand Up @@ -132,8 +132,7 @@ class AmountViewModel @Inject constructor(

private val session = MutableStateFlow(newAmountSession(numberFormat()))

var amount by mutableStateOf("")
private set
val amount = TextFieldState()

val amountInputType: StateFlow<GemAmountInputType> = session.map { it.inputType }
.stateIn(viewModelScope, SharingStarted.Eagerly, GemAmountInputType.ASSET)
Expand Down Expand Up @@ -228,18 +227,17 @@ class AmountViewModel @Inject constructor(
input.filterNotNull()
.onEach(::onInputChanged)
.launchIn(viewModelScope)

snapshotFlow { amount.text.toString() }
.onEach { text -> session.update { if (it.text == text) it else it.onText(text) } }
.launchIn(viewModelScope)
}

private fun onInputChanged(input: GemAmountInput) {
val current = assetInfo.value ?: return
showSession(session.value.onInputChanged(input, current.asset.toGem()))
}

fun updateAmount(input: String) {
amount = input
session.update { it.onText(input) }
}

fun onMaxAmount() {
val current = assetInfo.value ?: return
val input = input.value ?: return
Expand All @@ -252,7 +250,9 @@ class AmountViewModel @Inject constructor(

private fun showSession(next: GemAmountSession) {
session.value = next
amount = next.text
if (amount.text.toString() != next.text) {
amount.setTextAndPlaceCursorAtEnd(next.text)
}
}

fun onNext() {
Expand Down
Loading
Loading