fix navigation and activity results

stripe · Jan 3, 2025 · 8384f51 · 8384f51
1 parent bf11f9a
commit 8384f51
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/paymentsheet/src/main/java/com/stripe/android/link/LinkActivityViewModel.kt b/paymentsheet/src/main/java/com/stripe/android/link/LinkActivityViewModel.kt
@@ -105,7 +105,7 @@ internal class LinkActivityViewModel @Inject constructor(
         val navController = navController ?: return
         navController.navigate(screen.route) {
             if (clearStack) {
-                popUpTo(navController.graph.startDestinationId) {
+                popUpTo(navController.graph.id) {
                     inclusive = true
                 }
             }
@@ -132,8 +132,14 @@ internal class LinkActivityViewModel @Inject constructor(
                 AccountStatus.NeedsVerification, AccountStatus.VerificationStarted -> LinkScreen.Verification
                 AccountStatus.SignedOut, AccountStatus.Error -> LinkScreen.SignUp
             }
-            navController?.navigate(screen.route) {
+            navigate(screen, clearStack = true)
+
+            val navController = navController ?: return@launch
+            navController.navigate(screen.route) {
                 launchSingleTop = true
+                popUpTo(navController.graph.id) {
+                    inclusive = true
+                }
             }
         }
     }