From 66adb3300c6abfb07bcf6bd6f821a244bb345771 Mon Sep 17 00:00:00 2001 From: Brandon McAnsh Date: Fri, 22 May 2026 11:59:36 -0400 Subject: [PATCH] chore(withdraw): localize token balances in select screen Signed-off-by: Brandon McAnsh --- .../app/withdrawal/WithdrawalViewModel.kt | 15 ++++++++++----- .../app/tokens/ui/SelectTokenViewModel.kt | 5 +---- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/apps/flipcash/features/withdrawal/src/main/kotlin/com/flipcash/app/withdrawal/WithdrawalViewModel.kt b/apps/flipcash/features/withdrawal/src/main/kotlin/com/flipcash/app/withdrawal/WithdrawalViewModel.kt index a97593da8..daf89eb25 100644 --- a/apps/flipcash/features/withdrawal/src/main/kotlin/com/flipcash/app/withdrawal/WithdrawalViewModel.kt +++ b/apps/flipcash/features/withdrawal/src/main/kotlin/com/flipcash/app/withdrawal/WithdrawalViewModel.kt @@ -240,14 +240,19 @@ internal class WithdrawalViewModel @Inject constructor( exchange.observePreferredRate(), ) { tokens, balance, rate -> val token = tokens.find { it.address == tokenAddress } ?: return@combine null + val tokenName = when (token.address) { + Mint.usdc -> { + resources.getString(R.string.displayName_usdc) + } + Mint.usdf -> { + resources.getString(R.string.displayName_usdf) + } + else -> token.name + } TokenWithBalance( token = token, balance = balance.convertingTo(rate), - displayName = if (token.address == Mint.usdf) { - resources.getString(R.string.displayName_usdc) - } else { - token.name - } + displayName = tokenName, ) } }.filterNotNull() diff --git a/apps/flipcash/shared/tokens/src/main/kotlin/com/flipcash/app/tokens/ui/SelectTokenViewModel.kt b/apps/flipcash/shared/tokens/src/main/kotlin/com/flipcash/app/tokens/ui/SelectTokenViewModel.kt index a0818b4db..a1320dc85 100644 --- a/apps/flipcash/shared/tokens/src/main/kotlin/com/flipcash/app/tokens/ui/SelectTokenViewModel.kt +++ b/apps/flipcash/shared/tokens/src/main/kotlin/com/flipcash/app/tokens/ui/SelectTokenViewModel.kt @@ -101,10 +101,7 @@ class SelectTokenViewModel @Inject constructor( combine( stateFlow, tokenCoordinator.tokenBalances, - when (purpose) { - TokenPurpose.Withdraw -> flowOf(exchange.rateForUsd()) - else -> exchange.observePreferredRate() - } + exchange.observePreferredRate() ) { state, balances, rate -> dispatchEvent(Event.OnRateChanged(rate)) balances