fix: navigating back to conversation list on home [WPB-23983][WPB-23980] (#4644)

saleniuk · MohamadJaara · commit 69d198312e36 · 2026-03-12T17:22:28.000+01:00
(cherry picked from commit cd72c8c)
diff --git a/app/src/main/kotlin/com/wire/android/ui/home/HomeNavGraph.kt b/app/src/main/kotlin/com/wire/android/ui/home/HomeNavGraph.kt
@@ -17,10 +17,10 @@
  */
 package com.wire.android.ui.home
 
-import com.ramcosta.composedestinations.annotation.NavGraph
-import com.wire.android.navigation.WireRootNavGraph
+import com.ramcosta.composedestinations.animations.defaults.DefaultFadingTransitions
+import com.ramcosta.composedestinations.annotation.NavHostGraph
 
-@NavGraph<WireRootNavGraph>
+@NavHostGraph(defaultTransitions = DefaultFadingTransitions::class)
 annotation class HomeNavGraph(
     val start: Boolean = false
 )
diff --git a/app/src/main/kotlin/com/wire/android/ui/home/HomeScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/HomeScreen.kt
@@ -63,6 +63,12 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.compose.LocalLifecycleOwner
 import com.ramcosta.composedestinations.DestinationsNavHost
+import com.ramcosta.composedestinations.generated.app.destinations.ConversationFoldersScreenDestination
+import com.ramcosta.composedestinations.generated.app.destinations.ConversationScreenDestination
+import com.ramcosta.composedestinations.generated.app.destinations.NewConversationSearchPeopleScreenDestination
+import com.ramcosta.composedestinations.generated.app.destinations.OtherUserProfileScreenDestination
+import com.ramcosta.composedestinations.generated.app.destinations.SelfUserProfileScreenDestination
+import com.ramcosta.composedestinations.generated.app.navgraphs.HomeGraph
 import com.ramcosta.composedestinations.navigation.dependency
 import com.ramcosta.composedestinations.result.NavResult
 import com.ramcosta.composedestinations.result.ResultRecipient
@@ -74,8 +80,6 @@ import com.wire.android.navigation.NavigationCommand
 import com.wire.android.navigation.Navigator
 import com.wire.android.navigation.handleNavigation
 import com.wire.android.navigation.rememberWireNavHostEngine
-import com.ramcosta.composedestinations.generated.app.navgraphs.HomeGraph
-import com.ramcosta.composedestinations.generated.app.navgraphs.WireRootGraph
 import com.wire.android.ui.analytics.AnalyticsUsageViewModel
 import com.wire.android.ui.common.CollapsingTopBarScaffold
 import com.wire.android.ui.common.HandleActions
@@ -85,11 +89,6 @@ import com.wire.android.ui.common.dimensions
 import com.wire.android.ui.common.snackbar.LocalSnackbarHostState
 import com.wire.android.ui.common.topappbar.search.SearchTopBar
 import com.wire.android.ui.common.visbility.rememberVisibilityState
-import com.ramcosta.composedestinations.generated.app.destinations.ConversationFoldersScreenDestination
-import com.ramcosta.composedestinations.generated.app.destinations.ConversationScreenDestination
-import com.ramcosta.composedestinations.generated.app.destinations.NewConversationSearchPeopleScreenDestination
-import com.ramcosta.composedestinations.generated.app.destinations.OtherUserProfileScreenDestination
-import com.ramcosta.composedestinations.generated.app.destinations.SelfUserProfileScreenDestination
 import com.wire.android.ui.home.conversations.PermissionPermanentlyDeniedDialogState
 import com.wire.android.ui.home.conversations.details.GroupConversationActionType
 import com.wire.android.ui.home.conversations.details.GroupConversationDetailsNavBackArgs
@@ -364,8 +363,8 @@ fun HomeContent(
                         if (lifecycleState != Lifecycle.State.DESTROYED) {
                             val navHostEngine = rememberWireNavHostEngine()
                             DestinationsNavHost(
-                                navGraph = WireRootGraph,
-                                start = HomeGraph,
+                                navGraph = HomeGraph,
+                                start = HomeGraph.defaultStartDirection,
                                 engine = navHostEngine,
                                 navController = navController,
                                 dependenciesContainerBuilder = {
