GH-1969, GH-2029 Plus & Premium In App Promo's

_locales/en/messages.json

@@ -1818,7 +1818,7 @@
 		"message": "While Ghostery is free, you can choose to support us through a small subscription of $2 per month in exchange for cool perks, such as color themes, priority help service, and more. Join our mission and subscribe!"
 	},
 	"subscribe_pitch_spring": {
-		"message": "Support us and unlock a new spring theme, personal tracking insights, and other special perks by upgrading to Ghostery Plus for $2 per month."
+		"message": "Like what we do? Support us and unlock new spring themes, personal tracking insights, and other special perks by upgrading to Ghostery Plus."
 	},
 	"subscribe_pitch_learn_more": {
 		"message": "Learn more"
@@ -2381,10 +2381,10 @@
 		"message": "Try Ghostery Midnight"
 	},
 	"seven_day_free_trial": {
-		"message": "7 Day Free Trial ($14/mo)"
+		"message": "7 Day Free Trial"
 	},
-	"spring_has_sprung": {
-		"message": "Spring has sprung!"
+	"spring_is_here": {
+		"message": "Spring is here!"
 	},
   	"full_coverage_protection_promise": {
 	  "message": "Get full-coverage protection across all browsers & apps on your device"
@@ -2405,7 +2405,7 @@
 		"message": "Download for free"
 	},
 	"support_ghostery_for_2_instead": {
-		"message": "Support Ghostery for $2/mo instead"
+		"message": "Support Ghostery and try Plus instead"
 	},
 	"no_thanks_continue_with_basic": {
 		"message": "No thanks, continue with basic"

app/Account/AccountActions.js

@@ -30,6 +30,8 @@ import {
 	GET_USER_SUBSCRIPTION_DATA_SUCCESS
 } from './AccountConstants';
 
+import { CLEAR_THEME } from '../panel/constants/constants';
+
 export const getUserSettings = () => dispatch => (
 	sendMessageInPromise('account.getUserSettings')
 		.then((settings) => {
@@ -153,6 +155,7 @@ export const logout = () => dispatch => (
 	sendMessageInPromise('account.logout', {})
 		.then(() => {
 			dispatch({ type: LOGOUT_SUCCESS });
+			dispatch({ type: CLEAR_THEME });
 		})
 		.catch((err) => {
 			const errors = [{ title: err.toString(), detail: err.toString() }];

app/panel/actions/PanelActions.js

@@ -100,6 +100,12 @@ export const getTheme = name => dispatch => (
 		})
 );
 
+export function clearTheme() {
+	return {
+		type: CLEAR_THEME,
+	};
+}
+
 /**
  * Triggered when the user signs in through the Insights modal into an account that does not have an insights subscription, prompting to re-display the modal, requiring a re-render
  * @return {Object}

app/shared-components/ModalContent/PlusPromoModalContent/PlusPromoModalContent.jsx

@@ -33,7 +33,7 @@ const PlusPromoModalContent = (props) => {
 			<div className="PlusPromoModal__main-content-container">
 				<div className="PlusPromoModal__header">
 					<div className="title">
-						<div>{t('spring_has_sprung')}</div>
+						<div>{t('spring_is_here')}</div>
 					</div>
 					<div className="description">
 						<div dangerouslySetInnerHTML={{ __html: t('subscribe_pitch_spring') }} />

app/shared-components/ModalContent/PremiumPromoModalContent/PremiumPromoModalContent.scss

@@ -32,7 +32,8 @@ $condensed-font-family: Roboto Condensed, "Open Sans", "Helvetica Neue", Helveti
 }
 
 .PremiumPromoModal__main-content-container {
-  height: 210px;
+	height: 210px;
+	width: 508px;
   display: flex;
   flex-direction: column;
   align-items: center;
@@ -65,6 +66,7 @@ $condensed-font-family: Roboto Condensed, "Open Sans", "Helvetica Neue", Helveti
 }
 
 .PremiumPromoModal__features-container {
+	margin-left: 15px;
   display: flex;
   width: 100%;
 }
@@ -84,7 +86,7 @@ $condensed-font-family: Roboto Condensed, "Open Sans", "Helvetica Neue", Helveti
   display: flex;
   align-items: center;
   &:nth-child(1) {
-	margin-bottom: 4px;
+	margin-bottom: 10px;
   }
 }