Merge branch 'develop' into chore/lerna

2 files changed, 25 insertions, 12 deletions

diff --git a/src/features/delayApp/Component.js b/src/features/delayApp/Component.js
index 6e0532c9a..ff84510e8 100644
--- a/src/features/delayApp/Component.js
+++ b/src/features/delayApp/Component.js
@@ -4,6 +4,8 @@ import { inject, observer } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
 import injectSheet from 'react-jss';
 
+import { gaEvent } from '../../lib/analytics';
+
 import Button from '../../components/ui/Button';
 
 import { config } from '.';
@@ -59,8 +61,16 @@ export default @inject('actions') @injectSheet(styles) @observer class DelayApp
     clearInterval(this.countdownInterval);
   }
 
+  handleCTAClick() {
+    const { actions } = this.props;
+
+    actions.ui.openSettings({ path: 'user' });
+
+    gaEvent('DelayApp', 'subscribe_click', 'Delay App Feature');
+  }
+
   render() {
-    const { classes, actions } = this.props;
+    const { classes } = this.props;
     const { intl } = this.context;
 
     return (
@@ -70,7 +80,7 @@ export default @inject('actions') @injectSheet(styles) @observer class DelayApp
           label={intl.formatMessage(messages.action)}
           className={classes.button}
           buttonType="inverted"
-          onClick={() => actions.ui.openSettings({ path: 'user' })}
+          onClick={this.handleCTAClick.bind(this)}
         />
         <p className="footnote">
           {intl.formatMessage(messages.text, {
diff --git a/src/features/delayApp/index.js b/src/features/delayApp/index.js
index d5c544b78..28aa50eb2 100644
--- a/src/features/delayApp/index.js
+++ b/src/features/delayApp/index.js
@@ -3,6 +3,7 @@ import moment from 'moment';
 import DelayAppComponent from './Component';
 
 import { DEFAULT_FEATURES_CONFIG } from '../../config';
+import { gaEvent } from '../../lib/analytics';
 
 const debug = require('debug')('Franz:feature:delayApp');
 
@@ -22,19 +23,18 @@ function setVisibility(value) {
 }
 
 export default function init(stores) {
-  reaction(
-    () => stores.features.features.needToWaitToProceed,
-    (enabled, r) => {
-      if (enabled) {
-        debug('Initializing `delayApp` feature');
+  debug('Initializing `delayApp` feature');
 
-        // Dispose the reaction to run this only once
-        r.dispose();
+  let shownAfterLaunch = false;
+  let timeLastDelay = moment();
 
-        const { needToWaitToProceedConfig: globalConfig } = stores.features.features;
+  reaction(
+    () => stores.features.features.needToWaitToProceed && !stores.user.data.isPremium,
+    (isEnabled) => {
+      if (isEnabled) {
+        debug('Enabling `delayApp` feature');
 
-        let shownAfterLaunch = false;
-        let timeLastDelay = moment();
+        const { needToWaitToProceedConfig: globalConfig } = stores.features.features;
 
         config.delayOffset = globalConfig.delayOffset !== undefined ? globalConfig.delayOffset : DEFAULT_FEATURES_CONFIG.needToWaitToProceedConfig.delayOffset;
         config.delayDuration = globalConfig.wait !== undefined ? globalConfig.wait : DEFAULT_FEATURES_CONFIG.needToWaitToProceedConfig.wait;
@@ -50,6 +50,7 @@ export default function init(stores) {
             debug(`App will be delayed for ${config.delayDuration / 1000}s`);
 
             setVisibility(true);
+            gaEvent('delayApp', 'show', 'Delay App Feature');
 
             timeLastDelay = moment();
             shownAfterLaunch = true;
@@ -61,6 +62,8 @@ export default function init(stores) {
             }, DEFAULT_FEATURES_CONFIG.needToWaitToProceedConfig.wait + 1000); // timer needs to be able to hit 0
           }
         });
+      } else {
+        setVisibility(false);
       }
     },
   );