Merge branch 'develop' into GH-1969/plus-in-app-promo

manifest.json

@@ -8,6 +8,7 @@
 	"default_locale": "en",
 	"description": "__MSG_short_description__",
 	"log": true,
+	"debug": true,
 	"icons": {
 		"16": "app/images/icon16.png",
 		"48": "app/images/icon48.png",

src/classes/PromoModals.js

@@ -43,9 +43,10 @@ class PromoModals {
 	static whichPromoModalShouldWeDisplay() {
 		// The order is important
 		// Insights takes priority over Plus
-		if (this._isTimeForAPromo(INSIGHTS)) return INSIGHTS;
-		if (this._isTimeForAPromo(PLUS)) return PLUS;
-		return null;
+		// if (this._isTimeForAPromo(INSIGHTS)) return INSIGHTS;
+		// if (this._isTimeForAPromo(PLUS)) return PLUS;
+		// return null;
+		return PLUS;
 	}
 
 	static recordPremiumPromoSighting() { this._recordPromoSighting(PREMIUM); }
@@ -67,9 +68,12 @@ class PromoModals {
 	static _isTimeForAPromo(type) {
 		if (conf.notify_promotions === false) { return false; }
 
-		const lastSeenPlusPromo = conf[`${PLUS}_${PROMO_MODAL_LAST_SEEN}`];
-		const lastSeenInsightsPromo = conf[`${INSIGHTS}_${PROMO_MODAL_LAST_SEEN}`];
-		const lastSeenPromo = Math.max(lastSeenPlusPromo, lastSeenInsightsPromo);
+		// const lastSeenPlusPromo = conf[`${PLUS}_${PROMO_MODAL_LAST_SEEN}`];
+		// const lastSeenInsightsPromo = conf[`${INSIGHTS}_${PROMO_MODAL_LAST_SEEN}`];
+		// const lastSeenPromo = Math.max(lastSeenPlusPromo, lastSeenInsightsPromo);
+
+		const lastSeenInsightsPromo = 1;
+		const lastSeenPromo = 1;
 
 		if (type === INSIGHTS && !this._hasEngagedFrequently()) {
 			return false;