From 691e7cf7b432347fc8b5276f8e573dce3af6e36d Mon Sep 17 00:00:00 2001 From: Ilya Zarembsky Date: Fri, 9 Oct 2020 09:16:32 -0400 Subject: [PATCH 1/9] Update Learn More link in the upgrade banner promo modal --- app/panel/components/Subscribe.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/panel/components/Subscribe.jsx b/app/panel/components/Subscribe.jsx index a047e1193..2d8fe605d 100644 --- a/app/panel/components/Subscribe.jsx +++ b/app/panel/components/Subscribe.jsx @@ -38,7 +38,7 @@ const Subscribe = ({ match }) => {
- + {t('subscribe_pitch_learn_more')}
From cba2a007262da2cba919878734ac2942ad4343a4 Mon Sep 17 00:00:00 2001 From: Ben Date: Tue, 27 Oct 2020 12:43:41 -0400 Subject: [PATCH 2/9] Change learn more link in PromoModals.jsx --- app/shared-components/PromoModal/PromoModal.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/shared-components/PromoModal/PromoModal.jsx b/app/shared-components/PromoModal/PromoModal.jsx index 1edc471e5..0df5f9c70 100644 --- a/app/shared-components/PromoModal/PromoModal.jsx +++ b/app/shared-components/PromoModal/PromoModal.jsx @@ -69,7 +69,7 @@ class PromoModal extends React.Component { let url; switch (product) { case PLUS: - url = `${GHOSTERY_BASE_URL}/products/plus?utm_source=gbe&utm_campaign=${utm_campaign}`; + url = `${GHOSTERY_BASE_URL}/pricing?utm_source=gbe&utm_campaign=${utm_campaign}`; break; case PREMIUM: url = `${GHOSTERY_BASE_URL}/midnight?utm_source=gbe&utm_campaign=${utm_campaign}`; From 5ad0534392ea12da237243296253ae6d4b1ec68b Mon Sep 17 00:00:00 2001 From: Ben Date: Tue, 27 Oct 2020 13:10:57 -0400 Subject: [PATCH 3/9] Change checkout page in Subscribe.jsx and Stats.jsx --- src/background.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/background.js b/src/background.js index f0d211cab..dcc075b75 100644 --- a/src/background.js +++ b/src/background.js @@ -911,7 +911,7 @@ function onMessageHandler(request, sender, callback) { return false; } if (name === 'account.openCheckoutPage') { - let url = `${globals.CHECKOUT_BASE_URL}/plus`; + let url = `${globals.GHOSTERY_BASE_URL}/pricing`; const { utm } = message || null; if (utm) { url += `?utm_source=${utm.utm_source}&utm_campaign=${utm.utm_campaign}`; From 4c9e9b09fc2706cc38ccd1b1cf7d199c9b861bca Mon Sep 17 00:00:00 2001 From: Ben Date: Tue, 27 Oct 2020 13:22:54 -0400 Subject: [PATCH 4/9] Update historical stats learn more link --- _locales/en/messages.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 7da0073aa..50eb3c2f9 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -2099,7 +2099,7 @@ "content": "" }, "link_start": { - "content": "
" + "content": "
" } } }, From d404814a35251caa722ea67c0144d0bbf73c9f42 Mon Sep 17 00:00:00 2001 From: Ben Date: Tue, 27 Oct 2020 13:24:03 -0400 Subject: [PATCH 5/9] Remove / to make query params consistent --- app/shared-components/PromoModal/PromoModal.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/shared-components/PromoModal/PromoModal.jsx b/app/shared-components/PromoModal/PromoModal.jsx index 0df5f9c70..4a31ff554 100644 --- a/app/shared-components/PromoModal/PromoModal.jsx +++ b/app/shared-components/PromoModal/PromoModal.jsx @@ -76,7 +76,7 @@ class PromoModal extends React.Component { break; case INSIGHTS: sendMessage('ping', 'promo_modals_insights_upgrade_cta'); - url = `${GHOSTERY_BASE_URL}/insights/?utm_source=gbe&utm_campaign=${utm_campaign}`; + url = `${GHOSTERY_BASE_URL}/insights?utm_source=gbe&utm_campaign=${utm_campaign}`; break; default: } From 7a8e4492c6639797a00ca5682689ea549bb9eee2 Mon Sep 17 00:00:00 2001 From: Ben Date: Tue, 27 Oct 2020 21:31:51 -0400 Subject: [PATCH 6/9] Update link in Subscribe.jsx to use the GHOSTERY_BASE_URL and add back utm params --- app/panel/components/Subscribe.jsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/panel/components/Subscribe.jsx b/app/panel/components/Subscribe.jsx index 2d8fe605d..c879a3723 100644 --- a/app/panel/components/Subscribe.jsx +++ b/app/panel/components/Subscribe.jsx @@ -14,6 +14,9 @@ import React from 'react'; import { NavLink } from 'react-router-dom'; import PanelToTabLink from './BuildingBlocks/PanelToTabLink'; import { sendMessage, openCheckoutPage } from '../utils/msg'; +import globals from '../../../src/classes/Globals'; + +const { GHOSTERY_BASE_URL } = globals; /** * Helper function to handle clicking on the Become a Subscriber button @@ -38,7 +41,7 @@ const Subscribe = ({ match }) => {
- + {t('subscribe_pitch_learn_more')}
From ae8c66f4261e3e16ec3e05887a8049935e934f50 Mon Sep 17 00:00:00 2001 From: Ben Date: Tue, 27 Oct 2020 22:08:00 -0400 Subject: [PATCH 7/9] Use GHOSTERY_BASE_URL in StatsView.jsx --- _locales/en/messages.json | 16 +--------------- app/panel/components/StatsView.jsx | 10 ++++++++-- app/scss/partials/_stats.scss | 4 ++++ 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 50eb3c2f9..a7497a349 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -2087,21 +2087,7 @@ "message": "No, Keep History" }, "panel_stats_pitch_modal_text": { - "message": "Unlock your historical stats (and other cool perks) by upgrading to Ghostery Plus.$LINK_START$Learn More$LINK_END$", - "placeholders": { - "span_start": { - "content": "" - }, - "span_end": { - "content": "" - }, - "link_end": { - "content": "" - }, - "link_start": { - "content": "
" - } - } + "message": "Unlock your historical stats (and other cool perks) by upgrading to Ghostery Plus." }, "panel_stats_pitch_modal_already": { "message": "Already a Ghostery Supporter?" diff --git a/app/panel/components/StatsView.jsx b/app/panel/components/StatsView.jsx index 93fc45917..e86162e30 100644 --- a/app/panel/components/StatsView.jsx +++ b/app/panel/components/StatsView.jsx @@ -16,7 +16,10 @@ import ClassNames from 'classnames'; import { ReactSVG } from 'react-svg'; import StatsGraph from './BuildingBlocks/StatsGraph'; -import I18nWithLink from '../../shared-components/I18nWithLink'; +import PanelToTabLink from './BuildingBlocks/PanelToTabLink'; +import globals from '../../../src/classes/Globals'; + +const { GHOSTERY_BASE_URL } = globals; /** * A Functional React component for rendering the Stats View @@ -193,8 +196,11 @@ const StatsView = (props) => {
- +
{ t('panel_stats_pitch_modal_text') }
+ + {t('learn_more')} +
{t('get_ghostery_plus_bang')}
diff --git a/app/scss/partials/_stats.scss b/app/scss/partials/_stats.scss index 96ff5880a..9d3e732ad 100644 --- a/app/scss/partials/_stats.scss +++ b/app/scss/partials/_stats.scss @@ -254,6 +254,10 @@ font-weight: normal; } } + .pitch-learn-more { + display: flex; + justify-content: center; + } } .modal-buttons-container { display: flex; From d98467a1b0c7d2395fc8f8366ff6a668b1595494 Mon Sep 17 00:00:00 2001 From: Ben Date: Tue, 27 Oct 2020 22:14:16 -0400 Subject: [PATCH 8/9] Underline learn more --- app/scss/partials/_stats.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/scss/partials/_stats.scss b/app/scss/partials/_stats.scss index 9d3e732ad..1bf4eacf5 100644 --- a/app/scss/partials/_stats.scss +++ b/app/scss/partials/_stats.scss @@ -255,6 +255,7 @@ } } .pitch-learn-more { + text-decoration: underline; display: flex; justify-content: center; } From f3a42ec52c3703668b34e9206f517e308ffdb4d8 Mon Sep 17 00:00:00 2001 From: Ben Date: Tue, 27 Oct 2020 22:25:24 -0400 Subject: [PATCH 9/9] Add utm parameters to learn more link in StatsView.jsx --- app/panel/components/StatsView.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/panel/components/StatsView.jsx b/app/panel/components/StatsView.jsx index e86162e30..56cf027e6 100644 --- a/app/panel/components/StatsView.jsx +++ b/app/panel/components/StatsView.jsx @@ -198,7 +198,7 @@ const StatsView = (props) => {
{ t('panel_stats_pitch_modal_text') }
- + {t('learn_more')}