fixes merge conflicts with latest develop

1 files changed, 4 insertions, 3 deletions

diff --git a/src/config.js b/src/config.js
index b11952520..30a5a5cc0 100644
--- a/src/config.js
+++ b/src/config.js
@@ -1,13 +1,14 @@
 import electron from 'electron';
 import path from 'path';
 import isDevMode from 'electron-is-dev';
+import ms from 'ms';
 
 import { asarPath } from './helpers/asar-helpers';
 
 const app = process.type === 'renderer' ? electron.remote.app : electron.app;
 const systemPreferences = process.type === 'renderer' ? electron.remote.systemPreferences : electron.systemPreferences;
 
-export const CHECK_INTERVAL = 1000 * 3600; // How often should we perform checks
+export const CHECK_INTERVAL = ms('1h'); // How often should we perform checks
 export const LOCAL_API = 'http://localhost:3000';
 export const DEV_API = 'https://dev.franzinfra.com';
 export const LIVE_API = 'https://api.franzinfra.com';
@@ -35,8 +36,8 @@ export const DEFAULT_FEATURES_CONFIG = {
   isSpellcheckerPremiumFeature: false,
   needToWaitToProceed: false,
   needToWaitToProceedConfig: {
-    delayOffset: 3600000,
-    wait: 10000,
+    delayOffset: ms('1h'),
+    wait: ms('10s'),
   },
   isServiceProxyEnabled: false,
   isServiceProxyPremiumFeature: true,