From 6b176174e0b3ffb35b87630a274f0c2f6ab01e46 Mon Sep 17 00:00:00 2001
From: wlycdgr <ilya.zarembsky@gmail.com>
Date: Tue, 23 Mar 2021 13:23:19 -0400
Subject: [PATCH 1/4] Make feature card copy render at the correct font size in
 Dawn

---
 .../OnboardingViews/Step4_ChoosePlanView/ChoosePlanView.scss     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/dawn-hub/Views/OnboardingViews/Step4_ChoosePlanView/ChoosePlanView.scss b/app/dawn-hub/Views/OnboardingViews/Step4_ChoosePlanView/ChoosePlanView.scss
index 1d12b8aa9..ebefa006f 100644
--- a/app/dawn-hub/Views/OnboardingViews/Step4_ChoosePlanView/ChoosePlanView.scss
+++ b/app/dawn-hub/Views/OnboardingViews/Step4_ChoosePlanView/ChoosePlanView.scss
@@ -352,6 +352,7 @@ $plan-card-width: 250px;
 	justify-content: flex-start;
 	margin-bottom: 5px;
 	text-align: left;
+  	font-size: 75%;
 }
 .check {
 	display: inline-block;

From 88e8090c4d4836169bac44f97c97c900f0e0b026 Mon Sep 17 00:00:00 2001
From: wlycdgr <ilya.zarembsky@gmail.com>
Date: Tue, 23 Mar 2021 14:04:05 -0400
Subject: [PATCH 2/4] Fix alignment of CTA button on Premium user Choose Plan
 view

---
 .../Step4_ChoosePlanView/ChoosePlanView.jsx               | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/dawn-hub/Views/OnboardingViews/Step4_ChoosePlanView/ChoosePlanView.jsx b/app/dawn-hub/Views/OnboardingViews/Step4_ChoosePlanView/ChoosePlanView.jsx
index b99f1ce2e..c3929ca02 100644
--- a/app/dawn-hub/Views/OnboardingViews/Step4_ChoosePlanView/ChoosePlanView.jsx
+++ b/app/dawn-hub/Views/OnboardingViews/Step4_ChoosePlanView/ChoosePlanView.jsx
@@ -362,9 +362,11 @@ class ChoosePlanView extends React.Component {
 								</div>
 							))}
 							{isPremium && (
-								<NavLink className="ChoosePlanView__searchCTAButton" to="/onboarding/5" onClick={() => setSetupStep({ setup_step: CHOOSE_PLAN, dawn_setup_number: PREMIUM_SUBSCRIBER_KEEP_SUBSCRIPTION, origin: ONBOARDING })}>
-									<span>{t('next')}</span>
-								</NavLink>
+								<div className="ChoosePlanView__searchCTAButtonContainer">
+									<NavLink className="ChoosePlanView__searchCTAButton" to="/onboarding/5" onClick={() => setSetupStep({ setup_step: CHOOSE_PLAN, dawn_setup_number: PREMIUM_SUBSCRIBER_KEEP_SUBSCRIPTION, origin: ONBOARDING })}>
+										<span>{t('next')}</span>
+									</NavLink>
+								</div>
 							)}
 						</div>
 					)}

From 4b31b61bfe921d7a96f4f6fa608a50722b1c391f Mon Sep 17 00:00:00 2001
From: wlycdgr <ilya.zarembsky@gmail.com>
Date: Tue, 23 Mar 2021 14:10:19 -0400
Subject: [PATCH 3/4] Display correct Choose Plan view subheader based on user
 type and search selection

---
 .../OnboardingViews/Step4_ChoosePlanView/ChoosePlanView.jsx     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/dawn-hub/Views/OnboardingViews/Step4_ChoosePlanView/ChoosePlanView.jsx b/app/dawn-hub/Views/OnboardingViews/Step4_ChoosePlanView/ChoosePlanView.jsx
index c3929ca02..90ea33d55 100644
--- a/app/dawn-hub/Views/OnboardingViews/Step4_ChoosePlanView/ChoosePlanView.jsx
+++ b/app/dawn-hub/Views/OnboardingViews/Step4_ChoosePlanView/ChoosePlanView.jsx
@@ -174,9 +174,9 @@ class ChoosePlanView extends React.Component {
 	};
 
 	renderSubtitleText = (selectedGhosteryGlow) => {
-		if (selectedGhosteryGlow) return t('ghostery_dawn_onboarding_based_on_your_privacy_preferences');
 		if (this.isPremiumUser()) return '';
 		if (this.isPlusUser()) return t('ghostery_dawn_onboarding_keep_your_current_plan_or_upgrade');
+		if (selectedGhosteryGlow) return t('ghostery_dawn_onboarding_based_on_your_privacy_preferences');
 		return t('ghostery_dawn_onboarding_choose_an_option');
 	};
 

From 9561099f63106991fef7dcbd121e7071ae3de73a Mon Sep 17 00:00:00 2001
From: wlycdgr <ilya.zarembsky@gmail.com>
Date: Tue, 23 Mar 2021 14:22:41 -0400
Subject: [PATCH 4/4] Add warning comment to ChoosePlanView#renderSubtitleText

---
 .../OnboardingViews/Step4_ChoosePlanView/ChoosePlanView.jsx      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/dawn-hub/Views/OnboardingViews/Step4_ChoosePlanView/ChoosePlanView.jsx b/app/dawn-hub/Views/OnboardingViews/Step4_ChoosePlanView/ChoosePlanView.jsx
index 90ea33d55..58b684710 100644
--- a/app/dawn-hub/Views/OnboardingViews/Step4_ChoosePlanView/ChoosePlanView.jsx
+++ b/app/dawn-hub/Views/OnboardingViews/Step4_ChoosePlanView/ChoosePlanView.jsx
@@ -174,6 +174,7 @@ class ChoosePlanView extends React.Component {
 	};
 
 	renderSubtitleText = (selectedGhosteryGlow) => {
+		// Note that the order matters!
 		if (this.isPremiumUser()) return '';
 		if (this.isPlusUser()) return t('ghostery_dawn_onboarding_keep_your_current_plan_or_upgrade');
 		if (selectedGhosteryGlow) return t('ghostery_dawn_onboarding_based_on_your_privacy_preferences');