Merge branch 'code/cash' into dependabot/gradle/code/cash/ksp-2.3.6

Author: bmc08gt

.github/workflows/ci.yml

@@ -38,19 +38,16 @@ jobs:
         with:
           fileName: google-services.json
           fileDir: ./apps/flipcash/app/src
-          encodedString: ${{ secrets.FLIPCASH_GOOGLE_SERVICES_JSON }}
+          encodedString: ${{ secrets.FLIPCASH2_GOOGLE_SERVICES_JSON }}
 
       - name: Setup BugSnag API Key
         run: echo BUGSNAG_API_KEY=\"${{ secrets.FLIPCASH_BUGSNAG_API_KEY }}\" > ./local.properties
-
-      - name: Setup Fingerprint API Key
-        run: echo FINGERPRINT_API_KEY=${{ secrets.FINGERPRINT_API_KEY }} >> ./local.properties
-
+        
       - name: Setup Google Cloud Project Number
         run: echo GOOGLE_CLOUD_PROJECT_NUMBER=${{ secrets.GOOGLE_CLOUD_PROJECT_NUMBER }} >> ./local.properties
 
       - name: Setup Mixpanel API Key
         run: echo MIXPANEL_API_KEY=\"${{ secrets.FLIPCASH_MIXPANEL_API_KEY }}\" >> ./local.properties
 
-      - name: Run Code tests
+      - name: Run Flipcash tests
         run: bundle exec fastlane android flipcash_tests

CLAUDE.md

@@ -0,0 +1,102 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Project Overview
+
+Code/Flipcash is a mobile wallet app for instant, global, private payments using self-custodial blockchain (Solana/Kin) technology. The Android app is a multi-module Gradle project with 100+ modules.
+
+## Build Commands
+
+```bash
+# Build debug APK
+./gradlew :apps:flipcash:app:assembleDebug
+
+# Build release bundle
+./gradlew :apps:flipcash:app:bundleRelease
+
+# Run unit tests (all modules)
+./gradlew test
+
+# Run unit tests for a specific module
+./gradlew :apps:flipcash:features:<feature>:test
+
+# Run instrumented tests
+./gradlew connectedAndroidTest
+
+# Run tests via Fastlane (used in CI)
+bundle exec fastlane android flipcash_tests
+```
+
+**Requirements**: Java 21 (Corretto), `google-services.json` in `apps/flipcash/app/src/`, API keys in `local.properties` (BUGSNAG_API_KEY, FINGERPRINT_API_KEY, GOOGLE_CLOUD_PROJECT_NUMBER, MIXPANEL_API_KEY).
+
+## Module Structure
+
+```
+apps/flipcash/
+  app/              — Main application entry point (FlipcashApp, MainActivity)
+  core/             — Base Compose utilities, payment models, billing state, cache policies
+  features/         — 20+ isolated feature modules (login, cash, balance, etc.)
+  shared/           — 30+ shared modules (auth, tokens, payments, notifications, etc.)
+
+services/
+  flipcash/         — Flipcash gRPC services and models
+  opencode/         — Open Code Protocol gRPC services
+  *-compose/        — Compose wrappers for services
+
+definitions/
+  flipcash/         — Protobuf definitions for Flipcash
+  opencode/         — Protobuf definitions for OCP
+
+libs/               — 20+ internal libraries
+  crypto/           — Solana, Kin, Ed25519, encryption, key management
+  network/          — Connectivity, JWT, exchange rates, Coinbase
+  models, messaging, logging, etc.
+
+ui/                 — Shared UI layer
+  core/, components/, theme/, resources/
+  navigation/, scanner/, biometrics/, analytics/
+
+vendor/             — Third-party: Kik scanner, TipKit, OpenCV
+build-logic/        — Convention plugins for consistent module setup
+```
+
+## Convention Plugins (build-logic)
+
+All modules use convention plugins applied via `build.gradle.kts`:
+- `flipcash.android.library` — Base Android library config (compile SDK 36, min SDK 29, Java 21)
+- `flipcash.android.library.compose` — Adds Jetpack Compose support
+- `flipcash.android.feature` — Full feature module: Compose + Hilt + KSP + Parcelize + common UI dependencies
+
+The feature plugin automatically includes `:libs:logging`, `:ui:core`, `:ui:components`, `:ui:navigation`, `:ui:resources`, `:ui:theme`, and `:apps:flipcash:core`.
+
+## Architecture
+
+- **Pattern**: MVI/MVVM hybrid with Compose-driven UI and reactive state
+- **DI**: Hilt — all feature modules get Hilt via the convention plugin
+- **Navigation**: Jetpack Navigation + Voyager for compose-based screens; custom `Router` controller
+- **Networking**: gRPC with Protobuf for backend services; Retrofit/OkHttp for REST
+- **Async**: Kotlin Coroutines + RxJava 3 (both coexist)
+- **Persistence**: Room (encrypted with SQLCipher), DataStore for preferences
+- **Crypto**: Libsodium, Ed25519, Solana/Kin SDK for on-chain operations
+
+## Key Patterns
+
+- **CompositionLocal injection**: `MainActivity` provides dozens of controllers/services via `CompositionLocalProvider` — features access dependencies through `Local*` composition locals rather than direct injection
+- **Feature modules are self-contained**: Each has its own state, controllers, and UI; communicates via shared modules
+- **Protobuf models**: Backend models are generated from `.proto` files in `definitions/`; don't hand-edit generated code
+- **Dark mode only**: App forces `MODE_NIGHT_YES`
+
+## Namespaces
+
+- App: `com.flipcash.app.android` (debug: `com.flipcash.app.android.dev`)
+- Legacy/shared: `com.getcode`
+- Features: `com.flipcash.features.*`
+- Shared modules: `com.flipcash.shared.*`
+- UI: `com.getcode.ui.core`
+
+## Git Conventions
+
+- Conventional commits: `feat:`, `fix:`, `chore:`, with optional scope in parens (e.g., `feat(oc):`, `fix(tokens):`)
+- Main branch: `main`
+- CI runs on all PRs (tests via Fastlane)

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

