1 files changed, 18 insertions, 1 deletions

diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 463a290d2..8b9d21b87 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -9,7 +9,7 @@ import UserStore from '../../stores/UserStore';
 import TodosStore from '../../features/todos/store';
 import Form from '../../lib/Form';
 import { APP_LOCALES, SPELLCHECKER_LOCALES } from '../../i18n/languages';
-import { DEFAULT_APP_SETTINGS, DEFAULT_LOCK_PASSWORD } from '../../config';
+import { DEFAULT_APP_SETTINGS, DEFAULT_LOCK_PASSWORD, HIBERNATION_STRATEGIES } from '../../config';
 import { config as spellcheckerConfig } from '../../features/spellchecker';
 
 import { getSelectOptions } from '../../helpers/i18n-helpers';
@@ -53,6 +53,10 @@ const messages = defineMessages({
     id: 'settings.app.form.hibernate',
     defaultMessage: '!!!Enable service hibernation',
   },
+  hibernationStrategy: {
+    id: 'settings.app.form.hibernationStrategy',
+    defaultMessage: '!!!Hibernation strategy',
+  },
   server: {
     id: 'settings.app.form.server',
     defaultMessage: '!!!Server',
@@ -151,6 +155,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
         minimizeToSystemTray: settingsData.minimizeToSystemTray,
         privateNotifications: settingsData.privateNotifications,
         hibernate: settingsData.hibernate,
+        hibernationStrategy: settingsData.hibernationStrategy,
         server: settingsData.server,
         todoServer: settingsData.todoServer,
         lockingFeatureEnabled: settingsData.lockingFeatureEnabled,
@@ -203,6 +208,11 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
       locales: APP_LOCALES,
     });
 
+    const hibernationStrategies = getSelectOptions({
+      locales: HIBERNATION_STRATEGIES,
+      sort: false,
+    });
+
     const spellcheckingLanguages = getSelectOptions({
       locales: SPELLCHECKER_LOCALES,
       automaticDetectionText: this.context.intl.formatMessage(globalMessages.spellcheckerAutomaticDetection),
@@ -245,6 +255,12 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           value: settings.all.app.hibernate,
           default: DEFAULT_APP_SETTINGS.hibernate,
         },
+        hibernationStrategy: {
+          label: intl.formatMessage(messages.hibernationStrategy),
+          value: settings.all.app.hibernationStrategy,
+          options: hibernationStrategies,
+          default: DEFAULT_APP_SETTINGS.hibernationStrategy,
+        },
         server: {
           label: intl.formatMessage(messages.server),
           value: settings.all.app.server || API,
@@ -393,6 +409,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           server={server || 'https://api.franzinfra.com'}
           lockingFeatureEnabled={lockingFeatureEnabled}
           noUpdates={this.props.stores.settings.app.noUpdates}
+          hibernationEnabled={this.props.stores.settings.app.hibernate}
         />
       </ErrorBoundary>
     );