Merge branch 'code/cash' into dependabot/gradle/code/cash/navigation3-1.1.0

Author: bmc08gt

.github/workflows/ci.yml

@@ -50,5 +50,8 @@ jobs:
       - name: Setup Mixpanel API Key
         run: echo MIXPANEL_API_KEY=\"${{ secrets.FLIPCASH_MIXPANEL_API_KEY }}\" >> ./local.properties
 
+      - name: Setup Coinbase OnRamp API Key
+        run: echo COINBASE_ONRAMP_API_KEY=${{ secrets.COINBASE_ONRAMP_API_KEY }} >> ./local.properties
+
       - name: Run Flipcash tests
         run: bundle exec fastlane android flipcash_tests

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,12 +177,12 @@ 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"))
     implementation(project(":apps:flipcash:features:transactions"))
     implementation(project(":apps:flipcash:features:bill-customization"))
+    implementation(project(":apps:flipcash:features:currency-creator"))
     implementation(project(":apps:flipcash:features:discovery"))
     implementation(project(":apps:flipcash:features:userflags"))
 

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

@@ -16,15 +16,16 @@ import com.flipcash.app.appsettings.LocalAppSettings
 import com.flipcash.app.bill.customization.BillPlaygroundController
 import com.flipcash.app.bill.customization.LocalBillPlaygroundController
 import com.flipcash.app.billing.BillingClient
-import com.flipcash.app.billing.LocalBillingClient
 import com.flipcash.app.core.LocalUserManager
+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
-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
@@ -38,10 +39,7 @@ import com.flipcash.app.updates.LocalAppUpdater
 import com.flipcash.services.user.UserManager
 import com.getcode.libs.analytics.LocalAnalytics
 import com.getcode.opencode.compose.LocalExchange
-import com.getcode.opencode.compose.LocalTransactionController
-import com.getcode.opencode.controllers.TransactionController
 import com.getcode.opencode.exchange.Exchange
-import com.getcode.solana.rpc.RpcConfig
 import com.getcode.ui.testing.LocalUiTesting
 import com.getcode.util.permissions.PermissionChecker
 import com.getcode.util.permissions.ProvidePermissionChecker
@@ -51,8 +49,6 @@ import com.getcode.util.resources.ResourceHelper
 import com.getcode.util.resources.SettingsHelper
 import com.getcode.util.vibration.LocalVibrator
 import com.getcode.util.vibration.Vibrator
-import com.getcode.utils.CurrencyUtils
-import com.getcode.utils.LocalCurrencyUtils
 import com.getcode.utils.network.LocalNetworkObserver
 import com.getcode.utils.network.NetworkConnectivityListener
 import dagger.hilt.android.AndroidEntryPoint
