Merge remote-tracking branch 'origin/code/cash' into feat/phantom-sdk-migration

Resolve conflicts keeping phantom SDK approach (connectAndSign/signAndSend)
while adopting code/cash FundingSource enum, requestFlowExit(), and
deposit/verification changes.

Signed-off-by: Brandon McAnsh <git@bmcreations.dev>

Author: bmc08gt

.well-known/release-manifest.json

@@ -1,15 +1,15 @@
 {
-  "updated": "2026-05-14T21:12:28Z",
+  "updated": "2026-05-15T18:05:45Z",
   "tracks": {
     "production": {
-      "versionCode": 3586,
-      "versionName": "2026.5.3"
+      "versionCode": 3599,
+      "versionName": "2026.5.4"
     },
     "beta": null,
     "alpha": null,
     "internal": {
-      "versionCode": 3586,
-      "versionName": "2026.5.3"
+      "versionCode": 3599,
+      "versionName": "2026.5.4"
     }
   }
 }

apps/flipcash/app/build.gradle.kts

@@ -179,7 +179,6 @@ dependencies {
     implementation(project(":apps:flipcash:features:backupkey"))
     implementation(project(":apps:flipcash:features:shareapp"))
     implementation(project(":apps:flipcash:features:withdrawal"))
-    implementation(project(":apps:flipcash:features:onramp"))
     implementation(project(":apps:flipcash:features:contact-verification"))
     implementation(project(":apps:flipcash:features:tokens"))
     implementation(project(":apps:flipcash:features:transactions"))

apps/flipcash/app/src/main/kotlin/com/flipcash/app/internal/ui/navigation/AppScreenContent.kt

@@ -28,7 +28,8 @@ import com.flipcash.app.contact.verification.VerificationFlowScreen
 import com.flipcash.app.currencycreator.CurrencyCreatorFlowScreen
 import com.flipcash.app.core.AppRoute
 import com.flipcash.app.currency.RegionSelectionScreen
-import com.flipcash.app.deposit.DepositScreen
+import com.flipcash.app.deposit.DepositDestinationScreen
+import com.flipcash.app.deposit.DepositFlowScreen
 import com.flipcash.app.discovery.TokenDiscoveryScreen
 import com.flipcash.app.discovery.TokenDiscoverySheet
 import com.flipcash.app.internal.ui.navigation.decorators.rememberNavMessagingEntryDecorator
@@ -40,7 +41,6 @@ import com.flipcash.app.login.router.LoginRouter
 import com.flipcash.app.login.seed.SeedInputScreen
 import com.flipcash.app.menu.MenuScreen
 import com.flipcash.app.myaccount.MyAccountScreen
-import com.flipcash.app.onramp.OnRampCustomAmountScreen
 import com.flipcash.app.permissions.NotificationPermissionRationaleScreen
 import com.flipcash.app.permissions.NotificationPermissionScreen
 import com.flipcash.app.purchase.PurchaseAccountScreen
@@ -113,7 +113,6 @@ fun appEntryProvider(
     annotatedEntry<AppRoute.Token.TxProcessing> { key ->
         TokenTxProcessingScreen(key.swapId, key.swapPurpose, key.amount, key.awaitExternalWallet, key.isFundingShortfall)
     }
-    annotatedEntry<AppRoute.Token.OnRamp> { key -> OnRampCustomAmountScreen(key.mint) }
     annotatedEntry<AppRoute.Token.Discovery> { TokenDiscoveryScreen() }
     annotatedEntry<AppRoute.Token.CurrencyCreator> { key ->
         CurrencyCreatorFlowScreen(route = key, resultStateRegistry = resultStateRegistry)
@@ -128,13 +127,15 @@ fun appEntryProvider(
     annotatedEntry<AppRoute.Menu.AppSettings> { AppSettingsScreen() }
     annotatedEntry<AppRoute.Menu.Lab> { LabsScreen() }
     annotatedEntry<AppRoute.Menu.MyAccount> { MyAccountScreen() }
-    annotatedEntry<AppRoute.Menu.Deposit> { key -> DepositScreen(key.mint) }
     annotatedEntry<AppRoute.Menu.BackupKey> { BackupKeyScreen() }
     annotatedEntry<AppRoute.Menu.AdvancedFeatures> { AdvancedFeaturesScreen() }
     annotatedEntry<AppRoute.Menu.DeviceLogs> { DeviceLogsScreen() }
 
     annotatedEntry<AppRoute.UserFlags> { UserFlagsScreen() }
     // Transfers
+    annotatedEntry<AppRoute.Transfers.Deposit> { key ->
+        DepositFlowScreen(route = key, resultStateRegistry = resultStateRegistry)
+    }
     annotatedEntry<AppRoute.Transfers.Withdrawal> { key ->
         WithdrawalFlowScreen(route = key, resultStateRegistry = resultStateRegistry)
     }

apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/AppRoute.kt

@@ -2,6 +2,8 @@ package com.flipcash.app.core
 
 import android.os.Parcelable
 import androidx.navigation3.runtime.NavKey
+import com.flipcash.app.core.deposit.DepositResult
+import com.flipcash.app.core.deposit.DepositStep
 import com.flipcash.app.core.money.RegionSelectionKind
 import com.flipcash.app.core.tokens.CurrencyCreatorResult
 import com.flipcash.app.core.tokens.CurrencyCreatorStep
@@ -137,9 +139,15 @@ sealed interface AppRoute : NavKey, Parcelable {
             val shortfall: Fiat? = null,
         ) : Token, FlowRouteWithResult<SwapResult> {
             override val initialStack: List<NavKey>
-                get() = listOf(SwapStep.Entry(purpose))
+                get() = listOf(SwapStep.Entry(purpose, initialAmount = shortfall))
         }
 
+        @Serializable
+        data object PhantomConnectInfo: Token
+
+        @Serializable
+        data object PhantomConfirmTransaction: Token
+
         @Serializable
         data class TxProcessing(
             val swapId: SwapId,
@@ -149,9 +157,6 @@ sealed interface AppRoute : NavKey, Parcelable {
             val isFundingShortfall: Boolean = false,
         ) : Token, NonDismissableRoute, NonDraggableRoute
 
-        @Serializable
-        data class OnRamp(val mint: Mint) : Token
-
         @Serializable
         data object Discovery: AppRoute
 
@@ -165,6 +170,15 @@ sealed interface AppRoute : NavKey, Parcelable {
     @Serializable
     @Parcelize
     sealed interface Transfers : AppRoute {
+        @Serializable
+        data class Deposit(val mint: Mint): Transfers, FlowRouteWithResult<DepositResult> {
+            override val initialStack: List<NavKey>
+                get() = if (mint == Mint.usdf) {
+                    listOf(DepositStep.UsdcInformational)
+                } else {
+                    listOf(DepositStep.Destination(mint))
+                }
+        }
 
         @Serializable
         data class Withdrawal(val mint: Mint) : Transfers, FlowRouteWithResult<WithdrawalResult> {
@@ -209,7 +223,7 @@ private fun buildVerificationInitialStack(
     emailVerificationCode: String?,
 ): List<NavKey> {
     if (includePhone && includeEmail) {
-        return listOf(VerificationStep.Intro(origin is AppRoute.Token.OnRamp))
+        return listOf(VerificationStep.Intro(origin is AppRoute.Token.Swap))
     }
     if (includePhone) {
         return listOf(VerificationStep.PhoneEntry)

apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/android/extensions/Context.kt

@@ -21,7 +21,6 @@ fun Context.launchPhotos(searchQuery: String = "Flipcash") {
     if (searchIntent.resolveActivity(packageManager) != null) {
         startActivity(searchIntent)
     } else {
-        println("No apps handling image search")
         // Fall back to just opening the gallery
         val photosIntent = IntentUtils.photosApp()
         startActivity(photosIntent)

apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/deposit/DepositResult.kt

@@ -0,0 +1,16 @@
+package com.flipcash.app.core.deposit
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+import kotlinx.serialization.Serializable
+
+@Serializable
+sealed interface DepositResult : Parcelable {
+    @Parcelize
+    @Serializable
+    data object Success : DepositResult
+
+    @Parcelize
+    @Serializable
+    data object Canceled : DepositResult
+}

apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/deposit/DepositStep.kt

@@ -0,0 +1,22 @@
+package com.flipcash.app.core.deposit
+
+import android.os.Parcelable
+import com.getcode.navigation.flow.FlowStep
+import com.getcode.solana.keys.Mint
+import kotlinx.parcelize.Parcelize
+import kotlinx.serialization.Serializable
+
+/**
+ * Steps inside the Withdrawal flow. Owned by [com.flipcash.app.core.AppRoute.Transfers.Withdrawal]
+ * and rendered inside a [com.getcode.navigation.flow.FlowHost].
+ */
+@Serializable
+sealed interface DepositStep : FlowStep, Parcelable {
+    @Parcelize
+    object UsdcInformational : DepositStep
+
+
+    @Parcelize
+    @Serializable
+    data class Destination(val mint: Mint) : DepositStep
+}

apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/tokens/SwapStep.kt

@@ -5,19 +5,27 @@ import com.getcode.navigation.NonDismissableRoute
 import com.getcode.navigation.NonDraggableRoute
 import com.getcode.navigation.flow.FlowStep
 import com.getcode.opencode.internal.solana.model.SwapId
+import com.getcode.opencode.model.financial.Fiat
 import kotlinx.parcelize.Parcelize
 import kotlinx.serialization.Serializable
 
 @Serializable
 sealed interface SwapStep : FlowStep, Parcelable {
     @Parcelize
     @Serializable
-    data class Entry(val purpose: SwapPurpose) : SwapStep
+    data class Entry(val purpose: SwapPurpose, val initialAmount: Fiat? = null) : SwapStep
 
     @Parcelize
     @Serializable
     data object SellReceipt : SwapStep
 
+    @Parcelize
+    @Serializable
+    data object PhantomConnect: SwapStep
+
+    @Parcelize
+    @Serializable
+    data object PhantomConfirmTransaction: SwapStep
     @Parcelize
     @Serializable
     data class Processing(

apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/tokens/TokenSwapPurpose.kt

@@ -14,12 +14,22 @@ import kotlinx.serialization.Serializable
  * @see Buy Represents a purchase intent (e.g., swapping base currency for a specific token).
  * @see Sell Represents a liquidation intent (e.g., swapping a specific token back to base currency).
  */
+@Serializable
+enum class FundingSource {
+    Flexible,
+    Phantom,
+    Coinbase,
+}
+
 @Serializable
 @Parcelize
 sealed interface SwapPurpose : Parcelable {
+    val mint: Mint
     sealed interface BalanceIncrease
     sealed interface BalanceDecrease
-    @Serializable data class Buy(val mint: Mint) : SwapPurpose, BalanceIncrease
-    @Serializable data class FundWithWallet(val mint: Mint): SwapPurpose, BalanceIncrease
-    @Serializable data class Sell(val mint: Mint) : SwapPurpose, BalanceDecrease
+    @Serializable data class Buy(
+        override val mint: Mint,
+        val fundingSource: FundingSource = FundingSource.Flexible,
+    ) : SwapPurpose, BalanceIncrease
+    @Serializable data class Sell(override val  mint: Mint) : SwapPurpose, BalanceDecrease
 }