From e7369123578925320365295e50b874abf933d2f2 Mon Sep 17 00:00:00 2001
From: Ben <benjamin.strumeyer@gmail.com>
Date: Fri, 29 Jan 2021 11:03:08 -0500
Subject: [PATCH 1/2] Restore free trial link. Add UTM params to premium
 checkout link. Update CTA button copies. Ensure user is on a plus trial after
 redirecting to glowstery domains

---
 .../Step4_ChoosePlanView/ChoosePlanView.jsx   | 19 ++++++-------------
 src/classes/Globals.js                        |  2 ++
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/app/dawn-hub/Views/OnboardingViews/Step4_ChoosePlanView/ChoosePlanView.jsx b/app/dawn-hub/Views/OnboardingViews/Step4_ChoosePlanView/ChoosePlanView.jsx
index 98bbb7d6f..ef6ad7a9d 100644
--- a/app/dawn-hub/Views/OnboardingViews/Step4_ChoosePlanView/ChoosePlanView.jsx
+++ b/app/dawn-hub/Views/OnboardingViews/Step4_ChoosePlanView/ChoosePlanView.jsx
@@ -31,8 +31,8 @@ import {
 } from '../../OnboardingView/OnboardingConstants';
 import { SEARCH_GHOSTERY } from '../Step3_ChooseDefaultSearchView/ChooseDefaultSearchConstants';
 
