From 158126555c7f717e472947c444b67c2813ffd398 Mon Sep 17 00:00:00 2001
From: Codex <codex@local>
Date: Tue, 10 Mar 2026 00:33:10 +0300
Subject: [PATCH] android: remove back-to-chats from settings folders

---
 android/CHANGELOG.md                                      | 8 ++++++++
 .../ru/daemonlord/messenger/ui/navigation/AppNavGraph.kt  | 1 -
 .../ru/daemonlord/messenger/ui/settings/SettingsScreen.kt | 7 -------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/android/CHANGELOG.md b/android/CHANGELOG.md
index 43ac1fe..3a44453 100644
--- a/android/CHANGELOG.md
+++ b/android/CHANGELOG.md
@@ -807,3 +807,11 @@
 - Removed bottom `Back to chats` button from profile screen.
 - Simplified profile layout so the editable profile form is the primary secondary section toggled by `Edit`.
 - Updated `ProfileRoute` navigation contract to match the simplified screen API.
+
+### Step 117 - Settings folders cleanup (remove back button action)
+- Removed `Back to chats` button from all Settings folder pages.
+- Simplified Settings navigation contract by removing unused `onBackToChats` parameter from:
+  - `SettingsRoute`
+  - `SettingsScreen`
+  - `SettingsFolderView`
+- Updated `AppNavGraph` Settings destination call-site accordingly.
diff --git a/android/app/src/main/java/ru/daemonlord/messenger/ui/navigation/AppNavGraph.kt b/android/app/src/main/java/ru/daemonlord/messenger/ui/navigation/AppNavGraph.kt
index 11aec60..14eda4b 100644
--- a/android/app/src/main/java/ru/daemonlord/messenger/ui/navigation/AppNavGraph.kt
+++ b/android/app/src/main/java/ru/daemonlord/messenger/ui/navigation/AppNavGraph.kt
@@ -247,7 +247,6 @@ fun MessengerNavHost(
 
             composable(route = Routes.Settings) {
                 SettingsRoute(
-                    onBackToChats = { navController.navigate(Routes.Chats) },
                     onOpenProfile = { navController.navigate(Routes.Profile) },
                     onSwitchAccount = {
                         viewModel.recheckSession()
diff --git a/android/app/src/main/java/ru/daemonlord/messenger/ui/settings/SettingsScreen.kt b/android/app/src/main/java/ru/daemonlord/messenger/ui/settings/SettingsScreen.kt
index 6c50297..ff28c53 100644
--- a/android/app/src/main/java/ru/daemonlord/messenger/ui/settings/SettingsScreen.kt
+++ b/android/app/src/main/java/ru/daemonlord/messenger/ui/settings/SettingsScreen.kt
@@ -88,7 +88,6 @@ private enum class SettingsFolder(val title: String) {
 
 @Composable
 fun SettingsRoute(
-    onBackToChats: () -> Unit,
     onOpenProfile: () -> Unit,
     onSwitchAccount: () -> Unit,
     onLogout: () -> Unit,
@@ -96,7 +95,6 @@ fun SettingsRoute(
     viewModel: AccountViewModel = hiltViewModel(),
 ) {
     SettingsScreen(
-        onBackToChats = onBackToChats,
         onOpenProfile = onOpenProfile,
         onSwitchAccount = onSwitchAccount,
         onLogout = onLogout,
@@ -107,7 +105,6 @@ fun SettingsRoute(
 
 @Composable
 fun SettingsScreen(
-    onBackToChats: () -> Unit,
     onOpenProfile: () -> Unit,
     onSwitchAccount: () -> Unit,
     onLogout: () -> Unit,
@@ -151,7 +148,6 @@ fun SettingsScreen(
                     state = state,
                     folder = folder ?: SettingsFolder.Account,
                     onBack = { folder = null },
-                    onBackToChats = onBackToChats,
                     onSwitchAccount = onSwitchAccount,
                     onLogout = onLogout,
                     onOpenProfile = onOpenProfile,
@@ -213,7 +209,6 @@ private fun SettingsFolderView(
     state: AccountUiState,
     folder: SettingsFolder,
     onBack: () -> Unit,
-    onBackToChats: () -> Unit,
     onSwitchAccount: () -> Unit,
     onLogout: () -> Unit,
     onOpenProfile: () -> Unit,
@@ -252,8 +247,6 @@ private fun SettingsFolderView(
 
         if (!state.message.isNullOrBlank()) Text(state.message.orEmpty(), color = MaterialTheme.colorScheme.primary)
         if (!state.errorMessage.isNullOrBlank()) Text(state.errorMessage.orEmpty(), color = MaterialTheme.colorScheme.error)
-
-        OutlinedButton(onClick = onBackToChats, modifier = Modifier.fillMaxWidth()) { Text("Back to chats") }
     }
 }