Continue to upgrade screen from google sign in when appropriate (#1204)

Co-authored-by: ashiagr <[email protected]>
Automattic · Jul 27, 2023 · 63cbc99 · 63cbc99
1 parent 28b7fe8
commit 63cbc99
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,9 @@
         ([#1009](https://github.com/Automattic/pocket-casts-android/pull/1009))
     *   Fixed swiping to open Up Next queue in landscape and on foldables
         ([#1209](https://github.com/Automattic/pocket-casts-android/pull/1209))
+    *   Fixed upgrade flow when signing in with Google account
+        ([#1204](https://github.com/Automattic/pocket-casts-android/pull/1204))
+
 
 7.44
 -----

diff --git a/...c/main/java/au/com/shiftyjelly/pocketcasts/account/onboarding/OnboardingFlowComposable.kt b/...c/main/java/au/com/shiftyjelly/pocketcasts/account/onboarding/OnboardingFlowComposable.kt
@@ -125,7 +125,21 @@ private fun Content(
                     if (state.isNewAccount) {
                         onAccountCreated()
                     } else {
-                        exitOnboarding()
+                        when (flow) {
+                            OnboardingFlow.InitialOnboarding,
+                            OnboardingFlow.LoggedOut,
+                            is OnboardingFlow.PlusAccountUpgrade,
+                            is OnboardingFlow.PlusUpsell -> exitOnboarding()
+
+                            is OnboardingFlow.PatronAccountUpgrade,
+                            OnboardingFlow.PlusAccountUpgradeNeedsLogin ->
+                                navController.navigate(
+                                    OnboardingNavRoute.PlusUpgrade.routeWithSource(OnboardingUpgradeSource.LOGIN)
+                                ) {
+                                    // clear backstack after successful login
+                                    popUpTo(OnboardingNavRoute.logInOrSignUp) { inclusive = true }
+                                }
+                        }
                     }
                 },
             )