feat: add coinbase onramp for google pay behind beta flag

beginning to feature work

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

Author: bmc08gt

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

@@ -142,7 +142,7 @@ fun appEntryProvider(
             neededCurrency = key.neededAmount?.currencyCode,
         )
     }
-    annotatedEntry<AppRoute.OnRamp.AmountEntry> { OnRampCustomAmountScreen() }
+    annotatedEntry<AppRoute.OnRamp.AmountEntry> { key -> OnRampCustomAmountScreen(key.mint) }
 
     // Menu
     annotatedEntry<AppRoute.Menu.AppSettings> { AppSettingsScreen() }

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

@@ -7,7 +7,6 @@ import com.flipcash.app.core.tokens.TokenPurpose
 import com.flipcash.app.core.tokens.TokenSwapPurpose
 import com.getcode.navigation.NonDismissableRoute
 import com.getcode.navigation.NonDraggableRoute
-import com.getcode.navigation.Sheet
 import com.getcode.opencode.internal.solana.model.SwapId
 import com.getcode.opencode.model.financial.Fiat
 import com.getcode.solana.keys.Mint
@@ -96,7 +95,8 @@ sealed interface AppRoute : NavKey, Parcelable {
             val neededAmount: Fiat? = null,
         ) : OnRamp
 
-        @Serializable data object AmountEntry: OnRamp
+        @Serializable
+        data class AmountEntry(val mint: Mint? = null) : OnRamp
     }
 
     @Serializable

apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/verification/email/EmailDeeplinkOrigin.kt

@@ -4,6 +4,8 @@ import com.flipcash.app.core.AppRoute
 import com.getcode.ed25519.Ed25519
 import com.getcode.opencode.model.financial.Fiat
 import com.getcode.opencode.utils.base64
+import com.getcode.solana.keys.Mint
+import com.getcode.solana.keys.base58
 import com.getcode.utils.base58
 import com.getcode.utils.decodeBase58
 import com.getcode.utils.decodeBase64
