Skip to content

fix(tokens): stabilize token list sort order #772

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

Merged
bmc08gt merged 1 commit into from
May 26, 2026
Merged

fix(tokens): stabilize token list sort order #772

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
16 changes: 12 additions & 4 deletions ...flipcash/shared/tokens/src/main/kotlin/com/flipcash/app/tokens/ui/SelectTokenViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import com.getcode.opencode.model.financial.TokenWithLocalizedBalance
import com.getcode.opencode.model.financial.sum
import com.getcode.opencode.model.financial.toFiat
import com.getcode.solana.keys.Mint
import com.getcode.solana.keys.base58
import com.getcode.util.resources.ResourceHelper
import com.flipcash.libs.coroutines.DispatcherProvider
import com.getcode.view.BaseViewModel
Expand Down Expand Up @@ -94,16 +95,19 @@ class SelectTokenViewModel @Inject constructor(
.onEach { dispatchEvent(Event.OnDiscoveryEnabled(it)) }
.launchIn(viewModelScope)

exchange.observePreferredRate()
.distinctUntilChanged()
.onEach { dispatchEvent(Event.OnRateChanged(it)) }
.launchIn(viewModelScope)

eventFlow
.filterIsInstance<Event.OnPurposeChanged>()
.map { it.purpose }
.flatMapLatest { purpose ->
combine(
stateFlow,
tokenCoordinator.tokenBalances,
exchange.observePreferredRate()
) { state, balances, rate ->
dispatchEvent(Event.OnRateChanged(rate))
) { balances, rate ->
balances
.map {
val balance = LocalFiat(
Expand Down Expand Up @@ -138,6 +142,7 @@ class SelectTokenViewModel @Inject constructor(
it.token.name
}
}

TokenPurpose.Select -> it.token.name
TokenPurpose.Withdraw -> {
if (it.token.address == Mint.usdf) {
Expand All @@ -149,7 +154,10 @@ class SelectTokenViewModel @Inject constructor(
}
)
}
.sortedWith(compareByDescending { item -> item.balance.nativeAmount })
.sortedWith(
compareByDescending<TokenWithLocalizedBalance> { it.balance.nativeAmount.rounded() }
.thenBy { it.token.address.base58() }
)
.filter {
val hasBalance = it.balance.nativeAmount.hasDisplayableValue
when (purpose) {
Expand Down
Loading