chore: remove token selection from bill playground flow and remove from beta flag

bmc08gt · bmc08gt · commit aa02bb63896c · 2025-11-02T16:53:46.000-05:00
Signed-off-by: Brandon McAnsh &lt;git@bmcreations.dev&gt;
diff --git a/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/tokens/TokenPurpose.kt b/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/tokens/TokenPurpose.kt
@@ -9,5 +9,4 @@ sealed interface TokenPurpose: Parcelable {
     data object Withdraw: TokenPurpose
     data object Deposit: TokenPurpose
     data object Balance : TokenPurpose
-    data object BillPlayground: TokenPurpose
 }
diff --git a/apps/flipcash/features/advanced/build.gradle.kts b/apps/flipcash/features/advanced/build.gradle.kts
@@ -52,6 +52,7 @@ dependencies {
     implementation(Libs.compose_material)
     implementation(Libs.compose_materialIconsExtended)
 
+    implementation(project(":apps:flipcash:shared:bill-customization"))
     implementation(project(":apps:flipcash:shared:featureflags"))
     implementation(project(":apps:flipcash:shared:menu"))
     implementation(project(":apps:flipcash:core"))
diff --git a/apps/flipcash/features/advanced/src/main/kotlin/com/flipcash/app/advanced/AdvancedFeaturesScreen.kt b/apps/flipcash/features/advanced/src/main/kotlin/com/flipcash/app/advanced/AdvancedFeaturesScreen.kt
@@ -14,10 +14,13 @@ import cafe.adriel.voyager.core.screen.uniqueScreenKey
 import cafe.adriel.voyager.hilt.getViewModel
 import com.flipcash.app.advanced.internal.AdvancedFeaturesScreen
 import com.flipcash.app.advanced.internal.AdvancedFeaturesScreenViewModel
+import com.flipcash.app.bill.customization.LocalBillPlaygroundController
 import com.flipcash.core.R
 import com.getcode.navigation.core.LocalCodeNavigator
 import com.getcode.navigation.modal.ModalScreen
 import com.getcode.navigation.screens.NamedScreen
+import com.getcode.opencode.model.financial.Token
+import com.getcode.opencode.model.financial.usdc
 import com.getcode.ui.components.AppBarWithTitle
 import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.launchIn
@@ -38,7 +41,7 @@ class AdvancedFeaturesScreen: ModalScreen, NamedScreen, Parcelable {
     @Composable
     override fun ModalContent() {
         val navigator = LocalCodeNavigator.current
-
+        val billPlayground = LocalBillPlaygroundController.current
         val viewModel = getViewModel<AdvancedFeaturesScreenViewModel>()
 
         Column(
@@ -63,5 +66,15 @@ class AdvancedFeaturesScreen: ModalScreen, NamedScreen, Parcelable {
                 .onEach { navigator.push(it) }
                 .launchIn(this)
         }
+
+        LaunchedEffect(viewModel) {
+            viewModel.eventFlow
+                .filterIsInstance<AdvancedFeaturesScreenViewModel.Event.OpenBillPlayground>()
+                .onEach {
+                    navigator.hide()
+                    billPlayground.customizeFor(Token.usdc)
+                }
+                .launchIn(this)
+        }
     }
 }
diff --git a/apps/flipcash/features/advanced/src/main/kotlin/com/flipcash/app/advanced/internal/AdvancedFeatureMenuItems.kt b/apps/flipcash/features/advanced/src/main/kotlin/com/flipcash/app/advanced/internal/AdvancedFeatureMenuItems.kt
@@ -27,6 +27,5 @@ internal data object BillCustomizer : FullMenuItem<AdvancedFeaturesScreenViewMod
         @Composable get() = rememberVectorPainter(Icons.Outlined.Palette)
     override val name: String
         @Composable get() = stringResource(R.string.title_billCustomizer)
-    override val action: AdvancedFeaturesScreenViewModel.Event = AdvancedFeaturesScreenViewModel.Event.OpenScreen(
-        AppRoute.Sheets.TokenSelection(TokenPurpose.BillPlayground))
+    override val action: AdvancedFeaturesScreenViewModel.Event = AdvancedFeaturesScreenViewModel.Event.OpenBillPlayground
 }
diff --git a/apps/flipcash/features/advanced/src/main/kotlin/com/flipcash/app/advanced/internal/AdvancedFeaturesScreenViewModel.kt b/apps/flipcash/features/advanced/src/main/kotlin/com/flipcash/app/advanced/internal/AdvancedFeaturesScreenViewModel.kt
@@ -37,6 +37,8 @@ internal class AdvancedFeaturesScreenViewModel @Inject constructor(
         data class OnBetaFeaturesUnlocked(val unlocked: Boolean) : Event
         data class OnBillCustomizerEnabled(val enabled: Boolean) : Event
         data class OpenScreen(val screen: AppRoute) : Event
+
+        data object OpenBillPlayground: Event
     }
 
     init {
@@ -75,6 +77,7 @@ internal class AdvancedFeaturesScreenViewModel @Inject constructor(
                 }
 
                 is Event.OpenScreen -> { state -> state }
+                is Event.OpenBillPlayground -> { state -> state }
             }
         }
     }
