diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/settings/AllSettingsScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/settings/AllSettingsScreen.kt
index 545ba8f8a..4af68a174 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/settings/AllSettingsScreen.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/settings/AllSettingsScreen.kt
@@ -140,29 +140,6 @@ fun AllSettingsScreen(
tint = tint,
onClick = { nav.nav(Route.UserSettings) },
)
- accountViewModel.account.settings.keyPair.privKey?.let {
- HorizontalDivider()
- SettingsNavigationRow(
- title = R.string.backup_keys,
- icon = Icons.Outlined.Key,
- tint = tint,
- onClick = { nav.nav(Route.AccountBackup) },
- )
- HorizontalDivider()
- SettingsNavigationRow(
- title = R.string.request_to_vanish,
- icon = Icons.Outlined.DeleteForever,
- tint = tint,
- onClick = { nav.nav(Route.RequestToVanish) },
- )
- }
- HorizontalDivider()
- SettingsNavigationRow(
- title = R.string.vanish_history,
- icon = Icons.Outlined.History,
- tint = tint,
- onClick = { nav.nav(Route.VanishEvents) },
- )
HorizontalDivider(thickness = 4.dp)
SettingsSectionHeader(R.string.app_settings)
SettingsNavigationRow(
@@ -200,6 +177,30 @@ fun AllSettingsScreen(
tint = tint,
onClick = { nav.nav(Route.ReactionsSettings) },
)
+ HorizontalDivider(thickness = 4.dp)
+ SettingsSectionHeader(R.string.danger_zone)
+ accountViewModel.account.settings.keyPair.privKey?.let {
+ SettingsNavigationRow(
+ title = R.string.backup_keys,
+ icon = Icons.Outlined.Key,
+ tint = tint,
+ onClick = { nav.nav(Route.AccountBackup) },
+ )
+ HorizontalDivider()
+ SettingsNavigationRow(
+ title = R.string.request_to_vanish,
+ icon = Icons.Outlined.DeleteForever,
+ tint = tint,
+ onClick = { nav.nav(Route.RequestToVanish) },
+ )
+ HorizontalDivider()
+ }
+ SettingsNavigationRow(
+ title = R.string.vanish_history,
+ icon = Icons.Outlined.History,
+ tint = tint,
+ onClick = { nav.nav(Route.VanishEvents) },
+ )
}
}
}
diff --git a/amethyst/src/main/res/values/strings.xml b/amethyst/src/main/res/values/strings.xml
index 55325cc71..48655584a 100644
--- a/amethyst/src/main/res/values/strings.xml
+++ b/amethyst/src/main/res/values/strings.xml
@@ -997,6 +997,7 @@
Settings
Account Settings
App Settings
+ Danger Zone
Always
Wifi-only
Unmetered WiFi