fix(navigation) : back navigation registers search screen successfully. (openMF#2408)

Author: sam-arth07

cmp-navigation/src/commonMain/kotlin/cmp/navigation/App.kt

@@ -66,6 +66,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.navigation.NavGraph.Companion.findStartDestination
 import androidx.navigation.compose.currentBackStackEntryAsState
 import cmp.navigation.components.MifosNavigationBar
 import cmp.navigation.components.NavigationConstants
@@ -195,18 +196,8 @@ fun App(
                             selected = index == selectedItemIndex,
                             onClick = {
                                 selectedItemIndex = index
-                                selectedItemIndex?.let {
-                                    appState.navController.apply {
-                                        navigate(navigationDrawerTabs[it].route) {
-                                            restoreState = true
-                                            launchSingleTop = true
-                                            graph.startDestinationRoute?.let {
-                                                popUpTo(route = HomeDestinationsScreen.SearchScreen.route) {
-                                                    saveState = true
-                                                }
-                                            }
-                                        }
-                                    }
+                                appState.navController.navigate(navigationDrawerTabs[index].route) {
+                                    launchSingleTop = true
                                 }
                                 scope.launch {
                                     drawerState.close()
@@ -275,10 +266,9 @@ fun App(
                                         navigate(target) {
                                             restoreState = true
                                             launchSingleTop = true
-                                            graph.startDestinationRoute?.let {
-                                                popUpTo(route = HomeDestinationsScreen.SearchScreen.route) {
-                                                    saveState = true
-                                                }
+                                            popUpTo(route = graph.findStartDestination().route.toString()) {
+                                                saveState = true
+                                                inclusive = false
                                             }
                                         }
                                     }

cmp-navigation/src/commonMain/kotlin/cmp/navigation/components/MifosNavigationBar.kt

@@ -14,6 +14,7 @@ import androidx.compose.material3.NavigationBar
 import androidx.compose.material3.NavigationBarItem
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -35,11 +36,13 @@ fun MifosNavigationBar(
             HomeDestinationsScreen.GroupListScreen,
         )
     }
+    val isAnyTabSelected = remember(route) { tabs.any { route.contains(it.route) } }
 
     NavigationBar(modifier = modifier) {
         tabs.forEach { item ->
             val targetRoute = item.route
-            val selected = route.contains(targetRoute)
+            val selected =
+                if (isAnyTabSelected) route.contains(targetRoute) else targetRoute == HomeDestinationsScreen.SearchScreen.route
             NavigationBarItem(
                 icon = {
                     item.icon?.let {