-const plusCheckoutLink = `${globals.CHECKOUT_BASE_URL}/en/plus`;
-const premiumCheckoutLink = `${globals.CHECKOUT_BASE_URL}/en/premium`;
+const glowFreeTrialLink = `${globals.GLOWSTERY_BASE_URL}/account?utm_source=dawn&utm_medium=introhub&utm_campaign=onboarding`;
+const premiumCheckoutLink = `${globals.CHECKOUT_BASE_URL}/premium?utm_source=dawn&utm_medium=introhub&utm_campaign=onboarding`;
 
 const searchPromo = () => (
 	<div className="ChoosePlanView__searchPromoContainer">
@@ -304,7 +304,6 @@ class ChoosePlanView extends React.Component {
 			actions,
 			defaultSearch,
 			loggedIn,
-			history,
 			user,
 		} = this.props;
 		const { setSetupStep } = actions;
@@ -337,13 +336,7 @@ class ChoosePlanView extends React.Component {
 					{selectedGhosteryGlow && isBasic && (
 						<Fragment>
 							{searchPromo()}
-							{/* May have to change the below links depending on GH-2248 */}
-							{loggedIn && (
-								<a className="ChoosePlanView__searchCTAButton" href={plusCheckoutLink} target="_blank" rel="noreferrer" onClick={() => this.setSetupStepAndMoveToSuccessView(FREE_USER_PLUS_TRIAL)}>{t('ghostery_dawn_onboarding_start_trial')}</a>
-							)}
-							{!loggedIn && (
-								<div className="ChoosePlanView__searchCTAButton" onClick={() => this.setSetupStepAndMoveToSuccessView(FREE_USER_PLUS_TRIAL)}>{t('ghostery_dawn_onboarding_start_trial')}</div>
-							)}
+							<a className="ChoosePlanView__searchCTAButton" href={glowFreeTrialLink} target="_blank" rel="noreferrer" onClick={() => this.setSetupStepAndMoveToSuccessView(FREE_USER_PLUS_TRIAL)}>{t('ghostery_dawn_onboarding_start_trial')}</a>
 							<div className="ChoosePlanView__seeAllPlans" onClick={this.toggleSection}>{t('ghostery_dawn_onboarding_see_all_plans')}</div>
 							<div className={arrowClassNames} onClick={this.toggleSection} />
 						</Fragment>
@@ -377,14 +370,14 @@ class ChoosePlanView extends React.Component {
 								<div className="ChoosePlanView__ctaButtonContainer">
 									{(selectedPlan === BASIC) && (
 										<NavLink className="ChoosePlanView__searchCTAButton" to="/onboarding/5" onClick={() => setSetupStep({ setup_step: CHOOSE_PLAN, dawn_setup_number: FREE_USER_NO_TRIAL, origin: ONBOARDING })}>
-											<span>{t('next_or_start_trial')}</span>
+											<span>{t('next')}</span>
 										</NavLink>
 									)}
 									{selectedPlan === PLUS && (
-										<a className="ChoosePlanView__searchCTAButton" onClick={() => this.setSetupStepAndMoveToSuccessView(FREE_USER_PLUS_SUBSCRIPTION)} href={plusCheckoutLink} target="_blank" rel="noreferrer">{t('next_or_start_trial')}</a>
+										<a className="ChoosePlanView__searchCTAButton" onClick={() => this.setSetupStepAndMoveToSuccessView(FREE_USER_PLUS_SUBSCRIPTION)} href={glowFreeTrialLink} target="_blank" rel="noreferrer">{t('next')}</a>
 									)}
 									{selectedPlan === PREMIUM && (
-										<a className="ChoosePlanView__searchCTAButton" onClick={() => this.setSetupStepAndMoveToSuccessView(FREE_USER_PREMIUM_SUBSCRIPTION)} href={premiumCheckoutLink} target="_blank" rel="noreferrer">{t('next_or_start_trial')}</a>
+										<a className="ChoosePlanView__searchCTAButton" onClick={() => this.setSetupStepAndMoveToSuccessView(FREE_USER_PREMIUM_SUBSCRIPTION)} href={premiumCheckoutLink} target="_blank" rel="noreferrer">{t('next')}</a>
 									)}
 								</div>
 							))}
diff --git a/src/classes/Globals.js b/src/classes/Globals.js
index 6ba7ad2a4..200f5c979 100644
--- a/src/classes/Globals.js
+++ b/src/classes/Globals.js
@@ -54,6 +54,8 @@ class Globals {
 		this.GHOSTERY_BASE_URL = `https://${this.GHOSTERY_ROOT_DOMAIN}`;
 		this.ACCOUNT_BASE_URL = `https://account.${this.GHOSTERY_ROOT_DOMAIN}`;
 		this.CHECKOUT_BASE_URL = `https://checkout.${this.GHOSTERY_ROOT_DOMAIN}`;
+		this.GLOWSTERY_ROOT_DOMAIN = `${this.DEBUG ? 'staging.glowstery' : 'glowstery'}.com`;
+		this.GLOWSTERY_BASE_URL = `https://${this.GLOWSTERY_ROOT_DOMAIN}`;
 		this.METRICS_BASE_URL = `https://${this.DEBUG ? 'staging-d' : 'd'}.ghostery.com`;
 		this.CMP_BASE_URL = `https://${this.DEBUG ? 'staging-cmp-cdn' : 'cmp-cdn'}.ghostery.com`;
 		this.CDN_BASE_URL = `https://${this.DEBUG ? 'staging-cdn' : 'cdn'}.ghostery.com`;

From 8dc0c7396d00cf829ddbb10c6e93d0ab8f21e6b5 Mon Sep 17 00:00:00 2001
From: Ben <benjamin.strumeyer@gmail.com>
Date: Fri, 29 Jan 2021 11:08:36 -0500
Subject: [PATCH 2/2] Remove unused variable

---
 .../OnboardingViews/Step4_ChoosePlanView/ChoosePlanView.jsx      | 1 -
 1 file changed, 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 ef6ad7a9d..90b569e3c 100644
--- a/app/dawn-hub/Views/OnboardingViews/Step4_ChoosePlanView/ChoosePlanView.jsx
+++ b/app/dawn-hub/Views/OnboardingViews/Step4_ChoosePlanView/ChoosePlanView.jsx
@@ -303,7 +303,6 @@ class ChoosePlanView extends React.Component {
 		const {
 			actions,
 			defaultSearch,
-			loggedIn,
 			user,
 		} = this.props;
 		const { setSetupStep } = actions;