1 files changed, 24 insertions, 17 deletions

diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index d601e03d4..0d718489a 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -11,10 +11,9 @@ import Form from '../../lib/Form';
 import { APP_LOCALES, SPELLCHECKER_LOCALES } from '../../i18n/languages';
 import {
   HIBERNATION_STRATEGIES, SIDEBAR_WIDTH, ICON_SIZES, NAVIGATION_BAR_BEHAVIOURS, SEARCH_ENGINE_NAMES, TODO_APPS,
-  DEFAULT_SETTING_KEEP_ALL_WORKSPACES_LOADED, DEFAULT_IS_FEATURE_ENABLED_BY_USER,
+  DEFAULT_SETTING_KEEP_ALL_WORKSPACES_LOADED, DEFAULT_IS_FEATURE_ENABLED_BY_USER, WAKE_UP_STRATEGIES,
 } from '../../config';
 import { DEFAULT_APP_SETTINGS, isMac } from '../../environment';
-import { config as spellcheckerConfig } from '../../features/spellchecker';
 
 import { getSelectOptions } from '../../helpers/i18n-helpers';
 import { hash } from '../../helpers/password-helpers';
@@ -27,6 +26,8 @@ import globalMessages from '../../i18n/globalMessages';
 import WorkspacesStore from '../../features/workspaces/store';
 import ServicesStore from '../../stores/ServicesStore';
 
+const debug = require('debug')('Ferdi:EditSettingsScreen');
+
 const messages = defineMessages({
   autoLaunchOnStart: {
     id: 'settings.app.form.autoLaunchOnStart',
@@ -88,10 +89,6 @@ const messages = defineMessages({
     id: 'settings.app.form.sentry',
     defaultMessage: '!!!Send telemetry data',
   },
-  hibernate: {
-    id: 'settings.app.form.hibernate',
-    defaultMessage: '!!!Enable service hibernation',
-  },
   hibernateOnStartup: {
     id: 'settings.app.form.hibernateOnStartup',
     defaultMessage: '!!!Keep services in hibernation on startup',
@@ -100,6 +97,10 @@ const messages = defineMessages({
     id: 'settings.app.form.hibernationStrategy',
     defaultMessage: '!!!Hibernation strategy',
   },
+  wakeUpStrategy: {
+    id: 'settings.app.form.wakeUpStrategy',
+    defaultMessage: '!!!Wake up strategy',
+  },
   predefinedTodoServer: {
     id: 'settings.app.form.predefinedTodoServer',
     defaultMessage: '!!!Todo Server',
@@ -242,6 +243,8 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
       openInBackground: settingsData.autoLaunchInBackground,
     });
 
+    debug(`Updating settings store with data: ${settingsData}`);
+
     settings.update({
       type: 'app',
       data: {
@@ -257,9 +260,9 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
         navigationBarBehaviour: settingsData.navigationBarBehaviour,
         searchEngine: settingsData.searchEngine,
         sentry: settingsData.sentry,
-        hibernate: settingsData.hibernate,
         hibernateOnStartup: settingsData.hibernateOnStartup,
         hibernationStrategy: settingsData.hibernationStrategy,
+        wakeUpStrategy: settingsData.wakeUpStrategy,
         predefinedTodoServer: settingsData.predefinedTodoServer,
         customTodoServer: settingsData.customTodoServer,
         lockingFeatureEnabled: settingsData.lockingFeatureEnabled,
@@ -339,6 +342,11 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
       sort: false,
     });
 
+    const wakeUpStrategies = getSelectOptions({
+      locales: WAKE_UP_STRATEGIES,
+      sort: false,
+    });
+
     const todoApp = getSelectOptions({
       locales: TODO_APPS,
       sort: false,
@@ -433,11 +441,6 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           value: settings.all.app.sentry,
           default: DEFAULT_APP_SETTINGS.sentry,
         },
-        hibernate: {
-          label: intl.formatMessage(messages.hibernate),
-          value: settings.all.app.hibernate,
-          default: DEFAULT_APP_SETTINGS.hibernate,
-        },
         hibernateOnStartup: {
           label: intl.formatMessage(messages.hibernateOnStartup),
           value: settings.all.app.hibernateOnStartup,
@@ -449,6 +452,12 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           options: hibernationStrategies,
           default: DEFAULT_APP_SETTINGS.hibernationStrategy,
         },
+        wakeUpStrategy: {
+          label: intl.formatMessage(messages.wakeUpStrategy),
+          value: settings.all.app.wakeUpStrategy,
+          options: wakeUpStrategies,
+          default: DEFAULT_APP_SETTINGS.wakeUpStrategy,
+        },
         predefinedTodoServer: {
           label: intl.formatMessage(messages.predefinedTodoServer),
           value: settings.all.app.predefinedTodoServer,
@@ -516,8 +525,8 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
         },
         enableSpellchecking: {
           label: intl.formatMessage(messages.enableSpellchecking),
-          value: !this.props.stores.user.data.isPremium && !spellcheckerConfig.isIncludedInCurrentPlan ? false : settings.all.app.enableSpellchecking,
-          default: !this.props.stores.user.data.isPremium && !spellcheckerConfig.isIncludedInCurrentPlan ? false : DEFAULT_APP_SETTINGS.enableSpellchecking,
+          value: settings.all.app.enableSpellchecking,
+          default: DEFAULT_APP_SETTINGS.enableSpellchecking,
         },
         spellcheckerLanguage: {
           label: intl.formatMessage(globalMessages.spellcheckerLanguage),
@@ -646,16 +655,14 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           isUpdateAvailable={updateStatus === updateStatusTypes.AVAILABLE}
           noUpdateAvailable={updateStatus === updateStatusTypes.NOT_AVAILABLE}
           updateIsReadyToInstall={updateStatus === updateStatusTypes.DOWNLOADED}
-          onSubmit={d => this.onSubmit(d)}
+          onSubmit={(d) => this.onSubmit(d)}
           getCacheSize={() => app.cacheSize}
           isClearingAllCache={isClearingAllCache}
           onClearAllCache={clearAllCache}
-          isSpellcheckerIncludedInCurrentPlan={spellcheckerConfig.isIncludedInCurrentPlan}
           isTodosEnabled={todos.isFeatureActive}
           isWorkspaceEnabled={workspaces.isFeatureActive}
           lockingFeatureEnabled={lockingFeatureEnabled}
           automaticUpdates={this.props.stores.settings.app.automaticUpdates}
-          hibernationEnabled={this.props.stores.settings.app.hibernate}
           isDarkmodeEnabled={this.props.stores.settings.app.darkMode}
           isAdaptableDarkModeEnabled={this.props.stores.settings.app.adaptableDarkMode}
           isTodosActivated={this.props.stores.todos.isFeatureEnabledByUser}