Merge pull request #703 from Automattic/merge_7.30-rc-3_to_main

Merging 7.30-rc-3 to main
Automattic · Jan 16, 2023 · 38295d4 · 38295d4
2 parents 2365962 + b579b1b
commit 38295d4
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,6 +21,13 @@
     *   Improved the Android Automotive search
         ([#681](https://github.com/Automattic/pocket-casts-android/pull/681)).
 
+7.29.2
+-----
+* Bug Fixes:
+    *    Fix text on purchase button in new onboarding flow
+         ([#698](https://github.com/Automattic/pocket-casts-android/pull/698)).
+
+
 7.29.1
 -----
 * Bug Fixes:

diff --git a/...va/au/com/shiftyjelly/pocketcasts/account/onboarding/upgrade/OnboardingPlusBottomSheet.kt b/...va/au/com/shiftyjelly/pocketcasts/account/onboarding/upgrade/OnboardingPlusBottomSheet.kt
@@ -170,20 +170,26 @@ fun OnboardingPlusBottomSheet(
                     modifier = Modifier.padding(top = 16.dp)
                 )
             }
-        }
 
-        Divider(
-            thickness = 1.dp,
-            color = Color(0xFFE4E4E4),
-            modifier = Modifier
-                .padding(vertical = 16.dp)
-                .alpha(0.24f)
-        )
+            Divider(
+                thickness = 1.dp,
+                color = Color(0xFFE4E4E4),
+                modifier = Modifier
+                    .padding(vertical = 16.dp)
+                    .alpha(0.24f)
+            )
 
-        PlusRowButton(
-            text = stringResource(LR.string.onboarding_plus_start_free_trial_and_subscribe),
-            onClick = onClickSubscribe,
-        )
+            PlusRowButton(
+                text = stringResource(
+                    if (state.selectedSubscription.trialPricingPhase != null) {
+                        LR.string.onboarding_plus_start_free_trial_and_subscribe
+                    } else {
+                        LR.string.subscribe
+                    }
+                ),
+                onClick = onClickSubscribe,
+            )
+        }
 
         Spacer(Modifier.height(16.dp))
 

diff --git a/version.properties b/version.properties
@@ -1,3 +1,3 @@
 # Version Information for Vanilla / Release builds
-versionName=7.30-rc-2
-versionCode=9067
+versionName=7.30-rc-3
+versionCode=9069