From fabae81cf2066cc86de37463a8cc4a0f34a6d6fe Mon Sep 17 00:00:00 2001
From: wlycdgr <ilya.zarembsky@gmail.com>
Date: Thu, 12 Dec 2019 17:09:31 -0500
Subject: [PATCH 1/2] Set debug and log for testing promos. Do not show Plus
 subscribe link in promo if user is a Plus subscriber.

---
 app/hub/Views/HomeView/HomeViewContainer.jsx       |  1 +
 app/panel/components/Panel.jsx                     | 14 ++++++++++++++
 .../PremiumPromoModal/PremiumPromoModal.jsx        | 10 +++++++---
 .../PremiumPromoModal/PremiumPromoModal.scss       |  2 +-
 manifest.json                                      |  2 ++
 5 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/app/hub/Views/HomeView/HomeViewContainer.jsx b/app/hub/Views/HomeView/HomeViewContainer.jsx
index f7ee124e5..3ff37d738 100644
--- a/app/hub/Views/HomeView/HomeViewContainer.jsx
+++ b/app/hub/Views/HomeView/HomeViewContainer.jsx
@@ -139,6 +139,7 @@ class HomeViewContainer extends Component {
 			<div className="full-height">
 				<PremiumPromoModal
 					show={showPromoModal}
+					isPlus={isPlus}
 					location="hub"
 					handleKeepBasicClick={this._handleKeepBasicClick}
 					handleGetPlusClick={this._handleGetPlusClick}
diff --git a/app/panel/components/Panel.jsx b/app/panel/components/Panel.jsx
index d583a2c9f..0c8c4e44a 100644
--- a/app/panel/components/Panel.jsx
+++ b/app/panel/components/Panel.jsx
@@ -315,6 +315,17 @@ class Panel extends React.Component {
 		return loggedIn && (user && user.scopes && user.scopes.includes('subscriptions:premium'));
 	}
 
+	/**
+	 * @returns {bool}
+	 * @private
+	 * Is the user a Plus subscriber?
+	 */
+	_plusSubscriber = () => {
+		const { loggedIn, user } = this.props;
+
+		return loggedIn && (user && user.subscriptionsPlus);
+	}
+
 	/**
 	 * @returns {JSX}
 	 * @private
@@ -325,9 +336,12 @@ class Panel extends React.Component {
 
 		sendMessage('promoModals.sawPremiumPromo', {});
 
+		const isPlus = this._plusSubscriber();
+
 		return (
 			<PremiumPromoModal
 				show
+				isPlus={isPlus}
 				location="panel"
 				handleGoAwayClick={this._handlePromoGoAwayClick}
 				handleGetPlusClick={this._handlePromoGetPlusClick}
diff --git a/app/shared-components/PremiumPromoModal/PremiumPromoModal.jsx b/app/shared-components/PremiumPromoModal/PremiumPromoModal.jsx
index d7163fb3c..600195aeb 100644
--- a/app/shared-components/PremiumPromoModal/PremiumPromoModal.jsx
+++ b/app/shared-components/PremiumPromoModal/PremiumPromoModal.jsx
@@ -26,6 +26,7 @@ const PremiumPromoModal = (props) => {
 	const {
 		show,
 		location,
+		isPlus,
 		handleTryMidnightClick,
 		handleGetPlusClick,
 		handleKeepBasicClick,
@@ -97,9 +98,11 @@ const PremiumPromoModal = (props) => {
 						</div>
 					</div>
 					<div className="PremiumPromoModal__text-link-container">
-						<div onClick={handleGetPlusClick} className="PremiumPromoModal__text-link">
-							{t('support_ghostery_for_2_instead')}
-						</div>
+						{!isPlus && (
+							<div onClick={handleGetPlusClick} className="PremiumPromoModal__text-link">
+								{t('support_ghostery_for_2_instead')}
+							</div>
+						)}
 						{isInHub && (
 							<div onClick={handleKeepBasicClick} className="PremiumPromoModal__text-link">
 								{t('no_thanks_continue_with_basic')}
@@ -122,6 +125,7 @@ const PremiumPromoModal = (props) => {
 PremiumPromoModal.propTypes = {
 	show: PropTypes.bool.isRequired,
 	location: PropTypes.string.isRequired,
+	isPlus: PropTypes.bool.isRequired,
 	handleTryMidnightClick: PropTypes.func.isRequired,
 	handleGetPlusClick: PropTypes.func.isRequired,
 	handleKeepBasicClick: PropTypes.func,
diff --git a/app/shared-components/PremiumPromoModal/PremiumPromoModal.scss b/app/shared-components/PremiumPromoModal/PremiumPromoModal.scss
index f8258d80c..32817cc9f 100644
--- a/app/shared-components/PremiumPromoModal/PremiumPromoModal.scss
+++ b/app/shared-components/PremiumPromoModal/PremiumPromoModal.scss
@@ -151,7 +151,7 @@ $condensed-font-family: Roboto Condensed, "Open Sans", "Helvetica Neue", Helveti
 
 .PremiumPromoModal__text-link-container {
 	display: flex;
-	justify-content: space-between;
+	justify-content: space-evenly;
 }
 
 .PremiumPromoModal__text-link {
diff --git a/manifest.json b/manifest.json
index 3574f74d2..3ea4b2078 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,6 +6,8 @@
 			"strict_min_version": "52.0"
 		}
 	},
+  	"debug": true,
+  	"log": true,
 	"author": "Ghostery",
 	"name": "__MSG_name__",
 	"short_name": "Ghostery",

From 05e75c457e517b04cde16b93ad72eea1342f36df Mon Sep 17 00:00:00 2001
From: wlycdgr <ilya.zarembsky@gmail.com>
Date: Thu, 12 Dec 2019 17:23:33 -0500
Subject: [PATCH 2/2] Add utm params to Premium promo modal Download clicks

---
 app/hub/Views/HomeView/HomeViewContainer.jsx | 2 +-
 app/panel/components/Panel.jsx               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/hub/Views/HomeView/HomeViewContainer.jsx b/app/hub/Views/HomeView/HomeViewContainer.jsx
index 3ff37d738..babcbf1c1 100644
--- a/app/hub/Views/HomeView/HomeViewContainer.jsx
+++ b/app/hub/Views/HomeView/HomeViewContainer.jsx
@@ -76,7 +76,7 @@ class HomeViewContainer extends Component {
 				window.open(`https://checkout.${DOMAIN}.com/plus?utm_source=gbe&utm_campaign=intro_hub`, '_blank');
 				break;
 			case 'premium':
-				window.open('https://ghostery.com/thanks-for-downloading-midnight', '_blank');
+				window.open('https://ghostery.com/thanks-for-downloading-midnight?utm_source=gbe&utm_campaign=intro_hub', '_blank');
 				break;
 			case 'basic':
 			default:
diff --git a/app/panel/components/Panel.jsx b/app/panel/components/Panel.jsx
index 0c8c4e44a..c13fbb5da 100644
--- a/app/panel/components/Panel.jsx
+++ b/app/panel/components/Panel.jsx
@@ -238,7 +238,7 @@ class Panel extends React.Component {
 	_handlePromoTryMidnightClick = () => {
 		this.props.actions.togglePromoModal();
 
-		const url = 'https://ghostery.com/thanks-for-downloading-midnight';
+		const url = 'https://ghostery.com/thanks-for-downloading-midnight?utm_source=gbe&utm_campaign=in_app';
 		sendMessage('openNewTab', {
 			url,
 			become_active: true,