Move default feature config to config.js

3 files changed, 18 insertions, 21 deletions

diff --git a/src/features/delayApp/index.js b/src/features/delayApp/index.js
index 334433df8..3fc0f2570 100644
--- a/src/features/delayApp/index.js
+++ b/src/features/delayApp/index.js
@@ -2,19 +2,17 @@ import { autorun, observable, reaction } from 'mobx';
 import moment from 'moment';
 import DelayAppComponent from './Component';
 
-const debug = require('debug')('Franz:feature:delayApp');
+import { DEFAULT_FEATURES_CONFIG } from '../../config';
 
-const DEFAULT_DELAY_DURATION = 10000; // 10 seconds
-const DEFAULT_DELAY_OFFSET = 3600000; // 1 hour
-const DEFAULT_VISIBILITY = false;
+const debug = require('debug')('Franz:feature:delayApp');
 
 export const config = {
-  delayOffset: DEFAULT_DELAY_OFFSET,
-  delayDuration: DEFAULT_DELAY_DURATION,
+  delayOffset: DEFAULT_FEATURES_CONFIG.needToWaitToProceedConfig.delayOffset,
+  delayDuration: DEFAULT_FEATURES_CONFIG.needToWaitToProceedConfig.wait,
 };
 
 export const state = observable({
-  isDelayAppScreenVisible: DEFAULT_VISIBILITY,
+  isDelayAppScreenVisible: DEFAULT_FEATURES_CONFIG.needToWaitToProceed,
 });
 
 function setVisibility(value) {
@@ -38,8 +36,8 @@ export default function init(stores) {
         let shownAfterLaunch = false;
         let timeLastDelay = moment();
 
-        config.delayOffset = globalConfig.delayOffset !== undefined ? globalConfig.delayOffset : DEFAULT_DELAY_OFFSET;
-        config.delayDuration = globalConfig.wait !== undefined ? globalConfig.wait : DEFAULT_DELAY_DURATION;
+        config.delayOffset = globalConfig.delayOffset !== undefined ? globalConfig.delayOffset : DEFAULT_FEATURES_CONFIG.needToWaitToProceedConfig.delayOffset;
+        config.delayDuration = globalConfig.wait !== undefined ? globalConfig.wait : DEFAULT_FEATURES_CONFIG.needToWaitToProceedConfig.wait;
 
         autorun(() => {
           const diff = moment().diff(timeLastDelay);
@@ -55,7 +53,7 @@ export default function init(stores) {
               debug('Resetting app delay');
 
               setVisibility(false);
-            }, DEFAULT_DELAY_DURATION + 1000); // timer needs to be able to hit 0
+            }, DEFAULT_FEATURES_CONFIG.needToWaitToProceedConfig.wait + 1000); // timer needs to be able to hit 0
           }
         });
       }
diff --git a/src/features/serviceProxy/index.js b/src/features/serviceProxy/index.js
index edb1c9367..50dea8c9b 100644
--- a/src/features/serviceProxy/index.js
+++ b/src/features/serviceProxy/index.js
@@ -1,16 +1,15 @@
 import { autorun, reaction, observable } from 'mobx';
 import { remote } from 'electron';
 
+import { DEFAULT_FEATURES_CONFIG } from '../../config';
+
 const { session } = remote;
 
 const debug = require('debug')('Franz:feature:serviceProxy');
 
-const DEFAULT_ENABLED = false;
-const DEFAULT_IS_PREMIUM = true;
-
 export const config = observable({
-  isEnabled: DEFAULT_ENABLED,
-  isPremium: DEFAULT_IS_PREMIUM,
+  isEnabled: DEFAULT_FEATURES_CONFIG.isServiceProxyEnabled,
+  isPremium: DEFAULT_FEATURES_CONFIG.isServiceProxyPremiumFeature,
 });
 
 export default function init(stores) {
@@ -25,8 +24,8 @@ export default function init(stores) {
 
         const { isServiceProxyEnabled, isServiceProxyPremiumFeature } = stores.features.features;
 
-        config.isEnabled = isServiceProxyEnabled !== undefined ? isServiceProxyEnabled : DEFAULT_ENABLED;
-        config.isPremium = isServiceProxyPremiumFeature !== undefined ? isServiceProxyPremiumFeature : DEFAULT_IS_PREMIUM;
+        config.isEnabled = isServiceProxyEnabled !== undefined ? isServiceProxyEnabled : DEFAULT_FEATURES_CONFIG.isServiceProxyEnabled;
+        config.isPremium = isServiceProxyPremiumFeature !== undefined ? isServiceProxyPremiumFeature : DEFAULT_FEATURES_CONFIG.isServiceProxyPremiumFeature;
 
         autorun(() => {
           const services = stores.services.all;
diff --git a/src/features/spellchecker/index.js b/src/features/spellchecker/index.js
index 9bffc1949..454096e4e 100644
--- a/src/features/spellchecker/index.js
+++ b/src/features/spellchecker/index.js
@@ -1,11 +1,11 @@
 import { autorun, reaction } from 'mobx';
 
-const debug = require('debug')('Franz:feature:spellchecker');
+import { DEFAULT_FEATURES_CONFIG } from '../../config';
 
-const DEFAULT_IS_PREMIUM_FEATURE = true;
+const debug = require('debug')('Franz:feature:spellchecker');
 
 export const config = {
-  isPremiumFeature: DEFAULT_IS_PREMIUM_FEATURE,
+  isPremiumFeature: DEFAULT_FEATURES_CONFIG.isSpellcheckerPremiumFeature,
 };
 
 export default function init(stores) {
@@ -19,7 +19,7 @@ export default function init(stores) {
 
       const { isSpellcheckerPremiumFeature } = stores.features.features;
 
-      config.isPremiumFeature = isSpellcheckerPremiumFeature !== undefined ? isSpellcheckerPremiumFeature : DEFAULT_IS_PREMIUM_FEATURE;
+      config.isPremiumFeature = isSpellcheckerPremiumFeature !== undefined ? isSpellcheckerPremiumFeature : DEFAULT_FEATURES_CONFIG.isSpellcheckerPremiumFeature;
 
       autorun(() => {
         if (!stores.user.data.isPremium && config.isPremiumFeature) {