GH-2189: Learn More link takes you to Ghostery Image url instead of site

_locales/en/messages.json

@@ -2081,21 +2081,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>"
-			},
-			"span_end": {
-				"content": "</span>"
-			},
-			"link_end": {
-				"content": "</a>"
-			},
-			"link_start": {
-				"content": "<br><a target=\"_blank\" rel=\"noopener noreferrer\" href=\"https://www.ghostery.com/products/plus?utm_source=gbe&utm_campaign=in_app_hstats_lm\">"
-			}
-		}
+		"message": "Unlock your historical stats (and other cool perks) by upgrading to Ghostery Plus."
 	},
 	"panel_stats_pitch_modal_already": {
 		"message": "Already a Ghostery Supporter?"

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) => {
 				<div className="modal-container">
 					<div className="modal-content">
 						<div className="modal-text-container">
-							<I18nWithLink cssClasses="modal-title-text" value="panel_stats_pitch_modal_text" />
+							<div className="modal-title-text">{ t('panel_stats_pitch_modal_text') }</div>
 						</div>
+						<PanelToTabLink href={`${GHOSTERY_BASE_URL}/pricing?utm_source=gbe&utm_campaign=in_app_hstats_lm`}>
+							<span className="pitch-learn-more">{t('learn_more')}</span>
+						</PanelToTabLink>
 						<div className="modal-buttons-container">
 							<div className="modal-filled-button" onClick={subscribe}>{t('get_ghostery_plus_bang')}</div>
 						</div>

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 }) => {
 			<div className="pitch-container">
 				<span className="pitch-text" dangerouslySetInnerHTML={{ __html: t('subscribe_pitch') }} />
 			</div>
-			<PanelToTabLink href="https://www.ghostery.com/products/plus?utm_source=gbe&utm_campaign=in_app_plus_lm">
+			<PanelToTabLink href={`${GHOSTERY_BASE_URL}/pricing/?utm_source=gbe&utm_campaign=in_app_plus_lm`}>
 				<span className="pitch-learn-more">{t('subscribe_pitch_learn_more')}</span>
 			</PanelToTabLink>
 			<div>

app/scss/partials/_stats.scss

@@ -254,6 +254,11 @@
 					font-weight: normal;
 				}
 			}
+			.pitch-learn-more {
+				text-decoration: underline;
+				display: flex;
+				justify-content: center;
+			}
 		}
 		.modal-buttons-container {
 			display: flex;

app/shared-components/PromoModal/PromoModal.jsx

@@ -69,14 +69,14 @@ 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}`;
 				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:
 		}

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}`;