diff --git a/apps/flipcash/features/tokens/build.gradle.kts b/apps/flipcash/features/tokens/build.gradle.kts
@@ -53,7 +53,6 @@ dependencies {
     implementation(Libs.compose_materialIconsExtended)
 
     implementation(project(":apps:flipcash:shared:shareable"))
-    implementation(project(":apps:flipcash:shared:bill-customization"))
     implementation(project(":apps:flipcash:shared:tokens"))
     implementation(project(":apps:flipcash:core"))
 
diff --git a/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/SelectTokenScreen.kt b/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/SelectTokenScreen.kt
@@ -12,7 +12,6 @@ import cafe.adriel.voyager.core.registry.ScreenRegistry
 import cafe.adriel.voyager.core.screen.ScreenKey
 import cafe.adriel.voyager.core.screen.uniqueScreenKey
 import cafe.adriel.voyager.hilt.getViewModel
-import com.flipcash.app.bill.customization.LocalBillPlaygroundController
 import com.flipcash.app.core.AppRoute.Main.Give
 import com.flipcash.app.core.AppRoute.Menu.Deposit
 import com.flipcash.app.core.AppRoute.Transfers.Withdrawal.Amount
@@ -66,7 +65,6 @@ class SelectTokenScreen(private val purpose: TokenPurpose) : ModalScreen, NamedS
                 viewModel.dispatchEvent(SelectTokenViewModel.Event.OnPurposeChanged(purpose))
             }
 
-            val billPlayground = LocalBillPlaygroundController.current
             LaunchedEffect(viewModel) {
                 viewModel.eventFlow
                     .filterIsInstance<SelectTokenViewModel.Event.OnTokenSelected>()
@@ -89,11 +87,6 @@ class SelectTokenScreen(private val purpose: TokenPurpose) : ModalScreen, NamedS
                                     ScreenRegistry.get(Deposit(token.address))
                                 )
                             }
-
-                            TokenPurpose.BillPlayground -> {
-                                navigator.hide()
-                                billPlayground.customizeFor(token)
-                            }
                         }
                     }.launchIn(this)
             }
