chore: label cash reserves as USD Reserves; sort to the bottom when visible in lists

bmc08gt · bmc08gt · commit ccccc58fbb56 · 2026-01-05T12:04:51.000-05:00
Signed-off-by: Brandon McAnsh &lt;git@bmcreations.dev&gt;
diff --git a/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/ui/TokenBalanceRow.kt b/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/ui/TokenBalanceRow.kt
@@ -52,22 +52,25 @@ fun TokenBalanceRow(
     modifier: Modifier = Modifier,
     showName: Boolean = true,
     showFlag: Boolean = false,
+    showLogo: Boolean = true,
     isSelected: Boolean? = null,
     formattedBalance: (Fiat) -> String = { it.formatted() },
     horizontalArrangement: Arrangement.Horizontal = Arrangement.SpaceBetween,
     sizing: TokenBalanceRowSizing = rememberTokenBalanceRowSizing(),
     contentPadding: PaddingValues = PaddingValues(vertical = CodeTheme.dimens.inset),
     onClick: (() -> Unit)? = null,
 ) {
-    val (token, balance) = tokenWithBalance
+    val (token, balance, displayName) = tokenWithBalance
     TokenBalanceRow(
         token = token,
+        displayName = displayName,
         balance = balance.nativeAmount,
         formattedBalance = formattedBalance,
         isSelected = isSelected,
         modifier = modifier,
         showName = showName,
         showFlag = showFlag,
+        showLogo = showLogo,
         sizing = sizing,
         horizontalArrangement = horizontalArrangement,
         contentPadding = contentPadding,
@@ -89,9 +92,10 @@ fun TokenBalanceRow(
     contentPadding: PaddingValues = PaddingValues(vertical = CodeTheme.dimens.inset),
     onClick: (() -> Unit)? = null,
 ) {
-    val (token, balance) = tokenWithBalance
+    val (token, balance, displayName) = tokenWithBalance
     TokenBalanceRow(
         token = token,
+        displayName = displayName,
         balance = balance,
         showName = showName,
         showLogo = showLogo,
@@ -112,6 +116,7 @@ fun TokenBalanceRow(
     token: Token,
     balance: Fiat,
     modifier: Modifier = Modifier,
+    displayName: String = token.name,
     showName: Boolean = true,
     showLogo: Boolean = true,
     showFlag: Boolean = false,
@@ -139,6 +144,7 @@ fun TokenBalanceRow(
             showLogo && showName -> {
                 TokenIconWithName(
                     token = token,
+                    displayName = { displayName },
                     imageSize = sizing.iconSize,
                     textStyle = sizing.nameTextStyle,
                     textColor = CodeTheme.colors.textMain,
@@ -147,12 +153,10 @@ fun TokenBalanceRow(
             }
 
             showName -> {
-                TokenIconWithName(
-                    token = token,
-                    imageSize = sizing.iconSize,
-                    textStyle = sizing.nameTextStyle,
-                    textColor = CodeTheme.colors.textMain,
-                    spacing = CodeTheme.dimens.grid.x2,
+                Text(
+                    text = displayName,
+                    style = sizing.nameTextStyle,
+                    color = CodeTheme.colors.textMain,
                 )
             }
 
diff --git a/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/ui/TokenImageWithName.kt b/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/ui/TokenImageWithName.kt
@@ -25,9 +25,10 @@ import com.getcode.ui.components.R
 fun TokenIconWithName(
     token: Token,
     imageSize: Dp,
+    modifier: Modifier = Modifier,
+    displayName: (Token) -> String = { it.name },
     textStyle: TextStyle = CodeTheme.typography.screenTitle,
     textColor: Color = CodeTheme.colors.textMain,
-    modifier: Modifier = Modifier,
     spacing: Dp = 0.dp,
 ) {
     Row(
@@ -40,7 +41,7 @@ fun TokenIconWithName(
             modifier = Modifier.size(imageSize)
         )
         Text(
-            text = token.name,
+            text = displayName(token),
             style = textStyle,
             color = textColor,
         )
diff --git a/apps/flipcash/core/src/main/res/values/strings.xml b/apps/flipcash/core/src/main/res/values/strings.xml
@@ -451,7 +451,7 @@
     <string name="label_blendModeColorDodge">Color Dodge</string>
     <string name="label_blendModePlusLighter">Plus Lighter</string>
 
-    <string name="title_cashReserves">Cash Reserves</string>
+    <string name="title_cashReserves">USD Reserves</string>
     <string name="action_buyMore">Buy More</string>
     <string name="description_cashReserves">
         Your cash reserves are held in USDC, a fully backed digital dollar supported 1:1 by U.S. dollars. This ensures your funds retain the same value and stability as traditional USD, while benefiting from faster, more transparent transactions on modern financial infrastructure. You can deposit additional funds at any time, or withdraw your USDC for U.S. dollars whenever you like.
diff --git a/apps/flipcash/features/balance/src/main/kotlin/com/flipcash/app/balance/internal/BalanceScreenContent.kt b/apps/flipcash/features/balance/src/main/kotlin/com/flipcash/app/balance/internal/BalanceScreenContent.kt
@@ -121,8 +121,8 @@ private fun BalanceScreenContent(
                 ) {
                     Text(
                         text = stringResource(R.string.title_cashReserves),
-                        style = CodeTheme.typography.textMedium,
-                        color = CodeTheme.colors.textSecondary,
+                        style = CodeTheme.typography.screenTitle,
+                        color = CodeTheme.colors.textMain,
                     )
 
                     Icon(
@@ -131,7 +131,7 @@ private fun BalanceScreenContent(
                             .padding(start = CodeTheme.dimens.grid.x1),
                         painter = painterResource(id = R.drawable.ic_chevron_right),
                         contentDescription = null,
-                        tint = CodeTheme.colors.secondary,
+                        tint = CodeTheme.colors.textMain,
                     )
 
                     Spacer(Modifier.weight(1f))
diff --git a/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/internal/TokenInfoScreen.kt b/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/internal/TokenInfoScreen.kt
@@ -175,11 +175,11 @@ private fun BottomBar(state: TokenInfoViewModel.State, dispatch: (TokenInfoViewM
             CodeButton(
                 modifier = Modifier.weight(1f),
                 buttonState = ButtonState.FilledGreen,
-                text = stringResource(R.string.action_buyMore),
+                text = stringResource(R.string.action_withdraw),
             ) {
                 dispatch(
                     TokenInfoViewModel.Event.OpenScreen(
-                        AppRoute.OnRamp.ProviderList(from = AppRoute.Token.Info(state.mint!!))
+                        AppRoute.Transfers.Withdrawal.Amount(state.mint!!)
                     )
                 )
             }
diff --git a/apps/flipcash/shared/tokens/src/main/kotlin/SelectTokenViewModel.kt b/apps/flipcash/shared/tokens/src/main/kotlin/SelectTokenViewModel.kt
@@ -11,15 +11,16 @@ import com.flipcash.services.internal.model.thirdparty.OnRampProvider
 import com.flipcash.services.internal.model.thirdparty.OnRampType
 import com.flipcash.services.user.AuthState
 import com.flipcash.services.user.UserManager
+import com.flipcash.shared.tokens.R
 import com.getcode.opencode.controllers.TokenController
 import com.getcode.opencode.exchange.Exchange
 import com.getcode.opencode.model.financial.Fiat
 import com.getcode.opencode.model.financial.LocalFiat
-import com.getcode.opencode.model.financial.Token
 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.util.resources.ResourceHelper
 import com.getcode.view.BaseViewModel2
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.combine
@@ -41,7 +42,8 @@ class SelectTokenViewModel @Inject constructor(
     exchange: Exchange,
     analytics: FlipcashAnalyticsService,
     featureFlags: FeatureFlagController,
-): BaseViewModel2<SelectTokenViewModel.State, SelectTokenViewModel.Event>(
+    resources: ResourceHelper,
+) : BaseViewModel2<SelectTokenViewModel.State, SelectTokenViewModel.Event>(
     initialState = State(purpose = TokenPurpose.Balance),
     updateStateForEvent = updateStateForEvent
 ) {
@@ -59,18 +61,18 @@ class SelectTokenViewModel @Inject constructor(
 
     sealed interface Event {
         data class OnPreferredOnRampProviderChanged(val provider: OnRampProvider?) : Event
-        data class OnReservesEnabled(val enabled: Boolean): Event
+        data class OnReservesEnabled(val enabled: Boolean) : Event
 
         data class OnPurposeChanged(val purpose: TokenPurpose) : Event
         data class OnTokensUpdated(val tokens: List<TokenWithLocalizedBalance>) : Event
 
-        data class OnTokenSelected(val mint: Mint, val fromUser: Boolean = true): Event
+        data class OnTokenSelected(val mint: Mint, val fromUser: Boolean = true) : Event
 
-        data object OnTokenChanged: Event
+        data object OnTokenChanged : Event
 
-        data object OnAddCashClicked: Event
-        data object OpenOnRampAmountModal: Event
-        data class OpenScreen(val route: AppRoute): Event
+        data object OnAddCashClicked : Event
+        data object OpenOnRampAmountModal : Event
+        data class OpenScreen(val route: AppRoute) : Event
     }
 
     init {
@@ -101,15 +103,25 @@ class SelectTokenViewModel @Inject constructor(
                         TokenPurpose.Deposit -> exchange.observeEntryRate()
                     }
                 ) { state, balances, rate ->
-                    balances.map {
-                        TokenWithLocalizedBalance(
-                            token = it.token,
-                            balance = LocalFiat(
-                                usdc = it.balance,
-                                nativeAmount = it.balance.convertingTo(rate),
+                    balances
+                        .map {
+                            TokenWithLocalizedBalance(
+                                token = it.token,
+                                displayName = if (it.token.address == Mint.usdc) {
+                                    resources.getString(R.string.title_cashReserves)
+                                } else {
+                                    it.token.name
+                                },
+                                balance = LocalFiat(
+                                    usdc = it.balance,
+                                    nativeAmount = it.balance.convertingTo(rate),
+                                )
                             )
-                        )
-                    }.sortedByDescending { it.balance.nativeAmount }
+                        }
+                        .sortedWith(compareByDescending<TokenWithLocalizedBalance> { item ->
+                            if (state.reservesEnabled && item.isReserves) Fiat.MIN_VALUE
+                            else item.balance.nativeAmount
+                        })
                         .filter {
                             val baselineAmount = 0.01.toFiat(rate.currency)
                             when (purpose) {
@@ -163,9 +175,11 @@ class SelectTokenViewModel @Inject constructor(
                 is Event.OnPreferredOnRampProviderChanged -> { state ->
                     state.copy(preferredOnRampProvider = event.provider)
                 }
+
                 is Event.OnReservesEnabled -> { state ->
                     state.copy(reservesEnabled = event.enabled)
                 }
+
                 is Event.OnPurposeChanged -> { state -> state.copy(purpose = event.purpose) }
                 is Event.OnTokensUpdated -> { state -> state.copy(tokens = event.tokens) }
                 is Event.OnTokenSelected -> { state -> state.copy(selectedToken = event.mint) }
diff --git a/apps/flipcash/shared/tokens/src/main/kotlin/TokenInfoViewModel.kt b/apps/flipcash/shared/tokens/src/main/kotlin/TokenInfoViewModel.kt
@@ -10,26 +10,23 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
-import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.Placeholder
 import androidx.compose.ui.text.PlaceholderVerticalAlign
 import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.lifecycle.viewModelScope
-import cafe.adriel.voyager.core.registry.ScreenRegistry
 import com.flipcash.app.core.AppRoute
 import com.flipcash.app.core.extensions.onResult
 import com.flipcash.app.core.money.formatted
 import com.flipcash.app.core.tokens.TokenSwapPurpose
 import com.flipcash.app.featureflags.FeatureFlag
 import com.flipcash.app.featureflags.FeatureFlagController
 import com.flipcash.app.onramp.OnRampFlowTracker
-import com.flipcash.shared.tokens.R
 import com.flipcash.app.shareable.ShareSheetController
 import com.flipcash.app.shareable.Shareable
+import com.flipcash.shared.tokens.R
 import com.getcode.manager.BottomBarAction
 import com.getcode.manager.BottomBarManager
 import com.getcode.opencode.controllers.TokenController
diff --git a/apps/flipcash/shared/tokens/src/main/kotlin/TokenList.kt b/apps/flipcash/shared/tokens/src/main/kotlin/TokenList.kt
@@ -76,6 +76,7 @@ fun TokenList(
                         .padding(horizontal = CodeTheme.dimens.inset),
                     tokenWithBalance = item,
                     showFlag = showFlags,
+                    showLogo = !item.isReserves,
                     isSelected = (selectedToken == item.token.address).takeIf { showSelections },
                 ) { onTokenSelected(item.token) }
 
diff --git a/services/opencode/src/main/kotlin/com/getcode/opencode/model/financial/Fiat.kt b/services/opencode/src/main/kotlin/com/getcode/opencode/model/financial/Fiat.kt
@@ -171,6 +171,9 @@ data class Fiat(
 
         val Zero = Fiat(0, CurrencyCode.USD)
 
+        val MIN_VALUE = Fiat(Int.MIN_VALUE, CurrencyCode.USD)
+        val MAX_VALUE = Fiat(Int.MAX_VALUE, CurrencyCode.USD)
+
         private fun parseStringToDouble(stringAmount: String, decimalPlaces: Int = 6): Double {
             val formatter = DecimalFormat.getNumberInstance(Locale.US).apply {
                 isParseIntegerOnly = false
diff --git a/services/opencode/src/main/kotlin/com/getcode/opencode/model/financial/MintMetadata.kt b/services/opencode/src/main/kotlin/com/getcode/opencode/model/financial/MintMetadata.kt
@@ -15,13 +15,21 @@ import kotlin.time.Instant
 
 data class TokenWithBalance(
     val token: Token,
-    val balance: Fiat
-)
+    val balance: Fiat,
+    val displayName: String = token.name,
+) {
+    val isReserves: Boolean
+        get() = token.address == Mint.usdc
+}
 
 data class TokenWithLocalizedBalance(
     val token: Token,
-    val balance: LocalFiat
-)
+    val balance: LocalFiat,
+    val displayName: String = token.name,
+) {
+    val isReserves: Boolean
+        get() = token.address == Mint.usdc
+}
 
 typealias Token = MintMetadata
 

Original file line number	Diff line number	Diff line change
`@@ -175,11 +175,11 @@ private fun BottomBar(state: TokenInfoViewModel.State, dispatch: (TokenInfoViewM`
`175`	`175`	`CodeButton(`
`176`	`176`	`modifier = Modifier.weight(1f),`
`177`	`177`	`buttonState = ButtonState.FilledGreen,`
`178`		`- text = stringResource(R.string.action_buyMore),`
	`178`	`+ text = stringResource(R.string.action_withdraw),`
`179`	`179`	`) {`
`180`	`180`	`dispatch(`
`181`	`181`	`TokenInfoViewModel.Event.OpenScreen(`
`182`		`- AppRoute.OnRamp.ProviderList(from = AppRoute.Token.Info(state.mint!!))`
	`182`	`+ AppRoute.Transfers.Withdrawal.Amount(state.mint!!)`
`183`	`183`	`)`
`184`	`184`	`)`
`185`	`185`	`}`