Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GH-1969 Plus In App Promo & GH-1970 Telemetry #509

Merged
merged 18 commits into from Apr 20, 2020
Merged
Changes from 1 commit
Commits
File filter
Filter file types
Jump to
Jump to file
Failed to load files.

Always

Just for now

Fix imports and remove debug flag from manifest.json

  • Loading branch information
benstrumeyer committed Apr 7, 2020
commit 4f187afe5181930d0816d725db985b5dc610cd34
@@ -76,7 +76,7 @@ html, body, #root {
// Imports from ../shared-components directory
@import '../shared-components/ExitButton/ExitButton.scss';
@import '../shared-components/Modal/Modal.scss';
@import '../shared-components/PremiumPromoModalContent/PremiumPromoModalContent.scss';
@import '../shared-components/ModalContent/PremiumPromoModalContent/PremiumPromoModalContent.scss';
@import '../shared-components/SteppedNavigation/SteppedNavigation.scss';
@import '../shared-components/ToastMessage/ToastMessage.scss';
@import '../shared-components/ToggleCheckbox/ToggleCheckbox.scss';
@@ -78,6 +78,6 @@ html body {

// Imports from ../shared-components directory
@import '../shared-components/Modal/Modal.scss';
@import '../shared-components/PremiumPromoModalContent/PremiumPromoModalContent.scss';
@import '../shared-components/PlusPromoModalContent/PlusPromoModalContent.scss';
@import '../shared-components/InsightsPromoModalContent/InsightsPromoModalContent.scss';
@import '../shared-components/ModalContent/PremiumPromoModalContent/PremiumPromoModalContent.scss';
@import '../shared-components/ModalContent/PlusPromoModalContent/PlusPromoModalContent.scss';
@import '../shared-components/ModalContent/InsightsPromoModalContent/InsightsPromoModalContent.scss';
@@ -17,7 +17,9 @@

import ExitButton from './ExitButton';
import Modal from './Modal';
import PremiumPromoModalContent from './PremiumPromoModalContent';
import PremiumPromoModalContent from './ModalContent/PremiumPromoModalContent';
import PlusPromoModalContent from './ModalContent/PlusPromoModalContent';
import InsightsPromoModalContent from './ModalContent/InsightsPromoModalContent';
import SteppedNavigation from './SteppedNavigation';
import ToastMessage from './ToastMessage';
import ToggleCheckbox from './ToggleCheckbox';
@@ -27,6 +29,8 @@ export {
ExitButton,
Modal,
PremiumPromoModalContent,
PlusPromoModalContent,
InsightsPromoModalContent,
SteppedNavigation,
ToastMessage,
ToggleCheckbox,
@@ -7,7 +7,6 @@
"version_name": "8.4.7",
"default_locale": "en",
"description": "__MSG_short_description__",
"debug": true,
"log": true,
"icons": {
"16": "app/images/icon16.png",
@@ -104,5 +103,5 @@
"cliqz/offers-cc/index.html",
"cliqz/offers-reminder/index.html",
"cliqz/popup-notification/images/*"
],
]
}
@@ -18,10 +18,10 @@ import panelData from './PanelData';
const DAYS_BETWEEN_PROMOS = {
premium: globals.DEBUG ? 0.0005 : 30, // 40 seconds on staging
insights: globals.DEBUG ? 0.0005 : 30, // 40 seconds on staging
plus: globals.DEBUG ? 0.0005 : 7 // 40 seconds on staging
plus: globals.DEBUG ? 0.0005 : 30 // 40 seconds on staging
};
const WEEKLY_INSIGHTS_TARGET = globals.DEBUG ? 1 : 3;
const DAILY_INSIGHTS_TARGET = globals.DEBUG ? 2 : 3;
const DAILY_INSIGHTS_TARGET = globals.DEBUG ? 7 : 3;

const MSECS_IN_DAY = 86400000; // 1000 msecs-in-sec * 60 secs-in-min * 60 mins-in-hour * 24 hours-in-day
const PREMIUM = 'premium';
ProTip! Use n and p to navigate between commits in a pull request.