Minor correction for handling deeplinks for Biometry screen

eu-digital-identity-wallet · Jul 23, 2024 · f870e5e · f870e5e
1 parent 4834db1
commit f870e5e
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 15 deletions.
diff --git a/common-feature/src/main/java/eu/europa/ec/commonfeature/ui/biometric/BiometricScreen.kt b/common-feature/src/main/java/eu/europa/ec/commonfeature/ui/biometric/BiometricScreen.kt
@@ -52,7 +52,7 @@ import eu.europa.ec.uilogic.extension.resetBackStack
 import eu.europa.ec.uilogic.extension.setBackStackFlowCancelled
 import eu.europa.ec.uilogic.extension.setBackStackFlowSuccess
 import eu.europa.ec.uilogic.navigation.CommonScreens
-import eu.europa.ec.uilogic.navigation.DashboardScreens
+import eu.europa.ec.uilogic.navigation.helper.handleDeepLinkAction
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.collect
@@ -122,19 +122,22 @@ fun BiometricScreen(
                     }
 
                     is Effect.Navigation.Deeplink -> {
-
-                        context.cacheDeepLink(navigationEffect.link)
-
-                        if (navigationEffect.isPreAuthorization) {
-                            navController.navigate(DashboardScreens.Dashboard.screenRoute) {
-                                popUpTo(CommonScreens.Biometric.screenRoute) { inclusive = true }
+                        navigationEffect.routeToPop?.let { route ->
+                            context.cacheDeepLink(navigationEffect.link)
+                            if (navigationEffect.isPreAuthorization) {
+                                navController.navigate(route) {
+                                    popUpTo(CommonScreens.Biometric.screenRoute) {
+                                        inclusive = true
+                                    }
+                                }
+                            } else {
+                                navController.popBackStack(
+                                    route = route,
+                                    inclusive = false
+                                )
                             }
-                        } else {
-                            navController.popBackStack(
-                                route = DashboardScreens.Dashboard.screenRoute,
-                                inclusive = false
-                            )
-                        }
+                        } ?: handleDeepLinkAction(navController, navigationEffect.link)
+
                     }
 
                     is Effect.Navigation.Pop -> navController.popBackStack()

diff --git a/common-feature/src/main/java/eu/europa/ec/commonfeature/ui/biometric/BiometricViewModel.kt b/common-feature/src/main/java/eu/europa/ec/commonfeature/ui/biometric/BiometricViewModel.kt
@@ -80,7 +80,12 @@ sealed class Effect : ViewSideEffect {
         ) : Navigation()
 
         data object LaunchBiometricsSystemScreen : Navigation()
-        data class Deeplink(val link: Uri, val isPreAuthorization: Boolean) : Navigation()
+        data class Deeplink(
+            val link: Uri,
+            val isPreAuthorization: Boolean,
+            val routeToPop: String? = null
+        ) : Navigation()
+
         data object Pop : Navigation()
         data object Finish : Navigation()
     }
@@ -272,7 +277,8 @@ class BiometricViewModel(
 
             is NavigationType.Deeplink -> Effect.Navigation.Deeplink(
                 nav.link.toUri(),
-                viewState.value.config.isPreAuthorization
+                viewState.value.config.isPreAuthorization,
+                nav.routeToPop
             )
 
             is NavigationType.Pop -> Effect.Navigation.Pop