fix: Disable pin double back nav glitch

Author: ovitrif

app/src/main/java/to/bitkit/ui/ContentView.kt

@@ -25,6 +25,7 @@ import androidx.navigation.NavController
 import androidx.navigation.NavDeepLink
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
+import androidx.navigation.NavOptions
 import androidx.navigation.NavType
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
@@ -486,11 +487,8 @@ private fun NavGraphBuilder.securitySettings(navController: NavHostController) {
 }
 
 private fun NavGraphBuilder.disablePin(navController: NavHostController) {
-    composableWithDefaultTransitions<Routes.DisablePin> { backStackEntry ->
-        DisablePinScreen(
-            navController = navController,
-            savedStateHandle = backStackEntry.savedStateHandle,
-        )
+    composableWithDefaultTransitions<Routes.DisablePin> {
+        DisablePinScreen(navController)
     }
 }
 
@@ -708,13 +706,15 @@ fun NavController.navigateToAuthCheck(
     requirePin: Boolean = false,
     requireBiometrics: Boolean = false,
     onSuccessActionId: String,
+    navOptions: NavOptions? = null,
 ) = navigate(
     route = Routes.AuthCheck(
         showLogoOnPin = showLogoOnPin,
         requirePin = requirePin,
         requireBiometrics = requireBiometrics,
         onSuccessActionId = onSuccessActionId,
     ),
+    navOptions = navOptions,
 )
 
 fun NavController.navigateToDefaultUnitSettings() = navigate(

app/src/main/java/to/bitkit/ui/settings/SecuritySettingsScreen.kt

@@ -59,6 +59,10 @@ fun SecuritySettingsScreen(
                     AuthCheckAction.Id.TOGGLE_PIN_ON_LAUNCH -> {
                         app.setIsPinOnLaunchEnabled(!isPinOnLaunchEnabled)
                     }
+
+                    AuthCheckAction.Id.DISABLE_PIN -> {
+                        app.removePin()
+                    }
                 }
                 savedStateHandle.remove<String>(AuthCheckAction.KEY)
             }

app/src/main/java/to/bitkit/ui/settings/pin/DisablePinScreen.kt

@@ -9,18 +9,16 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.lifecycle.SavedStateHandle
 import androidx.navigation.NavController
-import kotlinx.coroutines.flow.filterNotNull
+import androidx.navigation.navOptions
 import to.bitkit.R
-import to.bitkit.ui.appViewModel
+import to.bitkit.ui.Routes
 import to.bitkit.ui.components.AuthCheckAction
 import to.bitkit.ui.components.BodyM
 import to.bitkit.ui.components.PrimaryButton
@@ -35,29 +33,13 @@ import to.bitkit.ui.theme.Colors
 @Composable
 fun DisablePinScreen(
     navController: NavController,
-    savedStateHandle: SavedStateHandle,
 ) {
-    val app = appViewModel ?: return
-
-    LaunchedEffect(savedStateHandle) {
-        savedStateHandle.getStateFlow<String?>(AuthCheckAction.KEY, null)
-            .filterNotNull()
-            .collect { actionId ->
-                when (actionId) {
-                    AuthCheckAction.Id.DISABLE_PIN -> {
-                        app.removePin()
-                        navController.popBackStack()
-                    }
-                }
-                savedStateHandle.remove<String>(AuthCheckAction.KEY)
-            }
-    }
-
     DisablePinContent(
         onDisableClick = {
             navController.navigateToAuthCheck(
                 requirePin = true,
                 onSuccessActionId = AuthCheckAction.Id.DISABLE_PIN,
+                navOptions = navOptions { popUpTo(Routes.SecuritySettings) },
             )
         },
         onBackClick = { navController.popBackStack() },