Create ModalPromos background class responsible for modal promo relat…

…ed business logic and state management

app/panel/components/Panel.jsx

@@ -210,12 +210,12 @@ class Panel extends React.Component {
 
 		const notificationText = this.props.notificationShown && this.renderNotification();
 
-		const { plusPromoModalSeen } = this.props;
+		const { isTimeForAnotherPlusPromo } = this.props;
 
 		return (
 			<div id="panel">
 				<PlusPromoModal
-					show={!plusPromoModalSeen}
+					show={isTimeForAnotherPlusPromo}
 					location="panel"
 					clickHandler={this._plusPromoClickHandlerPlaceholder}
 				/>

src/background.js

@@ -42,6 +42,7 @@ import metrics from './classes/Metrics';
 import rewards from './classes/Rewards';
 import account from './classes/Account';
 import GhosteryModule from './classes/Module';
+import modalPromos from './classes/ModalPromos';
 
 // utilities
 import { allowAllwaysC2P } from './utils/click2play';
@@ -542,8 +543,7 @@ function handleRewards(name, message, callback) {
 function handleGhosteryHub(name, message, callback) {
 	switch (name) {
 		case 'SET_PLUS_PROMO_MODAL_SEEN':
-			// TODO move this to a Promos class?
-			conf.plus_promo_modal_last_seen = Date.now();
+			modalPromos.recordPlusPromoSighting();
 			break;
 		case 'SEND_PING': {
 			const { type } = message;

src/classes/ConfData.js

@@ -123,7 +123,7 @@ class ConfData {
 			_initProperty('notify_library_updates', false);
 			_initProperty('notify_upgrade_updates', true);
 			_initProperty('paid_subscription', false);
-			_initProperty('plus_promo_modal_last_seen', null);
+			_initProperty('plus_promo_modal_last_seen', 0);
 			_initProperty('rewards_accepted', false);
 			_initProperty('rewards_opted_in', false);
 			_initProperty('settings_last_imported', 0);

src/classes/ModalPromos.js

@@ -0,0 +1,49 @@
+/**
+ * ModalPromos Class
+ *
+ * Ghostery Browser Extension
+ * https://www.ghostery.com/
+ *
+ * Copyright 2019 Ghostery, Inc. All rights reserved.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0
+ */
+
+import conf from './Conf';
+
+const DAYS_BETWEEN_PROMOS = {
+	plus: 30
+};
+const MSECS_IN_DAY = 1000 * 60 * 60 * 24; // msecs-in-sec * secs-in-min * mins-in-hour * hours-in-day
+
+/**
+ * Class for handling the business logic for the display of modal promos (Plus, Insights, etc...)
+ * @memberOf  BackgroundClasses
+ */
+class ModalPromos {
+	recordPlusPromoSighting() {
+		this._recordPromoSighting('plus');
+	}
+
+	isTimeForAnotherPlusPromo() {
+		return this._isTimeForAnotherPlusPromo('plus');
+	}
+
+	_isTimeForAnotherPlusPromo(promoType) {
+		const lastSeenTime = conf[`${promoType}_promo_modal_last_seen`];
+
+		return (
+			(Date.now() - lastSeenTime) >
+			(MSECS_IN_DAY * DAYS_BETWEEN_PROMOS[promoType])
+		);
+	}
+
+	_recordPromoSighting(promoType) {
+		conf[`${promoType}_promo_modal_last_seen`] = Date.now();
+	}
+}
+
+// return the class as a singleton
+export default new ModalPromos();

src/classes/PanelData.js

@@ -27,6 +27,7 @@ import tabInfo from './TabInfo';
 import rewards from './Rewards';
 import account from './Account';
 import dispatcher from './Dispatcher';
+import modalPromos from './ModalPromos';
 import { getCliqzGhosteryBugs, sendCliqzModuleCounts } from '../utils/cliqzModulesData';
 import { getActiveTab, flushChromeMemoryCache, processUrl } from '../utils/utils';
 import { objectEntries, log } from '../utils/common';
@@ -365,7 +366,7 @@ class PanelData {
 			is_expert,
 			is_android: globals.BROWSER_INFO.os === 'android',
 			language,
-			plusPromoModalSeen: !!plus_promo_modal_last_seen,
+			isTimeForAnotherPlusPromo: modalPromos.isTimeForAnotherPlusPromo(),
 			reload_banner_status,
 			tab_id,
 			trackers_banner_status,