@@ -77,7 +77,7 @@ internal fun AppScreenContent(content: @Composable () -> Unit) {
         }
 
         register<AppRoute.Main.Give> {
-            CashScreen(it.mint)
+            CashScreen(it.mint, it.fromTokenInfo)
         }
 
         register<AppRoute.Token.Info> {

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

@@ -41,7 +41,7 @@ sealed interface AppRoute : ScreenProvider, Parcelable {
         // TODO: is there a better place for this to live?
         data class RegionSelection(val kind: RegionSelectionKind) : Main
 
-        data class Give(val mint: Mint? = null) : Main
+        data class Give(val mint: Mint? = null, val fromTokenInfo: Boolean = false) : Main
     }
 
     @Parcelize

apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/ui/TokenImageWithName.kt

@@ -98,9 +98,7 @@ fun TokenIcon(
             .data(imageUrl)
             .crossfade(false)
             .error(R.drawable.ic_placeholder_user)
-            .memoryCacheKey(symbol)
             .memoryCachePolicy(CachePolicy.ENABLED)
-            .diskCacheKey(symbol)
             .diskCachePolicy(CachePolicy.ENABLED)
             .build(),
         contentDescription = null,

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

@@ -34,7 +34,8 @@ import kotlinx.parcelize.Parcelize
 
 @Parcelize
 class CashScreen(
-    private val selectedMint: Mint?
+    private val selectedMint: Mint?,
+    private val fromTokenInfo: Boolean,
 ) : ModalScreen, Parcelable {
 
     @IgnoredOnParcel
@@ -80,8 +81,15 @@ class CashScreen(
                         )
                     }
                 },
+                leftIcon = {
+                    if (fromTokenInfo) {
+                        AppBarDefaults.UpNavigation { navigator.pop() }
+                    }
+                },
                 rightContents = {
-                    AppBarDefaults.Close { navigator.hide() }
+                    if (!fromTokenInfo) {
+                        AppBarDefaults.Close { navigator.hide() }
+                    }
                 }
             )
             GiveScreenContent(viewModel)

apps/flipcash/features/deposit/src/main/kotlin/com/flipcash/app/deposit/internal/DepositViewModel.kt

