Merge remote-tracking branch 'origin/cherrypick_3216' into feature/eu…

…sm_develop
opensrp · May 25, 2024 · cdaaed5 · cdaaed5
2 parents 3219126 + 7eed252
commit cdaaed5
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/.../quest/src/main/java/org/smartregister/fhircore/quest/util/extensions/ConfigExtensions.kt b/.../quest/src/main/java/org/smartregister/fhircore/quest/util/extensions/ConfigExtensions.kt
@@ -164,11 +164,19 @@ fun List<ActionConfig>.handleClickEvent(
       ApplicationWorkflow.LAUNCH_INSIGHT_SCREEN ->
         navController.navigate(MainNavigationScreen.Insight.route)
       ApplicationWorkflow.DEVICE_TO_DEVICE_SYNC -> startP2PScreen(navController.context)
-      ApplicationWorkflow.LAUNCH_MAP ->
-        navController.navigate(
-          MainNavigationScreen.GeoWidgetLauncher.route,
-          bundleOf(NavigationArg.GEO_WIDGET_ID to actionConfig.id),
-        )
+      ApplicationWorkflow.LAUNCH_MAP -> {
+        val mapFragmentDestination = MainNavigationScreen.GeoWidgetLauncher.route
+        val isMapFragmentExists =
+          navController.currentBackStack.value.any { it.destination.id == mapFragmentDestination }
+        if (isMapFragmentExists) {
+          navController.popBackStack(mapFragmentDestination, false)
+        } else {
+          navController.navigate(
+            resId = mapFragmentDestination,
+            args = bundleOf(NavigationArg.GEO_WIDGET_ID to actionConfig.id),
+          )
+        }
+      }
       ApplicationWorkflow.LAUNCH_DIALLER -> {
         val actionParameter = interpolatedParams.first()
         val patientPhoneNumber = actionParameter.value