feat(ui/navigation): rebuild modal bottom sheet scene strategy to better support IME transitions

bmc08gt · bmc08gt · commit a6b696bcd17b · 2026-06-17T17:58:15.000-04:00
Signed-off-by: Brandon McAnsh &lt;git@bmcreations.dev&gt;
diff --git a/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/internal/ui/previews/AppBarTitlePreviews.kt b/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/internal/ui/previews/AppBarTitlePreviews.kt
@@ -14,7 +14,6 @@ private fun AppBarTitleOnGivePreview() {
     FlipcashPreview(showBackground = true) {
 
         AppBarWithTitle(
-            isInModal = true,
             leftIcon = { AppBarDefaults.UpNavigation() { }},
             title = {
                 TokenSelectionPill(
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
@@ -34,7 +34,6 @@ fun AdvancedFeaturesScreen() {
         AppBarWithTitle(
             title = stringResource(R.string.title_advancedFeatures),
             titleAlignment = Alignment.CenterHorizontally,
-            isInModal = true,
             backButton = true,
             onBackIconClicked = { navigator.pop() }
         )
diff --git a/apps/flipcash/features/appsettings/src/main/kotlin/com/flipcash/app/appsettings/AppSettingsScreen.kt b/apps/flipcash/features/appsettings/src/main/kotlin/com/flipcash/app/appsettings/AppSettingsScreen.kt
@@ -23,7 +23,6 @@ fun AppSettingsScreen() {
             title = stringResource(R.string.title_appSettings),
             titleAlignment = Alignment.CenterHorizontally,
             backButton = true,
-            isInModal = true,
             onBackIconClicked = navigator::pop
         )
 
diff --git a/apps/flipcash/features/backupkey/src/main/kotlin/com/flipcash/app/backupkey/BackupKeyScreen.kt b/apps/flipcash/features/backupkey/src/main/kotlin/com/flipcash/app/backupkey/BackupKeyScreen.kt
@@ -24,7 +24,6 @@ fun BackupKeyScreen() {
     ) {
         AppBarWithTitle(
             title = stringResource(R.string.title_accessKey),
-            isInModal = true,
             titleAlignment = Alignment.CenterHorizontally,
             backButton = true,
             onBackIconClicked = { navigator.pop() },
diff --git a/apps/flipcash/features/balance/src/main/kotlin/com/flipcash/app/balance/BalanceScreen.kt b/apps/flipcash/features/balance/src/main/kotlin/com/flipcash/app/balance/BalanceScreen.kt
@@ -31,7 +31,6 @@ fun BalanceScreen() {
     ) {
         AppBarWithTitle(
             title = stringResource(R.string.title_wallet),
-            isInModal = true,
             titleAlignment = Alignment.CenterHorizontally,
             endContent = {
                 AppBarDefaults.Close { navigator.hide() }
diff --git a/apps/flipcash/features/cash/src/main/kotlin/com/flipcash/app/cash/CashScreen.kt b/apps/flipcash/features/cash/src/main/kotlin/com/flipcash/app/cash/CashScreen.kt
@@ -50,7 +50,6 @@ fun CashScreen(
         horizontalAlignment = Alignment.CenterHorizontally,
     ) {
         AppBarWithTitle(
-            isInModal = true,
             title = {
                 TokenSelectionPill(state.token?.token) {
                     navigator.push(
diff --git a/apps/flipcash/features/contact-verification/src/main/kotlin/com/flipcash/app/contact/verification/VerificationFlowScreen.kt b/apps/flipcash/features/contact-verification/src/main/kotlin/com/flipcash/app/contact/verification/VerificationFlowScreen.kt
@@ -63,17 +63,16 @@ private fun verificationEntryProvider(
         VerificationFlowIntroContent(isForOnRamp = step.isForOnRamp)
     }
     annotatedEntry<VerificationStep.PhoneEntry> {
-        PhoneVerificationContent(isInModal = !route.fullScreen)
+        PhoneVerificationContent()
     }
     annotatedEntry<VerificationStep.PhoneCode> {
         PhoneCodeContent(
             includeEmail = route.includeEmail,
-            isInModal = !route.fullScreen,
             linkForPayment = route.linkForPayment,
         )
     }
     annotatedEntry<VerificationStep.PhoneCountryCode> {
-        PhoneCountryCodeContent(isInModal = !route.fullScreen)
+        PhoneCountryCodeContent()
     }
     annotatedEntry<VerificationStep.EmailEntry> {
         EmailVerificationContent(
diff --git a/apps/flipcash/features/contact-verification/src/main/kotlin/com/flipcash/app/contact/verification/email/EmailMagicLinkScreen.kt b/apps/flipcash/features/contact-verification/src/main/kotlin/com/flipcash/app/contact/verification/email/EmailMagicLinkScreen.kt
@@ -48,7 +48,6 @@ fun EmailMagicLinkContent(
     ) {
         AppBarWithTitle(
             title = stringResource(R.string.title_connectEmailAddress),
-            isInModal = true,
             titleAlignment = Alignment.CenterHorizontally,
             backButton = true,
             onBackIconClicked = { flowNavigator.back() },
diff --git a/apps/flipcash/features/contact-verification/src/main/kotlin/com/flipcash/app/contact/verification/email/EmailVerificationScreen.kt b/apps/flipcash/features/contact-verification/src/main/kotlin/com/flipcash/app/contact/verification/email/EmailVerificationScreen.kt
@@ -44,7 +44,6 @@ fun EmailVerificationContent(
     ) {
         AppBarWithTitle(
             title = stringResource(R.string.title_connectEmailAddress),
-            isInModal = true,
             titleAlignment = Alignment.CenterHorizontally,
             backButton = true,
             onBackIconClicked = {
diff --git a/apps/flipcash/features/contact-verification/src/main/kotlin/com/flipcash/app/contact/verification/internal/VerificationFlowIntroScreen.kt b/apps/flipcash/features/contact-verification/src/main/kotlin/com/flipcash/app/contact/verification/internal/VerificationFlowIntroScreen.kt
@@ -70,14 +70,12 @@ private fun VerificationFlowIntroScreenContent(
         topBar = {
             if (isSheetRoot) {
                 AppBarWithTitle(
-                    isInModal = true,
                     endContent = {
                         AppBarDefaults.Close { navigator.hide() }
                     },
                 )
             } else {
                 AppBarWithTitle(
-                    isInModal = true,
                     backButton = true,
                     onBackIconClicked = { navigator.pop() },
                 )
diff --git a/apps/flipcash/features/contact-verification/src/main/kotlin/com/flipcash/app/contact/verification/phone/PhoneCodeScreen.kt b/apps/flipcash/features/contact-verification/src/main/kotlin/com/flipcash/app/contact/verification/phone/PhoneCodeScreen.kt
@@ -24,7 +24,6 @@ import kotlinx.coroutines.flow.onEach
 @Composable
 fun PhoneCodeContent(
     includeEmail: Boolean,
-    isInModal: Boolean = true,
     linkForPayment: Boolean = false,
 ) {
     val flowNavigator = rememberFlowNavigator<VerificationStep, VerificationResult>()
@@ -36,7 +35,6 @@ fun PhoneCodeContent(
     ) {
         AppBarWithTitle(
             title = stringResource(R.string.title_enterTheCode),
-            isInModal = isInModal,
             titleAlignment = Alignment.CenterHorizontally,
             backButton = true,
             onBackIconClicked = { flowNavigator.back() },
diff --git a/apps/flipcash/features/contact-verification/src/main/kotlin/com/flipcash/app/contact/verification/phone/PhoneCountryCodeScreen.kt b/apps/flipcash/features/contact-verification/src/main/kotlin/com/flipcash/app/contact/verification/phone/PhoneCountryCodeScreen.kt
@@ -20,7 +20,7 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 
 @Composable
-fun PhoneCountryCodeContent(isInModal: Boolean = true) {
+fun PhoneCountryCodeContent() {
     val flowNavigator = rememberFlowNavigator<VerificationStep, VerificationResult>()
     val viewModel = flowSharedViewModel<PhoneVerificationViewModel>()
 
@@ -30,7 +30,6 @@ fun PhoneCountryCodeContent(isInModal: Boolean = true) {
     ) {
         AppBarWithTitle(
             title = stringResource(R.string.title_verifyPhoneNumber),
-            isInModal = isInModal,
             titleAlignment = Alignment.CenterHorizontally,
             backButton = true,
             onBackIconClicked = { flowNavigator.back() },
diff --git a/apps/flipcash/features/contact-verification/src/main/kotlin/com/flipcash/app/contact/verification/phone/PhoneVerificationScreen.kt b/apps/flipcash/features/contact-verification/src/main/kotlin/com/flipcash/app/contact/verification/phone/PhoneVerificationScreen.kt
@@ -25,7 +25,7 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 
 @Composable
-fun PhoneVerificationContent(isInModal: Boolean = true) {
+fun PhoneVerificationContent() {
     val codeNavigator = LocalCodeNavigator.current
     val flowNavigator = rememberFlowNavigator<VerificationStep, VerificationResult>()
     val viewModel = flowSharedViewModel<PhoneVerificationViewModel>()
@@ -37,7 +37,6 @@ fun PhoneVerificationContent(isInModal: Boolean = true) {
     ) {
         AppBarWithTitle(
             title = stringResource(R.string.title_connectPhoneNumber),
-            isInModal = isInModal,
             titleAlignment = Alignment.CenterHorizontally,
             backButton = true,
             onBackIconClicked = {
diff --git a/apps/flipcash/features/currency-creator/src/main/kotlin/com/flipcash/app/currencycreator/internal/components/CurrencyCreatorTopBar.kt b/apps/flipcash/features/currency-creator/src/main/kotlin/com/flipcash/app/currencycreator/internal/components/CurrencyCreatorTopBar.kt
@@ -63,7 +63,6 @@ internal fun CurrencyCreatorTopBar(
     val keyboard = rememberKeyboardController()
 
     AppBarWithTitle(
-        isInModal = true,
         title = { mainContent?.invoke() ?: defaultMainContent() },
         titleAlignment = Alignment.CenterHorizontally,
         leftIcon = {
diff --git a/apps/flipcash/features/deposit/src/main/kotlin/com/flipcash/app/deposit/DepositDestinationScreen.kt b/apps/flipcash/features/deposit/src/main/kotlin/com/flipcash/app/deposit/DepositDestinationScreen.kt
@@ -28,7 +28,6 @@ fun DepositDestinationScreen(mint: Mint) {
     ) {
         AppBarWithTitle(
             title = stringResource(R.string.title_depositToken, state.tokenName.orEmpty()),
-            isInModal = true,
             titleAlignment = Alignment.CenterHorizontally,
             backButton = true,
             onBackIconClicked = { navigator.pop() },
diff --git a/apps/flipcash/features/deposit/src/main/kotlin/com/flipcash/app/deposit/DepositFlowScreen.kt b/apps/flipcash/features/deposit/src/main/kotlin/com/flipcash/app/deposit/DepositFlowScreen.kt
@@ -108,7 +108,6 @@ private fun DepositSelectTokenScreen() {
         horizontalAlignment = Alignment.CenterHorizontally,
     ) {
         AppBarWithTitle(
-            isInModal = true,
             title = stringResource(R.string.title_selectCurrency),
             backButton = true,
             onBackIconClicked = { flowNavigator.back() },
diff --git a/apps/flipcash/features/deposit/src/main/kotlin/com/flipcash/app/deposit/internal/UsdcDepositInformationScreen.kt b/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),
-                isInModal = true,
                 backButton = true,
                 onBackIconClicked = { flowNavigator.back() },
                 titleAlignment = Alignment.CenterHorizontally,
diff --git a/apps/flipcash/features/device-logs/src/main/kotlin/com/flipcash/app/devicelogs/DeviceLogsScreen.kt b/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,
-            isInModal = true,
             backButton = true,
             onBackIconClicked = { navigator.pop() },
             endContent = {
diff --git a/apps/flipcash/features/direct-send/src/main/kotlin/com/flipcash/app/directsend/SendFlowScreen.kt b/apps/flipcash/features/direct-send/src/main/kotlin/com/flipcash/app/directsend/SendFlowScreen.kt
@@ -21,13 +21,14 @@ import com.getcode.navigation.flow.FlowHost
 import com.getcode.navigation.flow.flowSharedViewModel
 import com.getcode.navigation.results.NavResultStateRegistry
 import com.getcode.navigation.scenes.LocalBottomSheetDismissDispatcher
+import com.getcode.ui.utils.rememberKeyboardController
 
 @Composable
 fun SendFlowScreen(resultStateRegistry: NavResultStateRegistry) {
     val sheetDismiss = LocalBottomSheetDismissDispatcher.current
     val viewModel = hiltViewModel<SendFlowViewModel>()
     val state by viewModel.stateFlow.collectAsStateWithLifecycle()
-
+    val keyboard = rememberKeyboardController()
     FlowHost<SendStep, SendResult>(
         steps = state.steps,
         resumeAt = 0,
@@ -36,7 +37,7 @@ fun SendFlowScreen(resultStateRegistry: NavResultStateRegistry) {
             when (reason) {
                 is FlowExitReason.Completed,
                 FlowExitReason.BackedOutOfRoot,
-                FlowExitReason.Canceled -> sheetDismiss()
+                FlowExitReason.Canceled -> keyboard.hideIfVisible { sheetDismiss() }
             }
         },
         entryProvider = sendEntryProvider(),
diff --git a/apps/flipcash/features/direct-send/src/main/kotlin/com/flipcash/app/directsend/internal/screens/ContactListScreen.kt b/apps/flipcash/features/direct-send/src/main/kotlin/com/flipcash/app/directsend/internal/screens/ContactListScreen.kt
@@ -118,7 +118,6 @@ internal fun ContactListScreen() {
                 AppBarWithTitle(
                     title = stringResource(R.string.title_send),
                     titleAlignment = Alignment.CenterHorizontally,
-                    isInModal = true,
                     endContent = {
                         AppBarDefaults.Close { flowNavigator.exitCanceled() }
                     },
diff --git a/apps/flipcash/features/direct-send/src/main/kotlin/com/flipcash/app/directsend/internal/screens/ContactsPermissionGateScreen.kt b/apps/flipcash/features/direct-send/src/main/kotlin/com/flipcash/app/directsend/internal/screens/ContactsPermissionGateScreen.kt
@@ -60,7 +60,6 @@ internal fun ContactsPermissionGateScreen() {
         topBar = {
             AppBarWithTitle(
                 title = "",
-                isInModal = true,
                 endContent = {
                     AppBarDefaults.Close { flowNavigator.exitCanceled() }
                 },
diff --git a/apps/flipcash/features/direct-send/src/main/kotlin/com/flipcash/app/directsend/internal/screens/PhoneGateLandingScreen.kt b/apps/flipcash/features/direct-send/src/main/kotlin/com/flipcash/app/directsend/internal/screens/PhoneGateLandingScreen.kt
@@ -36,7 +36,6 @@ internal fun PhoneGateLandingScreen() {
         topBar = {
             AppBarWithTitle(
                 title = "",
-                isInModal = true,
                 endContent = {
                     AppBarDefaults.Close { flowNavigator.exitCanceled() }
                 },
diff --git a/apps/flipcash/features/discovery/src/main/kotlin/com/flipcash/app/discovery/TokenDiscoveryScreen.kt b/apps/flipcash/features/discovery/src/main/kotlin/com/flipcash/app/discovery/TokenDiscoveryScreen.kt
@@ -36,7 +36,6 @@ fun TokenDiscoveryScreen() {
         if (isSheetRoot) {
             AppBarWithTitle(
                 title = stringResource(R.string.title_discoverCurrencies),
-                isInModal = true,
                 titleAlignment = Alignment.CenterHorizontally,
                 endContent = {
                     AppBarDefaults.Close { navigator.hide() }
@@ -45,7 +44,6 @@ fun TokenDiscoveryScreen() {
         } else {
             AppBarWithTitle(
                 title = stringResource(R.string.title_discoverCurrencies),
-                isInModal = true,
                 titleAlignment = Alignment.CenterHorizontally,
                 backButton = true,
                 onBackIconClicked = { navigator.pop() },
diff --git a/apps/flipcash/features/lab/src/main/kotlin/com/flipcash/app/lab/LabsScreen.kt b/apps/flipcash/features/lab/src/main/kotlin/com/flipcash/app/lab/LabsScreen.kt
@@ -27,7 +27,6 @@ fun LabsScreen(onboarding: Boolean = false) {
             AppBarWithTitle(
                 title = stringResource(R.string.title_betaFlags),
                 titleAlignment = Alignment.CenterHorizontally,
-                isInModal = true,
                 endContent = {
                     AppBarDefaults.Close { navigator.hide() }
                 }
@@ -37,7 +36,6 @@ fun LabsScreen(onboarding: Boolean = false) {
                 title = stringResource(R.string.title_betaFlags),
                 titleAlignment = Alignment.CenterHorizontally,
                 backButton = true,
-                isInModal = true,
                 onBackIconClicked = navigator::pop
             )
         }
diff --git a/apps/flipcash/features/lab/src/main/kotlin/com/flipcash/app/lab/NavBarSettingsScreen.kt b/apps/flipcash/features/lab/src/main/kotlin/com/flipcash/app/lab/NavBarSettingsScreen.kt
@@ -20,7 +20,6 @@ fun NavBarSettingsScreen() {
         AppBarWithTitle(
             title = "",
             titleAlignment = Alignment.CenterHorizontally,
-            isInModal = true,
             endContent = {
                 AppBarDefaults.Close { dismiss() }
             }
diff --git a/apps/flipcash/features/menu/src/main/kotlin/com/flipcash/app/menu/internal/MenuScreenContent.kt b/apps/flipcash/features/menu/src/main/kotlin/com/flipcash/app/menu/internal/MenuScreenContent.kt
@@ -51,7 +51,6 @@ internal fun MenuScreenContent(viewModel: MenuScreenViewModel) {
         topBar = {
             AppBarWithTitle(
                 modifier = Modifier.fillMaxWidth(),
-                isInModal = true,
                 title = stringResource(R.string.title_settings),
                 titleAlignment = Alignment.CenterHorizontally,
                 endContent = { AppBarDefaults.Close { navigator.hide() } },
diff --git a/apps/flipcash/features/messenger/src/main/kotlin/com/flipcash/app/messenger/ChatAmountEntryScreen.kt b/apps/flipcash/features/messenger/src/main/kotlin/com/flipcash/app/messenger/ChatAmountEntryScreen.kt
@@ -93,7 +93,6 @@ internal fun ChatAmountEntryContent(
         onChangeCurrency = { navigator.push(AppRoute.Main.RegionSelection) },
         appBar = {
             AppBarWithTitle(
-                isInModal = true,
                 title = {
                     TokenSelectionPill(token) {
                         navigator.push(
diff --git a/apps/flipcash/features/myaccount/src/main/kotlin/com/flipcash/app/myaccount/MyAccountScreen.kt b/apps/flipcash/features/myaccount/src/main/kotlin/com/flipcash/app/myaccount/MyAccountScreen.kt
@@ -37,7 +37,6 @@ fun MyAccountScreen() {
                     text = stringResource(R.string.title_myAccount),
                 )
             },
-            isInModal = true,
             titleAlignment = Alignment.CenterHorizontally,
             leftIcon = { AppBarDefaults.UpNavigation { navigator.pop() } },
         )
diff --git a/apps/flipcash/features/myaccount/src/main/kotlin/com/flipcash/app/myaccount/UserProfileScreen.kt b/apps/flipcash/features/myaccount/src/main/kotlin/com/flipcash/app/myaccount/UserProfileScreen.kt
@@ -37,7 +37,6 @@ fun UserProfileScreen() {
                     text = stringResource(R.string.title_userProfile),
                 )
             },
-            isInModal = true,
             titleAlignment = Alignment.CenterHorizontally,
             leftIcon = { AppBarDefaults.UpNavigation { navigator.pop() } },
         )
diff --git a/apps/flipcash/features/shareapp/src/main/kotlin/com/flipcash/app/shareapp/ShareAppScreen.kt b/apps/flipcash/features/shareapp/src/main/kotlin/com/flipcash/app/shareapp/ShareAppScreen.kt
@@ -21,7 +21,6 @@ fun ShareAppScreen() {
         modifier = androidx.compose.ui.Modifier.fillMaxSize(),
     ) {
         AppBarWithTitle(
-            isInModal = true,
             titleAlignment = androidx.compose.ui.Alignment.CenterHorizontally,
             endContent = { AppBarDefaults.Close { navigator.hide() } }
         )
diff --git a/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/PhantomWalletScreens.kt b/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/PhantomWalletScreens.kt
@@ -58,7 +58,6 @@ internal fun PhantomConnectConfirmationScreen() {
         topBar = {
             AppBarWithTitle(
                 title = stringResource(R.string.title_purchase),
-                isInModal = true,
                 backButton = true,
                 onBackIconClicked = { flowNavigator.back() },
                 titleAlignment = Alignment.CenterHorizontally,
@@ -148,7 +147,6 @@ internal fun PhantomTransactionConfirmationScreen() {
         topBar = {
             AppBarWithTitle(
                 title = stringResource(R.string.title_purchase),
-                isInModal = true,
                 backButton = true,
                 onBackIconClicked = { flowNavigator.back() },
                 titleAlignment = Alignment.CenterHorizontally,
diff --git a/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/SwapEntryScreen.kt b/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/SwapEntryScreen.kt
@@ -48,7 +48,6 @@ internal fun SwapEntryScreen(
         horizontalAlignment = Alignment.CenterHorizontally,
     ) {
         AppBarWithTitle(
-            isInModal = true,
             title = when (purpose) {
                 is SwapPurpose.Buy if purpose.fundingSource != FundingSource.Flexible ->
                     stringResource(R.string.title_amountToDeposit)
diff --git a/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/TokenInfoScreen.kt b/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/TokenInfoScreen.kt
@@ -52,7 +52,6 @@ fun TokenInfoScreen(
         val viewModel = hiltViewModel<TokenInfoViewModel>()
         val state by viewModel.stateFlow.collectAsStateWithLifecycle()
         AppBarWithTitle(
-            isInModal = true,
             title = {
                 state.token.dataOrNull?.let { token ->
                     TokenIconWithName(
diff --git a/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/TokenSelectScreen.kt b/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/TokenSelectScreen.kt
@@ -31,7 +31,6 @@ fun TokenSelectScreen(purpose: TokenPurpose) {
         horizontalAlignment = Alignment.CenterHorizontally,
     ) {
         AppBarWithTitle(
-            isInModal = true,
             title = stringResource(R.string.title_selectCurrency),
             backButton = true,
             onBackIconClicked = { navigator.pop() },
diff --git a/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/TokenSellReceiptScreen.kt b/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/TokenSellReceiptScreen.kt
@@ -33,7 +33,6 @@ internal fun SellReceiptScreen() {
         horizontalAlignment = Alignment.CenterHorizontally,
     ) {
         AppBarWithTitle(
-            isInModal = true,
             title = stringResource(R.string.title_sellToken, state.tokenName),
             titleAlignment = Alignment.CenterHorizontally,
             backButton = true,
diff --git a/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/internal/TokenTxProcessingScreen.kt b/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/internal/TokenTxProcessingScreen.kt
@@ -54,7 +54,6 @@ private fun TokenTxProcessingScreen(
         processingState = state.processingProgress,
         topBar = {
             AppBarWithTitle(
-                isInModal = true,
                 title = when (val purpose = state.purpose) {
                     is SwapPurpose.Buy if purpose.fundingSource != FundingSource.Flexible ->
                         stringResource(R.string.title_depositingToken, state.tokenName)
diff --git a/apps/flipcash/features/transactions/src/main/kotlin/com/flipcash/app/transactions/TransactionHistoryScreen.kt b/apps/flipcash/features/transactions/src/main/kotlin/com/flipcash/app/transactions/TransactionHistoryScreen.kt
@@ -23,7 +23,6 @@ fun TransactionHistoryScreen(mint: Mint) {
         horizontalAlignment = Alignment.CenterHorizontally,
     ) {
         AppBarWithTitle(
-            isInModal = true,
             title = stringResource(R.string.title_transactionHistory),
             titleAlignment = Alignment.CenterHorizontally,
             backButton = true,
diff --git a/apps/flipcash/features/userflags/src/main/kotlin/com/flipcash/app/userflags/UserFlagsScreen.kt b/apps/flipcash/features/userflags/src/main/kotlin/com/flipcash/app/userflags/UserFlagsScreen.kt
@@ -27,7 +27,6 @@ fun UserFlagsScreen() {
             title = stringResource(R.string.title_userFlags),
             titleAlignment = Alignment.CenterHorizontally,
             backButton = true,
-            isInModal = true,
             onBackIconClicked = navigator::pop,
             endContent = {
                 AppBarDefaults.Reset { viewModel.dispatchEvent(UserFlagsViewModel.Event.Reset) }
diff --git a/apps/flipcash/features/withdrawal/src/main/kotlin/com/flipcash/app/withdrawal/WithdrawalFlowScreen.kt b/apps/flipcash/features/withdrawal/src/main/kotlin/com/flipcash/app/withdrawal/WithdrawalFlowScreen.kt
@@ -113,7 +113,6 @@ private fun WithdrawalSelectTokenScreen() {
         horizontalAlignment = Alignment.CenterHorizontally,
     ) {
         AppBarWithTitle(
-            isInModal = true,
             title = stringResource(R.string.title_selectCurrency),
             backButton = true,
             onBackIconClicked = { flowNavigator.back() },
diff --git a/apps/flipcash/features/withdrawal/src/main/kotlin/com/flipcash/app/withdrawal/internal/screens/UsdcWithdrawalInformationScreen.kt b/apps/flipcash/features/withdrawal/src/main/kotlin/com/flipcash/app/withdrawal/internal/screens/UsdcWithdrawalInformationScreen.kt
diff --git a/apps/flipcash/features/withdrawal/src/main/kotlin/com/flipcash/app/withdrawal/internal/screens/WithdrawalConfirmationScreen.kt b/apps/flipcash/features/withdrawal/src/main/kotlin/com/flipcash/app/withdrawal/internal/screens/WithdrawalConfirmationScreen.kt
diff --git a/apps/flipcash/features/withdrawal/src/main/kotlin/com/flipcash/app/withdrawal/internal/screens/WithdrawalDestinationScreen.kt b/apps/flipcash/features/withdrawal/src/main/kotlin/com/flipcash/app/withdrawal/internal/screens/WithdrawalDestinationScreen.kt
diff --git a/apps/flipcash/features/withdrawal/src/main/kotlin/com/flipcash/app/withdrawal/internal/screens/WithdrawalEntryScreen.kt b/apps/flipcash/features/withdrawal/src/main/kotlin/com/flipcash/app/withdrawal/internal/screens/WithdrawalEntryScreen.kt
diff --git a/apps/flipcash/shared/amount-entry/src/main/kotlin/com/flipcash/shared/amountentry/AmountEntryScreen.kt b/apps/flipcash/shared/amount-entry/src/main/kotlin/com/flipcash/shared/amountentry/AmountEntryScreen.kt
diff --git a/apps/flipcash/shared/permissions/src/main/kotlin/com/flipcash/app/permissions/internal/contacts/components/AnimatedContactListPreview.kt b/apps/flipcash/shared/permissions/src/main/kotlin/com/flipcash/app/permissions/internal/contacts/components/AnimatedContactListPreview.kt
diff --git a/apps/flipcash/shared/region-selection/ui/src/main/kotlin/com/flipcash/app/currency/RegionSelectionScreen.kt b/apps/flipcash/shared/region-selection/ui/src/main/kotlin/com/flipcash/app/currency/RegionSelectionScreen.kt
diff --git a/apps/flipcash/shared/transfers/src/main/kotlin/com/flipcash/app/transfers/TransferInformationalScreen.kt b/apps/flipcash/shared/transfers/src/main/kotlin/com/flipcash/app/transfers/TransferInformationalScreen.kt
diff --git a/build.gradle.kts b/build.gradle.kts
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
diff --git a/ui/components/src/main/kotlin/com/getcode/ui/components/TitleBar.kt b/ui/components/src/main/kotlin/com/getcode/ui/components/TitleBar.kt
diff --git a/ui/components/src/main/kotlin/com/getcode/ui/theme/CodeButton.kt b/ui/components/src/main/kotlin/com/getcode/ui/theme/CodeButton.kt
diff --git a/ui/navigation/build.gradle.kts b/ui/navigation/build.gradle.kts
diff --git a/ui/navigation/src/main/kotlin/com/getcode/navigation/scenes/ModalBottomSheetSceneStrategy.kt b/ui/navigation/src/main/kotlin/com/getcode/navigation/scenes/ModalBottomSheetSceneStrategy.kt

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,6 @@ fun AdvancedFeaturesScreen() {`
`34`	`34`	`AppBarWithTitle(`
`35`	`35`	`title = stringResource(R.string.title_advancedFeatures),`
`36`	`36`	`titleAlignment = Alignment.CenterHorizontally,`
`37`		`- isInModal = true,`
`38`	`37`	`backButton = true,`
`39`	`38`	`onBackIconClicked = { navigator.pop() }`
`40`	`39`	`)`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,6 @@ fun AppSettingsScreen() {`
`23`	`23`	`title = stringResource(R.string.title_appSettings),`
`24`	`24`	`titleAlignment = Alignment.CenterHorizontally,`
`25`	`25`	`backButton = true,`
`26`		`- isInModal = true,`
`27`	`26`	`onBackIconClicked = navigator::pop`
`28`	`27`	`)`
`29`	`28`
Original file line number	Diff line number	Diff line change
`@@ -63,17 +63,16 @@ private fun verificationEntryProvider(`
`63`	`63`	`VerificationFlowIntroContent(isForOnRamp = step.isForOnRamp)`
`64`	`64`	`}`
`65`	`65`	`annotatedEntry<VerificationStep.PhoneEntry> {`
`66`		`- PhoneVerificationContent(isInModal = !route.fullScreen)`
	`66`	`+ PhoneVerificationContent()`
`67`	`67`	`}`
`68`	`68`	`annotatedEntry<VerificationStep.PhoneCode> {`
`69`	`69`	`PhoneCodeContent(`
`70`	`70`	`includeEmail = route.includeEmail,`
`71`		`- isInModal = !route.fullScreen,`
`72`	`71`	`linkForPayment = route.linkForPayment,`
`73`	`72`	`)`
`74`	`73`	`}`
`75`	`74`	`annotatedEntry<VerificationStep.PhoneCountryCode> {`
`76`		`- PhoneCountryCodeContent(isInModal = !route.fullScreen)`
	`75`	`+ PhoneCountryCodeContent()`
`77`	`76`	`}`
`78`	`77`	`annotatedEntry<VerificationStep.EmailEntry> {`
`79`	`78`	`EmailVerificationContent(`