chore: allow token selection screen be used in all user flows

bmc08gt · bmc08gt · commit 07f1e9263613 · 2025-10-09T15:15:31.000-04:00
Signed-off-by: Brandon McAnsh &lt;git@bmcreations.dev&gt;
diff --git a/apps/flipcash/app/src/main/kotlin/com/flipcash/app/internal/ui/navigation/AppScreenContent.kt b/apps/flipcash/app/src/main/kotlin/com/flipcash/app/internal/ui/navigation/AppScreenContent.kt
@@ -74,11 +74,11 @@ internal fun AppScreenContent(content: @Composable () -> Unit) {
         }
 
         register<AppRoute.Main.Give> {
-            CashScreen(it.tokenAddress)
+            CashScreen(it.mint)
         }
 
         register<AppRoute.Sheets.TokenSelection> {
-            SelectTokenScreen()
+            SelectTokenScreen(it.purpose)
         }
 
         register<AppRoute.Sheets.Wallet> {
@@ -158,7 +158,7 @@ internal fun AppScreenContent(content: @Composable () -> Unit) {
 
         register<AppRoute.Transfers.Withdrawal.Amount> {
             WithdrawalFlow.start()
-            WithdrawalEntryScreen()
+            WithdrawalEntryScreen(it.mint)
         }
 
         register<AppRoute.Transfers.Withdrawal.Destination> {
diff --git a/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/AppRoute.kt b/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/AppRoute.kt
@@ -4,11 +4,12 @@ import android.os.Parcelable
 import cafe.adriel.voyager.core.registry.ScreenProvider
 import com.flipcash.app.core.money.RegionSelectionKind
 import com.flipcash.app.core.navigation.DeeplinkType
+import com.flipcash.app.core.tokens.TokenPurpose
 import com.flipcash.app.core.transfers.TransferDirection
 import com.getcode.ed25519.Ed25519
 import com.getcode.opencode.model.core.ID
 import com.getcode.opencode.model.financial.Fiat
-import com.getcode.solana.keys.PublicKey
+import com.getcode.solana.keys.Mint
 import com.getcode.ui.core.RestrictionType
 import kotlinx.parcelize.Parcelize
 
@@ -38,7 +39,7 @@ sealed interface AppRoute : ScreenProvider, Parcelable {
         data class RegionSelection(val kind: RegionSelectionKind) : Main
 
 
-        data class Give(val tokenAddress: PublicKey?) : Main
+        data class Give(val mint: Mint) : Main
     }
 
     @Parcelize
@@ -53,7 +54,7 @@ sealed interface AppRoute : ScreenProvider, Parcelable {
 
     @Parcelize
     sealed interface Sheets: AppRoute {
-        data object TokenSelection: Sheets
+        data class TokenSelection(val purpose: TokenPurpose): Sheets
         data object Wallet : Sheets
         data object Menu : Sheets
         data object Lab: Sheets
@@ -92,7 +93,7 @@ sealed interface AppRoute : ScreenProvider, Parcelable {
         data class Learn(val direction: TransferDirection) : Transfers
 
         sealed interface Withdrawal {
-            data object Amount : Transfers
+            data class Amount(val mint: Mint) : Transfers
             data object Destination : Transfers
             data object Confirmation : Transfers
         }
diff --git a/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/onramp/deeplinks/WalletDeeplinkConnectionResult.kt b/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/onramp/deeplinks/WalletDeeplinkConnectionResult.kt
@@ -4,7 +4,6 @@ import android.os.Parcelable
 import com.flipcash.app.core.AppRoute
 import com.getcode.ed25519.Ed25519
 import com.getcode.opencode.model.core.ID
-import com.getcode.opencode.model.financial.Token
 import com.getcode.opencode.utils.base64
 import com.getcode.solana.keys.PublicKey
 import com.getcode.solana.keys.base58
@@ -36,7 +35,7 @@ sealed class OnRampDeeplinkOrigin: Parcelable {
     data object Menu : OnRampDeeplinkOrigin()
 
     @Parcelize
-    data class Give(val tokenAddress: PublicKey?) : OnRampDeeplinkOrigin()
+    data class Give(val tokenAddress: PublicKey) : OnRampDeeplinkOrigin()
 
     @Parcelize
     data object Wallet: OnRampDeeplinkOrigin()
@@ -61,7 +60,7 @@ sealed class OnRampDeeplinkOrigin: Parcelable {
         fun fromRoute(route: AppRoute?): OnRampDeeplinkOrigin? {
             return when (route) {
                 is AppRoute.Sheets.Menu -> Menu
-                is AppRoute.Main.Give -> Give(route.tokenAddress)
+                is AppRoute.Main.Give -> Give(route.mint)
                 is AppRoute.Pool.Details -> {
                     route.rendezvous?.let { keyPair -> PoolWithRendezvous(keyPair) }
                     route.poolId?.let { id -> PoolWithId(id) }
@@ -77,9 +76,10 @@ sealed class OnRampDeeplinkOrigin: Parcelable {
                 value == "menu" -> Menu
                 value?.startsWith("give-") == true -> {
                     val tokenAddress = value.removePrefix("give-")
-                    Give(tokenAddress = runCatching {
+                    val mint = runCatching {
                         PublicKey.fromBase58(tokenAddress)
-                    }.getOrNull())
+                    }.getOrNull() ?: return null
+                    Give(mint)
                 }
                 value == "wallet" -> Wallet
                 value?.startsWith("pool-") == true -> {
diff --git a/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/tokens/TokenPurpose.kt b/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/tokens/TokenPurpose.kt
@@ -0,0 +1,11 @@
+package com.flipcash.app.core.tokens
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+sealed interface TokenPurpose: Parcelable {
+    data object Send : TokenPurpose
+    data object Withdraw: TokenPurpose
+    data object Balance : TokenPurpose
+}
diff --git a/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/transfers/TransferDirection.kt b/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/transfers/TransferDirection.kt
@@ -5,6 +5,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import com.flipcash.app.core.AppRoute
 import com.flipcash.core.R
+import com.getcode.solana.keys.Mint
 import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 
@@ -40,7 +41,7 @@ sealed interface TransferDirection : Parcelable {
 
     data object Outgoing : TransferDirection {
         @IgnoredOnParcel
-        override val nextScreen: AppRoute = AppRoute.Transfers.Withdrawal.Amount
+        override val nextScreen: AppRoute = AppRoute.Transfers.Withdrawal.Amount(Mint.usdc)
         override val title: String
             @Composable get() = stringResource(R.string.title_withdrawUsdc)
         override val description: String
diff --git a/apps/flipcash/features/balance/src/main/kotlin/com/flipcash/app/balance/BalanceScreen.kt b/apps/flipcash/features/balance/src/main/kotlin/com/flipcash/app/balance/BalanceScreen.kt
@@ -16,8 +16,8 @@ import com.flipcash.app.balance.internal.BalanceScreen
 import com.flipcash.app.balance.internal.BalanceViewModel
 import com.flipcash.app.core.AppRoute
 import com.flipcash.app.core.money.RegionSelectionKind
+import com.flipcash.app.core.tokens.TokenPurpose
 import com.flipcash.app.tokens.SelectTokenViewModel
-import com.flipcash.app.tokens.TokenPurpose
 import com.flipcash.core.R
 import com.getcode.navigation.core.LocalCodeNavigator
 import com.getcode.navigation.extensions.getActivityScopedViewModel
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
@@ -19,11 +19,11 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import com.flipcash.app.balance.internal.components.BalanceHeader
+import com.flipcash.app.core.tokens.TokenPurpose
 import com.flipcash.app.onramp.AddCashRow
 import com.flipcash.app.theme.FlipcashDesignSystem
 import com.flipcash.app.tokens.SelectTokenViewModel
 import com.flipcash.app.tokens.TokenList
-import com.flipcash.app.tokens.TokenPurpose
 import com.flipcash.features.balance.R
 import com.getcode.opencode.compose.ExchangeStub
 import com.getcode.opencode.compose.LocalExchange
diff --git a/apps/flipcash/features/balance/src/main/kotlin/com/flipcash/app/balance/internal/BalanceViewModel.kt b/apps/flipcash/features/balance/src/main/kotlin/com/flipcash/app/balance/internal/BalanceViewModel.kt
@@ -2,6 +2,7 @@ package com.flipcash.app.balance.internal
 
 import androidx.lifecycle.viewModelScope
 import com.flipcash.app.core.AppRoute
+import com.flipcash.app.core.tokens.TokenPurpose
 import com.flipcash.app.core.transfers.TransferDirection
 import com.flipcash.app.onramp.ConfirmationEvent
 import com.flipcash.app.onramp.OnRampAmount
@@ -78,7 +79,7 @@ internal class BalanceViewModel @Inject constructor(
             .onEach {
                 dispatchEvent(
                     Event.OpenScreen(
-                        AppRoute.Transfers.Learn(TransferDirection.Outgoing)
+                        AppRoute.Sheets.TokenSelection(TokenPurpose.Withdraw)
                     )
                 )
             }.launchIn(viewModelScope)
diff --git a/apps/flipcash/features/cash/src/main/kotlin/com/flipcash/app/cash/CashScreen.kt b/apps/flipcash/features/cash/src/main/kotlin/com/flipcash/app/cash/CashScreen.kt
@@ -30,7 +30,7 @@ import kotlinx.parcelize.Parcelize
 
 @Parcelize
 class CashScreen(
-    private val selectedTokenAddress: Mint?
+    private val selectedMint: Mint
 ): ModalScreen, Parcelable {
 
     @IgnoredOnParcel
@@ -67,10 +67,8 @@ class CashScreen(
             GiveScreenContent(viewModel)
         }
 
-        LaunchedEffect(viewModel, selectedTokenAddress) {
-            if (selectedTokenAddress != null) {
-                viewModel.dispatchEvent(CashScreenViewModel.Event.OnTokenSelected(selectedTokenAddress))
-            }
+        LaunchedEffect(viewModel, selectedMint) {
+            viewModel.dispatchEvent(CashScreenViewModel.Event.OnTokenSelected(selectedMint))
         }
 
         LaunchedEffect(viewModel) {
diff --git a/apps/flipcash/features/cash/src/main/kotlin/com/flipcash/app/cash/internal/CashScreenViewModel.kt b/apps/flipcash/features/cash/src/main/kotlin/com/flipcash/app/cash/internal/CashScreenViewModel.kt
@@ -350,7 +350,7 @@ internal class CashScreenViewModel @Inject constructor(
                     dispatchEvent(
                         Event.OpenScreen(
                             AppRoute.OnRamp.ProviderList(
-                                AppRoute.Main.Give(tokenAddress = stateFlow.value.token?.token?.address),
+                                AppRoute.Main.Give(mint = stateFlow.value.selectedTokenAddress!!),
                                 amount
                             )
                         )
diff --git a/apps/flipcash/features/menu/src/main/kotlin/com/flipcash/app/menu/internal/MenuScreenViewModel.kt b/apps/flipcash/features/menu/src/main/kotlin/com/flipcash/app/menu/internal/MenuScreenViewModel.kt
@@ -5,6 +5,7 @@ import com.flipcash.app.auth.AuthManager
 import com.flipcash.app.core.AppRoute
 import com.flipcash.app.core.android.VersionInfo
 import com.flipcash.app.core.extensions.onResult
+import com.flipcash.app.core.tokens.TokenPurpose
 import com.flipcash.app.core.transfers.TransferDirection
 import com.flipcash.app.featureflags.BetaFeature
 import com.flipcash.app.featureflags.FeatureFlagController
@@ -145,7 +146,7 @@ internal class MenuScreenViewModel @Inject constructor(
             .onEach {
                 dispatchEvent(
                     Event.OpenScreen(
-                        AppRoute.Transfers.Learn(TransferDirection.Outgoing)
+                        AppRoute.Sheets.TokenSelection(TokenPurpose.Withdraw)
                     )
                 )
             }.launchIn(viewModelScope)
diff --git a/apps/flipcash/features/scanner/src/main/kotlin/com/flipcash/app/scanner/internal/ScannerDecorItem.kt b/apps/flipcash/features/scanner/src/main/kotlin/com/flipcash/app/scanner/internal/ScannerDecorItem.kt
@@ -1,10 +1,10 @@
 package com.flipcash.app.scanner.internal
 
 import com.flipcash.app.core.AppRoute
-import com.getcode.solana.keys.Mint
+import com.flipcash.app.core.tokens.TokenPurpose
 
 sealed class ScannerDecorItem(val screen: AppRoute) {
-    data object Give : ScannerDecorItem(AppRoute.Main.Give(Mint.usdc))
+    data object Give : ScannerDecorItem(AppRoute.Sheets.TokenSelection(TokenPurpose.Send))
 
     data object Wallet : ScannerDecorItem(AppRoute.Sheets.Wallet)
     data object Menu : ScannerDecorItem(AppRoute.Sheets.Menu)
diff --git a/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/SelectTokenScreen.kt b/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/SelectTokenScreen.kt
@@ -13,6 +13,7 @@ import cafe.adriel.voyager.core.screen.ScreenKey
 import cafe.adriel.voyager.core.screen.uniqueScreenKey
 import cafe.adriel.voyager.hilt.getViewModel
 import com.flipcash.app.core.AppRoute
+import com.flipcash.app.core.tokens.TokenPurpose
 import com.flipcash.app.tokens.internal.SelectTokenScreen
 import com.flipcash.features.tokens.R
 import com.getcode.navigation.core.LocalCodeNavigator
@@ -28,7 +29,7 @@ import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-class SelectTokenScreen : ModalScreen, NamedScreen, Parcelable {
+class SelectTokenScreen(private val purpose: TokenPurpose) : ModalScreen, NamedScreen, Parcelable {
 
     @IgnoredOnParcel
     override val key: ScreenKey = uniqueScreenKey
@@ -46,14 +47,20 @@ class SelectTokenScreen : ModalScreen, NamedScreen, Parcelable {
             AppBarWithTitle(
                 isInModal = true,
                 title = name,
+                backButton = purpose !is TokenPurpose.Send,
+                onBackIconClicked = { navigator.pop() },
                 titleAlignment = Alignment.CenterHorizontally,
-                endContent = { AppBarDefaults.Close { navigator.hide() } },
+                endContent = {
+                    if (purpose is TokenPurpose.Send) {
+                        AppBarDefaults.Close { navigator.hide() }
+                    }
+                },
             )
             val viewModel = getViewModel<SelectTokenViewModel>()
             SelectTokenScreen(viewModel)
 
             LaunchedEffect(viewModel) {
-                viewModel.dispatchEvent(SelectTokenViewModel.Event.OnPurposeChanged(TokenPurpose.Send))
+                viewModel.dispatchEvent(SelectTokenViewModel.Event.OnPurposeChanged(purpose))
             }
 
 
@@ -62,9 +69,15 @@ class SelectTokenScreen : ModalScreen, NamedScreen, Parcelable {
                     .filterIsInstance<SelectTokenViewModel.Event.OnTokenSelected>()
                     .map { it.token }
                     .onEach { token ->
-                        navigator.push(
-                            ScreenRegistry.get(AppRoute.Main.Give(token.address))
-                        )
+                        when (purpose) {
+                            TokenPurpose.Balance -> Unit
+                            TokenPurpose.Send -> {
+                                navigator.push(
+                                    ScreenRegistry.get(AppRoute.Main.Give(token.address))
+                                )
+                            }
+                            TokenPurpose.Withdraw -> TODO()
+                        }
                     }.launchIn(this)
             }
         }
diff --git a/apps/flipcash/features/withdrawal/src/main/kotlin/com/flipcash/app/withdrawal/WithdrawalEntryScreen.kt b/apps/flipcash/features/withdrawal/src/main/kotlin/com/flipcash/app/withdrawal/WithdrawalEntryScreen.kt
@@ -4,6 +4,7 @@ import android.os.Parcelable
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
@@ -15,14 +16,17 @@ import com.getcode.navigation.core.LocalCodeNavigator
 import com.getcode.navigation.extensions.getStackScopedViewModel
 import com.getcode.navigation.modal.ModalScreen
 import com.getcode.navigation.screens.NamedScreen
+import com.getcode.solana.keys.Mint
 import com.getcode.ui.components.AppBarWithTitle
 import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 import kotlin.uuid.ExperimentalUuidApi
 import kotlin.uuid.Uuid
 
 @Parcelize
-class WithdrawalEntryScreen: ModalScreen, NamedScreen, Parcelable {
+class WithdrawalEntryScreen(
+    private val selectedMint: Mint
+): ModalScreen, NamedScreen, Parcelable {
 
     @IgnoredOnParcel
     override val key: ScreenKey = uniqueScreenKey
@@ -43,7 +47,12 @@ class WithdrawalEntryScreen: ModalScreen, NamedScreen, Parcelable {
                 onBackIconClicked = { navigator.pop() },
                 titleAlignment = Alignment.CenterHorizontally,
             )
-            WithdrawalEntryScreen(getStackScopedViewModel<WithdrawalViewModel>(key = WithdrawalFlow.key))
+            val viewModel = getStackScopedViewModel<WithdrawalViewModel>(key = WithdrawalFlow.key)
+            WithdrawalEntryScreen(viewModel)
+
+            LaunchedEffect(viewModel) {
+                // TODO:
+            }
         }
     }
 }
diff --git a/apps/flipcash/shared/tokens/src/main/kotlin/SelectTokenViewModel.kt b/apps/flipcash/shared/tokens/src/main/kotlin/SelectTokenViewModel.kt
@@ -1,6 +1,7 @@
 package com.flipcash.app.tokens
 
 import androidx.lifecycle.viewModelScope
+import com.flipcash.app.core.tokens.TokenPurpose
 import com.getcode.opencode.controllers.TokenController
 import com.getcode.opencode.exchange.Exchange
 import com.getcode.opencode.model.financial.LocalFiat
@@ -9,20 +10,14 @@ import com.getcode.opencode.model.financial.TokenWithLocalizedBalance
 import com.getcode.opencode.model.financial.sum
 import com.getcode.view.BaseViewModel2
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
 import javax.inject.Inject
 
-sealed interface TokenPurpose {
-    data object Send : TokenPurpose
-    data object Balance : TokenPurpose
-}
 @HiltViewModel
 class SelectTokenViewModel @Inject constructor(
     tokenController: TokenController,
@@ -54,10 +49,10 @@ class SelectTokenViewModel @Inject constructor(
             .flatMapLatest { purpose ->
                 combine(
                     tokenController.tokenBalances,
-                    if (purpose == TokenPurpose.Send) {
-                        exchange.observeEntryRate()
-                    } else {
-                        exchange.observeBalanceRate()
+                    when (purpose) {
+                        TokenPurpose.Balance -> exchange.observeBalanceRate()
+                        TokenPurpose.Send -> exchange.observeEntryRate()
+                        TokenPurpose.Withdraw -> exchange.observeEntryRate()
                     }
                 ) { balances, rate ->
                     balances.map {
diff --git a/services/opencode/src/main/kotlin/com/getcode/opencode/model/transactions/GrabRequest.kt b/services/opencode/src/main/kotlin/com/getcode/opencode/model/transactions/GrabRequest.kt

Original file line number	Diff line number	Diff line change
`@@ -74,11 +74,11 @@ internal fun AppScreenContent(content: @Composable () -> Unit) {`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`register<AppRoute.Main.Give> {`
`77`		`- CashScreen(it.tokenAddress)`
	`77`	`+ CashScreen(it.mint)`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`register<AppRoute.Sheets.TokenSelection> {`
`81`		`- SelectTokenScreen()`
	`81`	`+ SelectTokenScreen(it.purpose)`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`register<AppRoute.Sheets.Wallet> {`
`@@ -158,7 +158,7 @@ internal fun AppScreenContent(content: @Composable () -> Unit) {`
`158`	`158`
`159`	`159`	`register<AppRoute.Transfers.Withdrawal.Amount> {`
`160`	`160`	`WithdrawalFlow.start()`
`161`		`- WithdrawalEntryScreen()`
	`161`	`+ WithdrawalEntryScreen(it.mint)`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`register<AppRoute.Transfers.Withdrawal.Destination> {`
Original file line number	Diff line number	Diff line change
`@@ -350,7 +350,7 @@ internal class CashScreenViewModel @Inject constructor(`
`350`	`350`	`dispatchEvent(`
`351`	`351`	`Event.OpenScreen(`
`352`	`352`	`AppRoute.OnRamp.ProviderList(`
`353`		`- AppRoute.Main.Give(tokenAddress = stateFlow.value.token?.token?.address),`
	`353`	`+ AppRoute.Main.Give(mint = stateFlow.value.selectedTokenAddress!!),`
`354`	`354`	`amount`
`355`	`355`	`)`
`356`	`356`	`)`