synonymdev · ovitrif · Nov 28, 2025 · Nov 28, 2025 · Nov 28, 2025
diff --git a/app/src/main/java/to/bitkit/ui/ContentView.kt b/app/src/main/java/to/bitkit/ui/ContentView.kt
@@ -561,7 +561,6 @@ private fun RootNavHost(
                         navController.navigateToTransferFunding()
                         settingsViewModel.setHasSeenTransferIntro(true)
                     },
-                    onCloseClick = { navController.navigateToHome() },
                 )
             }
             composableWithDefaultTransitions<Routes.SavingsIntro> {
@@ -571,7 +570,6 @@ private fun RootNavHost(
                         settingsViewModel.setHasSeenSavingsIntro(true)
                     },
                     onBackClick = { navController.popBackStack() },
-                    onCloseClick = { navController.navigateToHome() },
                 )
             }
             composableWithDefaultTransitions<Routes.SavingsAvailability> {
@@ -586,14 +584,12 @@ private fun RootNavHost(
                     onConfirm = { navController.navigate(Routes.SavingsProgress) },
                     onAdvancedClick = { navController.navigate(Routes.SavingsAdvanced) },
                     onBackClick = { navController.popBackStack() },
-                    onCloseClick = { navController.navigateToHome() },
                 )
             }
             composableWithDefaultTransitions<Routes.SavingsAdvanced> {
                 SavingsAdvancedScreen(
                     onContinueClick = { navController.popBackStack<Routes.SavingsConfirm>(inclusive = false) },
                     onBackClick = { navController.popBackStack() },
-                    onCloseClick = { navController.navigateToHome() },
                 )
             }
             composableWithDefaultTransitions<Routes.SavingsProgress> {
@@ -602,7 +598,6 @@ private fun RootNavHost(
                     wallet = walletViewModel,
                     transfer = transferViewModel,
                     onContinueClick = { navController.popBackStack<Routes.TransferRoot>(inclusive = true) },
-                    onCloseClick = { navController.popBackStack<Routes.TransferRoot>(inclusive = true) },
                 )
             }
             composableWithDefaultTransitions<Routes.SpendingIntro> {
@@ -612,14 +607,12 @@ private fun RootNavHost(
                         settingsViewModel.setHasSeenSpendingIntro(true)
                     },
                     onBackClick = { navController.popBackStack() },
-                    onCloseClick = { navController.navigateToHome() },
                 )
             }
             composableWithDefaultTransitions<Routes.SpendingAmount> {
                 SpendingAmountScreen(
                     viewModel = transferViewModel,
                     onBackClick = { navController.popBackStack() },
-                    onCloseClick = { navController.navigateToHome() },
                     onOrderCreated = { navController.navigate(Routes.SpendingConfirm) },
                     toastException = { appViewModel.toast(it) },
                     toast = { title, description ->
@@ -651,7 +644,6 @@ private fun RootNavHost(
             composableWithDefaultTransitions<Routes.TransferLiquidity> {
                 LiquidityScreen(
                     onBackClick = { navController.popBackStack() },
-                    onCloseClick = { navController.navigateToHome() },
                     onContinueClick = { navController.popBackStack() }
                 )
             }
@@ -683,7 +675,6 @@ private fun RootNavHost(
                     },
                     onAdvanced = { navController.navigate(Routes.FundingAdvanced) },
                     onBackClick = { navController.popBackStack() },
-                    onCloseClick = { navController.navigateToHome() },
                     isGeoBlocked = isGeoBlocked,
                 )
             }
@@ -692,7 +683,6 @@ private fun RootNavHost(
                     onLnurl = { navController.navigateToScanner() },
                     onManual = { navController.navigate(Routes.ExternalNav) },
                     onBackClick = { navController.popBackStack() },
-                    onCloseClick = { navController.navigateToHome() },
                 )
             }
             navigationWithDefaultTransitions<Routes.ExternalNav>(
@@ -710,7 +700,6 @@ private fun RootNavHost(
                         onNodeConnected = { navController.navigate(Routes.ExternalAmount) },
                         onScanClick = { navController.navigateToScanner(isCalledForResult = true) },
                         onBackClick = { navController.popBackStack() },
-                        onCloseClick = { navController.navigateToHome() },
                     )
                 }
                 composableWithDefaultTransitions<Routes.ExternalAmount> {
@@ -721,7 +710,6 @@ private fun RootNavHost(
                         viewModel = viewModel,
                         onContinue = { navController.navigate(Routes.ExternalConfirm) },
                         onBackClick = { navController.popBackStack() },
-                        onCloseClick = { navController.navigateToHome() },
                     )
                 }
                 composableWithDefaultTransitions<Routes.ExternalConfirm> {
@@ -736,7 +724,6 @@ private fun RootNavHost(
                         },
                         onNetworkFeeClick = { navController.navigate(Routes.ExternalFeeCustom) },
                         onBackClick = { navController.popBackStack() },
-                        onCloseClick = { navController.navigateToHome() },
                     )
                 }
                 composableWithDefaultTransitions<Routes.LnurlChannel> {
@@ -837,7 +824,6 @@ private fun NavGraphBuilder.settings(
     composableWithDefaultTransitions<Routes.LanguageSettings> {
         LanguageSettingsScreen(
             onBackClick = { navController.popBackStack() },
-            onCloseClick = { navController.navigateToHome() },
         )
     }
 }
@@ -1125,7 +1111,6 @@ private fun NavGraphBuilder.activityItem(
             listViewModel = activityListViewModel,
             route = it.toRoute(),
             onBackClick = { navController.popBackStack() },
-            onCloseClick = { navController.navigateToHome() },
         )
     }
 }
