feat: add buys with purpose; return to Give when adding cash via a buy

bmc08gt · bmc08gt · commit d86c22b427c3 · 2026-02-06T13:47:26.000-05: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
@@ -81,15 +81,15 @@ internal fun AppScreenContent(content: @Composable () -> Unit) {
         }
 
         register<AppRoute.Token.Info> {
-            TokenInfoScreen(it.mint)
+            TokenInfoScreen(it.mint, it.forNeededFunds)
         }
 
         register<AppRoute.Token.Transactions> {
             TransactionHistoryScreen(it.mint)
         }
 
         register<AppRoute.Token.SwapTransact> {
-            BuySellFlow.start()
+            BuySellFlow.start(it.forNeededFunds)
             TokenBuySellEntryScreen(it.purpose)
         }
 
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
@@ -65,9 +65,9 @@ sealed interface AppRoute : ScreenProvider, Parcelable {
 
     @Parcelize
     sealed interface Token: AppRoute {
-        data class Info(val mint: Mint): Token
+        data class Info(val mint: Mint, val forNeededFunds: Boolean = false): Token
         data class Transactions(val mint: Mint): Token
-        data class SwapTransact(val purpose: TokenSwapPurpose): Token
+        data class SwapTransact(val purpose: TokenSwapPurpose, val forNeededFunds: Boolean = false): Token
         data class TxProcessing(val swapId: SwapId): Token
         data object SellReceipt: Token
     }
diff --git a/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/ui/NotifyButtonLabel.kt b/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/ui/NotifyButtonLabel.kt
@@ -44,7 +44,7 @@ fun buildNotifyButtonLabel(): AnnotatedButtonLabel {
                             end = CodeTheme.dimens.staticGrid.x1
                         ),
                         painter = painterResource(R.drawable.ic_check),
-                        colorFilter = ColorFilter.tint(Color.White),
+                        colorFilter = ColorFilter.tint(CodeTheme.colors.textSecondary),
                         contentDescription = null
                     )
                 }
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
@@ -323,10 +323,13 @@ internal class CashScreenViewModel @Inject constructor(
                     // has coinbase provider supporting google pay - pop selection for quick add
                     dispatchEvent(Event.OpenOnRampAmountModal(amount))
                 } else {
-                    // route to provider list
+                    // route to buy the token
                     dispatchEvent(
                         Event.OpenScreen(
-                            AppRoute.Menu.Deposit(mint = stateFlow.value.selectedTokenAddress!!),
+                            AppRoute.Token.Info(
+                                mint = stateFlow.value.selectedTokenAddress!!,
+                                forNeededFunds = true
+                            ),
                         )
                     )
                 }