@@ -20,9 +22,10 @@ sealed class EmailDeeplinkOrigin {
     fun serialize(): String {
         return when (this) {
             is OnRamp -> {
-                val amountString = amount?.let { Json.Default.encodeToString(Fiat.Companion.serializer(), it) }
+                val amountString = amount?.let { Json.encodeToString(Fiat.Companion.serializer(), it) }
                 when (source) {
                     is AppRoute.Sheets.Menu -> "onramp|menu|$amountString"
+                    is AppRoute.OnRamp.AmountEntry -> "onramp|amountentry|${source.mint?.base58()}"
 
                     else -> "onramp|null|$amountString"
                 }
@@ -35,8 +38,8 @@ sealed class EmailDeeplinkOrigin {
     companion object {
         fun fromRoute(route: AppRoute?): EmailDeeplinkOrigin? {
             return when (route) {
-                is AppRoute.OnRamp.ProviderList -> {
-                    OnRamp(route.from, route.neededAmount)
+                is AppRoute.OnRamp.AmountEntry -> {
+                    OnRamp(route)
                 }
 
                 is AppRoute.Menu.MyAccount -> MyAccount
@@ -51,12 +54,19 @@ sealed class EmailDeeplinkOrigin {
                 "onramp" -> {
                     val source = when (splits[1]) {
                         "menu" -> AppRoute.Sheets.Menu
-
+                        "amountentry" -> {
+                            println("deeplink origin amountentry")
+                            val mint = splits.getOrNull(2)?.let {
+                                println("deeplink mint = $it")
+                                Mint(it)
+                            }
+                            AppRoute.OnRamp.AmountEntry(mint)
+                        }
                         else -> null
                     }
 
                     val amount =
-                        splits.getOrNull(3)?.let { Json.Default.decodeFromString(Fiat.Companion.serializer(), it) }
+                        splits.getOrNull(3)?.let { Json.decodeFromString(Fiat.Companion.serializer(), it) }
 
                     OnRamp(source, amount)
                 }

apps/flipcash/core/src/main/res/drawable/ic_google_pay.xml

@@ -0,0 +1,27 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="80dp"
+    android:height="38.1dp"
+    android:viewportWidth="80"
+    android:viewportHeight="38.1">
+  <path
+      android:pathData="M37.8,19.7V29h-3V6h7.8c1.9,0 3.7,0.7 5.1,2c1.4,1.2 2.1,3 2.1,4.9c0,1.9 -0.7,3.6 -2.1,4.9c-1.4,1.3 -3.1,2 -5.1,2L37.8,19.7L37.8,19.7zM37.8,8.8v8h5c1.1,0 2.2,-0.4 2.9,-1.2c1.6,-1.5 1.6,-4 0.1,-5.5c0,0 -0.1,-0.1 -0.1,-0.1c-0.8,-0.8 -1.8,-1.3 -2.9,-1.2L37.8,8.8L37.8,8.8z"
+      android:fillColor="#5F6368"/>
+  <path
+      android:pathData="M56.7,12.8c2.2,0 3.9,0.6 5.2,1.8s1.9,2.8 1.9,4.8V29H61v-2.2h-0.1c-1.2,1.8 -2.9,2.7 -4.9,2.7c-1.7,0 -3.2,-0.5 -4.4,-1.5c-1.1,-1 -1.8,-2.4 -1.8,-3.9c0,-1.6 0.6,-2.9 1.8,-3.9c1.2,-1 2.9,-1.4 4.9,-1.4c1.8,0 3.2,0.3 4.3,1v-0.7c0,-1 -0.4,-2 -1.2,-2.6c-0.8,-0.7 -1.8,-1.1 -2.9,-1.1c-1.7,0 -3,0.7 -3.9,2.1l-2.6,-1.6C51.8,13.8 53.9,12.8 56.7,12.8zM52.9,24.2c0,0.8 0.4,1.5 1,1.9c0.7,0.5 1.5,0.8 2.3,0.8c1.2,0 2.4,-0.5 3.3,-1.4c1,-0.9 1.5,-2 1.5,-3.2c-0.9,-0.7 -2.2,-1.1 -3.9,-1.1c-1.2,0 -2.2,0.3 -3,0.9C53.3,22.6 52.9,23.3 52.9,24.2z"
+      android:fillColor="#5F6368"/>
+  <path
+      android:pathData="M80,13.3l-9.9,22.7h-3l3.7,-7.9l-6.5,-14.7h3.2l4.7,11.3h0.1l4.6,-11.3H80z"
+      android:fillColor="#5F6368"/>
+  <path
+      android:pathData="M25.9,17.7c0,-0.9 -0.1,-1.8 -0.2,-2.7H13.2v5.1h7.1c-0.3,1.6 -1.2,3.1 -2.6,4v3.3H22C24.5,25.1 25.9,21.7 25.9,17.7z"
+      android:fillColor="#4285F4"/>
+  <path
+      android:pathData="M13.2,30.6c3.6,0 6.6,-1.2 8.8,-3.2l-4.3,-3.3c-1.2,0.8 -2.7,1.3 -4.5,1.3c-3.4,0 -6.4,-2.3 -7.4,-5.5H1.4v3.4C3.7,27.8 8.2,30.6 13.2,30.6z"
+      android:fillColor="#34A853"/>
+  <path
+      android:pathData="M5.8,19.9c-0.6,-1.6 -0.6,-3.4 0,-5.1v-3.4H1.4c-1.9,3.7 -1.9,8.1 0,11.9L5.8,19.9z"
+      android:fillColor="#FBBC04"/>
+  <path
+      android:pathData="M13.2,9.4c1.9,0 3.7,0.7 5.1,2l0,0l3.8,-3.8c-2.4,-2.2 -5.6,-3.5 -8.8,-3.4c-5,0 -9.6,2.8 -11.8,7.3l4.4,3.4C6.8,11.7 9.8,9.4 13.2,9.4z"
+      android:fillColor="#EA4335"/>
+</vector>

apps/flipcash/core/src/main/res/values/strings.xml

@@ -400,6 +400,8 @@
 
     <string name="prompt_title_selectPurchaseMethod">Select Purchase Method</string>
     <string name="action_useCashReservesWithBalance">USDF (%1$s)</string>
+    <string name="action_debitCardWithPrefix">Debit Card with</string>
+    <string name="action_paySuffix">Pay</string>
 
     <string name="error_title_buySellFailed">Something Went Wrong</string>
     <string name="error_description_buySellFailed">Please try again</string>

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

@@ -43,18 +43,15 @@ internal fun BalanceScreen(
     viewModel: BalanceViewModel,
     tokenViewModel: SelectTokenViewModel,
 ) {
-    val walletState by viewModel.stateFlow.collectAsStateWithLifecycle()
     val tokenState by tokenViewModel.stateFlow.collectAsStateWithLifecycle()
     BalanceScreenContent(
-        walletState = walletState,
         tokenState = tokenState,
         dispatchEvent = viewModel::dispatchEvent
     )
 }
 
 @Composable
 private fun BalanceScreenContent(
-    walletState: BalanceViewModel.State,
     tokenState: SelectTokenViewModel.State,
     dispatchEvent: (BalanceViewModel.Event) -> Unit
 ) {
@@ -68,20 +65,7 @@ private fun BalanceScreenContent(
             dispatchEvent(BalanceViewModel.Event.OpenCurrencySelection)
         }
 
-        if (walletState.quickActionsEnabled) {
-            AddCashRow(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(
-                        horizontal = CodeTheme.dimens.inset,
-                        vertical = CodeTheme.dimens.grid.x4,
-                    ),
-                onAddCash = { dispatchEvent(BalanceViewModel.Event.OnAddCashClicked) },
-                onWithdraw = { dispatchEvent(BalanceViewModel.Event.OnWithdrawClicked) },
-            )
-        } else {
-            Spacer(modifier = Modifier.padding(CodeTheme.dimens.grid.x2))
-        }
+        Spacer(modifier = Modifier.padding(CodeTheme.dimens.grid.x2))
 
         val tokens = remember(tokenState.tokens) { tokenState.tokens }
 
@@ -188,7 +172,6 @@ private fun Preview_BalanceScreen_Empty() {
         ) {
             Box(modifier = Modifier.background(CodeTheme.colors.background)) {
                 BalanceScreenContent(
-                    walletState = BalanceViewModel.State(),
                     tokenState = SelectTokenViewModel.State(
                         purpose = TokenPurpose.Balance,
                         tokens = emptyList()

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

@@ -27,25 +27,19 @@ import javax.inject.Inject
 @HiltViewModel
 internal class BalanceViewModel @Inject constructor(
     userManager: UserManager,
-    onrampController: OnRampAmountController,
-    analytics: FlipcashAnalyticsService,
 ) : BaseViewModel2<BalanceViewModel.State, BalanceViewModel.Event>(
     initialState = State(),
     updateStateForEvent = updateStateForEvent
 ) {
     data class State(
         val preferredOnRampProvider: OnRampProvider? = null,
-        val quickActionsEnabled: Boolean = false,
     )
 
     sealed interface Event {
         data class OnPreferredOnRampProviderChanged(val provider: OnRampProvider?) : Event
 
         data object OpenCurrencySelection : Event
 
-        data object OnAddCashClicked : Event
-        data object OpenOnRampAmountModal : Event
-        data object OnWithdrawClicked : Event
         data class OpenScreen(val screen: AppRoute) : Event
     }
 
@@ -58,45 +52,6 @@ internal class BalanceViewModel @Inject constructor(
                 dispatchEvent(Event.OnPreferredOnRampProviderChanged(provider))
             }
             .launchIn(viewModelScope)
-
-        eventFlow
-            .filterIsInstance<Event.OnAddCashClicked>()
-            .onEach {
-                analytics.openOnramp(Analytics.OnrampSource.Balance)
-                val provider = stateFlow.value.preferredOnRampProvider
-                if (provider is OnRampProvider.Coinbase && provider.type == OnRampType.Virtual) {
-                    // has coinbase provider supporting google pay - pop selection for quick add
-                    dispatchEvent(Event.OpenOnRampAmountModal)
-                }
-            }.launchIn(viewModelScope)
-
-        eventFlow
-            .filterIsInstance<Event.OnWithdrawClicked>()
-            .onEach {
-                dispatchEvent(
-                    Event.OpenScreen(
-                        AppRoute.Sheets.TokenSelection(TokenPurpose.Withdraw)
-                    )
-                )
-            }.launchIn(viewModelScope)
-
-        eventFlow
-            .filterIsInstance<Event.OpenOnRampAmountModal>()
-            .map { onrampController.requestAmountSelection(OnRampProvider.Coinbase(OnRampType.Virtual)) }
-            .flatMapLatest {
-                onrampController.confirmationEvents.take(1)
-            }.onEach { event ->
-                when (event) {
-                    is ConfirmationEvent.OnConfirmationSuccess -> {
-                        when (event.amount) {
-                            OnRampAmount.Custom -> dispatchEvent(Event.OpenScreen(AppRoute.OnRamp.AmountEntry))
-                            is OnRampAmount.Predefined -> Unit
-                        }
-                    }
-
-                    ConfirmationEvent.Cancelled -> Unit
-                }
-            }.launchIn(viewModelScope)
     }
 
     internal companion object {
@@ -106,10 +61,6 @@ internal class BalanceViewModel @Inject constructor(
                 is Event.OnPreferredOnRampProviderChanged -> { state ->
                     state.copy(preferredOnRampProvider = event.provider)
                 }
-
-                Event.OnAddCashClicked -> { state -> state }
-                Event.OpenOnRampAmountModal -> { state -> state }
-                Event.OnWithdrawClicked -> { state -> state }
                 is Event.OpenScreen -> { state -> state }
             }
         }

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

@@ -343,7 +343,7 @@ internal class CashScreenViewModel @Inject constructor(
                 when (event) {
                     is ConfirmationEvent.OnConfirmationSuccess -> {
                         when (event.amount) {
-                            OnRampAmount.Custom -> dispatchEvent(Event.OpenScreen(AppRoute.OnRamp.AmountEntry))
+                            OnRampAmount.Custom -> dispatchEvent(Event.OpenScreen(AppRoute.OnRamp.AmountEntry()))
                             is OnRampAmount.Predefined -> Unit
                         }
                     }

apps/flipcash/features/contact-verification/src/main/kotlin/com/flipcash/app/contact/verification/VerificationFlowScreen.kt

@@ -1,6 +1,5 @@
 package com.flipcash.app.contact.verification
 
-import android.content.Context
 import androidx.compose.animation.AnimatedContent
 import androidx.compose.animation.slideInHorizontally
 import androidx.compose.animation.slideOutHorizontally
@@ -205,7 +204,7 @@ private fun buildStartingScreens(
     emailVerificationCode: String?,
 ): List<VerificationInternalScreen> {
     if (includePhone && includeEmail) {
-        return listOf(VerificationInternalScreen.Intro(origin is AppRoute.OnRamp.ProviderList))
+        return listOf(VerificationInternalScreen.Intro(origin is AppRoute.OnRamp.AmountEntry))
     }
     if (includePhone) {
         return listOf(VerificationInternalScreen.PhoneEntry)

apps/flipcash/features/menu/src/main/kotlin/com/flipcash/app/menu/internal/MenuScreenViewModel.kt

@@ -157,7 +157,7 @@ internal class MenuScreenViewModel @Inject constructor(
                 when (event) {
                     is ConfirmationEvent.OnConfirmationSuccess -> {
                         when (event.amount) {
-                            OnRampAmount.Custom -> dispatchEvent(Event.OpenScreen(AppRoute.OnRamp.AmountEntry))
+                            OnRampAmount.Custom -> dispatchEvent(Event.OpenScreen(AppRoute.OnRamp.AmountEntry()))
                             is OnRampAmount.Predefined -> Unit
                         }
                     }