Merge branch 'master' into feat/sync-node-view-v60

Author: jvsena42

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

@@ -785,10 +785,7 @@ private fun NavGraphBuilder.home(
             )
         }
     }
-    composable<Routes.Savings>(
-        enterTransition = { Transitions.slideInHorizontally },
-        exitTransition = { Transitions.slideOutHorizontally },
-    ) {
+    composableWithDefaultTransitions<Routes.Savings> {
         val hasSeenSpendingIntro by settingsViewModel.hasSeenSpendingIntro.collectAsStateWithLifecycle()
         val isGeoBlocked by appViewModel.isGeoBlocked.collectAsStateWithLifecycle()
         val onchainActivities by activityListViewModel.onchainActivities.collectAsStateWithLifecycle()
@@ -811,10 +808,7 @@ private fun NavGraphBuilder.home(
             forceCloseRemainingDuration = forceCloseRemainingDuration,
         )
     }
-    composable<Routes.Spending>(
-        enterTransition = { Transitions.slideInHorizontally },
-        exitTransition = { Transitions.slideOutHorizontally },
-    ) {
+    composableWithDefaultTransitions<Routes.Spending> {
         val hasSeenSavingsIntro by settingsViewModel.hasSeenSavingsIntro.collectAsStateWithLifecycle()
         val lightningState by walletViewModel.lightningState.collectAsStateWithLifecycle()
         val lightningActivities by activityListViewModel.lightningActivities.collectAsStateWithLifecycle()
@@ -1166,19 +1160,17 @@ private fun NavGraphBuilder.lightningConnections(
             LightningConnectionsScreen(navController, viewModel)
         }
         composableWithDefaultTransitions<Routes.ChannelDetail> {
-            val parentEntry = remember(it) { navController.getBackStackEntry(Routes.ConnectionsNav) }
-            val viewModel = hiltViewModel<LightningConnectionsViewModel>(parentEntry)
+            val route = it.toRoute<Routes.ChannelDetail>()
             ChannelDetailScreen(
+                channelId = route.channelId,
                 navController = navController,
-                viewModel = viewModel,
             )
         }
         composableWithDefaultTransitions<Routes.CloseConnection> {
-            val parentEntry = remember(it) { navController.getBackStackEntry(Routes.ConnectionsNav) }
-            val viewModel = hiltViewModel<LightningConnectionsViewModel>(parentEntry)
+            val route = it.toRoute<Routes.CloseConnection>()
             CloseConnectionScreen(
+                channelId = route.channelId,
                 navController = navController,
-                viewModel = viewModel,
             )
         }
     }
@@ -1194,10 +1186,7 @@ private fun NavGraphBuilder.activityItem(
             route = it.toRoute(),
             onExploreClick = { id -> navController.navigateToActivityExplore(id) },
             onChannelClick = { channelId ->
-                navController.currentBackStackEntry?.savedStateHandle?.set("selectedChannelId", channelId)
-                navController.navigate(Routes.ConnectionsNav) {
-                    launchSingleTop = true
-                }
+                navController.navigate(Routes.ChannelDetail(channelId))
             },
             onBackClick = { navController.popBackStack() },
             onCloseClick = { navController.navigateToHome() },
@@ -1785,10 +1774,10 @@ sealed interface Routes {
     data object LightningConnections : Routes
 
     @Serializable
-    data object ChannelDetail : Routes
+    data class ChannelDetail(val channelId: String) : Routes
 
     @Serializable
-    data object CloseConnection : Routes
+    data class CloseConnection(val channelId: String) : Routes
 
     @Serializable
     data object DevSettings : Routes