@@ -7,7 +7,7 @@ import com.flipcash.app.core.extensions.setText
 import com.flipcash.features.deposit.R
 import com.flipcash.services.user.UserManager
 import com.getcode.manager.BottomBarManager
-import com.getcode.opencode.controllers.TokenController
+import com.getcode.opencode.providers.TokenMetadataProvider
 import com.getcode.solana.keys.Mint
 import com.getcode.solana.keys.base58
 import com.getcode.util.resources.ResourceHelper
@@ -24,7 +24,7 @@ import kotlin.time.Duration.Companion.seconds
 @HiltViewModel
 internal class DepositViewModel @Inject constructor(
     userManager: UserManager,
-    tokenController: TokenController,
+    tokenController: TokenMetadataProvider,
     clipboardManager: ClipboardManager,
     resources: ResourceHelper,
 ) : BaseViewModel2<DepositViewModel.State, DepositViewModel.Event>(

apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/internal/TokenInfoScreen.kt

@@ -282,46 +282,44 @@ private fun BottomBarButtons(
                 verticalAlignment = Alignment.CenterVertically,
                 horizontalArrangement = Arrangement.spacedBy(CodeTheme.dimens.grid.x2),
             ) {
-                if (!state.isCashReserve) {
-                    if (state.cashReservesEnabled) {
-                        CodeButton(
-                            modifier = Modifier.weight(1f),
-                            buttonState = ButtonState.Filled,
-                            text = stringResource(R.string.action_buy),
-                        ) {
-                            dispatch(TokenInfoViewModel.Event.OpenPurchaseMethods(forNeededFunds = isForNeededFunds))
-                        }
+                if (state.isCashReserve) return@Row
+                val canGive = state.balance.nativeAmount.isPositive
+                if (canGive) {
+                    CodeButton(
+                        modifier = Modifier.weight(1f),
+                        buttonState = ButtonState.Filled,
+                        text = stringResource(R.string.action_give),
+                    ) {
+                        dispatch(
+                            TokenInfoViewModel.Event.OpenScreen(
+                                AppRoute.Main.Give(mint = loadable.data.address, fromTokenInfo = true)
+                            )
+                        )
+                    }
+                }
 
-                        if (state.canSell) {
-                            CodeButton(
-                                modifier = Modifier
-                                    .weight(1f),
-                                buttonState = ButtonState.Filled20,
-                                text = stringResource(R.string.action_sell),
-                            ) {
-                                analytics.buttonTapped(Button.TokenSell)
-                                dispatch(
-                                    TokenInfoViewModel.Event.OpenScreen(
-                                        AppRoute.Token.SwapTransact(
-                                            purpose = TokenSwapPurpose.Sell(loadable.data.address),
-                                        )
-                                    )
-                                )
-                            }
-                        }
-                    } else {
+                if (state.cashReservesEnabled) {
+                    CodeButton(
+                        modifier = Modifier.weight(1f),
+                        buttonState = if (canGive) ButtonState.Filled20 else ButtonState.Filled,
+                        text = stringResource(R.string.action_buy),
+                    ) {
+                        dispatch(TokenInfoViewModel.Event.OpenPurchaseMethods(forNeededFunds = isForNeededFunds))
+                    }
+
+                    if (state.canSell) {
                         CodeButton(
                             modifier = Modifier
-                                .fillMaxWidth()
-                                .padding(horizontal = CodeTheme.dimens.inset)
-                                .padding(bottom = CodeTheme.dimens.grid.x3)
-                                .navigationBarsPadding(),
-                            buttonState = ButtonState.Filled,
-                            text = stringResource(R.string.action_give),
+                                .weight(1f),
+                            buttonState = ButtonState.Filled20,
+                            text = stringResource(R.string.action_sell),
                         ) {
+                            analytics.buttonTapped(Button.TokenSell)
                             dispatch(
                                 TokenInfoViewModel.Event.OpenScreen(
-                                    AppRoute.Main.Give(mint = loadable.data.address)
+                                    AppRoute.Token.SwapTransact(
+                                        purpose = TokenSwapPurpose.Sell(loadable.data.address),
+                                    )
                                 )
                             )
                         }

apps/flipcash/shared/session/src/main/kotlin/com/flipcash/app/session/internal/RealSessionController.kt

@@ -14,7 +14,6 @@ import com.flipcash.app.core.internal.bill.BillController
 import com.flipcash.app.core.internal.errors.showNetworkError
 import com.flipcash.app.core.internal.updater.ProfileUpdater
 import com.flipcash.app.core.navigation.DeeplinkType
-import com.flipcash.app.tokens.TokenUpdater
 import com.flipcash.app.featureflags.FeatureFlag
 import com.flipcash.app.featureflags.FeatureFlagController
 import com.flipcash.app.session.BillDeterminationResult
@@ -29,6 +28,7 @@ import com.flipcash.app.shareable.ShareSheetController
 import com.flipcash.app.shareable.Shareable
 import com.flipcash.app.shareable.ShareableConfirmationController
 import com.flipcash.app.tokens.TokenCoordinator
+import com.flipcash.app.tokens.TokenUpdater
 import com.flipcash.core.R
 import com.flipcash.services.controllers.AccountController
 import com.flipcash.services.user.AuthState
@@ -44,9 +44,6 @@ import com.getcode.opencode.model.core.PayloadKind
 import com.getcode.opencode.model.financial.LocalFiat
 import com.getcode.opencode.model.financial.Token
 import com.getcode.opencode.model.financial.sum
-import com.getcode.opencode.model.financial.usdf
-import com.getcode.opencode.model.transactions.AirdropType
-import com.getcode.opencode.utils.nonce
 import com.getcode.ui.core.RestrictionType
 import com.getcode.util.permissions.PermissionResult
 import com.getcode.util.resources.ResourceHelper
@@ -72,7 +69,6 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.mapNotNull
 import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.flow.scan
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.suspendCancellableCoroutine
@@ -188,18 +184,6 @@ class RealSessionController @Inject constructor(
             .onEach { tokens ->
                 _state.update { it.copy(tokens = tokens) }
             }.launchIn(scope)
-
-        state
-            .map { it.isCameraUp }
-            .distinctUntilChanged() // Emit only when value changes
-            .scan(Pair(null as Boolean?, null as Boolean?)) { previousPair, current ->
-                Pair(previousPair.second, current)
-            }
-            .mapNotNull { (previous, current) ->
-                if (previous == null && current != null) current else null
-            }
-            .onEach { checkForAirdrops() }
-            .launchIn(scope)
     }
 
     /**
@@ -274,56 +258,6 @@ class RealSessionController @Inject constructor(
         }
     }
 
-    private fun checkForAirdrops() {
-        if (userManager.authState.canAccessAuthenticatedApis) {
-            scope.launch {
-                userManager.accountCluster?.let {
-                    transactionController.airdrop(
-                        type = AirdropType.WelcomeBonus,
-                        destination = it.authority.keyPair
-                    ).onSuccess { amount ->
-                        presentWelcomeBonus(amount)
-                    }
-                }
-            }
-        }
-    }
-
-    private fun presentWelcomeBonus(amount: LocalFiat) {
-        scope.launch {
-            val presentWithBill = featureFlagController.get(FeatureFlag.WelcomeBonusBill)
-            toastController.enqueue(
-                amount = amount,
-                isDeposit = true,
-                initialDelay = if (presentWithBill) ToastController.INITIAL_DELAY else AIRDROP_INITIAL_DELAY
-            )
-
-            if (!presentWithBill) {
-                // consume the toast immediately
-                toastController.consumeQueue()
-                return@launch
-            }
-
-            delay(1.seconds)
-            val payloadInfo = OpenCodePayload(
-                kind = PayloadKind.Cash,
-                value = amount.nativeAmount,
-                nonce = nonce
-            )
-
-            val bill = Bill.Cash(
-                token = Token.usdf,
-                data = payloadInfo.codeData.toList(),
-                amount = amount,
-                didReceive = true,
-                confirmationDelay = 500.milliseconds
-            )
-
-            presentBillToUser(data = payloadInfo.codeData.toList(), bill = bill)
-            feedCoordinator.fetchSinceLatest()
-        }
-    }
-
     private fun checkPendingItemsInFeed() {
         if (userManager.authState.canAccessAuthenticatedApis) {
             scope.launch {