refactor(onramp): consolidate Coinbase onramp into CoinbaseOnRampController

Merge CoinbaseOnRampManager into OnRampController and rename to
CoinbaseOnRampController for consistency with ExternalWalletOnRampController.
Provide via LocalCoinbaseOnRampController from MainActivity and remove
ViewModel intermediary.

Author: bmc08gt

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

@@ -21,6 +21,8 @@ import com.flipcash.app.core.verification.email.EmailCodeChannel
 import com.flipcash.app.core.verification.email.LocalEmailCodeChannel
 import com.flipcash.app.onramp.ExternalWalletOnRampController
 import com.flipcash.app.onramp.LocalExternalWalletOnRampController
+import com.flipcash.app.onramp.LocalCoinbaseOnRampController
+import com.flipcash.app.onramp.CoinbaseOnRampController
 import com.flipcash.app.featureflags.FeatureFlagController
 import com.flipcash.app.featureflags.LocalFeatureFlags
 import com.flipcash.app.internal.ui.App
@@ -118,6 +120,9 @@ class MainActivity : FragmentActivity() {
     @Inject
     lateinit var externalWalletOnRampController: ExternalWalletOnRampController
 
+    @Inject
+    lateinit var coinbaseOnRampController: CoinbaseOnRampController
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         handleUncaughtException()
@@ -142,6 +147,7 @@ class MainActivity : FragmentActivity() {
                 LocalAppUpdater provides appUpdater,
                 LocalEmailCodeChannel provides emailCodeChannel,
                 LocalExternalWalletOnRampController provides externalWalletOnRampController,
+                LocalCoinbaseOnRampController provides coinbaseOnRampController,
                 LocalUiTesting provides intent.getBooleanExtra(UI_TEST, false),
             ) {
                 ProvidePermissionChecker(permissionChecker) {

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

@@ -42,6 +42,7 @@ import com.flipcash.app.internal.ui.navigation.decorators.rememberNavMessagingEn
 import com.flipcash.app.onramp.CoinbaseOnRampHandler
 import com.flipcash.app.onramp.ExternalWalletOnRampHandler
 import com.flipcash.app.onramp.LocalExternalWalletOnRampController
+import com.flipcash.app.onramp.LocalCoinbaseOnRampController
 import com.flipcash.app.router.LocalRouter
 import com.flipcash.app.session.LocalSessionController
 import com.flipcash.app.theme.FlipcashTheme
@@ -145,8 +146,7 @@ internal fun App(
                                     navigator = codeNavigator,
                                 ) {
                                     CoinbaseOnRampHandler(
-                                        manager = viewModel.coinbaseOnRampManager,
-                                        controller = viewModel.onRampController,
+                                        controller = LocalCoinbaseOnRampController.current,
                                         navigator = codeNavigator,
                                     ) {
                                         AppNavHost(

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

@@ -6,8 +6,6 @@ import com.flipcash.app.android.R
 import com.flipcash.app.appsettings.AppSettingValue
 import com.flipcash.app.appsettings.AppSettingsCoordinator
 import com.flipcash.app.auth.AuthManager
-import com.flipcash.app.onramp.CoinbaseOnRampManager
-import com.flipcash.app.onramp.OnRampController
 import com.flipcash.app.shareable.ShareSheetController
 import com.flipcash.services.user.UserManager
 import com.getcode.manager.BottomBarAction
@@ -28,8 +26,6 @@ internal class HomeViewModel @Inject constructor(
     private val resources: ResourceHelper,
     private val appSettingsCoordinator: AppSettingsCoordinator,
     private val shareSheetController: ShareSheetController,
-    val coinbaseOnRampManager: CoinbaseOnRampManager,
-    val onRampController: OnRampController,
 ) : ViewModel() {
 
     private val _requireBiometrics = MutableStateFlow<Boolean?>(null)

apps/flipcash/features/onramp/src/main/kotlin/com/flipcash/app/onramp/internal/OnRampViewModel.kt

@@ -6,7 +6,7 @@ import com.flipcash.app.core.extensions.onResult
 import com.flipcash.app.core.ui.CurrencyHolder
 import com.flipcash.app.onramp.CoinbaseOnRampState
 import com.flipcash.app.onramp.OnRampAuthError
-import com.flipcash.app.onramp.OnRampController
+import com.flipcash.app.onramp.CoinbaseOnRampController
 import com.flipcash.app.onramp.OnRampPaymentError
 import com.flipcash.features.onramp.R
 import com.flipcash.libs.coroutines.DispatcherProvider
@@ -72,7 +72,7 @@ internal data class AmountEntryState(
 internal class OnRampViewModel @Inject constructor(
     private val exchange: Exchange,
     private val resources: ResourceHelper,
-    private val onRampController: OnRampController,
+    private val onRampController: CoinbaseOnRampController,
     tokenController: TokenController,
     transactionController: TransactionOperations,
     dispatchers: DispatcherProvider,

…/flipcash/app/onramp/OnRampController.kt …h/app/onramp/CoinbaseOnRampController.ktapps/flipcash/shared/onramp/coinbase/src/main/kotlin/com/flipcash/app/onramp/OnRampController.kt renamed to apps/flipcash/shared/onramp/coinbase/src/main/kotlin/com/flipcash/app/onramp/CoinbaseOnRampController.kt apps/flipcash/shared/onramp/coinbase/src/main/kotlin/com/flipcash/app/onramp/OnRampController.kt renamed to apps/flipcash/shared/onramp/coinbase/src/main/kotlin/com/flipcash/app/onramp/CoinbaseOnRampController.kt

@@ -27,7 +27,12 @@ import com.getcode.opencode.model.transactions.SwapFundingSource
 import com.getcode.solana.keys.base58
 import com.getcode.utils.base64
 import com.getcode.vendor.Base58
+import com.flipcash.app.onramp.internal.CoinbaseOnRampWebError
+import dagger.hilt.android.scopes.ActivityRetainedScoped
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import retrofit2.HttpException
@@ -38,19 +43,45 @@ typealias OrderWithPaymentLink = Pair<String, OnRampPurchaseResponse.PaymentLink
 
 private val json = Json { encodeDefaults = true }
 
-class OnRampController @Inject constructor(
+@ActivityRetainedScoped
+class CoinbaseOnRampController @Inject constructor(
     private val jwtProvider: OnRampJwtProvider,
     private val onRampApiEndpoint: OnRampApiConfig,
     private val api: CoinbaseApi,
     private val userManager: UserManager,
     private val exchange: Exchange,
     private val featureFlags: FeatureFlagController,
-    private val coinbaseOnRampManager: CoinbaseOnRampManager,
     private val transactionController: TransactionOperations,
     private val googlePayReadiness: GooglePayReadiness,
 ) {
 
-    val state: StateFlow<CoinbaseOnRampState> get() = coinbaseOnRampManager.state
+    private val _state = MutableStateFlow<CoinbaseOnRampState>(CoinbaseOnRampState.Idle)
+    val state: StateFlow<CoinbaseOnRampState> = _state.asStateFlow()
+
+    fun startPayment(order: OnrampOrder, token: Token, amount: LocalFiat) {
+        _state.value = CoinbaseOnRampState.Paying(order, token, amount)
+    }
+
+    fun onPaymentSuccess(orderId: String) {
+        val current = _state.value
+        if (current is CoinbaseOnRampState.Paying) {
+            _state.update {
+                CoinbaseOnRampState.Processing(orderId, current.token, current.amount)
+            }
+        }
+    }
+
+    fun onPaymentFailure(error: CoinbaseOnRampWebError) {
+        _state.update { CoinbaseOnRampState.Failed(error) }
+    }
+
+    fun onPaymentCancel() {
+        _state.update { CoinbaseOnRampState.Idle }
+    }
+
+    fun reset() {
+        _state.update { CoinbaseOnRampState.Idle }
+    }
 
     suspend fun placeOrderAndStartPayment(
         amount: Fiat,
@@ -68,12 +99,12 @@ class OnRampController @Inject constructor(
         return placeOrderInclusiveOfFees(amount)
             .map { (orderId, paymentLink) ->
                 val order = OnrampOrder(orderId, paymentLink.url)
-                coinbaseOnRampManager.startPayment(order, token, localFiat)
+                startPayment(order, token, localFiat)
             }
     }
 
     suspend fun processPayment(): Result<SwapId> {
-        val current = coinbaseOnRampManager.state.value
+        val current = _state.value
         if (current !is CoinbaseOnRampState.Processing) {
             return Result.failure(IllegalStateException("Not in Processing state"))
         }
@@ -99,10 +130,10 @@ class OnRampController @Inject constructor(
                 ).getOrThrow()
             }
             .onSuccess { swapId ->
-                coinbaseOnRampManager.onCompleted(swapId)
+                _state.update { CoinbaseOnRampState.Completed(swapId) }
             }
             .onFailure {
-                coinbaseOnRampManager.reset()
+                reset()
             }
     }
 

apps/flipcash/shared/onramp/coinbase/src/main/kotlin/com/flipcash/app/onramp/CoinbaseOnRampHandler.kt

@@ -15,12 +15,11 @@ import kotlinx.coroutines.delay
 
 @Composable
 fun CoinbaseOnRampHandler(
-    manager: CoinbaseOnRampManager,
-    controller: OnRampController,
+    controller: CoinbaseOnRampController,
     navigator: CodeNavigator,
     content: @Composable () -> Unit,
 ) {
-    val state by manager.state.collectAsState()
+    val state by controller.state.collectAsState()
     val context = LocalContext.current
 
     when (val current = state) {
@@ -29,13 +28,13 @@ fun CoinbaseOnRampHandler(
                 orderId = current.order.orderId,
                 paymentLinkUrl = current.order.paymentLink,
                 onPaymentSuccess = { orderId ->
-                    manager.onPaymentSuccess(orderId)
+                    controller.onPaymentSuccess(orderId)
                 },
                 onPaymentFailure = { error ->
-                    manager.onPaymentFailure(error)
+                    controller.onPaymentFailure(error)
                 },
                 onCancel = {
-                    manager.onPaymentCancel()
+                    controller.onPaymentCancel()
                 },
             )
         }
@@ -56,15 +55,15 @@ fun CoinbaseOnRampHandler(
         is CoinbaseOnRampState.Completed -> {
             LaunchedEffect(current) {
                 navigator.push(AppRoute.Token.TxProcessing(current.swapId))
-                manager.reset()
+                controller.reset()
             }
         }
 
         is CoinbaseOnRampState.Failed -> {
             LaunchedEffect(current) {
                 delay(400) // let the system payment sheet finish its dismiss animation
                 showOnRampFailure(context, current.error)
-                manager.reset()
+                controller.reset()
             }
         }
 

apps/flipcash/shared/onramp/coinbase/src/main/kotlin/com/flipcash/app/onramp/CoinbaseOnRampLocal.kt

@@ -0,0 +1,6 @@
+package com.flipcash.app.onramp
+
+import androidx.compose.runtime.compositionLocalOf
+
+val LocalCoinbaseOnRampController =
+    compositionLocalOf<CoinbaseOnRampController> { throw IllegalStateException() }

apps/flipcash/shared/onramp/coinbase/src/main/kotlin/com/flipcash/app/onramp/CoinbaseOnRampManager.kt

@@ -31,7 +31,7 @@ import kotlin.test.assertTrue
 @OptIn(ExperimentalCoroutinesApi::class)
 @RunWith(RobolectricTestRunner::class)
 @Config(manifest = Config.NONE)
-class OnRampControllerTest {
+class CoinbaseOnRampControllerTest {
 
     private val jwtProvider = mockk<OnRampJwtProvider>(relaxed = true)
     private val api = mockk<CoinbaseApi>(relaxed = true)
@@ -46,7 +46,7 @@ class OnRampControllerTest {
         method = "POST",
     )
 
-    private lateinit var controller: OnRampController
+    private lateinit var controller: CoinbaseOnRampController
 
     @Before
     fun setUp() {
@@ -58,13 +58,15 @@ class OnRampControllerTest {
         every { Token.usdf } returns fakeToken
         every { fakeToken.timelockSwapAccounts(any()) } returns mockk(relaxed = true)
 
-        controller = OnRampController(
+        controller = CoinbaseOnRampController(
             jwtProvider = jwtProvider,
             onRampApiEndpoint = onRampApiEndpoint,
             api = api,
             userManager = userManager,
             exchange = exchange,
             featureFlags = featureFlags,
+            transactionController = mockk(relaxed = true),
+            googlePayReadiness = mockk(relaxed = true),
         )
     }