@@ -1359,7 +1344,6 @@ private fun NavGraphBuilder.widgets(
 
             BlocksEditScreen(
                 blocksViewModel = viewModel,
-                onClose = { navController.navigateToHome() },
                 onBack = { navController.popBackStack() },
                 navigatePreview = { navController.navigate(Routes.BlocksPreview) }
             )

diff --git a/app/src/main/java/to/bitkit/ui/screens/transfer/FundingAdvancedScreen.kt b/app/src/main/java/to/bitkit/ui/screens/transfer/FundingAdvancedScreen.kt
@@ -31,7 +31,6 @@ fun FundingAdvancedScreen(
     onLnurl: () -> Unit = {},
     onManual: () -> Unit = {},
     onBackClick: () -> Unit = {},
-    onCloseClick: () -> Unit = {},
 ) {
     ScreenColumn {
         AppTopBar(

diff --git a/app/src/main/java/to/bitkit/ui/screens/transfer/FundingScreen.kt b/app/src/main/java/to/bitkit/ui/screens/transfer/FundingScreen.kt
@@ -46,7 +46,6 @@ fun FundingScreen(
     onFund: () -> Unit = {},
     onAdvanced: () -> Unit = {},
     onBackClick: () -> Unit = {},
-    onCloseClick: () -> Unit = {},
 ) {
     val balances = LocalBalances.current
     val canTransfer = remember(balances.totalOnchainSats) {

diff --git a/app/src/main/java/to/bitkit/ui/screens/transfer/LiquidityScreen.kt b/app/src/main/java/to/bitkit/ui/screens/transfer/LiquidityScreen.kt
@@ -32,7 +32,6 @@ import to.bitkit.ui.utils.withAccent
 fun LiquidityScreen(
     onContinueClick: () -> Unit = {},
     onBackClick: () -> Unit = {},
-    onCloseClick: () -> Unit = {},
 ) {
     val transfer = transferViewModel ?: return
     val state by transfer.spendingUiState.collectAsStateWithLifecycle()
@@ -47,7 +46,6 @@ fun LiquidityScreen(
         localBalance = localBalance,
         remoteBalance = remoteBalance,
         onBackClick = onBackClick,
-        onCloseClick = onCloseClick,
         onContinueClick = onContinueClick,
     )
 }
@@ -58,7 +56,6 @@ private fun LiquidityScreen(
     localBalance: Long,
     remoteBalance: Long,
     onBackClick: () -> Unit = {},
-    onCloseClick: () -> Unit = {},
     onContinueClick: () -> Unit = {},
 ) {
     ScreenColumn {

diff --git a/app/src/main/java/to/bitkit/ui/screens/transfer/SavingsAdvancedScreen.kt b/app/src/main/java/to/bitkit/ui/screens/transfer/SavingsAdvancedScreen.kt
@@ -48,7 +48,6 @@ import to.bitkit.ui.walletViewModel
 fun SavingsAdvancedScreen(
     onContinueClick: () -> Unit,
     onBackClick: () -> Unit,
-    onCloseClick: () -> Unit,
 ) {
     val currency = currencyViewModel ?: return
     val wallet = walletViewModel ?: return
@@ -93,7 +92,6 @@ fun SavingsAdvancedScreen(
             onContinueClick()
         },
         onBackClick = onBackClick,
-        onCloseClick = onCloseClick,
     )
 }
 
@@ -104,7 +102,6 @@ private fun SavingsAdvancedContent(
     onAmountClick: () -> Unit = {},
     onContinueClick: () -> Unit = {},
     onBackClick: () -> Unit = {},
-    onCloseClick: () -> Unit = {},
 ) {
     val totalAmount = channelItems.filter { it.isSelected }.sumOf { it.balance }
 

diff --git a/app/src/main/java/to/bitkit/ui/screens/transfer/SavingsConfirmScreen.kt b/app/src/main/java/to/bitkit/ui/screens/transfer/SavingsConfirmScreen.kt
@@ -49,7 +49,6 @@ fun SavingsConfirmScreen(
     onConfirm: () -> Unit,
     onAdvancedClick: () -> Unit,
     onBackClick: () -> Unit,
-    onCloseClick: () -> Unit,
 ) {
     val currency = currencyViewModel ?: return
     val transfer = transferViewModel ?: return
@@ -76,7 +75,6 @@ fun SavingsConfirmScreen(
         hasMultiple = hasMultiple,
         hasSelected = hasSelected,
         onBackClick = onBackClick,
-        onCloseClick = onCloseClick,
         onAmountClick = { currency.switchUnit() },
         onAdvancedClick = onAdvancedClick,
         onSelectAllClick = { transfer.setSelectedChannelIds(emptySet()) },
@@ -93,7 +91,6 @@ private fun SavingsConfirmContent(
     hasMultiple: Boolean,
     hasSelected: Boolean,
     onBackClick: () -> Unit = {},
-    onCloseClick: () -> Unit = {},
     onAmountClick: () -> Unit = {},
     onAdvancedClick: () -> Unit = {},
     onSelectAllClick: () -> Unit = {},

diff --git a/app/src/main/java/to/bitkit/ui/screens/transfer/SavingsIntroScreen.kt b/app/src/main/java/to/bitkit/ui/screens/transfer/SavingsIntroScreen.kt
@@ -32,7 +32,6 @@ import to.bitkit.ui.utils.withAccent
 fun SavingsIntroScreen(
     onContinueClick: () -> Unit = {},
     onBackClick: () -> Unit = {},
-    onCloseClick: () -> Unit = {},
 ) {
     Box(
         contentAlignment = Alignment.TopCenter,

diff --git a/app/src/main/java/to/bitkit/ui/screens/transfer/SavingsProgressScreen.kt b/app/src/main/java/to/bitkit/ui/screens/transfer/SavingsProgressScreen.kt
@@ -52,7 +52,6 @@ fun SavingsProgressScreen(
     transfer: TransferViewModel,
     wallet: WalletViewModel,
     onContinueClick: () -> Unit = {},
-    onCloseClick: () -> Unit = {},
 ) {
     val window = LocalActivity.current?.window
     var progressState by remember { mutableStateOf(SavingsProgressState.PROGRESS) }

diff --git a/app/src/main/java/to/bitkit/ui/screens/transfer/SpendingAmountScreen.kt b/app/src/main/java/to/bitkit/ui/screens/transfer/SpendingAmountScreen.kt
@@ -53,7 +53,6 @@ import kotlin.math.min
 fun SpendingAmountScreen(
     viewModel: TransferViewModel,
     onBackClick: () -> Unit = {},
-    onCloseClick: () -> Unit = {},
     onOrderCreated: () -> Unit = {},
     toastException: (Throwable) -> Unit,
     toast: (title: String, description: String) -> Unit,
@@ -85,7 +84,6 @@ fun SpendingAmountScreen(
         amountInputViewModel = amountInputViewModel,
         currencies = currencies,
         onBackClick = onBackClick,
-        onCloseClick = onCloseClick,
         onClickQuarter = {
             val quarter = uiState.balanceAfterFeeQuarter()
             val max = uiState.maxAllowedToSend
@@ -116,7 +114,6 @@ private fun Content(
     uiState: TransferToSpendingUiState,
     amountInputViewModel: AmountInputViewModel,
     onBackClick: () -> Unit,
-    onCloseClick: () -> Unit,
     onClickQuarter: () -> Unit,
     onClickMaxAmount: () -> Unit,
     onConfirmAmount: () -> Unit,
@@ -254,7 +251,6 @@ private fun Preview() {
             amountInputViewModel = previewAmountInputViewModel(),
             currencies = CurrencyState(),
             onBackClick = {},
-            onCloseClick = {},
             onClickQuarter = {},
             onClickMaxAmount = {},
             onConfirmAmount = {},
@@ -272,7 +268,6 @@ private fun PreviewInitializing() {
             amountInputViewModel = previewAmountInputViewModel(),
             currencies = CurrencyState(),
             onBackClick = {},
-            onCloseClick = {},
             onClickQuarter = {},
             onClickMaxAmount = {},
             onConfirmAmount = {},

diff --git a/app/src/main/java/to/bitkit/ui/screens/transfer/SpendingConfirmScreen.kt b/app/src/main/java/to/bitkit/ui/screens/transfer/SpendingConfirmScreen.kt
@@ -96,7 +96,6 @@ fun SpendingConfirmScreen(
 
     Content(
         onBackClick = onBackClick,
-        onCloseClick = onCloseClick,
         onLearnMoreClick = onLearnMoreClick,
         onAdvancedClick = onAdvancedClick,
         onConfirm = onConfirm,
@@ -114,7 +113,6 @@ fun SpendingConfirmScreen(
 @Composable
 private fun Content(
     onBackClick: () -> Unit,
-    onCloseClick: () -> Unit,
     onLearnMoreClick: () -> Unit,
     onAdvancedClick: () -> Unit,
     onConfirm: () -> Unit,
@@ -273,7 +271,6 @@ private fun Preview() {
     AppThemeSurface {
         Content(
             onBackClick = {},
-            onCloseClick = {},
             onLearnMoreClick = {},
             onAdvancedClick = {},
             onConfirm = {},
@@ -351,7 +348,6 @@ private fun Preview2() {
     AppThemeSurface {
         Content(
             onBackClick = {},
-            onCloseClick = {},
             onLearnMoreClick = {},
             onAdvancedClick = {},
             onConfirm = {},
@@ -429,7 +425,6 @@ private fun Preview3() {
     AppThemeSurface {
         Content(
             onBackClick = {},
-            onCloseClick = {},
             onLearnMoreClick = {},
             onAdvancedClick = {},
             onConfirm = {},
@@ -507,7 +502,6 @@ private fun Preview4() {
     AppThemeSurface {
         Content(
             onBackClick = {},
-            onCloseClick = {},
             onLearnMoreClick = {},
             onAdvancedClick = {},
             onConfirm = {},

diff --git a/app/src/main/java/to/bitkit/ui/screens/transfer/SpendingIntroScreen.kt b/app/src/main/java/to/bitkit/ui/screens/transfer/SpendingIntroScreen.kt
@@ -31,7 +31,6 @@ import to.bitkit.ui.utils.withAccent
 fun SpendingIntroScreen(
     onContinueClick: () -> Unit = {},
     onBackClick: () -> Unit = {},
-    onCloseClick: () -> Unit = {},
 ) {
     Box(
         contentAlignment = Alignment.TopCenter,

diff --git a/app/src/main/java/to/bitkit/ui/screens/transfer/TransferIntroScreen.kt b/app/src/main/java/to/bitkit/ui/screens/transfer/TransferIntroScreen.kt
@@ -33,7 +33,6 @@ import to.bitkit.ui.utils.withAccent
 @Composable
 fun TransferIntroScreen(
     onContinueClick: () -> Unit = {},
-    onCloseClick: () -> Unit = {},
 ) {
     Box(
         contentAlignment = Alignment.TopCenter,

diff --git a/app/src/main/java/to/bitkit/ui/screens/transfer/external/ExternalAmountScreen.kt b/app/src/main/java/to/bitkit/ui/screens/transfer/external/ExternalAmountScreen.kt
@@ -53,7 +53,6 @@ fun ExternalAmountScreen(
     viewModel: ExternalNodeViewModel,
     onContinue: () -> Unit,
     onBackClick: () -> Unit,
-    onCloseClick: () -> Unit,
     amountInputViewModel: AmountInputViewModel = hiltViewModel(),
     currencies: CurrencyState = LocalCurrencies.current,
 ) {
@@ -73,7 +72,6 @@ fun ExternalAmountScreen(
             onContinue()
         },
         onBackClick = onBackClick,
-        onCloseClick = onCloseClick,
     )
 }
 
@@ -85,7 +83,6 @@ private fun Content(
     currencies: CurrencyState = LocalCurrencies.current,
     onContinueClick: () -> Unit = {},
     onBackClick: () -> Unit = {},
-    onCloseClick: () -> Unit = {},
 ) {
     ScreenColumn {
         AppTopBar(

diff --git a/app/src/main/java/to/bitkit/ui/screens/transfer/external/ExternalConfirmScreen.kt b/app/src/main/java/to/bitkit/ui/screens/transfer/external/ExternalConfirmScreen.kt
@@ -52,7 +52,6 @@ fun ExternalConfirmScreen(
     onConfirm: () -> Unit,
     onNetworkFeeClick: () -> Unit,
     onBackClick: () -> Unit,
-    onCloseClick: () -> Unit,
 ) {
     val uiState by viewModel.uiState.collectAsState()
 
@@ -70,7 +69,6 @@ fun ExternalConfirmScreen(
         onConfirm = { viewModel.onConfirm() },
         onNetworkFeeClick = onNetworkFeeClick,
         onBackClick = onBackClick,
-        onCloseClick = onCloseClick,
     )
 }
 
@@ -80,7 +78,6 @@ private fun Content(
     onConfirm: () -> Unit = {},
     onNetworkFeeClick: () -> Unit = {},
     onBackClick: () -> Unit = {},
-    onCloseClick: () -> Unit = {},
 ) {
     ScreenColumn {
         AppTopBar(