code-payments · bmc08gt · Aug 13, 2026 · Aug 13, 2026
diff --git a/apps/flipcash/app/build.gradle.kts b/apps/flipcash/app/build.gradle.kts
@@ -174,6 +174,7 @@ androidComponents {
 }
 
 dependencies {
+    implementation(project(":apps:flipcash:core-ui"))
     implementation(libs.bundles.haze)
     implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
     // KMP shared core — consumed transitively via :libs:encryption:base58 but declared

diff --git a/apps/flipcash/core-ui/.gitignore b/apps/flipcash/core-ui/.gitignore
@@ -0,0 +1,2 @@
+build/
+.gradle/
diff --git a/apps/flipcash/core-ui/build.gradle.kts b/apps/flipcash/core-ui/build.gradle.kts
@@ -0,0 +1,18 @@
+plugins {
+    alias(libs.plugins.flipcash.android.feature)
+}
+
+android {
+    namespace = "${Gradle.flipcashNamespace}.core.ui"
+}
+
+dependencies {
+    implementation(project(":apps:flipcash:shared:featureflags"))
+
+    implementation(libs.compose.material3)
+    implementation(libs.bundles.haze)
+
+    testImplementation(kotlin("test"))
+    testImplementation(libs.bundles.unit.testing)
+    testImplementation(libs.robolectric)
+}
diff --git a/...ternal/ui/previews/AppBarTitlePreviews.kt → ...ternal/ui/previews/AppBarTitlePreviews.kt b/...ternal/ui/previews/AppBarTitlePreviews.kt → ...ternal/ui/previews/AppBarTitlePreviews.kt
diff --git a/...re/internal/ui/previews/ButtonPreviews.kt → ...re/internal/ui/previews/ButtonPreviews.kt b/...re/internal/ui/previews/ButtonPreviews.kt → ...re/internal/ui/previews/ButtonPreviews.kt
diff --git a/...e/internal/ui/previews/CalloutPreviews.kt → ...e/internal/ui/previews/CalloutPreviews.kt b/...e/internal/ui/previews/CalloutPreviews.kt → ...e/internal/ui/previews/CalloutPreviews.kt
diff --git a/.../flipcash/app/core/ui/AmountWithKeypad.kt → .../flipcash/app/core/ui/AmountWithKeypad.kt b/.../flipcash/app/core/ui/AmountWithKeypad.kt → .../flipcash/app/core/ui/AmountWithKeypad.kt
diff --git a/...ipcash/app/core/ui/BrandedGradientIcon.kt → ...ipcash/app/core/ui/BrandedGradientIcon.kt b/...ipcash/app/core/ui/BrandedGradientIcon.kt → ...ipcash/app/core/ui/BrandedGradientIcon.kt
diff --git a/...otlin/com/flipcash/app/core/ui/Callout.kt → ...otlin/com/flipcash/app/core/ui/Callout.kt b/...otlin/com/flipcash/app/core/ui/Callout.kt → ...otlin/com/flipcash/app/core/ui/Callout.kt
diff --git a/...flipcash/app/core/ui/ConfirmationStyle.kt → ...flipcash/app/core/ui/ConfirmationStyle.kt b/...flipcash/app/core/ui/ConfirmationStyle.kt → ...flipcash/app/core/ui/ConfirmationStyle.kt
diff --git a/.../app/core/ui/CurrencyAppreciationLabel.kt → .../app/core/ui/CurrencyAppreciationLabel.kt b/.../app/core/ui/CurrencyAppreciationLabel.kt → .../app/core/ui/CurrencyAppreciationLabel.kt
diff --git a/...om/flipcash/app/core/ui/CurrencyHolder.kt → ...om/flipcash/app/core/ui/CurrencyHolder.kt b/...om/flipcash/app/core/ui/CurrencyHolder.kt → ...om/flipcash/app/core/ui/CurrencyHolder.kt
diff --git a/...n/com/flipcash/app/core/ui/DeviceFrame.kt → ...n/com/flipcash/app/core/ui/DeviceFrame.kt b/...n/com/flipcash/app/core/ui/DeviceFrame.kt → ...n/com/flipcash/app/core/ui/DeviceFrame.kt
diff --git a/.../flipcash/app/core/ui/DisplayTextInput.kt → .../flipcash/app/core/ui/DisplayTextInput.kt b/.../flipcash/app/core/ui/DisplayTextInput.kt → .../flipcash/app/core/ui/DisplayTextInput.kt
diff --git a/.../com/flipcash/app/core/ui/FlagWithFiat.kt → .../com/flipcash/app/core/ui/FlagWithFiat.kt b/.../com/flipcash/app/core/ui/FlagWithFiat.kt → .../com/flipcash/app/core/ui/FlagWithFiat.kt
diff --git a/...lipcash/app/core/ui/LongPressDraggable.kt → ...lipcash/app/core/ui/LongPressDraggable.kt b/...lipcash/app/core/ui/LongPressDraggable.kt → ...lipcash/app/core/ui/LongPressDraggable.kt
diff --git a/...com/flipcash/app/core/ui/NavigationBar.kt → ...com/flipcash/app/core/ui/NavigationBar.kt b/...com/flipcash/app/core/ui/NavigationBar.kt → ...com/flipcash/app/core/ui/NavigationBar.kt
diff --git a/...ipcash/app/core/ui/NotificationPreview.kt → ...ipcash/app/core/ui/NotificationPreview.kt b/...ipcash/app/core/ui/NotificationPreview.kt → ...ipcash/app/core/ui/NotificationPreview.kt
diff --git a/...flipcash/app/core/ui/NotifyButtonLabel.kt → ...flipcash/app/core/ui/NotifyButtonLabel.kt b/...flipcash/app/core/ui/NotifyButtonLabel.kt → ...flipcash/app/core/ui/NotifyButtonLabel.kt
diff --git a/...m/flipcash/app/core/ui/ReceiptLineItem.kt → ...m/flipcash/app/core/ui/ReceiptLineItem.kt b/...m/flipcash/app/core/ui/ReceiptLineItem.kt → ...m/flipcash/app/core/ui/ReceiptLineItem.kt
diff --git a/...tlin/com/flipcash/app/core/ui/Skeleton.kt → ...tlin/com/flipcash/app/core/ui/Skeleton.kt b/...tlin/com/flipcash/app/core/ui/Skeleton.kt → ...tlin/com/flipcash/app/core/ui/Skeleton.kt
diff --git a/...com/flipcash/app/core/ui/SwitchPreview.kt → ...com/flipcash/app/core/ui/SwitchPreview.kt b/...com/flipcash/app/core/ui/SwitchPreview.kt → ...com/flipcash/app/core/ui/SwitchPreview.kt
diff --git a/...in/com/flipcash/app/core/ui/TileButton.kt → ...in/com/flipcash/app/core/ui/TileButton.kt b/...in/com/flipcash/app/core/ui/TileButton.kt → ...in/com/flipcash/app/core/ui/TileButton.kt
diff --git a/...m/flipcash/app/core/ui/TokenBalanceRow.kt → ...m/flipcash/app/core/ui/TokenBalanceRow.kt b/...m/flipcash/app/core/ui/TokenBalanceRow.kt → ...m/flipcash/app/core/ui/TokenBalanceRow.kt
diff --git a/...lin/com/flipcash/app/core/ui/TokenCard.kt → ...lin/com/flipcash/app/core/ui/TokenCard.kt b/...lin/com/flipcash/app/core/ui/TokenCard.kt → ...lin/com/flipcash/app/core/ui/TokenCard.kt
diff --git a/...om/flipcash/app/core/ui/TokenCardStack.kt → ...om/flipcash/app/core/ui/TokenCardStack.kt b/...om/flipcash/app/core/ui/TokenCardStack.kt → ...om/flipcash/app/core/ui/TokenCardStack.kt
diff --git a/...lipcash/app/core/ui/TokenImageWithName.kt → ...lipcash/app/core/ui/TokenImageWithName.kt b/...lipcash/app/core/ui/TokenImageWithName.kt → ...lipcash/app/core/ui/TokenImageWithName.kt
diff --git a/...lipcash/app/core/ui/TokenSelectionPill.kt → ...lipcash/app/core/ui/TokenSelectionPill.kt b/...lipcash/app/core/ui/TokenSelectionPill.kt → ...lipcash/app/core/ui/TokenSelectionPill.kt
diff --git a/...flipcash/app/core/ui/flow/FlowProgress.kt → ...flipcash/app/core/ui/flow/FlowProgress.kt b/...flipcash/app/core/ui/flow/FlowProgress.kt → ...flipcash/app/core/ui/flow/FlowProgress.kt
diff --git a/.../flipcash/app/core/ui/flow/FlowStepBar.kt → .../flipcash/app/core/ui/flow/FlowStepBar.kt b/.../flipcash/app/core/ui/flow/FlowStepBar.kt → .../flipcash/app/core/ui/flow/FlowStepBar.kt
diff --git a/...app/core/ui/flow/FlowStepBarController.kt → ...app/core/ui/flow/FlowStepBarController.kt b/...app/core/ui/flow/FlowStepBarController.kt → ...app/core/ui/flow/FlowStepBarController.kt
diff --git a/.../flipcash/app/core/ui/flow/FlowStepper.kt → .../flipcash/app/core/ui/flow/FlowStepper.kt b/.../flipcash/app/core/ui/flow/FlowStepper.kt → .../flipcash/app/core/ui/flow/FlowStepper.kt
diff --git a/...h/app/core/ui/flow/SteppedFlowScaffold.kt → ...h/app/core/ui/flow/SteppedFlowScaffold.kt b/...h/app/core/ui/flow/SteppedFlowScaffold.kt → ...h/app/core/ui/flow/SteppedFlowScaffold.kt
@@ -9,6 +9,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.navigation3.runtime.NavEntry
 import androidx.navigation3.runtime.NavKey
+import com.flipcash.app.core.navigation.SteppedFlowRoute
 import com.getcode.navigation.flow.FlowExitReason
 import com.getcode.navigation.flow.FlowHost
 import com.getcode.navigation.flow.FlowStep

diff --git a/...ore/ui/processing/FlowProcessingScreen.kt → ...ore/ui/processing/FlowProcessingScreen.kt b/...ore/ui/processing/FlowProcessingScreen.kt → ...ore/ui/processing/FlowProcessingScreen.kt
diff --git a/.../processing/ProcessingLoadingIndicator.kt → .../processing/ProcessingLoadingIndicator.kt b/.../processing/ProcessingLoadingIndicator.kt → .../processing/ProcessingLoadingIndicator.kt
diff --git a/.../core/ui/transitions/SharedTransitions.kt → .../core/ui/transitions/SharedTransitions.kt b/.../core/ui/transitions/SharedTransitions.kt → .../core/ui/transitions/SharedTransitions.kt
diff --git a/...cash/app/core/ui/flow/FlowProgressTest.kt → ...cash/app/core/ui/flow/FlowProgressTest.kt b/...cash/app/core/ui/flow/FlowProgressTest.kt → ...cash/app/core/ui/flow/FlowProgressTest.kt
diff --git a/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/AppRoute.kt b/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/AppRoute.kt
@@ -14,7 +14,7 @@ import com.flipcash.app.core.tokens.SwapPurpose
 import com.flipcash.app.core.tokens.SwapResult
 import com.flipcash.app.core.tokens.SwapStep
 import com.flipcash.app.core.tokens.TokenPurpose
-import com.flipcash.app.core.ui.flow.SteppedFlowRoute
+import com.flipcash.app.core.navigation.SteppedFlowRoute
 import com.flipcash.app.core.userprofile.UpdateProfileResult
 import com.flipcash.app.core.userprofile.UpdateProfileStep
 import com.flipcash.app.core.verification.VerificationResult

diff --git a/...cash/app/core/ui/flow/SteppedFlowRoute.kt → ...h/app/core/navigation/SteppedFlowRoute.kt b/...cash/app/core/ui/flow/SteppedFlowRoute.kt → ...h/app/core/navigation/SteppedFlowRoute.kt
@@ -1,4 +1,4 @@
-package com.flipcash.app.core.ui.flow
+package com.flipcash.app.core.navigation
 
 import android.os.Parcelable
 import com.getcode.navigation.flow.FlowRouteWithResult

diff --git a/apps/flipcash/shared/chat-ui/build.gradle.kts b/apps/flipcash/shared/chat-ui/build.gradle.kts
@@ -7,6 +7,7 @@ android {
 }
 
 dependencies {
+    implementation(project(":apps:flipcash:core-ui"))
     implementation(project(":apps:flipcash:core"))
     implementation(project(":apps:flipcash:shared:chat"))
     implementation(project(":ui:core"))

diff --git a/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt
@@ -43,6 +43,18 @@ class AndroidFeatureConventionPlugin : Plugin<Project> {
                 if (path != ":apps:flipcash:core") {
                     "implementation"(project(":apps:flipcash:core"))
                 }
+
+                // Shared UI composables. core-ui sits above core (core-ui -> core -> featureflags),
+                // so it must not be added to itself or to any module it transitively depends on, or
+                // Gradle reports a dependency cycle.
+                val coreUiCycleModules = setOf(
+                    ":apps:flipcash:core",
+                    ":apps:flipcash:core-ui",
+                    ":apps:flipcash:shared:featureflags",
+                )
+                if (path !in coreUiCycleModules) {
+                    "implementation"(project(":apps:flipcash:core-ui"))
+                }
             }
         }
     }

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -43,6 +43,7 @@ include(
 
     // flipcash modules
     ":apps:flipcash:core",
+    ":apps:flipcash:core-ui",
     ":libs:test-utils",
     // shared flipcash coordinators/controllers/viewmodels/services
     ":apps:flipcash:shared:amount-entry",