fix: Polish navigation

Author: ovitrif

app/src/main/java/to/bitkit/ui/nav/Navigator.kt

@@ -7,7 +7,12 @@ import androidx.navigation3.runtime.NavKey
 
 @Stable
 class Navigator(@PublishedApi internal val backStack: NavBackStack<NavKey>) {
-    fun navigate(route: Routes) = run { backStack.add(route) }
+
+    fun navigate(route: Routes) {
+        if (backStack.lastOrNull() != route) {
+            backStack.add(route)
+        }
+    }
 
     fun goBack(): Boolean = backStack.removeLastOrNull() != null
 
@@ -50,9 +55,6 @@ class Navigator(@PublishedApi internal val backStack: NavBackStack<NavKey>) {
         else -> false
     }
 
-    fun navigateToQuickPaySettings(hasSeenIntro: Boolean = true) = navigate(
-        if (hasSeenIntro) Routes.QuickPaySettings else Routes.QuickPayIntro
-    )
 }
 
 const val MS_NAV_DELAY = 100L

app/src/main/java/to/bitkit/ui/nav/SheetSceneStrategy.kt

@@ -13,7 +13,7 @@ class SheetSceneStrategy<T : Any> : SceneStrategy<T> {
 
     override fun SceneStrategyScope<T>.calculateScene(entries: List<NavEntry<T>>): Scene<T>? {
         val lastEntry = entries.lastOrNull()
-        val sheetProperties = lastEntry?.metadata?.get(SHEET_KEY) as? SheetProperties
+        val sheetProperties = lastEntry?.metadata?.get(KEY_SHEET) as? SheetProperties
         return sheetProperties?.let { props ->
             @Suppress("UNCHECKED_CAST")
             SheetScene(
@@ -29,10 +29,10 @@ class SheetSceneStrategy<T : Any> : SceneStrategy<T> {
 
     companion object {
         fun sheet(size: SheetSize = SheetSize.LARGE): Map<String, Any> = mapOf(
-            SHEET_KEY to SheetProperties(size),
+            KEY_SHEET to SheetProperties(size),
         )
 
-        internal const val SHEET_KEY = "bitkit_sheet"
+        internal const val KEY_SHEET = "bitkit_sheet"
     }
 }
 

app/src/main/java/to/bitkit/ui/nav/entries/SettingsEntries.kt

@@ -211,7 +211,7 @@ fun EntryProviderScope<NavKey>.settingsEntries(
     entry<Routes.QuickPayIntro> {
         QuickPayIntroScreen(
             onBack = { navigator.goBack() },
-            onContinue = { navigator.navigateToQuickPaySettings() },
+            onContinue = { navigator.navigate(Routes.QuickPaySettings) },
         )
     }
 

app/src/main/java/to/bitkit/ui/nav/entries/SheetEntries.kt

@@ -871,7 +871,7 @@ private fun EntryProviderScope<NavKey>.timedSheetEntries(
         QuickPayIntroSheet(
             onContinue = {
                 appViewModel.dismissTimedSheet(skipQueue = true)
-                navigator.navigateToQuickPaySettings()
+                navigator.navigate(Routes.QuickPaySettings)
             },
         )
     }

app/src/main/java/to/bitkit/ui/screens/wallets/HomeScreen.kt

@@ -216,11 +216,8 @@ fun HomeScreen(
                 }
 
                 Suggestion.QUICK_PAY -> {
-                    if (!quickPayIntroSeen) {
-                        navigator.navigate(Routes.QuickPayIntro)
-                    } else {
-                        navigator.navigateToQuickPaySettings()
-                    }
+                    val route = if (quickPayIntroSeen) Routes.QuickPaySettings else Routes.QuickPayIntro
+                    navigator.navigate(route)
                 }
 
                 Suggestion.NOTIFICATIONS -> {

app/src/main/java/to/bitkit/ui/settings/general/GeneralSettingsScreen.kt

@@ -57,7 +57,10 @@ fun GeneralSettingsScreen(
         onDefaultUnitClick = { navigator.navigate(Routes.DefaultUnitSettings) },
         onTransactionSpeedClick = { navigator.navigate(Routes.TransactionSpeedSettings) },
         onWidgetsClick = { navigator.navigate(Routes.WidgetsSettings) },
-        onQuickPayClick = { navigator.navigateToQuickPaySettings(quickPayIntroSeen) },
+        onQuickPayClick = {
+            val route = if (quickPayIntroSeen) Routes.QuickPaySettings else Routes.QuickPayIntro
+            navigator.navigate(route)
+        },
         onTagsClick = { navigator.navigate(Routes.TagsSettings) },
         onLanguageSettingsClick = { navigator.navigate(Routes.LanguageSettings) },
         onBgPaymentsClick = {