Merge branch 'code/cash' into feat/usd-on-flipcash-deposit

Author: bmc08gt

.claude/skills/release-notes/SKILL.md

@@ -55,7 +55,19 @@ Use the Agent tool with `model: "haiku"`. Pass the raw changelog output with thi
 > - If no user-facing changes, output: Bug fixes and performance improvements.
 > - Output ONLY the section markdown, no title or fences
 
-### 3. Assemble final notes
+### 3. Generate App Store "What's New"
+
+Using the same changelog, write a short "What's New" blurb suitable for the Google Play Store listing. Rules:
+- 3–5 bullet lines max, plain dashes (`- `)
+- Lead with the most impactful user-facing features
+- End with "Bug fixes and performance improvements" if there are fixes/chores
+- No markdown bold, no sections headers — just a flat list
+- Keep each line under ~60 characters
+- If there are no notable user-facing changes, output only: `- Bug fixes and performance improvements`
+
+You can derive this yourself from the changelog without a subagent call.
+
+### 4. Assemble final notes
 
 Combine the agent's output with the changelog compare link:
 
@@ -67,11 +79,11 @@ Combine the agent's output with the changelog compare link:
 
 The release title/name is the version number without the `fcash/` prefix (e.g., `2026.4.11`).
 
-### 4. Review gate
+### 5. Review gate
 
-Show the assembled release notes to the user for approval. Do NOT create the release until the user explicitly confirms.
+Show the assembled GitHub release notes **and** the App Store "What's New" to the user for approval. Do NOT create the release until the user explicitly confirms.
 