@@ -76,9 +72,6 @@ class MainActivity : FragmentActivity() {
     @Inject
     lateinit var networkObserver: NetworkConnectivityListener
 
-    @Inject
-    lateinit var currencyUtils: CurrencyUtils
-
     @Inject
     lateinit var vibrator: Vibrator
 
@@ -109,30 +102,26 @@ class MainActivity : FragmentActivity() {
     @Inject
     lateinit var featureFlagController: FeatureFlagController
 
-    @Inject
-    lateinit var paymentController: PaymentController
-
     @Inject
     lateinit var analytics: FlipcashAnalyticsService
 
-    @Inject
-    lateinit var solanaRpcConfig: RpcConfig
-
     @Inject
     lateinit var phoneUtils: PhoneUtils
 
-    @Inject
-    lateinit var onRampAmountController: OnRampAmountController
-
     @Inject
     lateinit var billPlaygroundController: BillPlaygroundController
 
     @Inject
     lateinit var appUpdater: AppUpdateController
 
     @Inject
-    lateinit var transactionController: TransactionController
+    lateinit var emailCodeChannel: EmailCodeChannel
 
+    @Inject
+    lateinit var externalWalletOnRampController: ExternalWalletOnRampController
+
+    @Inject
+    lateinit var coinbaseOnRampController: CoinbaseOnRampController
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -146,28 +135,25 @@ class MainActivity : FragmentActivity() {
                 LocalNetworkObserver provides networkObserver,
                 LocalExchange provides exchange,
                 LocalAnalytics provides analytics,
-                LocalCurrencyUtils provides currencyUtils,
                 LocalVibrator provides vibrator,
                 LocalRouter provides router,
                 LocalUserManager provides userManager,
                 LocalSessionController provides sessionController,
-                LocalBillingClient provides billing,
                 LocalShareController provides shareController,
                 LocalAppSettings provides appSettingsCoordinator,
                 LocalFeatureFlags provides featureFlagController,
-                LocalPaymentController provides paymentController,
-                LocalOnRampAmountController provides onRampAmountController,
-                LocalTransactionController provides transactionController,
                 LocalPhoneUtils provides phoneUtils,
                 LocalBillPlaygroundController provides billPlaygroundController,
                 LocalAppUpdater provides appUpdater,
+                LocalEmailCodeChannel provides emailCodeChannel,
+                LocalExternalWalletOnRampController provides externalWalletOnRampController,
+                LocalCoinbaseOnRampController provides coinbaseOnRampController,
                 LocalUiTesting provides intent.getBooleanExtra(UI_TEST, false),
             ) {
                 ProvidePermissionChecker(permissionChecker) {
                     Rinku {
                         App(
                             tipsEngine = tipsEngine,
-                            solanaRpcConfig = solanaRpcConfig,
                         )
                     }
                 }

apps/flipcash/app/src/main/kotlin/com/flipcash/app/inject/AppModule.kt

@@ -7,8 +7,10 @@ import androidx.core.app.NotificationManagerCompat
 import com.flipcash.app.android.BuildConfig
 import com.flipcash.app.core.android.VersionInfo
 import com.flipcash.app.core.annotations.AccountType
+import com.getcode.util.resources.AndroidContentReader
 import com.getcode.util.resources.AndroidResources
 import com.getcode.util.resources.AndroidSettingsHelper
+import com.getcode.util.resources.ContentReader
 import com.getcode.util.resources.ResourceHelper
 import com.getcode.util.resources.SettingsHelper
 import dagger.Module
@@ -33,6 +35,11 @@ object AppModule {
     @AccountType
     fun providesAccountType(): String = "flipcash.com"
 
+    @Provides
+    fun providesContentReader(
+        @ApplicationContext context: Context,
+    ): ContentReader = AndroidContentReader(context)
+
     @Provides
     fun providesResourceHelper(
         @ApplicationContext context: Context,

apps/flipcash/app/src/main/kotlin/com/flipcash/app/internal/debug/FlipcashBugsnagErrorCallback.kt

@@ -1,15 +1,34 @@
 package com.flipcash.app.internal.debug
 
 import com.bugsnag.android.OnErrorCallback
+import com.getcode.utils.ErrorUtils
+import com.getcode.utils.TraceManager
+import io.grpc.StatusException
 
 internal val FlipcashErrorCallback = OnErrorCallback onError@{ event ->
-    // Only tag unhandled errors — handled errors go through ErrorUtils.handleError()
-    if (!event.isUnhandled) return@onError true
     val error = event.originalError ?: return@onError true
-
     val cause = error.cause ?: error
-    event.addMetadata("alert", "slack_notify", true)
-    event.addMetadata("alert", "error_type", cause.javaClass.simpleName)
-    event.addMetadata("alert", "error_family", cause.javaClass.enclosingClass?.simpleName ?: "Unknown")
+
+    // Discard gRPC client-error / validation status codes — these are not bugs
+    if (cause is StatusException && cause.status.code in ErrorUtils.ignoredGrpcStatusCodes) {
+        return@onError false
+    }
+
+    // Discard handled gRPC INTERNAL — server-side errors, not actionable from the client
+    if (!event.isUnhandled && cause is StatusException && cause.status.code == io.grpc.Status.Code.INTERNAL) {
+        return@onError false
+    }
+
+    if (!event.isUnhandled) return@onError true
+
+    // Attach recent logs
+    val logFile = TraceManager.getLogFile(includeHeader = false)
+    if (logFile != null && logFile.exists()) {
+        // Bugsnag metadata has a size limit (~1MB per event).
+        // Attach the last ~64KB of log content as a metadata tab.
+        val tail = logFile.readText().takeLast(64_000)
+        event.addMetadata("App Logs", "app_log", tail)
+    }
+
     true
 }

apps/flipcash/app/src/main/kotlin/com/flipcash/app/internal/startup/TraceInitializer.kt

@@ -22,8 +22,9 @@ class TraceInitializer: Initializer<Unit> {
             Timber.plant(FlipcashDebugTree)
         } else {
             CoroutineScope(Dispatchers.IO).launch {
-                val config = Configuration.load(context)
-                config.addOnError(FlipcashErrorCallback)
+                val config = Configuration.load(context).apply {
+                    addOnError(FlipcashErrorCallback)
+                }
                 Bugsnag.start(context, config)
 
                 ErrorUtils.addReporter(BugsnagErrorReporter())