feat(payments): replace PaymentController with PurchaseMethodController, extract shared:tokens:core

- Replace old PaymentController/PaymentState/PaymentEvent with
  PurchaseMethodController backed by MutableSharedFlow for selections
- Add typed PurchaseMethodMetadata/PurchaseMethodSelection for passing
  context (mint, isFundingShortfall) through present() calls
- Extract shared:tokens:core module with ReservesBalanceProvider interface
  to break circular dep between shared:tokens and shared:payments
- TokenCoordinator implements ReservesBalanceProvider; Hilt binding in
  TokenModule
- Delete BuySellFlow and migrate standalone TokenTxProcessingScreen from
  flowScopedViewModel to hiltViewModel with isFundingShortfall on the route
- Remove features:payments, shared:onramp:common modules

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

Author: bmc08gt

apps/flipcash/app/build.gradle.kts

@@ -152,7 +152,6 @@ dependencies {
     implementation(project(":apps:flipcash:shared:currency-selection:core"))
     implementation(project(":apps:flipcash:shared:currency-selection:ui"))
     implementation(project(":apps:flipcash:shared:notifications"))
-    implementation(project(":apps:flipcash:shared:onramp:common"))
     implementation(project(":apps:flipcash:shared:onramp:coinbase"))
     implementation(project(":apps:flipcash:shared:onramp:deeplinks"))
     implementation(project(":apps:flipcash:shared:payments"))
@@ -178,7 +177,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:payments"))
     implementation(project(":apps:flipcash:features:onramp"))
     implementation(project(":apps:flipcash:features:contact-verification"))
     implementation(project(":apps:flipcash:features:tokens"))

apps/flipcash/app/src/main/kotlin/com/flipcash/app/MainActivity.kt

@@ -23,10 +23,6 @@ import com.flipcash.app.core.verification.email.LocalEmailCodeChannel
 import com.flipcash.app.featureflags.FeatureFlagController
 import com.flipcash.app.featureflags.LocalFeatureFlags
 import com.flipcash.app.internal.ui.App
-import com.flipcash.app.onramp.LocalOnRampAmountController
-import com.flipcash.app.onramp.OnRampAmountController
-import com.flipcash.app.payments.LocalPaymentController
-import com.flipcash.app.payments.PaymentController
 import com.flipcash.app.phone.LocalPhoneUtils
 import com.flipcash.app.phone.PhoneUtils
 import com.flipcash.app.router.LocalRouter
@@ -111,9 +107,6 @@ class MainActivity : FragmentActivity() {
     @Inject
     lateinit var featureFlagController: FeatureFlagController
 
-    @Inject
-    lateinit var paymentController: PaymentController
-
     @Inject
     lateinit var analytics: FlipcashAnalyticsService
 
@@ -123,9 +116,6 @@ class MainActivity : FragmentActivity() {
     @Inject
     lateinit var phoneUtils: PhoneUtils
 
-    @Inject
-    lateinit var onRampAmountController: OnRampAmountController
-
     @Inject
     lateinit var billPlaygroundController: BillPlaygroundController
 
@@ -159,8 +149,6 @@ class MainActivity : FragmentActivity() {
                 LocalShareController provides shareController,
                 LocalAppSettings provides appSettingsCoordinator,
                 LocalFeatureFlags provides featureFlagController,
-                LocalPaymentController provides paymentController,
-                LocalOnRampAmountController provides onRampAmountController,
                 LocalTransactionController provides transactionController,
                 LocalPhoneUtils provides phoneUtils,
                 LocalBillPlaygroundController provides billPlaygroundController,

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

@@ -41,9 +41,7 @@ import com.flipcash.app.internal.ui.navigation.decorators.rememberNavBlockingOve
 import com.flipcash.app.internal.ui.navigation.decorators.rememberNavMessagingEntryDecorator
 import com.flipcash.app.onramp.ExternalWalletOnRampHandler
 import com.flipcash.app.onramp.LocalExternalWalletState
-import com.flipcash.app.onramp.OnRampAmountScaffold
 import com.flipcash.app.onramp.rememberExternalWalletState
-import com.flipcash.app.payments.PaymentScaffold
 import com.flipcash.app.router.LocalRouter
 import com.flipcash.app.session.LocalSessionController
 import com.flipcash.app.theme.FlipcashTheme
@@ -123,9 +121,7 @@ internal fun App(
         CompositionLocalProvider(
             LocalExternalWalletState provides externalWalletOnRamp
         ) {
-            PaymentScaffold {
-                OnRampAmountScaffold {
-                    TipScaffold(tipsEngine = tipsEngine) {
+            TipScaffold(tipsEngine = tipsEngine) {
                         val backStack = remember { NavBackStack<NavKey>(AppRoute.Loading) }
                         val resultStateRegistry = rememberNavResultStateRegistry()
                         val codeNavigator = rememberCodeNavigator(
@@ -295,10 +291,9 @@ internal fun App(
                                 }
                             }
                         }
-                    }
-                }
             }
-
         }
     }
 }
+
+

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

@@ -102,14 +102,14 @@ fun appEntryProvider(
 
     // Tokens
     annotatedEntry<AppRoute.Token.Info> { key ->
-        TokenInfoScreen(key.mint, key.forNeededFunds, key.fromDeeplink)
+        TokenInfoScreen(key.mint, key.isFundingShortfall, key.fromDeeplink)
     }
     annotatedEntry<AppRoute.Token.Transactions> { key -> TransactionHistoryScreen(key.mint) }
     annotatedEntry<AppRoute.Token.Swap> { key ->
         SwapFlowScreen(route = key, resultStateRegistry = resultStateRegistry)
     }
     annotatedEntry<AppRoute.Token.TxProcessing> { key ->
-        TokenTxProcessingScreen(key.swapId, key.awaitExternalWallet)
+        TokenTxProcessingScreen(key.swapId, key.awaitExternalWallet, key.isFundingShortfall)
     }
     annotatedEntry<AppRoute.Token.OnRamp> { key -> OnRampCustomAmountScreen(key.mint) }
     annotatedEntry<AppRoute.Token.Discovery> { TokenDiscoveryScreen() }

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

@@ -17,7 +17,6 @@ import com.getcode.navigation.NonDismissableRoute
 import com.getcode.navigation.NonDraggableRoute
 import com.getcode.navigation.flow.FlowRouteWithResult
 import com.getcode.opencode.internal.solana.model.SwapId
-import com.getcode.opencode.model.financial.Fiat
 import com.getcode.solana.keys.Mint
 import com.getcode.ui.core.RestrictionType
 import kotlinx.parcelize.Parcelize
@@ -120,7 +119,7 @@ sealed interface AppRoute : NavKey, Parcelable {
         @Serializable
         data class Info(
             val mint: Mint,
-            val forNeededFunds: Boolean = false,
+            val isFundingShortfall: Boolean = false,
             val fromDeeplink: Boolean = false
         ) : Token
 
@@ -129,15 +128,18 @@ sealed interface AppRoute : NavKey, Parcelable {
         @Serializable
         data class Swap(
             val purpose: SwapPurpose,
-            val forNeededFunds: Boolean = false,
+            val isFundingShortfall: Boolean = false,
         ) : Token, FlowRouteWithResult<SwapResult> {
             override val initialStack: List<NavKey>
                 get() = listOf(SwapStep.Entry(purpose))
         }
 
         @Serializable
-        data class TxProcessing(val swapId: SwapId, val awaitExternalWallet: Boolean = false) :
-            Token, NonDismissableRoute, NonDraggableRoute
+        data class TxProcessing(
+            val swapId: SwapId,
+            val awaitExternalWallet: Boolean = false,
+            val isFundingShortfall: Boolean = false,
+        ) : Token, NonDismissableRoute, NonDraggableRoute
 
         @Serializable
         data class OnRamp(val mint: Mint) : Token

apps/flipcash/features/balance/build.gradle.kts

@@ -10,7 +10,6 @@ dependencies {
     implementation(libs.compose.paging)
 
     implementation(project(":apps:flipcash:shared:analytics"))
-    implementation(project(":apps:flipcash:shared:onramp:common"))
     implementation(project(":apps:flipcash:shared:featureflags"))
     implementation(project(":apps:flipcash:shared:tokens"))
     implementation(project(":apps:flipcash:shared:userflags"))

apps/flipcash/features/balance/src/main/kotlin/com/flipcash/app/balance/internal/BalanceScreenContent.kt

@@ -5,12 +5,10 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.Icon
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
@@ -19,17 +17,14 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.flipcash.app.balance.internal.components.BalanceHeader
 import com.flipcash.app.balance.internal.components.CashReservesRow
 import com.flipcash.app.core.AppRoute
-import com.flipcash.app.core.money.formatted
 import com.flipcash.app.core.tokens.TokenPurpose
-import com.flipcash.app.onramp.AddCashRow
 import com.flipcash.app.theme.FlipcashPreview
 import com.flipcash.app.tokens.ui.SelectTokenViewModel
 import com.flipcash.app.tokens.ui.TokenList
@@ -39,7 +34,6 @@ import com.getcode.opencode.compose.LocalExchange
 import com.getcode.opencode.model.financial.CurrencyCode
 import com.getcode.opencode.model.financial.Rate
 import com.getcode.theme.CodeTheme
-import com.getcode.ui.core.rememberedClickable
 import com.getcode.ui.theme.ButtonState
 import com.getcode.ui.theme.CodeButton
 
@@ -76,7 +70,6 @@ private fun BalanceScreenContent(
 
         TokenList(
             modifier = Modifier.weight(1f),
-            reservesEnabled = tokenState.reservesEnabled,
             emptyState = {
                 Box(
                     modifier = Modifier

apps/flipcash/features/cash/build.gradle.kts

@@ -15,7 +15,6 @@ dependencies {
 
     implementation(libs.kotlin.stdlib)
     implementation(project(":apps:flipcash:shared:analytics"))
-    implementation(project(":apps:flipcash:shared:onramp:common"))
     implementation(project(":apps:flipcash:shared:session"))
     implementation(project(":apps:flipcash:shared:tokens"))
     implementation(project(":libs:datetime"))

apps/flipcash/features/cash/src/main/kotlin/com/flipcash/app/cash/internal/CashScreenViewModel.kt

@@ -328,7 +328,7 @@ internal class CashScreenViewModel @Inject constructor(
                     Event.OpenScreen(
                         AppRoute.Token.Info(
                             mint = stateFlow.value.selectedTokenAddress!!,
-                            forNeededFunds = true
+                            isFundingShortfall = true
                         ),
                     )
                 )

apps/flipcash/features/menu/build.gradle.kts

@@ -12,7 +12,6 @@ dependencies {
     implementation(project(":apps:flipcash:shared:authentication"))
     implementation(project(":apps:flipcash:shared:featureflags"))
     implementation(project(":apps:flipcash:shared:menu"))
-    implementation(project(":apps:flipcash:shared:onramp:common"))
     implementation(project(":apps:flipcash:shared:userflags"))
 
     implementation(project(":libs:datetime"))