-### 5. Publish
+### 6. Publish
 
 After user confirms, create the release:
 ```bash

.well-known/release-manifest.json

@@ -1,15 +1,15 @@
 {
-  "updated": "2026-05-13T22:30:06Z",
+  "updated": "2026-05-15T18:05:45Z",
   "tracks": {
     "production": {
-      "versionCode": 3508,
-      "versionName": "2026.5.2"
+      "versionCode": 3599,
+      "versionName": "2026.5.4"
     },
     "beta": null,
     "alpha": null,
     "internal": {
-      "versionCode": 3584,
-      "versionName": "2026.5.3"
+      "versionCode": 3599,
+      "versionName": "2026.5.4"
     }
   }
 }

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

@@ -15,9 +15,11 @@ import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableLongStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.semantics
@@ -32,45 +34,50 @@ import androidx.navigation3.scene.SinglePaneSceneStrategy
 import com.flipcash.app.analytics.rememberAnalytics
 import com.flipcash.app.android.BuildConfig
 import com.flipcash.app.bill.customization.BillPlaygroundScaffold
-import com.flipcash.app.core.LocalUserManager
 import com.flipcash.app.core.AppRoute
-import com.flipcash.app.core.verification.email.LocalEmailCodeChannel
+import com.flipcash.app.core.LocalUserManager
+import com.flipcash.app.core.extensions.navigateTo
 import com.flipcash.app.core.navigation.DeeplinkAction
+import com.flipcash.app.core.verification.email.LocalEmailCodeChannel
+import com.flipcash.app.featureflags.FeatureFlag
+import com.flipcash.app.featureflags.LocalFeatureFlags
+import com.flipcash.app.featureflags.model.BackgroundResetTimeout
 import com.flipcash.app.internal.ui.navigation.appEntryProvider
 import com.flipcash.app.internal.ui.navigation.decorators.rememberNavBlockingOverlayEntryDecorator
 import com.flipcash.app.internal.ui.navigation.decorators.rememberNavMessagingEntryDecorator
 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
 import com.flipcash.features.shareapp.R
 import com.flipcash.services.user.AuthState
+import com.getcode.animation.LocalSharedTransitionScope
 import com.getcode.libs.biometrics.BiometricsError
 import com.getcode.libs.qr.rememberQrBitmapPainter
 import com.getcode.navigation.AppNavHost
+import com.getcode.navigation.Sheet
+import com.getcode.navigation.core.CodeNavigator
 import com.getcode.navigation.core.LocalCodeNavigator
 import com.getcode.navigation.core.rememberCodeNavigator
 import com.getcode.navigation.extensions.getActivityScopedViewModel
 import com.getcode.navigation.results.rememberNavResultStateRegistry
 import com.getcode.navigation.scenes.ModalBottomSheetSceneStrategy
+import com.getcode.navigation.scrim.LocalScrimController
+import com.getcode.navigation.scrim.ScrimController
+import com.getcode.navigation.scrim.ScrimOverlay
 import com.getcode.theme.CodeTheme
 import com.getcode.ui.biometrics.LocalBiometricsState
 import com.getcode.ui.biometrics.rememberBiometricsState
 import com.getcode.ui.components.OnLifecycleEvent
 import com.getcode.ui.components.bars.rememberBarManager
 import com.getcode.ui.core.RestrictionType
-import com.flipcash.app.core.extensions.navigateTo
-import com.getcode.animation.LocalSharedTransitionScope
-import com.getcode.navigation.scrim.LocalScrimController
-import com.getcode.navigation.scrim.ScrimController
-import com.getcode.navigation.scrim.ScrimOverlay
 import dev.bmcreations.tipkit.TipScaffold
 import dev.bmcreations.tipkit.engines.TipsEngine
 import dev.theolm.rinku.DeepLink
 import dev.theolm.rinku.compose.ext.DeepLinkListener
+import kotlinx.coroutines.flow.first
 
 @Composable
 internal fun App(
@@ -96,6 +103,7 @@ internal fun App(
     }
 
     var deepLink by remember { mutableStateOf<DeepLink?>(null) }
+    var deeplinkHandled by remember { mutableStateOf(false) }
     val userManager = LocalUserManager.current!!
     DeepLinkListener {
         analytics.deeplinkOpened(it.data)
@@ -239,7 +247,9 @@ internal fun App(
                                         return@LaunchedEffect
                                     }
 
-                                    when (val action = router.dispatch(link)) {
+                                    val action = router.dispatch(link)
+                                    deeplinkHandled = action != DeeplinkAction.None
+                                    when (action) {
                                         is DeeplinkAction.Navigate -> {
                                             // If a verification code targets a screen already open,
                                             // deliver via side-channel and skip navigation.
@@ -323,6 +333,13 @@ internal fun App(
                                         else -> Unit
                                     }
                                 }
+
+                                BackgroundResetEffect(
+                                    navigator = codeNavigator,
+                                    deepLink = { deepLink },
+                                    deeplinkHandled = { deeplinkHandled },
+                                    onReset = { deeplinkHandled = false },
+                                )
                             }
                         }
                     }
@@ -331,3 +348,51 @@ internal fun App(
         }
     }
 
+@Composable
+private fun BackgroundResetEffect(
+    navigator: CodeNavigator,
+    deepLink: () -> DeepLink?,
+    deeplinkHandled: () -> Boolean,
+    onReset: () -> Unit,
+) {
+    val featureFlags = LocalFeatureFlags.current
+    val option by featureFlags.getOption(FeatureFlag.BackgroundReset)
+        .collectAsStateWithLifecycle()
+
+    var pendingReset by remember { mutableStateOf(false) }
+    var backgroundedAt by remember { mutableLongStateOf(0L) }
+
+    OnLifecycleEvent { _, event ->
+        when (event) {
+            Lifecycle.Event.ON_STOP -> {
+                backgroundedAt = System.currentTimeMillis()
+            }
+            Lifecycle.Event.ON_RESUME -> {
+                val timeout = runCatching { BackgroundResetTimeout.valueOf(option) }
+                    .getOrNull()
+                    ?.duration
+
+                if (timeout != null && backgroundedAt > 0L) {
+                    val elapsed = System.currentTimeMillis() - backgroundedAt
+                    if (elapsed >= timeout.inWholeMilliseconds) {
+                        pendingReset = true
+                    }
+                }
+                backgroundedAt = 0L
+            }
+            else -> Unit
+        }
+    }
+
+    LaunchedEffect(pendingReset) {
+        if (!pendingReset) return@LaunchedEffect
+        // Wait for any pending deeplink to be consumed before deciding
+        snapshotFlow { deepLink() }.first { it == null }
+        if (!deeplinkHandled()) {
+            navigator.popUntil { it !is Sheet }
+        }
+        onReset()
+        pendingReset = false
+    }
+}
+

apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/tokens/TokenSwapPurpose.kt

@@ -18,6 +18,7 @@ import kotlinx.serialization.Serializable
 enum class FundingSource {
     Flexible,
     Phantom,
+    Coinbase,
 }
 
 @Serializable

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

@@ -14,22 +14,22 @@
   ~ limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="111dp"
-    android:height="112dp"
-    android:viewportWidth="111"
-    android:viewportHeight="112">
+    android:width="122dp"
+    android:height="124dp"
+    android:viewportWidth="122"
+    android:viewportHeight="124">
   <path
-      android:pathData="M50,100C77.71,100 100,77.71 100,50C100,22.29 77.71,0 50,0C22.29,0 0,22.29 0,50C0,77.71 22.29,100 50,100Z"
+      android:pathData="M61,112C88.71,112 111,89.71 111,62C111,34.29 88.71,12 61,12C33.29,12 11,34.29 11,62C11,89.71 33.29,112 61,112Z"
       android:fillColor="#AB9FF1"/>
   <path
-      android:pathData="M26.77,75.76C34.63,75.76 40.53,68.93 44.06,63.53C43.63,64.72 43.39,65.92 43.39,67.07C43.39,70.22 45.2,72.47 48.77,72.47C53.67,72.47 58.91,68.17 61.63,63.53C61.44,64.2 61.34,64.82 61.34,65.39C61.34,67.59 62.58,68.98 65.1,68.98C73.05,68.98 81.05,54.88 81.05,42.55C81.05,32.95 76.2,24.49 64.01,24.49C42.58,24.49 19.49,50.68 19.49,67.59C19.49,74.23 23.06,75.76 26.77,75.76ZM56.63,41.5C56.63,39.11 57.96,37.44 59.91,37.44C61.82,37.44 63.15,39.11 63.15,41.5C63.15,43.89 61.82,45.61 59.91,45.61C57.96,45.61 56.63,43.89 56.63,41.5ZM66.82,41.5C66.82,39.11 68.15,37.44 70.1,37.44C72.01,37.44 73.34,39.11 73.34,41.5C73.34,43.89 72.01,45.61 70.1,45.61C68.15,45.61 66.82,43.89 66.82,41.5Z"
+      android:pathData="M37.77,87.76C45.63,87.76 51.53,80.93 55.06,75.53C54.63,76.72 54.39,77.92 54.39,79.07C54.39,82.22 56.2,84.47 59.77,84.47C64.67,84.47 69.91,80.17 72.63,75.53C72.44,76.2 72.34,76.82 72.34,77.39C72.34,79.59 73.58,80.98 76.1,80.98C84.05,80.98 92.05,66.88 92.05,54.55C92.05,44.95 87.2,36.49 75.01,36.49C53.58,36.49 30.49,62.68 30.49,79.59C30.49,86.23 34.06,87.76 37.77,87.76ZM67.63,53.5C67.63,51.11 68.96,49.44 70.91,49.44C72.82,49.44 74.15,51.11 74.15,53.5C74.15,55.89 72.82,57.61 70.91,57.61C68.96,57.61 67.63,55.89 67.63,53.5ZM77.82,53.5C77.82,51.11 79.15,49.44 81.1,49.44C83.01,49.44 84.34,51.11 84.34,53.5C84.34,55.89 83.01,57.61 81.1,57.61C79.15,57.61 77.82,55.89 77.82,53.5Z"
       android:fillColor="#ffffff"/>
   <path
-      android:pathData="M91.73,92.76m-16.98,0a16.98,16.98 0,1 1,33.96 0a16.98,16.98 0,1 1,-33.96 0"
+      android:pathData="M102.73,104.76m-16.98,0a16.98,16.98 0,1 1,33.96 0a16.98,16.98 0,1 1,-33.96 0"
       android:strokeWidth="3.95626"
       android:fillColor="#ffffff"
       android:strokeColor="#19191A"/>
   <path
-      android:pathData="M99.3,88.29L89.72,99.05L84.69,94.11L86.15,92.63L89.62,96.03L97.75,86.9L99.3,88.29Z"
+      android:pathData="M110.3,100.29L100.72,111.05L95.69,106.11L97.15,104.63L100.62,108.03L108.75,98.9L110.3,100.29Z"
       android:fillColor="#19191A"/>
 </vector>

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

@@ -594,6 +594,10 @@
     <string name="error_title_onrampGooglePayNotReady">Google Pay Not Ready</string>
     <string name="error_description_onrampGooglePayNotReady">Please add a payment method to Google Pay and try again</string>
 
+    <string name="error_title_onrampNonStableWebView">Unsupported WebView</string>
+    <string name="error_description_onrampNonStableWebView">Your device is using a %1$s version of Android System WebView, which may cause issues with purchases. Google recommends switching to the stable channel before continuing with your purchase</string>
+    <string name="action_continueAnyway">Continue Anyway</string>
+
     <string name="error_title_onrampUnknownFailure">Something Went Wrong</string>
     <string name="error_description_onrampUnknownFailure">Please contact support@flipcash.com</string>
 

apps/flipcash/features/bill-customization/src/main/kotlin/com/flipcash/app/bill/customization/components/BillPlayground.kt

@@ -217,7 +217,7 @@ internal fun Modifier.presenceBorder(
 )
 
 private object PreviewFeatureFlagController : FeatureFlagController by NoOpFeatureFlagController {
-    override fun observe(flag: FeatureFlag): StateFlow<Boolean> = MutableStateFlow(true)
+    override fun observe(flag: FeatureFlag<*>): StateFlow<Boolean> = MutableStateFlow(true)
 }
 
 @Composable

apps/flipcash/features/lab/src/main/kotlin/com/flipcash/app/lab/internal/LabsScreenContent.kt

@@ -25,6 +25,7 @@ import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.flipcash.app.core.AppRoute
 import com.flipcash.app.core.extensions.navigateTo
+import com.flipcash.app.featureflags.FlagOption
 import com.flipcash.app.featureflags.LocalFeatureFlags
 import com.flipcash.app.featureflags.message
 import com.flipcash.app.featureflags.title
@@ -35,6 +36,7 @@ import com.getcode.ui.components.ListItem
 import com.getcode.ui.components.SettingsSwitchRow
 import com.getcode.ui.components.text.SectionHeader
 import com.getcode.ui.core.verticalScrollStateGradient
+import com.getcode.ui.theme.CodeSegmentedControl
 import com.getcode.ui.utils.sheetResignmentBehavior
 
 @Composable
@@ -59,12 +61,24 @@ internal fun LabsScreenContent(viewModel: LabsScreenViewModel) {
             SectionHeader(stringResource(R.string.title_settingsSectionFeatures))
         }
         items(betaFlags, key = { it.flag.key }) { feature ->
-            SettingsSwitchRow(
-                title = feature.flag.title,
-                subtitle = feature.flag.message,
-                checked = feature.enabled
-            ) {
-                betaFlagsController.set(feature.flag, !feature.enabled)
+            if (feature.flag.isOptionFlag) {
+                SettingsOptionRow(
+                    title = feature.flag.title,
+                    subtitle = feature.flag.message,
+                    options = feature.flag.options,
+                    selectedOption = feature.selectedOption ?: feature.flag.defaultOption,
+                    onOptionSelected = { optionKey ->
+                        betaFlagsController.setOption(feature.flag, optionKey)
+                    },
+                )
+            } else {
+                SettingsSwitchRow(
+                    title = feature.flag.title,
+                    subtitle = feature.flag.message,
+                    checked = feature.enabled
+                ) {
+                    betaFlagsController.set(feature.flag, !feature.enabled)
+                }
             }
 
             HorizontalDivider(
@@ -133,4 +147,46 @@ internal fun LabsScreenContent(viewModel: LabsScreenViewModel) {
             }
         }
     }
+}
+
+@Composable
+private fun SettingsOptionRow(
+    title: String,
+    subtitle: String?,
+    options: List<FlagOption>,
+    selectedOption: String,
+    onOptionSelected: (String) -> Unit,
+) {
+    Column(
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(horizontal = CodeTheme.dimens.grid.x3)
+            .padding(vertical = CodeTheme.dimens.grid.x3),
+    ) {
+        Text(
+            text = title,
+            color = CodeTheme.colors.textMain,
+            style = CodeTheme.typography.textMedium,
+        )
+        if (!subtitle.isNullOrEmpty()) {
+            Text(
+                text = subtitle,
+                style = CodeTheme.typography.textSmall,
+                color = CodeTheme.colors.textSecondary,
+            )
+        }
+        CodeSegmentedControl(
+            options = options,
+            selected = options.find { it.key == selectedOption },
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(top = CodeTheme.dimens.grid.x2),
+            mapper = { option ->
+                Text(text = option.label)
+            },
+            onSelectionChanged = { option ->
+                onOptionSelected(option.key)
+            },
+        )
+    }
 }

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

@@ -50,7 +50,7 @@ internal data object SwitchAccount : StaffMenuItem<MenuScreenViewModel.Event>()
     override val name: String
         @Composable get() = stringResource(R.string.title_switchAccounts)
     override val action: MenuScreenViewModel.Event = MenuScreenViewModel.Event.OnSwitchAccountsClicked
-    override val featureFlag: FeatureFlag = FeatureFlag.CredentialManager
+    override val featureFlag: FeatureFlag<*> = FeatureFlag.CredentialManager
 }
 
 internal data object Labs : StaffMenuItem<MenuScreenViewModel.Event>() {

apps/flipcash/shared/featureflags/src/main/kotlin/com/flipcash/app/featureflags/BetaFeature.kt

@@ -1,6 +1,7 @@
 package com.flipcash.app.featureflags
 
 data class BetaFeature(
-    val flag: FeatureFlag,
+    val flag: FeatureFlag<*>,
     val enabled: Boolean,
+    val selectedOption: String? = null,
 )