diff --git a/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/BuySellFlow.kt b/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/BuySellFlow.kt
@@ -8,8 +8,12 @@ object BuySellFlow {
     internal var key: String = ""
         private set
 
+    var isForNeededFunds: Boolean = false
+        private set
+
     @OptIn(ExperimentalUuidApi::class)
-    fun start() {
+    fun start(forNeededFunds: Boolean) {
         key = Uuid.random().toString()
+        isForNeededFunds = forNeededFunds
     }
 }
diff --git a/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/TokenInfoScreen.kt b/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/TokenInfoScreen.kt
@@ -14,7 +14,6 @@ import cafe.adriel.voyager.core.registry.ScreenRegistry
 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.ui.TokenIconWithName
 import com.flipcash.app.onramp.LocalExternalWalletState
 import com.flipcash.app.onramp.OnRampFlowTracker
@@ -24,7 +23,6 @@ import com.flipcash.services.internal.model.thirdparty.OnRampProvider
 import com.getcode.navigation.core.LocalCodeNavigator
 import com.getcode.navigation.modal.ModalScreen
 import com.getcode.navigation.screens.AppScreen
-import com.getcode.navigation.screens.OnScreenResult
 import com.getcode.solana.keys.Mint
 import com.getcode.theme.CodeTheme
 import com.getcode.ui.components.AppBarDefaults
@@ -40,7 +38,10 @@ import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-class TokenInfoScreen(private val mint: Mint) : AppScreen(), ModalScreen, Parcelable {
+class TokenInfoScreen(
+    private val mint: Mint,
+    private val forNeededFunds: Boolean,
+) : AppScreen(), ModalScreen, Parcelable {
 
     @IgnoredOnParcel
     override val key: ScreenKey = uniqueScreenKey
@@ -84,10 +85,10 @@ class TokenInfoScreen(private val mint: Mint) : AppScreen(), ModalScreen, Parcel
                 },
             )
 
-            TokenInfoScreen(viewModel)
+            TokenInfoScreen(viewModel, forNeededFunds)
 
             LaunchedEffect(Unit) {
-                viewModel.dispatchEvent(TokenInfoViewModel.Event.OnMintProvided(mint))
+                viewModel.dispatchEvent(TokenInfoViewModel.Event.OnMintProvided(mint, forNeededFunds))
             }
 
             LaunchedEffect(viewModel) {
diff --git a/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/TokenTxProcessingScreen.kt b/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/TokenTxProcessingScreen.kt
@@ -40,8 +40,12 @@ class TokenTxProcessingScreen(val swapId: SwapId) : ModalScreen, NamedScreen, Pa
             viewModel.eventFlow
                 .filterIsInstance<Event.OnTransactionSuccessful>()
                 .onEach {
-                    navigator.popUntil { it is TokenInfoScreen }
-                }
+                    if (BuySellFlow.isForNeededFunds) {
+                        navigator.popAll()
+                    } else {
+                        navigator.popUntil { it is TokenInfoScreen }
+                    }
+                }.launchIn(this)
         }
 
         LaunchedEffect(viewModel) {
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
@@ -45,20 +45,21 @@ import com.getcode.ui.utils.calculateStartPadding
 import com.getcode.ui.utils.sheetResignmentBehavior
 
 @Composable
-internal fun TokenInfoScreen(viewModel: TokenInfoViewModel) {
+internal fun TokenInfoScreen(viewModel: TokenInfoViewModel, isForNeededFunds: Boolean) {
     val state by viewModel.stateFlow.collectAsStateWithLifecycle()
-    TokenInfoScreen(state, viewModel::dispatchEvent)
+    TokenInfoScreen(isForNeededFunds, state, viewModel::dispatchEvent)
 }
 
 @Composable
 private fun TokenInfoScreen(
+    isForNeededFunds: Boolean,
     state: TokenInfoViewModel.State,
     dispatch: (TokenInfoViewModel.Event) -> Unit
 ) {
     val listState = rememberLazyListState()
 
     CodeScaffold(
-        bottomBar = { BottomBar(state, dispatch) }
+        bottomBar = { BottomBar(isForNeededFunds, state, dispatch) }
     ) { innerPadding ->
         Box(
             modifier = Modifier.verticalScrollStateGradient(
@@ -172,6 +173,7 @@ private fun TokenInfoScreen(
 
 @Composable
 private fun BottomBar(
+    isForNeededFunds: Boolean,
     state: TokenInfoViewModel.State,
     dispatch: (TokenInfoViewModel.Event) -> Unit
 ) {
@@ -197,6 +199,7 @@ private fun BottomBar(
                     top = CodeTheme.dimens.grid.x9,
                     bottom = CodeTheme.dimens.grid.x3
                 ),
+            isForNeededFunds = isForNeededFunds,
             state = state,
             dispatch = dispatch
         )
@@ -205,6 +208,7 @@ private fun BottomBar(
 
 @Composable
 private fun BottomBarButtons(
+    isForNeededFunds: Boolean,
     state: TokenInfoViewModel.State,
     modifier: Modifier = Modifier,
     dispatch: (TokenInfoViewModel.Event) -> Unit
@@ -233,7 +237,7 @@ private fun BottomBarButtons(
                 buttonState = ButtonState.Filled,
                 text = stringResource(R.string.action_buy),
             ) {
-                dispatch(TokenInfoViewModel.Event.OpenPurchaseMethods)
+                dispatch(TokenInfoViewModel.Event.OpenPurchaseMethods(forNeededFunds = isForNeededFunds))
             }
 
             if (state.canSell) {
@@ -246,7 +250,7 @@ private fun BottomBarButtons(
                     dispatch(
                         TokenInfoViewModel.Event.OpenScreen(
                             AppRoute.Token.SwapTransact(
-                                purpose = TokenSwapPurpose.Sell(state.token!!.address)
+                                purpose = TokenSwapPurpose.Sell(state.token!!.address),
                             )
                         )
                     )
diff --git a/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/internal/TokenTxProcessingScreen.kt b/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/internal/TokenTxProcessingScreen.kt
@@ -120,7 +120,7 @@ private fun TokenTxProcessingScreen(
                         text = stringResource(R.string.action_ok),
                         buttonState = ButtonState.Filled,
                         onClick = {
-                            dispatch(BuySellSwapTokenViewModel.Event.Exit)
+                            dispatch(BuySellSwapTokenViewModel.Event.OnTransactionSuccessful)
                         }
                     )
                 }
diff --git a/apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/ExternalWalletOnRampHandler.kt b/apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/ExternalWalletOnRampHandler.kt
@@ -200,7 +200,8 @@ fun ExternalWalletOnRampHandler(
                             navigator.push(
                                 ScreenRegistry.get(
                                     AppRoute.Token.SwapTransact(
-                                        TokenSwapPurpose.FundWithWallet(origin.mint)
+                                        TokenSwapPurpose.FundWithWallet(origin.mint),
+                                        forNeededFunds = origin.forNeededFunds
                                     )
                                 )
                             )
diff --git a/apps/flipcash/shared/tokens/src/main/kotlin/BuySellSwapTokenViewModel.kt b/apps/flipcash/shared/tokens/src/main/kotlin/BuySellSwapTokenViewModel.kt
@@ -608,7 +608,6 @@ class BuySellSwapTokenViewModel @Inject constructor(
                         // update activity feed to grab the tx as a result of this buy/sell
                         feedCoordinator.fetchSinceLatest()
                     }
-                    dispatchEvent(Event.OnTransactionSuccessful)
                     dispatchEvent(Event.UpdateProcessingState(loading = false, success = true))
                 },
                 onError = {
diff --git a/apps/flipcash/shared/tokens/src/main/kotlin/TokenInfoViewModel.kt b/apps/flipcash/shared/tokens/src/main/kotlin/TokenInfoViewModel.kt
@@ -19,6 +19,7 @@ import androidx.lifecycle.viewModelScope
 import com.flipcash.app.core.AppRoute
 import com.flipcash.app.core.data.Loadable
 import com.flipcash.app.core.extensions.onResult
+import com.flipcash.app.core.extensions.to
 import com.flipcash.app.core.money.formatted
 import com.flipcash.app.core.tokens.TokenSwapPurpose
 import com.flipcash.app.featureflags.FeatureFlag
@@ -55,6 +56,7 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.mapNotNull
 import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.take
 import javax.inject.Inject
 import kotlin.collections.map
 
@@ -98,8 +100,8 @@ class TokenInfoViewModel @Inject constructor(
     sealed interface Event {
         data class CashReservesEnabled(val enabled: Boolean) : Event
         data class MarketCapChartEnabled(val enabled: Boolean) : Event
-        data class OnMintProvided(val mint: Mint) : Event
-        data class OnTokenChanged(val token: Token) : Event
+        data class OnMintProvided(val mint: Mint, val forNeededFunds: Boolean = false) : Event
+        data class OnTokenChanged(val token: Token, val forNeededFunds: Boolean = false) : Event
         data class OnMarketCapChanged(val mcap: Fiat?) : Event
         data class LoadHistoricalDataForPeriod(val period: Period, val evict: Boolean = false) : Event
 
@@ -116,7 +118,7 @@ class TokenInfoViewModel @Inject constructor(
         data class OnAppreciationUpdated(val amount: LocalFiat?) : Event
         data class ExpandDescription(val expand: Boolean) : Event
         data object Share : Event
-        data object OpenPurchaseMethods : Event
+        data class OpenPurchaseMethods(val forNeededFunds: Boolean = false) : Event
         data class OpenScreen(val screen: AppRoute) : Event
         data object ConnectPhantomWallet : Event
         data object Exit : Event
@@ -135,28 +137,25 @@ class TokenInfoViewModel @Inject constructor(
 
         eventFlow
             .filterIsInstance<Event.OnMintProvided>()
-            .map { it.mint }
             .distinctUntilChanged()
-            .map { tokenController.getTokenMetadata(it) }
-            .onResult(
-                onSuccess = {
-                    dispatchEvent(Event.OnTokenChanged(it.token))
-                },
-                onError = {
-                    BottomBarManager.showError(
-                        title = resources.getString(R.string.error_title_tokenNotFound),
-                        message = resources.getString(R.string.error_description_tokenNotFound),
-                    ) {
-                        dispatchEvent(Event.Exit)
+            .onEach {
+                tokenController.getTokenMetadata(it.mint)
+                    .onSuccess { result ->
+                        dispatchEvent(Event.OnTokenChanged(result.token, it.forNeededFunds))
+                    }.onFailure {
+                        BottomBarManager.showError(
+                            title = resources.getString(R.string.error_title_tokenNotFound),
+                            message = resources.getString(R.string.error_description_tokenNotFound),
+                        ) {
+                            dispatchEvent(Event.Exit)
+                        }
                     }
-                }
-            ).launchIn(viewModelScope)
+            }.launchIn(viewModelScope)
 
         eventFlow
             .filterIsInstance<Event.OnTokenChanged>()
-            .map { it.token }
             .distinctUntilChanged()
-            .flatMapLatest { token ->
+            .flatMapLatest { (token, needsFunds) ->
                 combine(
                     tokenController.balanceForToken(token.address),
                     tokenController.appreciationForToken(token.address),
@@ -180,12 +179,20 @@ class TokenInfoViewModel @Inject constructor(
                         null
                     }
 
-                    localizedBalance to localizedAppreciation
+                    localizedBalance to localizedAppreciation to  needsFunds
                 }
-            }.onEach { (balance, appreciation) ->
+            }.map { (balance, appreciation, needsFunds) ->
                 dispatchEvent(Event.OnBalanceUpdated(balance))
                 dispatchEvent(Event.OnAppreciationUpdated(appreciation))
-            }.launchIn(viewModelScope)
+
+                needsFunds
+            }.take(1)
+            .onEach {
+                if (it) {
+                    dispatchEvent(Event.OpenPurchaseMethods(true))
+                }
+            }
+            .launchIn(viewModelScope)
 
         combine(
             tokenController.observeReservesBalance(),
@@ -298,7 +305,8 @@ class TokenInfoViewModel @Inject constructor(
                                             dispatchEvent(
                                                 Event.OpenScreen(
                                                     AppRoute.Token.SwapTransact(
-                                                        purpose = TokenSwapPurpose.Buy(stateFlow.value.token!!.address)
+                                                        purpose = TokenSwapPurpose.Buy(stateFlow.value.token!!.address),
+                                                        forNeededFunds = it.forNeededFunds
                                                     )
                                                 )
                                             )
diff --git a/ui/components/src/main/kotlin/com/getcode/ui/theme/CodeButton.kt b/ui/components/src/main/kotlin/com/getcode/ui/theme/CodeButton.kt
@@ -382,7 +382,7 @@ fun CodeButton(
                                     ) {
                                         CodeCircularProgressIndicator(
                                             strokeWidth = CodeTheme.dimens.thickBorder,
-                                            color = White,
+                                            color = colors.contentColor(enabled).value,
                                             modifier = Modifier
                                                 .size(CodeTheme.dimens.grid.x3)
                                         )

Original file line number	Diff line number	Diff line change
`@@ -81,15 +81,15 @@ internal fun AppScreenContent(content: @Composable () -> Unit) {`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`register<AppRoute.Token.Info> {`
`84`		`- TokenInfoScreen(it.mint)`
	`84`	`+ TokenInfoScreen(it.mint, it.forNeededFunds)`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`register<AppRoute.Token.Transactions> {`
`88`	`88`	`TransactionHistoryScreen(it.mint)`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`register<AppRoute.Token.SwapTransact> {`
`92`		`- BuySellFlow.start()`
	`92`	`+ BuySellFlow.start(it.forNeededFunds)`
`93`	`93`	`TokenBuySellEntryScreen(it.purpose)`
`94`	`94`	`}`
`95`	`95`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ fun buildNotifyButtonLabel(): AnnotatedButtonLabel {`
`44`	`44`	`end = CodeTheme.dimens.staticGrid.x1`
`45`	`45`	`),`
`46`	`46`	`painter = painterResource(R.drawable.ic_check),`
`47`		`- colorFilter = ColorFilter.tint(Color.White),`
	`47`	`+ colorFilter = ColorFilter.tint(CodeTheme.colors.textSecondary),`
`48`	`48`	`contentDescription = null`
`49`	`49`	`)`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -323,10 +323,13 @@ internal class CashScreenViewModel @Inject constructor(`
`323`	`323`	`// has coinbase provider supporting google pay - pop selection for quick add`
`324`	`324`	`dispatchEvent(Event.OpenOnRampAmountModal(amount))`
`325`	`325`	`} else {`
`326`		`- // route to provider list`
	`326`	`+ // route to buy the token`
`327`	`327`	`dispatchEvent(`
`328`	`328`	`Event.OpenScreen(`
`329`		`- AppRoute.Menu.Deposit(mint = stateFlow.value.selectedTokenAddress!!),`
	`329`	`+ AppRoute.Token.Info(`
	`330`	`+ mint = stateFlow.value.selectedTokenAddress!!,`
	`331`	`+ forNeededFunds = true`
	`332`	`+ ),`
`330`	`333`	`)`
`331`	`334`	`)`
`332`	`335`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,12 @@ object BuySellFlow {`
`8`	`8`	`internal var key: String = ""`
`9`	`9`	`private set`
`10`	`10`
	`11`	`+ var isForNeededFunds: Boolean = false`
	`12`	`+ private set`
	`13`	`+`
`11`	`14`	`@OptIn(ExperimentalUuidApi::class)`
`12`		`- fun start() {`
	`15`	`+ fun start(forNeededFunds: Boolean) {`
`13`	`16`	`key = Uuid.random().toString()`
	`17`	`+ isForNeededFunds = forNeededFunds`
`14`	`18`	`}`
`15`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ private fun TokenTxProcessingScreen(`
`120`	`120`	`text = stringResource(R.string.action_ok),`
`121`	`121`	`buttonState = ButtonState.Filled,`
`122`	`122`	`onClick = {`
`123`		`- dispatch(BuySellSwapTokenViewModel.Event.Exit)`
	`123`	`+ dispatch(BuySellSwapTokenViewModel.Event.OnTransactionSuccessful)`
`124`	`124`	`}`
`125`	`125`	`)`
`126`	`126`	`}`
Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,8 @@ fun ExternalWalletOnRampHandler(`
`200`	`200`	`navigator.push(`
`201`	`201`	`ScreenRegistry.get(`
`202`	`202`	`AppRoute.Token.SwapTransact(`
`203`		`- TokenSwapPurpose.FundWithWallet(origin.mint)`
	`203`	`+ TokenSwapPurpose.FundWithWallet(origin.mint),`
	`204`	`+ forNeededFunds = origin.forNeededFunds`
`204`	`205`	`)`
`205`	`206`	`)`
`206`	`207`	`)`