merge-in latest develop

2 files changed, 2 insertions, 10 deletions

diff --git a/src/features/basicAuth/index.js b/src/features/basicAuth/index.js
index 03269582c..00ad65ce6 100644
--- a/src/features/basicAuth/index.js
+++ b/src/features/basicAuth/index.js
@@ -31,15 +31,6 @@ export default function initialize() {
     state.authInfo = data.authInfo;
     state.isModalVisible = true;
   });
-
-  // autorun(() => {
-  //   // if (state.serviceId) {
-  //   // const service = stores.services.one(state.serviceId);
-  //   // if (service) {
-  //   //   state.service = service;
-  //   // }
-  //   // }
-  // });
 }
 
 export function mainIpcHandler(mainWindow, authInfo) {
diff --git a/src/features/delayApp/index.js b/src/features/delayApp/index.js
index 28aa50eb2..48aac34b6 100644
--- a/src/features/delayApp/index.js
+++ b/src/features/delayApp/index.js
@@ -3,7 +3,7 @@ import moment from 'moment';
 import DelayAppComponent from './Component';
 
 import { DEFAULT_FEATURES_CONFIG } from '../../config';
-import { gaEvent } from '../../lib/analytics';
+import { gaEvent, gaPage } from '../../lib/analytics';
 
 const debug = require('debug')('Franz:feature:delayApp');
 
@@ -50,6 +50,7 @@ export default function init(stores) {
             debug(`App will be delayed for ${config.delayDuration / 1000}s`);
 
             setVisibility(true);
+            gaPage('/delayApp');
             gaEvent('delayApp', 'show', 'Delay App Feature');
 
             timeLastDelay = moment();