Refactor messaging passing

app/panel/components/Stats.jsx

@@ -277,7 +277,10 @@ class Stats extends React.Component {
 	 */
 	subscribe = () => {
 		sendMessage('ping', 'hist_plus_cta');
-		openCheckoutPage('historical_stats');
+		openCheckoutPage({
+			utm_source: 'gbe',
+			utm_campaign: 'in_app_hstats'
+		});
 	}
 
 	/**

app/panel/components/Subscribe.jsx

@@ -21,7 +21,10 @@ import { sendMessage, openCheckoutPage } from '../utils/msg';
  */
 function _handleBecomeClick() {
 	sendMessage('ping', 'plus_cta_extension');
-	openCheckoutPage('plus_panel');
+	openCheckoutPage({
+		utm_source: 'gbe',
+		utm_campaign: 'in_app_plus'
+	});
 }
 
 /**

app/panel/utils/msg.js

@@ -124,10 +124,8 @@ export function openSubscriptionPage() {
  * This should be used for messages that don't require a callback.
  * @memberOf PanelUtils
  */
-export function openCheckoutPage(from) {
-	sendMessage('account.openCheckoutPage', {
-		from
-	});
+export function openCheckoutPage(utm) {
+	sendMessage('account.openCheckoutPage', { utm });
 	window.close();
 }
 

src/background.js

@@ -850,11 +850,9 @@ function onMessageHandler(request, sender, callback) {
 	}
 	if (name === 'account.openCheckoutPage') {
 		let url = `https://checkout.${globals.GHOSTERY_DOMAIN}.com/plus`;
-		const { from } = message;
-		if (from === 'historical_stats') {
-			url += '?utm_source=gbe&utm_campaign=in_app_hstats';
-		} else if (from === 'plus_panel') {
-			url += '?utm_source=gbe&utm_campaign=in_app_plus';
+		const { utm } = message || null;
+		if (utm) {
+			url += `?utm_source=${utm.utm_source}&utm_campaign=${utm.utm_campaign}`;
 		}
 		utils.openNewTab({ url, become_active: true });
 		return false;