feat(deposit): show deposit toast on camera after successful deposit

bmc08gt · bmc08gt · commit 98e8dac94c97 · 2026-06-11T16:18:10.000-04:00
Extract public ToastController interface into core so features can
trigger toasts independently of the bill-grab queue. Pass deposited
amount through SwapResult.Success and fire the toast before popAll.
diff --git a/apps/flipcash/app/src/main/kotlin/com/flipcash/app/MainActivity.kt b/apps/flipcash/app/src/main/kotlin/com/flipcash/app/MainActivity.kt
@@ -19,6 +19,8 @@ import com.flipcash.app.billing.BillingClient
 import com.flipcash.app.contacts.ContactCoordinator
 import com.flipcash.app.contacts.LocalContactCoordinator
 import com.flipcash.app.core.LocalUserManager
+import com.flipcash.app.core.toast.LocalToastController
+import com.flipcash.app.core.toast.ToastController
 import com.flipcash.app.core.verification.email.EmailCodeChannel
 import com.flipcash.app.core.verification.email.LocalEmailCodeChannel
 import com.flipcash.app.onramp.LocalCoinbaseOnRampController
@@ -125,6 +127,9 @@ class MainActivity : FragmentActivity() {
     @Inject
     lateinit var contactCoordinator: ContactCoordinator
 
+    @Inject
+    lateinit var toastController: ToastController
+
     @Inject
     lateinit var coinbaseOnRampController: CoinbaseOnRampController
 
@@ -153,6 +158,7 @@ class MainActivity : FragmentActivity() {
                 LocalAppUpdater provides appUpdater,
                 LocalEmailCodeChannel provides emailCodeChannel,
                 LocalContactCoordinator provides contactCoordinator,
+                LocalToastController provides toastController,
                 LocalCoinbaseOnRampController provides coinbaseOnRampController,
                 LocalUiTesting provides intent.getBooleanExtra(UI_TEST, false),
             ) {
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
@@ -173,6 +173,7 @@ sealed interface AppRoute : NavKey, Parcelable {
         data class Swap(
             val purpose: SwapPurpose,
             val shortfall: Fiat? = null,
+            val popToRoot: Boolean = false,
         ) : Token, FlowRouteWithResult<SwapResult> {
             override val initialStack: List<NavKey>
                 get() = listOf(SwapStep.Entry(purpose, initialAmount = shortfall))
diff --git a/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/toast/ToastController.kt b/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/toast/ToastController.kt
@@ -0,0 +1,12 @@
+package com.flipcash.app.core.toast
+
+import androidx.compose.runtime.staticCompositionLocalOf
+import com.getcode.opencode.model.financial.Fiat
+
+interface ToastController {
+    fun showToast(amount: Fiat, isDeposit: Boolean)
+}
+
+val LocalToastController = staticCompositionLocalOf<ToastController> {
+    error("No ToastController provided")
+}
diff --git a/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/tokens/SwapResult.kt b/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/tokens/SwapResult.kt
@@ -1,14 +1,15 @@
 package com.flipcash.app.core.tokens
 
 import android.os.Parcelable
+import com.getcode.opencode.model.financial.Fiat
 import kotlinx.parcelize.Parcelize
 import kotlinx.serialization.Serializable
 
 @Serializable
 sealed interface SwapResult : Parcelable {
     @Parcelize
     @Serializable
-    data object Success : SwapResult
+    data class Success(val amount: Fiat = Fiat.Zero) : SwapResult
 
     @Parcelize
     @Serializable
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
@@ -54,7 +54,7 @@ internal class BalanceViewModel @Inject constructor(
 
         eventFlow
             .filterIsInstance<Event.PresentDepositOptions>()
-            .mapNotNull { purchaseMethodController.presentDepositOptions() }
+            .mapNotNull { purchaseMethodController.presentDepositOptions(popToRoot = true) }
             .onEach { route -> dispatchEvent(Event.OpenScreen(route)) }
             .launchIn(viewModelScope)
     }
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
@@ -152,7 +152,7 @@ internal class MenuScreenViewModel @Inject constructor(
 
         eventFlow
             .filterIsInstance<Event.PresentDepositOptions>()
-            .mapNotNull { purchaseMethodController.presentDepositOptions() }
+            .mapNotNull { purchaseMethodController.presentDepositOptions(popToRoot = true) }
             .onEach { route -> dispatchEvent(Event.OpenScreen(route)) }
             .launchIn(viewModelScope)
     }
diff --git a/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/SwapFlowScreen.kt b/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/SwapFlowScreen.kt
@@ -5,8 +5,10 @@ import androidx.navigation3.runtime.NavEntry
 import androidx.navigation3.runtime.NavKey
 import androidx.navigation3.runtime.entryProvider
 import com.flipcash.app.core.AppRoute
+import com.flipcash.app.core.toast.LocalToastController
 import com.flipcash.app.core.tokens.SwapResult
 import com.flipcash.app.core.tokens.SwapStep
+import com.getcode.opencode.model.financial.Fiat
 import com.getcode.navigation.annotatedEntry
 import com.getcode.navigation.core.LocalCodeNavigator
 import com.getcode.navigation.flowAnnotatedEntry
@@ -23,6 +25,7 @@ fun SwapFlowScreen(
     resultStateRegistry: NavResultStateRegistry,
 ) {
     val outerNavigator = LocalCodeNavigator.current
+    val toastController = LocalToastController.current
     val initialStack = route.rememberInitialStack<SwapStep>()
 
     FlowHost<SwapStep, SwapResult>(
@@ -39,9 +42,15 @@ fun SwapFlowScreen(
                 value = NavResultOrCanceled.ReturnValue(result),
             )
             when (result) {
-                SwapResult.Success -> {
-                    if (route.shortfall != null) outerNavigator.popAll()
-                    else outerNavigator.pop()
+                is SwapResult.Success -> {
+                    if (route.shortfall != null || route.popToRoot) {
+                        if (result.amount > Fiat.Zero) {
+                            toastController.showToast(result.amount, isDeposit = true)
+                        }
+                        outerNavigator.popAll()
+                    } else {
+                        outerNavigator.pop()
+                    }
                 }
                 SwapResult.OpenDeposit,
                 SwapResult.Canceled -> outerNavigator.pop()
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
@@ -28,7 +28,8 @@ internal fun SwapProcessingScreen() {
         viewModel.eventFlow
             .filterIsInstance<Event.OnTransactionSuccessful>()
             .onEach {
-                flowNavigator.exitWithResult(SwapResult.Success)
+                val amount = viewModel.stateFlow.value.enteredAmount
+                flowNavigator.exitWithResult(SwapResult.Success(amount))
             }.launchIn(this)
     }
 
diff --git a/apps/flipcash/shared/payments/src/main/kotlin/com/flipcash/app/payments/PurchaseMethodController.kt b/apps/flipcash/shared/payments/src/main/kotlin/com/flipcash/app/payments/PurchaseMethodController.kt
@@ -9,5 +9,5 @@ interface PurchaseMethodController {
     val selections: Flow<PurchaseMethodSelection>
     fun present(metadata: PurchaseMethodMetadata = PurchaseMethodMetadata())
     fun select(method: PurchaseMethod, metadata: PurchaseMethodMetadata)
-    suspend fun presentDepositOptions(): AppRoute?
+    suspend fun presentDepositOptions(popToRoot: Boolean = false): AppRoute?
 }
diff --git a/apps/flipcash/shared/payments/src/main/kotlin/com/flipcash/app/payments/internal/InternalPurchaseMethodController.kt b/apps/flipcash/shared/payments/src/main/kotlin/com/flipcash/app/payments/internal/InternalPurchaseMethodController.kt
@@ -122,7 +122,7 @@ class InternalPurchaseMethodController @Inject constructor(
         )
     }
 
-    override suspend fun presentDepositOptions(): AppRoute? {
+    override suspend fun presentDepositOptions(popToRoot: Boolean): AppRoute? {
         delay(150)
         present(PurchaseMethodMetadata(mint = Mint.usdf, showReserves = false, canUseOtherWallets = true))
 
@@ -133,10 +133,12 @@ class InternalPurchaseMethodController @Inject constructor(
 
         return when (result) {
             PurchaseMethod.CoinbaseOnRamp -> AppRoute.Token.Swap(
-                purpose = SwapPurpose.Buy(Mint.usdf, FundingSource.Coinbase)
+                purpose = SwapPurpose.Buy(Mint.usdf, FundingSource.Coinbase),
+                popToRoot = popToRoot,
             )
             PurchaseMethod.PhantomWallet -> AppRoute.Token.Swap(
-                purpose = SwapPurpose.Buy(Mint.usdf, FundingSource.Phantom)
+                purpose = SwapPurpose.Buy(Mint.usdf, FundingSource.Phantom),
+                popToRoot = popToRoot,
             )
             PurchaseMethod.OtherWallet -> AppRoute.Transfers.Deposit(showOtherOptions = true)
             is PurchaseMethod.CashReserves -> null
diff --git a/apps/flipcash/shared/session/src/main/kotlin/com/flipcash/app/session/inject/CoreModule.kt b/apps/flipcash/shared/session/src/main/kotlin/com/flipcash/app/session/inject/CoreModule.kt
@@ -1,7 +1,9 @@
 package com.flipcash.app.session.inject
 
+import com.flipcash.app.core.toast.ToastController
 import com.flipcash.app.session.SessionController
 import com.flipcash.app.session.internal.RealSessionController
+import com.flipcash.app.session.internal.toast.SessionToastController
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -14,4 +16,8 @@ abstract class SessionModule {
     @Binds
     @Singleton
     abstract fun bindSessionController(impl: RealSessionController): SessionController
+
+    @Binds
+    @Singleton
+    abstract fun bindToastController(impl: SessionToastController): ToastController
 }
diff --git a/apps/flipcash/shared/session/src/main/kotlin/com/flipcash/app/session/internal/RealSessionController.kt b/apps/flipcash/shared/session/src/main/kotlin/com/flipcash/app/session/internal/RealSessionController.kt
@@ -25,7 +25,7 @@ import com.flipcash.app.session.Grabbed
 import com.flipcash.app.session.PutInWallet
 import com.flipcash.app.session.SessionController
 import com.flipcash.app.session.SessionState
-import com.flipcash.app.session.internal.toast.ToastController
+import com.flipcash.app.session.internal.toast.SessionToastController
 import com.flipcash.app.shareable.ShareConfirmationResult
 import com.flipcash.app.shareable.ShareResult
 import com.flipcash.app.shareable.ShareSheetController
@@ -125,7 +125,7 @@ class RealSessionController @Inject constructor(
     private val profileUpdater: ProfileUpdater,
     private val shareSheetController: ShareSheetController,
     private val shareConfirmationController: ShareableConfirmationController,
-    private val toastController: ToastController,
+    private val toastController: SessionToastController,
     private val billingClient: BillingClient,
     private val tokenCoordinator: TokenCoordinator,
     private val contactCoordinator: ContactCoordinator,
@@ -782,7 +782,7 @@ class RealSessionController @Inject constructor(
 
     override fun presentDepositOptions(onRoute: ((AppRoute) -> Unit)?) {
         scope.launch {
-            purchaseMethodController.presentDepositOptions()?.let { onRoute?.invoke(it) }
+            purchaseMethodController.presentDepositOptions(popToRoot = true)?.let { onRoute?.invoke(it) }
         }
     }
 
diff --git a/apps/flipcash/shared/session/src/main/kotlin/com/flipcash/app/session/internal/toast/ToastController.kt b/apps/flipcash/shared/session/src/main/kotlin/com/flipcash/app/session/internal/toast/ToastController.kt
@@ -2,6 +2,8 @@ package com.flipcash.app.session.internal.toast
 
 import com.flipcash.app.core.bill.BillToast
 import com.flipcash.app.core.internal.bill.BillController
+import com.flipcash.app.core.toast.ToastController
+import com.getcode.opencode.model.financial.Fiat
 import com.getcode.opencode.model.financial.LocalFiat
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -15,9 +17,9 @@ import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.seconds
 
 @Singleton
-class ToastController @Inject constructor(
+class SessionToastController @Inject constructor(
     private val billController: BillController
-) {
+) : ToastController {
     companion object {
         val INITIAL_DELAY = 500.milliseconds
         val SHOW_DELAY = 3.seconds
@@ -107,4 +109,18 @@ class ToastController @Inject constructor(
         }
         isConsumingQueue = false
     }
+
+    override fun showToast(amount: Fiat, isDeposit: Boolean) {
+        if (amount.decimalValue == 0.0) return
+        scope.launch {
+            delay(INITIAL_DELAY)
+            billController.update {
+                it.copy(showToast = true, toast = BillToast(amount = amount, isDeposit = isDeposit))
+            }
+            delay(SHOW_DELAY)
+            billController.update { it.copy(showToast = false) }
+            delay(INITIAL_DELAY)
+            billController.update { it.copy(toast = null) }
+        }
+    }
 }
diff --git a/apps/flipcash/shared/session/src/test/kotlin/com/flipcash/app/session/internal/SessionControllerGiftCardErrorTest.kt b/apps/flipcash/shared/session/src/test/kotlin/com/flipcash/app/session/internal/SessionControllerGiftCardErrorTest.kt
@@ -1,39 +1,24 @@
 package com.flipcash.app.session.internal
 
-import com.flipcash.app.activityfeed.ActivityFeedCoordinator
-import com.flipcash.app.activityfeed.ActivityFeedUpdater
 import com.flipcash.app.analytics.FlipcashAnalyticsService
-import com.flipcash.app.appsettings.AppSettingsCoordinator
+import com.flipcash.app.core.MainCoroutineRule
+import com.flipcash.app.core.bill.Bill
+import com.flipcash.app.core.bill.BillState
 import com.flipcash.app.core.internal.bill.BillController
-import com.flipcash.app.session.internal.toast.ToastController
-import com.flipcash.app.featureflags.FeatureFlagController
-import com.flipcash.app.shareable.ShareSheetController
 import com.flipcash.app.shareable.ShareResult
+import com.flipcash.app.shareable.ShareSheetController
 import com.flipcash.app.shareable.Shareable
-import com.flipcash.app.shareable.ShareableConfirmationController
 import com.flipcash.app.tokens.TokenCoordinator
-import com.flipcash.app.tokens.TokenUpdater
-import com.flipcash.services.controllers.AccountController
-import com.flipcash.app.core.internal.updater.ProfileUpdater
-import com.flipcash.services.controllers.SettingsController
 import com.flipcash.services.user.UserManager
 import com.flipcash.shared.session.R
 import com.getcode.manager.BottomBarManager
-import com.getcode.opencode.controllers.TransactionController
 import com.getcode.opencode.internal.manager.VerifiedState
 import com.getcode.opencode.internal.transactors.ReceiveGiftTransactorError
 import com.getcode.opencode.model.accounts.AccountCluster
-import com.flipcash.app.core.bill.Bill
-import com.flipcash.app.core.bill.BillState
+import com.getcode.opencode.model.accounts.GiftCardAccount
 import com.getcode.opencode.model.financial.LocalFiat
-import com.getcode.opencode.model.financial.Token
 import com.getcode.util.resources.ResourceHelper
-import com.flipcash.app.billing.BillingClient
-import com.flipcash.app.core.MainCoroutineRule
-import com.flipcash.app.payments.PurchaseMethodController
 import com.getcode.utils.network.NetworkConnectivityListener
-import com.getcode.util.vibration.Vibrator
-import com.getcode.opencode.model.accounts.GiftCardAccount
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.mockkObject
diff --git a/apps/flipcash/shared/tokens/src/test/kotlin/com/flipcash/app/tokens/TokenSelectionResolverTest.kt b/apps/flipcash/shared/tokens/src/test/kotlin/com/flipcash/app/tokens/TokenSelectionResolverTest.kt
@@ -148,10 +148,10 @@ class TokenSelectionResolverTest {
 
     // endregion
 
-    // region USDF exclusion
+    // region USDF selection
 
     @Test
-    fun `never selects USDF as fallback`() {
+    fun `selects USDF as fallback when it has highest balance`() {
         val result = resolveTokenSelection(
             balances = mapOf(
                 mintA to Fiat(0.0, CurrencyCode.USD),
@@ -160,11 +160,11 @@ class TokenSelectionResolverTest {
             currentSelection = mintA,
             rate = usdRate,
         )
-        assertNull(result)
+        assertEquals(Mint.usdf, result)
     }
 
     @Test
-    fun `skips USDF and selects next highest`() {
+    fun `selects USDF over lower balance tokens`() {
         val result = resolveTokenSelection(
             balances = mapOf(
                 mintA to Fiat(0.0, CurrencyCode.USD),
@@ -174,7 +174,7 @@ class TokenSelectionResolverTest {
             currentSelection = mintA,
             rate = usdRate,
         )
-        assertEquals(mintB, result)
+        assertEquals(Mint.usdf, result)
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ internal class BalanceViewModel @Inject constructor(`
`54`	`54`
`55`	`55`	`eventFlow`
`56`	`56`	`.filterIsInstance<Event.PresentDepositOptions>()`
`57`		`- .mapNotNull { purchaseMethodController.presentDepositOptions() }`
	`57`	`+ .mapNotNull { purchaseMethodController.presentDepositOptions(popToRoot = true) }`
`58`	`58`	`.onEach { route -> dispatchEvent(Event.OpenScreen(route)) }`
`59`	`59`	`.launchIn(viewModelScope)`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ internal class MenuScreenViewModel @Inject constructor(`
`152`	`152`
`153`	`153`	`eventFlow`
`154`	`154`	`.filterIsInstance<Event.PresentDepositOptions>()`
`155`		`- .mapNotNull { purchaseMethodController.presentDepositOptions() }`
	`155`	`+ .mapNotNull { purchaseMethodController.presentDepositOptions(popToRoot = true) }`
`156`	`156`	`.onEach { route -> dispatchEvent(Event.OpenScreen(route)) }`
`157`	`157`	`.launchIn(viewModelScope)`
`158`	`158`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,8 @@ internal fun SwapProcessingScreen() {`
`28`	`28`	`viewModel.eventFlow`
`29`	`29`	`.filterIsInstance<Event.OnTransactionSuccessful>()`
`30`	`30`	`.onEach {`
`31`		`- flowNavigator.exitWithResult(SwapResult.Success)`
	`31`	`+ val amount = viewModel.stateFlow.value.enteredAmount`
	`32`	`+ flowNavigator.exitWithResult(SwapResult.Success(amount))`
`32`	`33`	`}.launchIn(this)`
`33`	`34`	`}`
`34`	`35`
Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,5 @@ interface PurchaseMethodController {`
`9`	`9`	`val selections: Flow<PurchaseMethodSelection>`
`10`	`10`	`fun present(metadata: PurchaseMethodMetadata = PurchaseMethodMetadata())`
`11`	`11`	`fun select(method: PurchaseMethod, metadata: PurchaseMethodMetadata)`
`12`		`- suspend fun presentDepositOptions(): AppRoute?`
	`12`	`+ suspend fun presentDepositOptions(popToRoot: Boolean = false): AppRoute?`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ class InternalPurchaseMethodController @Inject constructor(`
`122`	`122`	`)`
`123`	`123`	`}`
`124`	`124`
`125`		`- override suspend fun presentDepositOptions(): AppRoute? {`
	`125`	`+ override suspend fun presentDepositOptions(popToRoot: Boolean): AppRoute? {`
`126`	`126`	`delay(150)`
`127`	`127`	`present(PurchaseMethodMetadata(mint = Mint.usdf, showReserves = false, canUseOtherWallets = true))`
`128`	`128`
`@@ -133,10 +133,12 @@ class InternalPurchaseMethodController @Inject constructor(`
`133`	`133`
`134`	`134`	`return when (result) {`
`135`	`135`	`PurchaseMethod.CoinbaseOnRamp -> AppRoute.Token.Swap(`
`136`		`- purpose = SwapPurpose.Buy(Mint.usdf, FundingSource.Coinbase)`
	`136`	`+ purpose = SwapPurpose.Buy(Mint.usdf, FundingSource.Coinbase),`
	`137`	`+ popToRoot = popToRoot,`
`137`	`138`	`)`
`138`	`139`	`PurchaseMethod.PhantomWallet -> AppRoute.Token.Swap(`
`139`		`- purpose = SwapPurpose.Buy(Mint.usdf, FundingSource.Phantom)`
	`140`	`+ purpose = SwapPurpose.Buy(Mint.usdf, FundingSource.Phantom),`
	`141`	`+ popToRoot = popToRoot,`
`140`	`142`	`)`
`141`	`143`	`PurchaseMethod.OtherWallet -> AppRoute.Transfers.Deposit(showOtherOptions = true)`
`142`	`144`	`is PurchaseMethod.CashReserves -> null`