refactor(ui): internalize AppBar back-vs-close, drop backButton flag

apps/flipcash/features/advanced/src/main/kotlin/com/flipcash/app/advanced/AdvancedFeaturesScreen.kt

@@ -34,7 +34,6 @@ fun AdvancedFeaturesScreen() {
         AppBarWithTitle(
             title = stringResource(R.string.title_advancedFeatures),
             titleAlignment = Alignment.CenterHorizontally,
-            backButton = true,
             onBackIconClicked = { navigator.pop() }
         )
 

apps/flipcash/features/appsettings/src/main/kotlin/com/flipcash/app/appsettings/AppSettingsScreen.kt

@@ -22,7 +22,6 @@ fun AppSettingsScreen() {
         AppBarWithTitle(
             title = stringResource(R.string.title_appSettings),
             titleAlignment = Alignment.CenterHorizontally,
-            backButton = true,
             onBackIconClicked = navigator::pop
         )
 

apps/flipcash/features/backupkey/src/main/kotlin/com/flipcash/app/backupkey/BackupKeyScreen.kt

@@ -25,7 +25,6 @@ fun BackupKeyScreen() {
         AppBarWithTitle(
             title = stringResource(R.string.title_accessKey),
             titleAlignment = Alignment.CenterHorizontally,
-            backButton = true,
             onBackIconClicked = { navigator.pop() },
         )
         BackupKeyScreenContent(viewModel)

apps/flipcash/features/contact-verification/src/main/kotlin/com/flipcash/app/contact/verification/email/EmailMagicLinkScreen.kt

@@ -53,7 +53,6 @@ fun EmailMagicLinkContent(
         AppBarWithTitle(
             title = stringResource(R.string.title_connectEmailAddress),
             titleAlignment = Alignment.CenterHorizontally,
-            backButton = true,
             onBackIconClicked = { flowNavigator.back() },
         )
         EmailMagicLinkScreen(viewModel)

apps/flipcash/features/contact-verification/src/main/kotlin/com/flipcash/app/contact/verification/email/EmailVerificationScreen.kt

@@ -45,7 +45,6 @@ fun EmailVerificationContent(
         AppBarWithTitle(
             title = stringResource(R.string.title_connectEmailAddress),
             titleAlignment = Alignment.CenterHorizontally,
-            backButton = true,
             onBackIconClicked = {
                 keyboard.hideIfVisible {
                     codeNavigator.pop()

apps/flipcash/features/contact-verification/src/main/kotlin/com/flipcash/app/contact/verification/phone/PhoneCodeScreen.kt

@@ -36,7 +36,6 @@ fun PhoneCodeContent(
         AppBarWithTitle(
             title = stringResource(R.string.title_enterTheCode),
             titleAlignment = Alignment.CenterHorizontally,
-            backButton = true,
             onBackIconClicked = { flowNavigator.back() },
         )
         PhoneCodeScreen(viewModel)

apps/flipcash/features/contact-verification/src/main/kotlin/com/flipcash/app/contact/verification/phone/PhoneCountryCodeScreen.kt

@@ -31,7 +31,6 @@ fun PhoneCountryCodeContent() {
         AppBarWithTitle(
             title = stringResource(R.string.title_verifyPhoneNumber),
             titleAlignment = Alignment.CenterHorizontally,
-            backButton = true,
             onBackIconClicked = { flowNavigator.back() },
         )
         PhoneCountryCodeScreen(viewModel = viewModel)

apps/flipcash/features/contact-verification/src/main/kotlin/com/flipcash/app/contact/verification/phone/PhoneVerificationScreen.kt

@@ -38,7 +38,6 @@ fun PhoneVerificationContent() {
         AppBarWithTitle(
             title = stringResource(R.string.title_connectPhoneNumber),
             titleAlignment = Alignment.CenterHorizontally,
-            backButton = true,
             onBackIconClicked = {
                 keyboard.hideIfVisible {
                     codeNavigator.pop()

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

@@ -29,7 +29,6 @@ fun DepositDestinationScreen(mint: Mint) {
         AppBarWithTitle(
             title = stringResource(R.string.title_depositToken, state.tokenName.orEmpty()),
             titleAlignment = Alignment.CenterHorizontally,
-            backButton = true,
             onBackIconClicked = { navigator.pop() },
         )
         DepositDestinationScreen(viewModel)

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

@@ -108,7 +108,6 @@ private fun DepositSelectTokenScreen() {
     ) {
         AppBarWithTitle(
             title = stringResource(R.string.title_selectCurrency),
-            backButton = true,
             onBackIconClicked = { flowNavigator.back() },
             titleAlignment = Alignment.CenterHorizontally,
         )

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

@@ -33,7 +33,6 @@ internal fun UsdcDepositInformationScreen(showOtherOptions: Boolean) {
         topBar = {
             AppBarWithTitle(
                 title = stringResource(R.string.title_deposit),
-                backButton = true,
                 onBackIconClicked = { flowNavigator.back() },
                 titleAlignment = Alignment.CenterHorizontally,
             )

apps/flipcash/features/device-logs/src/main/kotlin/com/flipcash/app/devicelogs/DeviceLogsScreen.kt

@@ -45,7 +45,6 @@ fun DeviceLogsScreen() {
         AppBarWithTitle(
             title = stringResource(R.string.title_deviceLogs),
             titleAlignment = Alignment.CenterHorizontally,
-            backButton = true,
             onBackIconClicked = { navigator.pop() },
             endContent = {
                 Box {

apps/flipcash/features/discovery/src/main/kotlin/com/flipcash/app/discovery/TokenDiscoveryScreen.kt

@@ -4,7 +4,6 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
@@ -16,7 +15,6 @@ import com.flipcash.core.R
 import com.getcode.navigation.core.CodeNavigator
 import com.getcode.navigation.core.LocalCodeNavigator
 import com.getcode.opencode.model.ui.DiscoverCategory
-import com.getcode.ui.components.AppBarDefaults
 import com.getcode.ui.components.AppBarWithTitle
 import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.launchIn
@@ -27,28 +25,17 @@ import kotlinx.coroutines.flow.onEach
 fun TokenDiscoveryScreen() {
     val navigator = LocalCodeNavigator.current
     val viewModel = hiltViewModel<TokenDiscoveryViewModel>()
-    val isSheetRoot = remember(navigator) { navigator.backStack.size <= 1 }
 
     Column(
         modifier = Modifier.fillMaxSize(),
         horizontalAlignment = Alignment.CenterHorizontally,
     ) {
-        if (isSheetRoot) {
-            AppBarWithTitle(
-                title = stringResource(R.string.title_discoverCurrencies),
-                titleAlignment = Alignment.CenterHorizontally,
-                endContent = {
-                    AppBarDefaults.Close { navigator.hide() }
-                },
-            )
-        } else {
-            AppBarWithTitle(
-                title = stringResource(R.string.title_discoverCurrencies),
-                titleAlignment = Alignment.CenterHorizontally,
-                backButton = true,
-                onBackIconClicked = { navigator.pop() },
-            )
-        }
+        // Sheet-aware app bar: a Close (✕) at the sheet root, a back arrow when pushed deeper.
+        AppBarWithTitle(
+            title = stringResource(R.string.title_discoverCurrencies),
+            titleAlignment = Alignment.CenterHorizontally,
+            onBackIconClicked = { navigator.navigateBack() },
+        )
         TokenDiscoveryScreen(viewModel)
     }
 

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

@@ -3,7 +3,6 @@ package com.flipcash.app.lab
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
@@ -12,33 +11,21 @@ import com.flipcash.app.lab.internal.LabsScreenViewModel
 import com.getcode.navigation.extensions.getActivityScopedViewModel
 import com.flipcash.core.R
 import com.getcode.navigation.core.LocalCodeNavigator
-import com.getcode.ui.components.AppBarDefaults
 import com.getcode.ui.components.AppBarWithTitle
 
 @Composable
 fun LabsScreen(onboarding: Boolean = false) {
     val navigator = LocalCodeNavigator.current
-    val isSheetRoot = remember(navigator) { navigator.backStack.size <= 1 }
     Column(
         modifier = Modifier.fillMaxSize(),
         horizontalAlignment = Alignment.CenterHorizontally,
     ) {
-        if (isSheetRoot) {
-            AppBarWithTitle(
-                title = stringResource(R.string.title_betaFlags),
-                titleAlignment = Alignment.CenterHorizontally,
-                endContent = {
-                    AppBarDefaults.Close { navigator.hide() }
-                }
-            )
-        } else {
-            AppBarWithTitle(
-                title = stringResource(R.string.title_betaFlags),
-                titleAlignment = Alignment.CenterHorizontally,
-                backButton = true,
-                onBackIconClicked = navigator::pop
-            )
-        }
+        // Sheet-aware app bar: a Close (✕) at the sheet root, a back arrow when pushed deeper.
+        AppBarWithTitle(
+            title = stringResource(R.string.title_betaFlags),
+            titleAlignment = Alignment.CenterHorizontally,
+            onBackIconClicked = { navigator.navigateBack() },
+        )
 
         val viewModel = getActivityScopedViewModel<LabsScreenViewModel>()
 

apps/flipcash/features/login/src/main/kotlin/com/flipcash/app/login/OnboardingFlowScreen.kt

@@ -387,7 +387,6 @@ private fun SeedInputStepContent() {
     Column {
         AppBarWithTitle(
             modifier = Modifier.fillMaxWidth(),
-            backButton = true,
             titleAlignment = Alignment.CenterHorizontally,
             onBackIconClicked = { flowNavigator.back() },
             title = stringResource(R.string.title_enterAccessKeyWords),

apps/flipcash/features/login/src/main/kotlin/com/flipcash/app/login/internal/screens/PhotoAccessKeyScreen.kt

@@ -51,7 +51,6 @@ private fun AccessKeyInPhotos(
                 modifier = Modifier.fillMaxWidth(),
                 title = stringResource(R.string.title_cantFindYourAccessKey),
                 titleAlignment = Alignment.CenterHorizontally,
-                backButton = true,
                 onBackIconClicked = goBack,
             )
         },

apps/flipcash/features/messenger/src/main/kotlin/com/flipcash/app/messenger/internal/screens/profile/ChatProfileScreen.kt

@@ -40,7 +40,7 @@ internal fun ChatProfileScreen(viewModel: ChatProfileViewModel) {
 
     CodeScaffold(
         topBar = {
-            AppBarWithTitle(backButton = true, onBackIconClicked = { flowNavigator.back() })
+            AppBarWithTitle(onBackIconClicked = { flowNavigator.back() })
         },
     ) { innerPadding ->
         MenuList(

apps/flipcash/features/purchase/src/main/kotlin/com/flipcash/app/purchase/PurchaseAccountScreen.kt

@@ -14,7 +14,6 @@ fun PurchaseAccountScreen(
     val navigator = LocalCodeNavigator.current
     Column {
         AppBarWithTitle(
-            backButton = true,
             onBackIconClicked = {
                 if (fromLogin) {
                     navigator.popAll()

apps/flipcash/features/tipping/src/main/kotlin/com/flipcash/app/tipping/internal/screens/TipCardScreen.kt

@@ -51,7 +51,6 @@ internal fun TipCardScreen() {
                 AppBarWithTitle(
                     title = stringResource(R.string.title_myTipCard),
                     titleAlignment = Alignment.CenterHorizontally,
-                    backButton = true,
                     onBackIconClicked = { flowNavigator.back() },
                 )
                 Text(

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

@@ -81,7 +81,6 @@ internal fun PhantomConnectConfirmationScreen(
                 } else {
                     stringResource(R.string.title_purchase)
                 },
-                backButton = true,
                 onBackIconClicked = { flowNavigator.back() },
                 titleAlignment = Alignment.CenterHorizontally,
             )
@@ -181,7 +180,6 @@ internal fun PhantomTransactionConfirmationScreen() {
         topBar = {
             AppBarWithTitle(
                 title = stringResource(R.string.title_purchase),
-                backButton = true,
                 onBackIconClicked = { flowNavigator.back() },
                 titleAlignment = Alignment.CenterHorizontally,
             )

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

@@ -55,7 +55,6 @@ internal fun SwapEntryScreen(
                 is SwapPurpose.BalanceDecrease -> stringResource(R.string.title_amountToSell)
             },
             titleAlignment = Alignment.CenterHorizontally,
-            backButton = true,
             onBackIconClicked = {
                 if (state.buyProgress.loading) {
                     // swallow

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

@@ -34,7 +34,6 @@ internal fun BuyReceiptScreen() {
         AppBarWithTitle(
             title = stringResource(R.string.title_confirmPurchase),
             titleAlignment = Alignment.CenterHorizontally,
-            backButton = true,
             onBackIconClicked = { flowNavigator.back() }
         )
 

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

@@ -62,9 +62,6 @@ fun TokenInfoScreen(
                 }
             },
             titleAlignment = Alignment.CenterHorizontally,
-            leftIcon = {
-                AppBarDefaults.UpNavigation { navigator.pop() }
-            },
             rightContents = {
                 state.token.dataOrNull?.let {
                     if (!state.isCashReserve) {
@@ -74,6 +71,7 @@ fun TokenInfoScreen(
                         }
                     }
                 }
+                AppBarDefaults.Close { navigator.pop() }
             },
         )
 

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

@@ -53,7 +53,6 @@ fun TokenSelectScreen(
                         is TokenPurpose.LaunchFunding -> stringResource(R.string.title_selectPaymentCurrency)
                         else -> stringResource(R.string.title_selectCurrency)
                     },
-                    backButton = true,
                     onBackIconClicked = { navigator.pop() },
                     titleAlignment = Alignment.CenterHorizontally,
                 )

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

@@ -34,7 +34,6 @@ internal fun SellReceiptScreen() {
         AppBarWithTitle(
             title = stringResource(R.string.title_confirmSale),
             titleAlignment = Alignment.CenterHorizontally,
-            backButton = true,
             onBackIconClicked = {
                 if (state.sellProgress.loading) {
                     // swallow

apps/flipcash/features/transactions/src/main/kotlin/com/flipcash/app/transactions/TransactionHistoryScreen.kt

@@ -25,7 +25,6 @@ fun TransactionHistoryScreen(mint: Mint) {
         AppBarWithTitle(
             title = stringResource(R.string.title_transactionHistory),
             titleAlignment = Alignment.CenterHorizontally,
-            backButton = true,
             onBackIconClicked = { navigator.pop() }
         )
         val viewModel = hiltViewModel<TransactionHistoryViewModel>()

apps/flipcash/features/user-profile/src/main/kotlin/com/flipcash/app/userprofile/internal/name/NameEntryScreen.kt

@@ -58,7 +58,6 @@ internal fun NameEntryScreen(
     Column {
         if (allowBack) {
             AppBarWithTitle(
-                backButton = true,
                 onBackIconClicked = {
                     keyboard.hideIfVisible {
                         flowNavigator.back()

apps/flipcash/features/user-profile/src/main/kotlin/com/flipcash/app/userprofile/internal/photo/PhotoSelectionScreen.kt

@@ -67,7 +67,6 @@ internal fun PhotoSelectionScreen() {
 
     Column {
         AppBarWithTitle(
-            backButton = true,
             onBackIconClicked = {
                 keyboard.hideIfVisible {
                     flowNavigator.back()

apps/flipcash/features/userflags/src/main/kotlin/com/flipcash/app/userflags/UserFlagsScreen.kt

@@ -26,7 +26,6 @@ fun UserFlagsScreen() {
         AppBarWithTitle(
             title = stringResource(R.string.title_userFlags),
             titleAlignment = Alignment.CenterHorizontally,
-            backButton = true,
             onBackIconClicked = navigator::pop,
             endContent = {
                 AppBarDefaults.Reset { viewModel.dispatchEvent(UserFlagsViewModel.Event.Reset) }

apps/flipcash/features/withdrawal/src/main/kotlin/com/flipcash/app/withdrawal/WithdrawalFlowScreen.kt

@@ -115,7 +115,6 @@ private fun WithdrawalSelectTokenScreen() {
     ) {
         AppBarWithTitle(
             title = stringResource(R.string.title_selectCurrency),
-            backButton = true,
             onBackIconClicked = { flowNavigator.back() },
             titleAlignment = Alignment.CenterHorizontally,
         )

apps/flipcash/features/withdrawal/src/main/kotlin/com/flipcash/app/withdrawal/internal/screens/UsdcWithdrawalInformationScreen.kt

@@ -40,7 +40,6 @@ internal fun UsdcWithdrawalInformationScreen(showOtherOptions: Boolean) {
         topBar = {
             AppBarWithTitle(
                 title = stringResource(R.string.title_withdraw),
-                backButton = true,
                 onBackIconClicked = { flowNavigator.back() },
                 titleAlignment = Alignment.CenterHorizontally,
             )

apps/flipcash/features/withdrawal/src/main/kotlin/com/flipcash/app/withdrawal/internal/screens/WithdrawalConfirmationScreen.kt

@@ -39,7 +39,6 @@ internal fun WithdrawalConfirmationScreen() {
         AppBarWithTitle(
             title = stringResource(R.string.title_withdraw),
             titleAlignment = Alignment.CenterHorizontally,
-            backButton = true,
             onBackIconClicked = { flowNavigator.back() },
         )
         WithdrawalConfirmationScreen(viewModel)

apps/flipcash/features/withdrawal/src/main/kotlin/com/flipcash/app/withdrawal/internal/screens/WithdrawalDestinationScreen.kt

@@ -30,7 +30,6 @@ internal fun WithdrawalDestinationScreen() {
         AppBarWithTitle(
             title = stringResource(R.string.title_withdraw),
             titleAlignment = Alignment.CenterHorizontally,
-            backButton = true,
             onBackIconClicked = { flowNavigator.back() },
         )
         WithdrawalDestinationScreen(viewModel)

apps/flipcash/features/withdrawal/src/main/kotlin/com/flipcash/app/withdrawal/internal/screens/WithdrawalEntryScreen.kt

@@ -35,7 +35,6 @@ internal fun WithdrawalEntryScreen(
     ) {
         AppBarWithTitle(
             title = stringResource(R.string.title_withdraw),
-            backButton = true,
             onBackIconClicked = { flowNavigator.back() },
             titleAlignment = Alignment.CenterHorizontally,
         )

apps/flipcash/shared/region-selection/ui/src/main/kotlin/com/flipcash/app/currency/RegionSelectionScreen.kt

@@ -23,7 +23,6 @@ fun RegionSelectionScreen() {
         AppBarWithTitle(
             title = stringResource(R.string.title_selectRegion),
             titleAlignment = Alignment.CenterHorizontally,
-            backButton = true,
             onBackIconClicked = {
                 navigator.pop()
             }