Merge branch 'code/cash' into fcash/release/2025.9.3

Author: bmc08gt

apps/flipcash/app/build.gradle.kts

@@ -154,6 +154,7 @@ dependencies {
     implementation(project(":apps:flipcash:shared:permissions"))
     implementation(project(":apps:flipcash:shared:phone"))
     implementation(project(":apps:flipcash:shared:shareable"))
+    implementation(project(":apps:flipcash:shared:tokens"))
     implementation(project(":apps:flipcash:shared:transfers"))
     implementation(project(":apps:flipcash:shared:web"))
     implementation(project(":apps:flipcash:shared:workers"))
@@ -175,6 +176,7 @@ dependencies {
     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(":libs:crypto:solana"))
     implementation(project(":libs:datetime"))
@@ -202,7 +204,7 @@ dependencies {
     implementation(Libs.androidx_lifecycle_viewmodel)
     implementation(Libs.androidx_navigation_ui)
     implementation(Libs.androidx_work)
-    implementation("androidx.webkit:webkit:1.13.0")
+    implementation("androidx.webkit:webkit:1.14.0")
 
     //hilt dependency injection
     implementation(Libs.hilt)
@@ -216,7 +218,7 @@ dependencies {
     testImplementation(Libs.hilt_android_test)
     kspTest(Libs.hilt_android_compiler)
 
-    androidTestImplementation("io.mockk:mockk:1.13.17")
+    androidTestImplementation("io.mockk:mockk:1.14.6")
 
     //Jetpack compose
     implementation(platform(Libs.compose_bom))
@@ -231,9 +233,6 @@ dependencies {
 
     implementation(Libs.androidx_activity)
 
-    implementation(Libs.coil3)
-    implementation(Libs.coil3_network)
-
     implementation(Libs.androidx_browser)
 
     implementation(Libs.slf4j)

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

@@ -11,7 +11,7 @@ import com.flipcash.app.balance.PreloadBalance
 import com.flipcash.app.cash.CashScreen
 import com.flipcash.app.contact.verification.VerificationFlowScreen
 import com.flipcash.app.core.AppRoute
-import com.flipcash.app.currency.CurrencySelectionScreen
+import com.flipcash.app.currency.RegionSelectionScreen
 import com.flipcash.app.deposit.DepositScreen
 import com.flipcash.app.lab.LabsScreen
 import com.flipcash.app.lab.PreloadLabs
@@ -34,6 +34,7 @@ import com.flipcash.app.pools.create.PoolQuestionScreen
 import com.flipcash.app.purchase.PurchaseAccountScreen
 import com.flipcash.app.scanner.ScannerScreen
 import com.flipcash.app.shareapp.ShareAppScreen
+import com.flipcash.app.tokens.SelectTokenScreen
 import com.flipcash.app.transfers.TransferInformationalScreen
 import com.flipcash.app.withdrawal.WithdrawalConfirmationScreen
 import com.flipcash.app.withdrawal.WithdrawalDestinationScreen
@@ -72,8 +73,12 @@ internal fun AppScreenContent(content: @Composable () -> Unit) {
             ScannerScreen(it.deeplink)
         }
 
-        register<AppRoute.Sheets.Give> {
-            CashScreen()
+        register<AppRoute.Main.Give> {
+            CashScreen(it.tokenAddress)
+        }
+
+        register<AppRoute.Sheets.TokenSelection> {
+            SelectTokenScreen()
         }
 
         register<AppRoute.Sheets.Wallet> {
@@ -104,8 +109,8 @@ internal fun AppScreenContent(content: @Composable () -> Unit) {
              )
         }
 
-        register<AppRoute.Main.CurrencySelection> {
-            CurrencySelectionScreen(it.kind)
+        register<AppRoute.Main.RegionSelection> {
+            RegionSelectionScreen(it.kind)
         }
 
         register<AppRoute.Sheets.ShareApp> {

apps/flipcash/core/build.gradle.kts

@@ -64,6 +64,9 @@ dependencies {
     implementation(Libs.androidx_credentials_play_auth)
     implementation(Libs.androidx_datastore)
 
+    api(Libs.coil3)
+    api(Libs.coil3_network)
+
     api(project(":services:flipcash-compose"))
 
     implementation(project(":libs:messaging"))

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

@@ -2,12 +2,13 @@ package com.flipcash.app.core
 
 import android.os.Parcelable
 import cafe.adriel.voyager.core.registry.ScreenProvider
-import com.flipcash.app.core.money.CurrencySelectionKind
+import com.flipcash.app.core.money.RegionSelectionKind
 import com.flipcash.app.core.navigation.DeeplinkType
 import com.flipcash.app.core.transfers.TransferDirection
 import com.getcode.ed25519.Ed25519
 import com.getcode.opencode.model.core.ID
 import com.getcode.opencode.model.financial.Fiat
+import com.getcode.solana.keys.PublicKey
 import com.getcode.ui.core.RestrictionType
 import kotlinx.parcelize.Parcelize
 
@@ -34,7 +35,10 @@ sealed interface AppRoute : ScreenProvider, Parcelable {
         data class Scanner(val deeplink: DeeplinkType? = null) : Main
 
         // TODO: is there a better place for this to live?
-        data class CurrencySelection(val kind: CurrencySelectionKind) : Main
+        data class RegionSelection(val kind: RegionSelectionKind) : Main
+
+
+        data class Give(val tokenAddress: PublicKey?) : Main
     }
 
     @Parcelize
@@ -49,7 +53,7 @@ sealed interface AppRoute : ScreenProvider, Parcelable {
 
     @Parcelize
     sealed interface Sheets: AppRoute {
-        data object Give : Sheets
+        data object TokenSelection: Sheets
         data object Wallet : Sheets
         data object Menu : Sheets
         data object Lab: Sheets

…/core/internal/updater/BalanceUpdater.kt …pp/core/internal/updater/TokenUpdater.ktapps/flipcash/core/src/main/kotlin/com/flipcash/app/core/internal/updater/BalanceUpdater.kt renamed to apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/internal/updater/TokenUpdater.kt apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/internal/updater/BalanceUpdater.kt renamed to apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/internal/updater/TokenUpdater.kt

@@ -1,17 +1,15 @@
 package com.flipcash.app.core.internal.updater
 
 import com.flipcash.app.core.updater.NetworkUpdater
-import com.getcode.opencode.controllers.BalanceController
+import com.getcode.opencode.controllers.TokenController
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
-import java.util.Timer
 import javax.inject.Inject
 import kotlin.concurrent.fixedRateTimer
 import kotlin.time.Duration
-import kotlin.time.Duration.Companion.seconds
 
-class BalanceUpdater @Inject constructor(
-    private val balanceController: BalanceController,
+class TokenUpdater @Inject constructor(
+    private val tokenController: TokenController,
 ) : NetworkUpdater() {
     override fun poll(
         key: Any?,
@@ -21,12 +19,12 @@ class BalanceUpdater @Inject constructor(
     ) {
         stop()
         updater = fixedRateTimer(
-            name = "update balance",
+            name = "update tokens",
             initialDelay = startIn.inWholeMilliseconds,
             period = frequency.inWholeMilliseconds
         ) {
             scope.launch {
-                balanceController.fetchBalance()
+                tokenController.update()
             }
         }
     }

…/app/core/money/CurrencySelectionKind.kt …sh/app/core/money/RegionSelectionKind.ktapps/flipcash/core/src/main/kotlin/com/flipcash/app/core/money/CurrencySelectionKind.kt renamed to apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/money/RegionSelectionKind.kt apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/money/CurrencySelectionKind.kt renamed to apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/money/RegionSelectionKind.kt

@@ -1,6 +1,6 @@
 package com.flipcash.app.core.money
 
-enum class CurrencySelectionKind {
+enum class RegionSelectionKind {
     Entry,
     Balance;
 }

apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/onramp/deeplinks/WalletDeeplinkConnectionResult.kt

@@ -4,8 +4,10 @@ import android.os.Parcelable
 import com.flipcash.app.core.AppRoute
 import com.getcode.ed25519.Ed25519
 import com.getcode.opencode.model.core.ID
+import com.getcode.opencode.model.financial.Token
 import com.getcode.opencode.utils.base64
 import com.getcode.solana.keys.PublicKey
+import com.getcode.solana.keys.base58
 import com.getcode.utils.base58
 import com.getcode.utils.decodeBase58
 import com.getcode.utils.decodeBase64
@@ -34,7 +36,7 @@ sealed class OnRampDeeplinkOrigin: Parcelable {
     data object Menu : OnRampDeeplinkOrigin()
 
     @Parcelize
-    data object Give: OnRampDeeplinkOrigin()
+    data class Give(val tokenAddress: PublicKey?) : OnRampDeeplinkOrigin()
 
     @Parcelize
     data object Wallet: OnRampDeeplinkOrigin()
@@ -50,7 +52,7 @@ sealed class OnRampDeeplinkOrigin: Parcelable {
             is PoolWithId -> "pool-id_${id.base58}"
             is PoolWithRendezvous -> "pool-seed_${keyPair.seed.base64}"
             Menu -> "menu"
-            Give -> "give"
+            is Give -> "give-${tokenAddress?.base58()}"
             Wallet -> "wallet"
         }.lowercase()
     }
@@ -59,7 +61,7 @@ sealed class OnRampDeeplinkOrigin: Parcelable {
         fun fromRoute(route: AppRoute?): OnRampDeeplinkOrigin? {
             return when (route) {
                 is AppRoute.Sheets.Menu -> Menu
-                is AppRoute.Sheets.Give -> Give
+                is AppRoute.Main.Give -> Give(route.tokenAddress)
                 is AppRoute.Pool.Details -> {
                     route.rendezvous?.let { keyPair -> PoolWithRendezvous(keyPair) }
                     route.poolId?.let { id -> PoolWithId(id) }
@@ -73,7 +75,12 @@ sealed class OnRampDeeplinkOrigin: Parcelable {
         fun fromString(value: String?): OnRampDeeplinkOrigin? {
             return when {
                 value == "menu" -> Menu
-                value == "give" -> Give
+                value?.startsWith("give-") == true -> {
+                    val tokenAddress = value.removePrefix("give-")
+                    Give(tokenAddress = runCatching {
+                        PublicKey.fromBase58(tokenAddress)
+                    }.getOrNull())
+                }
                 value == "wallet" -> Wallet
                 value?.startsWith("pool-") == true -> {
                     val idStringWithPrefix = value.removePrefix("pool-")

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

@@ -0,0 +1,100 @@
+package com.flipcash.app.core.ui
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import coil3.compose.AsyncImage
+import coil3.compose.LocalPlatformContext
+import coil3.request.ImageRequest
+import coil3.request.error
+import com.getcode.opencode.model.financial.Fiat
+import com.getcode.opencode.model.financial.Token
+import com.getcode.opencode.model.financial.TokenWithBalance
+import com.getcode.opencode.model.financial.TokenWithLocalizedBalance
+import com.getcode.theme.CodeTheme
+import com.getcode.ui.components.R
+
+@Composable
+fun TokenBalanceRow(
+    tokenWithBalance: TokenWithLocalizedBalance,
+    modifier: Modifier = Modifier,
+    onClick: () -> Unit
+) {
+    val (token, balance) = tokenWithBalance
+    TokenBalanceRow(
+        token = token,
+        balance = balance.converted,
+        modifier = modifier,
+        onClick = onClick
+    )
+}
+
+@Composable
+fun TokenBalanceRow(
+    tokenWithBalance: TokenWithBalance,
+    modifier: Modifier = Modifier,
+    onClick: () -> Unit
+) {
+    val (token, balance) = tokenWithBalance
+    TokenBalanceRow(
+        token = token,
+        balance = balance,
+        modifier = modifier,
+        onClick = onClick
+    )
+}
+
+
+@Composable
+fun TokenBalanceRow(
+    token: Token,
+    balance: Fiat,
+    modifier: Modifier = Modifier,
+    onClick: () -> Unit
+) {
+    Row(
+        modifier = Modifier
+            .clickable(onClick = onClick)
+            .then(modifier)
+            .padding(
+                vertical = CodeTheme.dimens.inset,
+            ),
+        horizontalArrangement = Arrangement.spacedBy(CodeTheme.dimens.grid.x2),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        AsyncImage(
+            modifier = Modifier
+                .size(CodeTheme.dimens.staticGrid.x5)
+                .clip(CircleShape),
+            model = ImageRequest.Builder(LocalPlatformContext.current)
+                .data(token.imageUrl)
+                .error(R.drawable.ic_placeholder_user)
+                .placeholderMemoryCacheKey(token.symbol)
+                .build(),
+            contentDescription = null,
+        )
+
+        Text(
+            text = token.name,
+            style = CodeTheme.typography.screenTitle,
+            color = CodeTheme.colors.textMain,
+        )
+
+        Spacer(Modifier.weight(1f))
+
+        Text(
+            text = balance.formatted(),
+            style = CodeTheme.typography.screenTitle,
+            color = CodeTheme.colors.textMain,
+        )
+    }
+}

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

@@ -55,6 +55,7 @@
     <string name="error_description_linkExpired">The cash was automatically returned to the sender because it wasn\'t collected within 7 days. Please ask them to send the cash again</string>
 
     <string name="subtitle_balanceIsHeldInUsdStablecoins">Your balance is held in US dollar stablecoins</string>
+    <string name="subtitle_currentValueOfAllCurrencies">The current value of your currencies</string>
     <string name="subtitle_ofUsdStablecoins">of US dollar stablecoins</string>
     <string name="subtitle_balanceEmptyState">Ask a friend to give you some cash with Flipcash, or deposit USDC from your crypto exchange or another crypto wallet</string>
     <string name="action_depositFunds">Deposit Funds</string>
@@ -402,4 +403,10 @@
 
     <string name="subtitle_addUsdcToWallet">Add Solana USDC to your Flipcash wallet</string>
 
+    <string name="title_selectCurrency">Select Currency</string>
+    <string name="title_selectRegion">Select Region</string>
+    <string name="title_recentRegions">Recent Regions</string>
+    <string name="title_otherRegions">Other Regions</string>
+    <string name="subtitle_searchRegions">Search regions</string>
+    <string name="title_enterAmount">Enter Amount</string>
 </resources>

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

@@ -56,6 +56,7 @@ dependencies {
     implementation(project(":apps:flipcash:shared:activityfeed"))
     implementation(project(":apps:flipcash:shared:onramp:common"))
     implementation(project(":apps:flipcash:shared:featureflags"))
+    implementation(project(":apps:flipcash:shared:tokens"))
     implementation(project(":libs:datetime"))
     implementation(project(":libs:logging"))
     implementation(project(":libs:messaging"))