fix: navigate back home on nested graph

Author: jvsena42

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

@@ -195,6 +195,8 @@ fun ContentView(
     modifier: Modifier = Modifier,
 ) {
     val navController = rememberNavController()
+    val walletNavController = rememberNavController()
+
     val drawerState = rememberDrawerState(initialValue = DrawerValue.Closed)
     val context = LocalContext.current
     val lifecycle = LocalLifecycleOwner.current.lifecycle
@@ -436,6 +438,7 @@ fun ContentView(
                 Box(modifier = Modifier.fillMaxSize()) {
                     RootNavHost(
                         navController = navController,
+                        walletNavController = walletNavController,
                         drawerState = drawerState,
                         walletViewModel = walletViewModel,
                         appViewModel = appViewModel,
@@ -466,6 +469,7 @@ fun ContentView(
             DrawerMenu(
                 drawerState = drawerState,
                 rootNavController = navController,
+                walletNavController = walletNavController,
                 hasSeenWidgetsIntro = hasSeenWidgetsIntro,
                 hasSeenShopIntro = hasSeenShopIntro,
                 modifier = Modifier.align(Alignment.TopEnd),
@@ -477,6 +481,7 @@ fun ContentView(
 @Composable
 private fun RootNavHost(
     navController: NavHostController,
+    walletNavController: NavHostController,
     drawerState: DrawerState,
     walletViewModel: WalletViewModel,
     appViewModel: AppViewModel,
@@ -494,7 +499,8 @@ private fun RootNavHost(
             activityListViewModel = activityListViewModel,
             settingsViewModel = settingsViewModel,
             navController = navController,
-            drawerState = drawerState
+            walletNavController = walletNavController,
+            drawerState = drawerState,
         )
         allActivity(
             activityListViewModel = activityListViewModel,
@@ -741,6 +747,7 @@ private fun NavGraphBuilder.home(
     activityListViewModel: ActivityListViewModel,
     settingsViewModel: SettingsViewModel,
     navController: NavHostController,
+    walletNavController: NavHostController,
     drawerState: DrawerState,
 ) {
     composable<Routes.Home> {
@@ -750,6 +757,7 @@ private fun NavGraphBuilder.home(
             activityListViewModel = activityListViewModel,
             settingsViewModel = settingsViewModel,
             rootNavController = navController,
+            walletNavController = walletNavController,
             drawerState = drawerState,
         )
     }

app/src/main/java/to/bitkit/ui/components/DrawerMenu.kt

@@ -46,6 +46,7 @@ import to.bitkit.R
 import to.bitkit.ui.Routes
 import to.bitkit.ui.navigateIfNotCurrent
 import to.bitkit.ui.navigateToHome
+import to.bitkit.ui.screens.wallets.HomeRoutes
 import to.bitkit.ui.shared.util.blockPointerInputPassthrough
 import to.bitkit.ui.shared.util.clickableAlpha
 import to.bitkit.ui.theme.AppThemeSurface
@@ -62,6 +63,7 @@ private val drawerWidth = 200.dp
 fun DrawerMenu(
     drawerState: DrawerState,
     rootNavController: NavController,
+    walletNavController: NavController,
     hasSeenWidgetsIntro: Boolean,
     hasSeenShopIntro: Boolean,
     modifier: Modifier = Modifier,
@@ -97,6 +99,7 @@ fun DrawerMenu(
     ) {
         Menu(
             rootNavController = rootNavController,
+            walletNavController = walletNavController,
             drawerState = drawerState,
             onClickAddWidget = {
                 if (!hasSeenWidgetsIntro) {
@@ -119,6 +122,7 @@ fun DrawerMenu(
 @Composable
 private fun Menu(
     rootNavController: NavController,
+    walletNavController: NavController,
     drawerState: DrawerState,
     onClickAddWidget: () -> Unit,
     onClickShop: () -> Unit,
@@ -139,8 +143,18 @@ private fun Menu(
             iconRes = R.drawable.ic_coins,
             onClick = {
                 val isOnHome = rootNavController.currentBackStackEntry
-                    ?.destination?.hasRoute<Routes.Home>() ?: false
+                    ?.destination?.hasRoute<Routes.Home>() == true && walletNavController.currentBackStackEntry
+                    ?.destination?.hasRoute<HomeRoutes.Home>() == true
                 if (!isOnHome) {
+                    walletNavController.run {
+                        val popped = popBackStack<HomeRoutes.Home>(inclusive = false)
+                        if (!popped) {
+                            navigate(HomeRoutes.Home) {
+                                popUpTo(graph.startDestinationId)
+                                launchSingleTop = true
+                            }
+                        }
+                    }
                     rootNavController.navigateToHome()
                 }
                 scope.launch { drawerState.close() }
@@ -304,6 +318,7 @@ private fun Preview() {
         Box {
             DrawerMenu(
                 rootNavController = navController,
+                walletNavController = navController,
                 drawerState = rememberDrawerState(initialValue = DrawerValue.Open),
                 hasSeenWidgetsIntro = false,
                 hasSeenShopIntro = false,

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

@@ -37,6 +37,7 @@ fun HomeNav(
     activityListViewModel: ActivityListViewModel,
     settingsViewModel: SettingsViewModel,
     rootNavController: NavController,
+    walletNavController: NavHostController,
     drawerState: DrawerState,
 ) {
     val uiState: MainUiState by walletViewModel.uiState.collectAsStateWithLifecycle()
@@ -47,9 +48,6 @@ fun HomeNav(
             settingsViewModel.setNotificationPreference(granted)
         }
     )
-
-    val walletNavController = rememberNavController()
-
     Box(
         modifier = Modifier
             .fillMaxSize()