diff --git a/apps/flipcash/shared/featureflags/src/main/kotlin/com/flipcash/app/featureflags/FeatureFlag.kt b/apps/flipcash/shared/featureflags/src/main/kotlin/com/flipcash/app/featureflags/FeatureFlag.kt
@@ -66,8 +66,8 @@ sealed interface FeatureFlag {
     @FeatureFlagMarker
     data object BillCustomizer: FeatureFlag {
         override val key: String = "bill_customizer_enabled"
-        override val default: Boolean = false
-        override val launched: Boolean = false
+        override val default: Boolean = true
+        override val launched: Boolean = true
         override val visible: Boolean = true
         override val persistLogOut: Boolean = false
     }
diff --git a/apps/flipcash/shared/tokens/src/main/kotlin/SelectTokenViewModel.kt b/apps/flipcash/shared/tokens/src/main/kotlin/SelectTokenViewModel.kt
@@ -56,7 +56,6 @@ class SelectTokenViewModel @Inject constructor(
                         TokenPurpose.Send -> exchange.observeEntryRate()
                         TokenPurpose.Withdraw -> flowOf(exchange.rateForUsd())
                         TokenPurpose.Deposit -> exchange.observeEntryRate()
-                        TokenPurpose.BillPlayground -> exchange.observeBalanceRate()
                     }
                 ) { balances, rate ->
                     balances.map {

Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,4 @@ sealed interface TokenPurpose: Parcelable {`
`9`	`9`	`data object Withdraw: TokenPurpose`
`10`	`10`	`data object Deposit: TokenPurpose`
`11`	`11`	`data object Balance : TokenPurpose`
`12`		`- data object BillPlayground: TokenPurpose`
`13`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,5 @@ internal data object BillCustomizer : FullMenuItem<AdvancedFeaturesScreenViewMod`
`27`	`27`	`@Composable get() = rememberVectorPainter(Icons.Outlined.Palette)`
`28`	`28`	`override val name: String`
`29`	`29`	`@Composable get() = stringResource(R.string.title_billCustomizer)`
`30`		`- override val action: AdvancedFeaturesScreenViewModel.Event = AdvancedFeaturesScreenViewModel.Event.OpenScreen(`
`31`		`- AppRoute.Sheets.TokenSelection(TokenPurpose.BillPlayground))`
	`30`	`+ override val action: AdvancedFeaturesScreenViewModel.Event = AdvancedFeaturesScreenViewModel.Event.OpenBillPlayground`
`32`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,8 @@ internal class AdvancedFeaturesScreenViewModel @Inject constructor(`
`37`	`37`	`data class OnBetaFeaturesUnlocked(val unlocked: Boolean) : Event`
`38`	`38`	`data class OnBillCustomizerEnabled(val enabled: Boolean) : Event`
`39`	`39`	`data class OpenScreen(val screen: AppRoute) : Event`
	`40`	`+`
	`41`	`+ data object OpenBillPlayground: Event`
`40`	`42`	`}`
`41`	`43`
`42`	`44`	`init {`
`@@ -75,6 +77,7 @@ internal class AdvancedFeaturesScreenViewModel @Inject constructor(`
`75`	`77`	`}`
`76`	`78`
`77`	`79`	`is Event.OpenScreen -> { state -> state }`
	`80`	`+ is Event.OpenBillPlayground -> { state -> state }`
`78`	`81`	`}`
`79`	`82`	`}`
`80`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@ import cafe.adriel.voyager.core.registry.ScreenRegistry`
`12`	`12`	`import cafe.adriel.voyager.core.screen.ScreenKey`
`13`	`13`	`import cafe.adriel.voyager.core.screen.uniqueScreenKey`
`14`	`14`	`import cafe.adriel.voyager.hilt.getViewModel`
`15`		`-import com.flipcash.app.bill.customization.LocalBillPlaygroundController`
`16`	`15`	`import com.flipcash.app.core.AppRoute.Main.Give`
`17`	`16`	`import com.flipcash.app.core.AppRoute.Menu.Deposit`
`18`	`17`	`import com.flipcash.app.core.AppRoute.Transfers.Withdrawal.Amount`
`@@ -66,7 +65,6 @@ class SelectTokenScreen(private val purpose: TokenPurpose) : ModalScreen, NamedS`
`66`	`65`	`viewModel.dispatchEvent(SelectTokenViewModel.Event.OnPurposeChanged(purpose))`
`67`	`66`	`}`
`68`	`67`
`69`		`- val billPlayground = LocalBillPlaygroundController.current`
`70`	`68`	`LaunchedEffect(viewModel) {`
`71`	`69`	`viewModel.eventFlow`
`72`	`70`	`.filterIsInstance<SelectTokenViewModel.Event.OnTokenSelected>()`
`@@ -89,11 +87,6 @@ class SelectTokenScreen(private val purpose: TokenPurpose) : ModalScreen, NamedS`
`89`	`87`	`ScreenRegistry.get(Deposit(token.address))`
`90`	`88`	`)`
`91`	`89`	`}`
`92`		`-`
`93`		`- TokenPurpose.BillPlayground -> {`
`94`		`- navigator.hide()`
`95`		`- billPlayground.customizeFor(token)`
`96`		`- }`
`97`	`90`	`}`
`98`	`91`	`}.launchIn(this)`
`99`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,6 @@ class SelectTokenViewModel @Inject constructor(`
`56`	`56`	`TokenPurpose.Send -> exchange.observeEntryRate()`
`57`	`57`	`TokenPurpose.Withdraw -> flowOf(exchange.rateForUsd())`
`58`	`58`	`TokenPurpose.Deposit -> exchange.observeEntryRate()`
`59`		`- TokenPurpose.BillPlayground -> exchange.observeBalanceRate()`
`60`	`59`	`}`
`61`	`60`	`) { balances, rate ->`
`62`	`61`	`balances.map {`