Refactor updates settings (#506)

* Reorder updates toggle buttons

* Updated 'Disable updates' message to 'Enable automatic updates'

* Update 'noUpdates' to 'automaticUpdates'

* Update 'noUpdates' to 'automaticUpdates'

* Add condition for 'Include beta version' to show

* Enable automatic updates by default

* Update file  so when automaticUpdates is true automatic updates are enabled

* Fix conditions with enableUpdate

* Apply code style

* Fix wrong condition with enableUpdate

* Delete unsued variable 'server'

* Apply style code

* Commit changes to submodule 'recipes'

* Update default message to 'Enable updates' from 'Disable updates'

* Update  text to 'Enable updates' from 'Enable automatic update'

* Add migration for updates settings

* Update default messages to 'Enable updates' from 'Disable updates'

* Remove empty line

* Check for updates was disabled when updates were enabled

* Avoid superfluous break line when updates are disabled

* Add fragments to up-to-date message

* Add fragments to up-to-date message

* Remove file from previous commit

* Remove extra line

* Add 'Show draggable area on window' to en-US.json file

* Apply prepare-code script changes

Co-authored-by: Amine <amine@mouafik.fr>

11 files changed, 322 insertions, 273 deletions

diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 8d93737b8..e1c2a2d4f 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -158,7 +158,7 @@ export default @observer class EditSettingsForm extends Component {
     isTodosEnabled: PropTypes.bool.isRequired,
     isTodosActivated: PropTypes.bool.isRequired,
     isWorkspaceEnabled: PropTypes.bool.isRequired,
-    noUpdates: PropTypes.bool.isRequired,
+    automaticUpdates: PropTypes.bool.isRequired,
     hibernationEnabled: PropTypes.bool.isRequired,
     isDarkmodeEnabled: PropTypes.bool.isRequired,
     isAdaptableDarkModeEnabled: PropTypes.bool.isRequired,
@@ -196,7 +196,7 @@ export default @observer class EditSettingsForm extends Component {
       isSpellcheckerIncludedInCurrentPlan,
       isTodosEnabled,
       isWorkspaceEnabled,
-      noUpdates,
+      automaticUpdates,
       hibernationEnabled,
       isDarkmodeEnabled,
       openProcessManager,
@@ -503,31 +503,39 @@ export default @observer class EditSettingsForm extends Component {
 
             {/* Updates */}
             <h2 id="updates">{intl.formatMessage(messages.headlineUpdates)}</h2>
-            {updateIsReadyToInstall ? (
-              <Button
-                label={intl.formatMessage(messages.buttonInstallUpdate)}
-                onClick={installUpdate}
-              />
-            ) : (
-              <Button
-                buttonType="secondary"
-                label={intl.formatMessage(updateButtonLabelMessage)}
-                onClick={checkForUpdates}
-                disabled={noUpdates || isCheckingForUpdates || isUpdateAvailable}
-                loaded={!isCheckingForUpdates || !isUpdateAvailable}
-              />
+            <Toggle field={form.$('automaticUpdates')} />
+            {automaticUpdates && (
+              <div>
+                <Toggle field={form.$('beta')} />
+                {updateIsReadyToInstall ? (
+                  <Button
+                    label={intl.formatMessage(messages.buttonInstallUpdate)}
+                    onClick={installUpdate}
+                  />
+                ) : (
+                  <Button
+                    buttonType="secondary"
+                    label={intl.formatMessage(updateButtonLabelMessage)}
+                    onClick={checkForUpdates}
+                    disabled={!automaticUpdates || isCheckingForUpdates || isUpdateAvailable}
+                    loaded={!isCheckingForUpdates || !isUpdateAvailable}
+                  />
+                )}
+                <br />
+              </div>
             )}
-            <br />
-            <Toggle field={form.$('beta')} />
-            <Toggle field={form.$('noUpdates')} />
             {intl.formatMessage(messages.currentVersion)}
             {' '}
             {remote.app.getVersion()}
-            <br />
-            <br />
-            {noUpdateAvailable && intl.formatMessage(messages.updateStatusUpToDate)}
+            {noUpdateAvailable && (
+              <>
+                <br />
+                <br />
+                {intl.formatMessage(messages.updateStatusUpToDate)}
+              </>
+            )
+            }
             <p className="settings__message">
-
               <span className="mdi mdi-github-face" />
               <span>
 
diff --git a/src/config.js b/src/config.js
index cfb9a3658..bde710d44 100644
--- a/src/config.js
+++ b/src/config.js
@@ -120,7 +120,7 @@ export const DEFAULT_APP_SETTINGS = {
   hibernate: false,
   hibernationStrategy: 300,
   inactivityLock: 0,
-  noUpdates: false,
+  automaticUpdates: true,
   showServiceNavigationBar: false,
   universalDarkMode: true,
   adaptableDarkMode: true,
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 4c99de9da..74ec1909e 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -162,9 +162,9 @@ const messages = defineMessages({
     id: 'settings.app.form.beta',
     defaultMessage: '!!!Include beta versions',
   },
-  noUpdates: {
-    id: 'settings.app.form.noUpdates',
-    defaultMessage: '!!!Disable updates',
+  automaticUpdates: {
+    id: 'settings.app.form.automaticUpdates',
+    defaultMessage: '!!!Enable updates',
   },
   enableTodos: {
     id: 'settings.app.form.enableTodos',
@@ -231,14 +231,14 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
         enableSpellchecking: settingsData.enableSpellchecking,
         spellcheckerLanguage: settingsData.spellcheckerLanguage,
         beta: settingsData.beta, // we need this info in the main process as well
-        noUpdates: settingsData.noUpdates, // we need this info in the main process as well
+        automaticUpdates: settingsData.automaticUpdates, // we need this info in the main process as well
         locale: settingsData.locale, // we need this info in the main process as well
       },
     });
 
     user.update({
       userData: {
-        noUpdates: settingsData.noUpdates,
+        automaticUpdates: settingsData.automaticUpdates,
         beta: settingsData.beta,
         locale: settingsData.locale,
       },
@@ -491,10 +491,10 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           value: user.data.beta,
           default: DEFAULT_APP_SETTINGS.beta,
         },
-        noUpdates: {
-          label: intl.formatMessage(messages.noUpdates),
-          value: settings.app.noUpdates,
-          default: DEFAULT_APP_SETTINGS.noUpdates,
+        automaticUpdates: {
+          label: intl.formatMessage(messages.automaticUpdates),
+          value: settings.app.automaticUpdates,
+          default: DEFAULT_APP_SETTINGS.automaticUpdates,
         },
       },
     };
@@ -556,7 +556,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           isTodosEnabled={todos.isFeatureActive}
           isWorkspaceEnabled={workspaces.isFeatureActive}
           lockingFeatureEnabled={lockingFeatureEnabled}
-          noUpdates={this.props.stores.settings.app.noUpdates}
+          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}
diff --git a/src/electron/ipc-api/autoUpdate.js b/src/electron/ipc-api/autoUpdate.js
index 506aecdf7..8c4d908dc 100644
--- a/src/electron/ipc-api/autoUpdate.js
+++ b/src/electron/ipc-api/autoUpdate.js
@@ -4,15 +4,13 @@ import { autoUpdater } from 'electron-updater';
 const debug = require('debug')('Ferdi:ipcApi:autoUpdate');
 
 export default (params) => {
-  const disableUpdates = Boolean(params.settings.app.get('noUpdates'));
+  const enableUpdate = Boolean(params.settings.app.get('automaticUpdates'));
 
-  if (disableUpdates) {
+  if (!enableUpdate) {
     autoUpdater.autoInstallOnAppQuit = false;
     autoUpdater.autoDownload = false;
   } else if (process.platform === 'darwin' || process.platform === 'win32' || process.env.APPIMAGE) {
     ipcMain.on('autoUpdate', (event, args) => {
-      const enableUpdate = !params.settings.app.get('noUpdates');
-
       if (enableUpdate) {
         try {
           autoUpdater.autoInstallOnAppQuit = false;
@@ -42,7 +40,6 @@ export default (params) => {
     autoUpdater.on('update-available', (event) => {
       debug('update-available');
 
-      const enableUpdate = !params.settings.app.get('noUpdates');
       if (enableUpdate) {
         params.mainWindow.webContents.send('autoUpdate', {
           version: event.version,
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index 36d930218..56d0b1971 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -4570,81 +4570,94 @@
         }
       },
       {
-        "defaultMessage": "!!!Enable spell checking",
+        "defaultMessage": "!!!Show draggable area on window",
         "end": {
           "column": 3,
           "line": 152
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
+        "id": "settings.app.form.showDragArea",
+        "start": {
+          "column": 16,
+          "line": 149
+        }
+      },
+      {
+        "defaultMessage": "!!!Enable spell checking",
+        "end": {
+          "column": 3,
+          "line": 156
+        },
+        "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableSpellchecking",
         "start": {
           "column": 23,
-          "line": 149
+          "line": 153
         }
       },
       {
         "defaultMessage": "!!!Enable GPU Acceleration",
         "end": {
           "column": 3,
-          "line": 156
+          "line": 160
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableGPUAcceleration",
         "start": {
           "column": 25,
-          "line": 153
+          "line": 157
         }
       },
       {
         "defaultMessage": "!!!Include beta versions",
         "end": {
           "column": 3,
-          "line": 160
+          "line": 164
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.beta",
         "start": {
           "column": 8,
-          "line": 157
+          "line": 161
         }
       },
       {
-        "defaultMessage": "!!!Disable updates",
+        "defaultMessage": "!!!Enable updates",
         "end": {
           "column": 3,
-          "line": 164
+          "line": 168
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.noUpdates",
+        "id": "settings.app.form.automaticUpdates",
         "start": {
-          "column": 13,
-          "line": 161
+          "column": 20,
+          "line": 165
         }
       },
       {
         "defaultMessage": "!!!Enable Franz Todos",
         "end": {
           "column": 3,
-          "line": 168
+          "line": 172
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableTodos",
         "start": {
           "column": 15,
-          "line": 165
+          "line": 169
         }
       },
       {
         "defaultMessage": "!!!Keep all workspaces loaded",
         "end": {
           "column": 3,
-          "line": 172
+          "line": 176
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.keepAllWorkspacesLoaded",
         "start": {
           "column": 27,
-          "line": 169
+          "line": 173
         }
       }
     ],
@@ -6712,640 +6725,640 @@
         }
       },
       {
-        "defaultMessage": "!!!Toggle Developer Tools",
+        "defaultMessage": "!!!Toggle Dark Mode",
         "end": {
           "column": 3,
           "line": 117
         },
         "file": "src/lib/Menu.js",
-        "id": "menu.view.toggleDevTools",
+        "id": "menu.view.toggleDarkMode",
         "start": {
           "column": 18,
           "line": 114
         }
       },
       {
-        "defaultMessage": "!!!Toggle Dark Mode",
+        "defaultMessage": "!!!Toggle Developer Tools",
         "end": {
           "column": 3,
-          "line": 117
+          "line": 121
         },
         "file": "src/lib/Menu.js",
-        "id": "menu.view.toggleDarkMode",
+        "id": "menu.view.toggleDevTools",
         "start": {
           "column": 18,
-          "line": 114
+          "line": 118
         }
       },
       {
         "defaultMessage": "!!!Toggle Todos Developer Tools",
         "end": {
           "column": 3,
-          "line": 121
+          "line": 125
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.toggleTodosDevTools",
         "start": {
           "column": 23,
-          "line": 118
+          "line": 122
         }
       },
       {
         "defaultMessage": "!!!Toggle Service Developer Tools",
         "end": {
           "column": 3,
-          "line": 125
+          "line": 129
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.toggleServiceDevTools",
         "start": {
           "column": 25,
-          "line": 122
+          "line": 126
         }
       },
       {
         "defaultMessage": "!!!Reload Service",
         "end": {
           "column": 3,
-          "line": 129
+          "line": 133
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.reloadService",
         "start": {
           "column": 17,
-          "line": 126
+          "line": 130
         }
       },
       {
         "defaultMessage": "!!!Reload Ferdi",
         "end": {
           "column": 3,
-          "line": 133
+          "line": 137
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.reloadFranz",
         "start": {
           "column": 15,
-          "line": 130
+          "line": 134
         }
       },
       {
         "defaultMessage": "!!!Lock Ferdi",
         "end": {
           "column": 3,
-          "line": 137
+          "line": 141
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.lockFerdi",
         "start": {
           "column": 13,
-          "line": 134
+          "line": 138
         }
       },
       {
         "defaultMessage": "!!!Minimize",
         "end": {
           "column": 3,
-          "line": 141
+          "line": 145
         },
         "file": "src/lib/Menu.js",
         "id": "menu.window.minimize",
         "start": {
           "column": 12,
-          "line": 138
+          "line": 142
         }
       },
       {
         "defaultMessage": "!!!Close",
         "end": {
           "column": 3,
-          "line": 145
+          "line": 149
         },
         "file": "src/lib/Menu.js",
         "id": "menu.window.close",
         "start": {
           "column": 9,
-          "line": 142
+          "line": 146
         }
       },
       {
         "defaultMessage": "!!!Learn More",
         "end": {
           "column": 3,
-          "line": 149
+          "line": 153
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.learnMore",
         "start": {
           "column": 13,
-          "line": 146
+          "line": 150
         }
       },
       {
         "defaultMessage": "!!!Changelog",
         "end": {
           "column": 3,
-          "line": 153
+          "line": 157
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.changelog",
         "start": {
           "column": 13,
-          "line": 150
+          "line": 154
         }
       },
       {
         "defaultMessage": "!!!Support",
         "end": {
           "column": 3,
-          "line": 157
+          "line": 161
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.support",
         "start": {
           "column": 11,
-          "line": 154
+          "line": 158
         }
       },
       {
         "defaultMessage": "!!!Copy Debug Information",
         "end": {
           "column": 3,
-          "line": 161
+          "line": 165
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.debugInfo",
         "start": {
           "column": 13,
-          "line": 158
+          "line": 162
         }
       },
       {
         "defaultMessage": "!!!Publish Debug Information",
         "end": {
           "column": 3,
-          "line": 165
+          "line": 169
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.publishDebugInfo",
         "start": {
           "column": 20,
-          "line": 162
+          "line": 166
         }
       },
       {
         "defaultMessage": "!!!Ferdi Debug Information",
         "end": {
           "column": 3,
-          "line": 169
+          "line": 173
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.debugInfoCopiedHeadline",
         "start": {
           "column": 27,
-          "line": 166
+          "line": 170
         }
       },
       {
         "defaultMessage": "!!!Your Debug Information has been copied to your clipboard.",
         "end": {
           "column": 3,
-          "line": 173
+          "line": 177
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.debugInfoCopiedBody",
         "start": {
           "column": 23,
-          "line": 170
+          "line": 174
         }
       },
       {
         "defaultMessage": "!!!Unlock with Touch ID",
         "end": {
           "column": 3,
-          "line": 177
+          "line": 181
         },
         "file": "src/lib/Menu.js",
         "id": "locked.touchId",
         "start": {
           "column": 11,
-          "line": 174
+          "line": 178
         }
       },
       {
         "defaultMessage": "!!!unlock via Touch ID",
         "end": {
           "column": 3,
-          "line": 181
+          "line": 185
         },
         "file": "src/lib/Menu.js",
         "id": "locked.touchIdPrompt",
         "start": {
           "column": 17,
-          "line": 178
+          "line": 182
         }
       },
       {
         "defaultMessage": "!!!Terms of Service",
         "end": {
           "column": 3,
-          "line": 185
+          "line": 189
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.tos",
         "start": {
           "column": 7,
-          "line": 182
+          "line": 186
         }
       },
       {
         "defaultMessage": "!!!Privacy Statement",
         "end": {
           "column": 3,
-          "line": 189
+          "line": 193
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.privacy",
         "start": {
           "column": 11,
-          "line": 186
+          "line": 190
         }
       },
       {
         "defaultMessage": "!!!File",
         "end": {
           "column": 3,
-          "line": 193
+          "line": 197
         },
         "file": "src/lib/Menu.js",
         "id": "menu.file",
         "start": {
           "column": 8,
-          "line": 190
+          "line": 194
         }
       },
       {
         "defaultMessage": "!!!View",
         "end": {
           "column": 3,
-          "line": 197
+          "line": 201
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view",
         "start": {
           "column": 8,
-          "line": 194
+          "line": 198
         }
       },
       {
         "defaultMessage": "!!!Services",
         "end": {
           "column": 3,
-          "line": 201
+          "line": 205
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services",
         "start": {
           "column": 12,
-          "line": 198
+          "line": 202
         }
       },
       {
         "defaultMessage": "!!!Window",
         "end": {
           "column": 3,
-          "line": 205
+          "line": 209
         },
         "file": "src/lib/Menu.js",
         "id": "menu.window",
         "start": {
           "column": 10,
-          "line": 202
+          "line": 206
         }
       },
       {
         "defaultMessage": "!!!Help",
         "end": {
           "column": 3,
-          "line": 209
+          "line": 213
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help",
         "start": {
           "column": 8,
-          "line": 206
+          "line": 210
         }
       },
       {
         "defaultMessage": "!!!About Ferdi",
         "end": {
           "column": 3,
-          "line": 213
+          "line": 217
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.about",
         "start": {
           "column": 9,
-          "line": 210
+          "line": 214
         }
       },
       {
         "defaultMessage": "!!!What's new?",
         "end": {
           "column": 3,
-          "line": 217
+          "line": 221
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.announcement",
         "start": {
           "column": 16,
-          "line": 214
+          "line": 218
         }
       },
       {
         "defaultMessage": "!!!Settings",
         "end": {
           "column": 3,
-          "line": 221
+          "line": 225
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.settings",
         "start": {
           "column": 12,
-          "line": 218
+          "line": 222
         }
       },
       {
         "defaultMessage": "!!!Check for updates",
         "end": {
           "column": 3,
-          "line": 225
+          "line": 229
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.checkForUpdates",
         "start": {
           "column": 19,
-          "line": 222
+          "line": 226
         }
       },
       {
         "defaultMessage": "!!!Hide",
         "end": {
           "column": 3,
-          "line": 229
+          "line": 233
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.hide",
         "start": {
           "column": 8,
-          "line": 226
+          "line": 230
         }
       },
       {
         "defaultMessage": "!!!Hide Others",
         "end": {
           "column": 3,
-          "line": 233
+          "line": 237
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.hideOthers",
         "start": {
           "column": 14,
-          "line": 230
+          "line": 234
         }
       },
       {
         "defaultMessage": "!!!Unhide",
         "end": {
           "column": 3,
-          "line": 237
+          "line": 241
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.unhide",
         "start": {
           "column": 10,
-          "line": 234
+          "line": 238
         }
       },
       {
         "defaultMessage": "!!!Auto-hide menu bar",
         "end": {
           "column": 3,
-          "line": 241
+          "line": 245
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.autohideMenuBar",
         "start": {
           "column": 19,
-          "line": 238
+          "line": 242
         }
       },
       {
         "defaultMessage": "!!!Quit",
         "end": {
           "column": 3,
-          "line": 245
+          "line": 249
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.quit",
         "start": {
           "column": 8,
-          "line": 242
+          "line": 246
         }
       },
       {
         "defaultMessage": "!!!Add New Service...",
         "end": {
           "column": 3,
-          "line": 249
+          "line": 253
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.addNewService",
         "start": {
           "column": 17,
-          "line": 246
+          "line": 250
         }
       },
       {
         "defaultMessage": "!!!Add New Workspace...",
         "end": {
           "column": 3,
-          "line": 253
+          "line": 257
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces.addNewWorkspace",
         "start": {
           "column": 19,
-          "line": 250
+          "line": 254
         }
       },
       {
         "defaultMessage": "!!!Open workspace drawer",
         "end": {
           "column": 3,
-          "line": 257
+          "line": 261
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces.openWorkspaceDrawer",
         "start": {
           "column": 23,
-          "line": 254
+          "line": 258
         }
       },
       {
         "defaultMessage": "!!!Close workspace drawer",
         "end": {
           "column": 3,
-          "line": 261
+          "line": 265
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces.closeWorkspaceDrawer",
         "start": {
           "column": 24,
-          "line": 258
+          "line": 262
         }
       },
       {
         "defaultMessage": "!!!Activate next service...",
         "end": {
           "column": 3,
-          "line": 265
+          "line": 269
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.setNextServiceActive",
         "start": {
           "column": 23,
-          "line": 262
+          "line": 266
         }
       },
       {
         "defaultMessage": "!!!Activate previous service...",
         "end": {
           "column": 3,
-          "line": 269
+          "line": 273
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.activatePreviousService",
         "start": {
           "column": 27,
-          "line": 266
+          "line": 270
         }
       },
       {
         "defaultMessage": "!!!Disable notifications & audio",
         "end": {
           "column": 3,
-          "line": 273
+          "line": 277
         },
         "file": "src/lib/Menu.js",
         "id": "sidebar.muteApp",
         "start": {
           "column": 11,
-          "line": 270
+          "line": 274
         }
       },
       {
         "defaultMessage": "!!!Enable notifications & audio",
         "end": {
           "column": 3,
-          "line": 277
+          "line": 281
         },
         "file": "src/lib/Menu.js",
         "id": "sidebar.unmuteApp",
         "start": {
           "column": 13,
-          "line": 274
+          "line": 278
         }
       },
       {
         "defaultMessage": "!!!Workspaces",
         "end": {
           "column": 3,
-          "line": 281
+          "line": 285
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces",
         "start": {
           "column": 14,
-          "line": 278
+          "line": 282
         }
       },
       {
         "defaultMessage": "!!!Default",
         "end": {
           "column": 3,
-          "line": 285
+          "line": 289
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces.defaultWorkspace",
         "start": {
           "column": 20,
-          "line": 282
+          "line": 286
         }
       },
       {
         "defaultMessage": "!!!Todos",
         "end": {
           "column": 3,
-          "line": 289
+          "line": 293
         },
         "file": "src/lib/Menu.js",
         "id": "menu.todos",
         "start": {
           "column": 9,
-          "line": 286
+          "line": 290
         }
       },
       {
         "defaultMessage": "!!!Open Todos drawer",
         "end": {
           "column": 3,
-          "line": 293
+          "line": 297
         },
         "file": "src/lib/Menu.js",
         "id": "menu.Todoss.openTodosDrawer",
         "start": {
           "column": 19,
-          "line": 290
+          "line": 294
         }
       },
       {
         "defaultMessage": "!!!Close Todos drawer",
         "end": {
           "column": 3,
-          "line": 297
+          "line": 301
         },
         "file": "src/lib/Menu.js",
         "id": "menu.Todoss.closeTodosDrawer",
         "start": {
           "column": 20,
-          "line": 294
+          "line": 298
         }
       },
       {
         "defaultMessage": "!!!Enable Todos",
         "end": {
           "column": 3,
-          "line": 301
+          "line": 305
         },
         "file": "src/lib/Menu.js",
         "id": "menu.todos.enableTodos",
         "start": {
           "column": 15,
-          "line": 298
+          "line": 302
         }
       },
       {
         "defaultMessage": "!!!Home",
         "end": {
           "column": 3,
-          "line": 305
+          "line": 309
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.goHome",
         "start": {
           "column": 17,
-          "line": 302
+          "line": 306
         }
       }
     ],
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 7e46ddc6f..9f19ad742 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -277,6 +277,7 @@
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
   "settings.app.form.autoLaunchInBackground": "Open in background",
   "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start",
+  "settings.app.form.automaticUpdates": "Enable updates",
   "settings.app.form.beta": "Include beta versions",
   "settings.app.form.customTodoServer": "Custom Todo Server",
   "settings.app.form.darkMode": "Enable dark mode",
@@ -294,7 +295,6 @@
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
-  "settings.app.form.noUpdates": "Disable updates",
   "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
   "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
@@ -306,6 +306,7 @@
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
+  "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -512,4 +513,4 @@
   "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
   "workspaces.switchingIndicator.switchingTo": "Switching to"
-}
\ No newline at end of file
+}
diff --git a/src/i18n/locales/whitelist_en-US.json b/src/i18n/locales/whitelist_en-US.json
index 32960f8ce..fe51488c7 100644
--- a/src/i18n/locales/whitelist_en-US.json
+++ b/src/i18n/locales/whitelist_en-US.json
@@ -1,2 +1 @@
-[
-]
\ No newline at end of file
+[]
diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
index 267fa08cd..5e084c1e1 100644
--- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
+++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
@@ -390,15 +390,28 @@
     }
   },
   {
+    "id": "settings.app.form.showDragArea",
+    "defaultMessage": "!!!Show draggable area on window",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 149,
+      "column": 16
+    },
+    "end": {
+      "line": 152,
+      "column": 3
+    }
+  },
+  {
     "id": "settings.app.form.enableSpellchecking",
     "defaultMessage": "!!!Enable spell checking",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 149,
+      "line": 153,
       "column": 23
     },
     "end": {
-      "line": 152,
+      "line": 156,
       "column": 3
     }
   },
@@ -407,11 +420,11 @@
     "defaultMessage": "!!!Enable GPU Acceleration",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 153,
+      "line": 157,
       "column": 25
     },
     "end": {
-      "line": 156,
+      "line": 160,
       "column": 3
     }
   },
@@ -420,24 +433,24 @@
     "defaultMessage": "!!!Include beta versions",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 157,
+      "line": 161,
       "column": 8
     },
     "end": {
-      "line": 160,
+      "line": 164,
       "column": 3
     }
   },
   {
-    "id": "settings.app.form.noUpdates",
-    "defaultMessage": "!!!Disable updates",
+    "id": "settings.app.form.automaticUpdates",
+    "defaultMessage": "!!!Enable updates",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 161,
-      "column": 13
+      "line": 165,
+      "column": 20
     },
     "end": {
-      "line": 164,
+      "line": 168,
       "column": 3
     }
   },
@@ -446,11 +459,11 @@
     "defaultMessage": "!!!Enable Franz Todos",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 165,
+      "line": 169,
       "column": 15
     },
     "end": {
-      "line": 168,
+      "line": 172,
       "column": 3
     }
   },
@@ -459,11 +472,11 @@
     "defaultMessage": "!!!Keep all workspaces loaded",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 169,
+      "line": 173,
       "column": 27
     },
     "end": {
-      "line": 172,
+      "line": 176,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/lib/Menu.json b/src/i18n/messages/src/lib/Menu.json
index 587754463..08028032d 100644
--- a/src/i18n/messages/src/lib/Menu.json
+++ b/src/i18n/messages/src/lib/Menu.json
@@ -312,8 +312,8 @@
     }
   },
   {
-    "id": "menu.view.toggleDevTools",
-    "defaultMessage": "!!!Toggle Developer Tools",
+    "id": "menu.view.toggleDarkMode",
+    "defaultMessage": "!!!Toggle Dark Mode",
     "file": "src/lib/Menu.js",
     "start": {
       "line": 114,
@@ -325,15 +325,15 @@
     }
   },
   {
-    "id": "menu.view.toggleDarkMode",
-    "defaultMessage": "!!!Toggle Dark Mode",
+    "id": "menu.view.toggleDevTools",
+    "defaultMessage": "!!!Toggle Developer Tools",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 114,
+      "line": 118,
       "column": 18
     },
     "end": {
-      "line": 117,
+      "line": 121,
       "column": 3
     }
   },
@@ -342,11 +342,11 @@
     "defaultMessage": "!!!Toggle Todos Developer Tools",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 118,
+      "line": 122,
       "column": 23
     },
     "end": {
-      "line": 121,
+      "line": 125,
       "column": 3
     }
   },
@@ -355,11 +355,11 @@
     "defaultMessage": "!!!Toggle Service Developer Tools",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 122,
+      "line": 126,
       "column": 25
     },
     "end": {
-      "line": 125,
+      "line": 129,
       "column": 3
     }
   },
@@ -368,11 +368,11 @@
     "defaultMessage": "!!!Reload Service",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 126,
+      "line": 130,
       "column": 17
     },
     "end": {
-      "line": 129,
+      "line": 133,
       "column": 3
     }
   },
@@ -381,11 +381,11 @@
     "defaultMessage": "!!!Reload Ferdi",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 130,
+      "line": 134,
       "column": 15
     },
     "end": {
-      "line": 133,
+      "line": 137,
       "column": 3
     }
   },
@@ -394,11 +394,11 @@
     "defaultMessage": "!!!Lock Ferdi",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 134,
+      "line": 138,
       "column": 13
     },
     "end": {
-      "line": 137,
+      "line": 141,
       "column": 3
     }
   },
@@ -407,11 +407,11 @@
     "defaultMessage": "!!!Minimize",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 138,
+      "line": 142,
       "column": 12
     },
     "end": {
-      "line": 141,
+      "line": 145,
       "column": 3
     }
   },
@@ -420,11 +420,11 @@
     "defaultMessage": "!!!Close",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 142,
+      "line": 146,
       "column": 9
     },
     "end": {
-      "line": 145,
+      "line": 149,
       "column": 3
     }
   },
@@ -433,11 +433,11 @@
     "defaultMessage": "!!!Learn More",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 146,
+      "line": 150,
       "column": 13
     },
     "end": {
-      "line": 149,
+      "line": 153,
       "column": 3
     }
   },
@@ -446,11 +446,11 @@
     "defaultMessage": "!!!Changelog",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 150,
+      "line": 154,
       "column": 13
     },
     "end": {
-      "line": 153,
+      "line": 157,
       "column": 3
     }
   },
@@ -459,11 +459,11 @@
     "defaultMessage": "!!!Support",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 154,
+      "line": 158,
       "column": 11
     },
     "end": {
-      "line": 157,
+      "line": 161,
       "column": 3
     }
   },
@@ -472,11 +472,11 @@
     "defaultMessage": "!!!Copy Debug Information",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 158,
+      "line": 162,
       "column": 13
     },
     "end": {
-      "line": 161,
+      "line": 165,
       "column": 3
     }
   },
@@ -485,11 +485,11 @@
     "defaultMessage": "!!!Publish Debug Information",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 162,
+      "line": 166,
       "column": 20
     },
     "end": {
-      "line": 165,
+      "line": 169,
       "column": 3
     }
   },
@@ -498,11 +498,11 @@
     "defaultMessage": "!!!Ferdi Debug Information",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 166,
+      "line": 170,
       "column": 27
     },
     "end": {
-      "line": 169,
+      "line": 173,
       "column": 3
     }
   },
@@ -511,11 +511,11 @@
     "defaultMessage": "!!!Your Debug Information has been copied to your clipboard.",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 170,
+      "line": 174,
       "column": 23
     },
     "end": {
-      "line": 173,
+      "line": 177,
       "column": 3
     }
   },
@@ -524,11 +524,11 @@
     "defaultMessage": "!!!Unlock with Touch ID",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 174,
+      "line": 178,
       "column": 11
     },
     "end": {
-      "line": 177,
+      "line": 181,
       "column": 3
     }
   },
@@ -537,11 +537,11 @@
     "defaultMessage": "!!!unlock via Touch ID",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 178,
+      "line": 182,
       "column": 17
     },
     "end": {
-      "line": 181,
+      "line": 185,
       "column": 3
     }
   },
@@ -550,11 +550,11 @@
     "defaultMessage": "!!!Terms of Service",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 182,
+      "line": 186,
       "column": 7
     },
     "end": {
-      "line": 185,
+      "line": 189,
       "column": 3
     }
   },
@@ -563,11 +563,11 @@
     "defaultMessage": "!!!Privacy Statement",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 186,
+      "line": 190,
       "column": 11
     },
     "end": {
-      "line": 189,
+      "line": 193,
       "column": 3
     }
   },
@@ -576,11 +576,11 @@
     "defaultMessage": "!!!File",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 190,
+      "line": 194,
       "column": 8
     },
     "end": {
-      "line": 193,
+      "line": 197,
       "column": 3
     }
   },
@@ -589,11 +589,11 @@
     "defaultMessage": "!!!View",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 194,
+      "line": 198,
       "column": 8
     },
     "end": {
-      "line": 197,
+      "line": 201,
       "column": 3
     }
   },
@@ -602,11 +602,11 @@
     "defaultMessage": "!!!Services",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 198,
+      "line": 202,
       "column": 12
     },
     "end": {
-      "line": 201,
+      "line": 205,
       "column": 3
     }
   },
@@ -615,11 +615,11 @@
     "defaultMessage": "!!!Window",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 202,
+      "line": 206,
       "column": 10
     },
     "end": {
-      "line": 205,
+      "line": 209,
       "column": 3
     }
   },
@@ -628,11 +628,11 @@
     "defaultMessage": "!!!Help",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 206,
+      "line": 210,
       "column": 8
     },
     "end": {
-      "line": 209,
+      "line": 213,
       "column": 3
     }
   },
@@ -641,11 +641,11 @@
     "defaultMessage": "!!!About Ferdi",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 210,
+      "line": 214,
       "column": 9
     },
     "end": {
-      "line": 213,
+      "line": 217,
       "column": 3
     }
   },
@@ -654,11 +654,11 @@
     "defaultMessage": "!!!What's new?",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 214,
+      "line": 218,
       "column": 16
     },
     "end": {
-      "line": 217,
+      "line": 221,
       "column": 3
     }
   },
@@ -667,11 +667,11 @@
     "defaultMessage": "!!!Settings",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 218,
+      "line": 222,
       "column": 12
     },
     "end": {
-      "line": 221,
+      "line": 225,
       "column": 3
     }
   },
@@ -680,11 +680,11 @@
     "defaultMessage": "!!!Check for updates",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 222,
+      "line": 226,
       "column": 19
     },
     "end": {
-      "line": 225,
+      "line": 229,
       "column": 3
     }
   },
@@ -693,11 +693,11 @@
     "defaultMessage": "!!!Hide",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 226,
+      "line": 230,
       "column": 8
     },
     "end": {
-      "line": 229,
+      "line": 233,
       "column": 3
     }
   },
@@ -706,11 +706,11 @@
     "defaultMessage": "!!!Hide Others",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 230,
+      "line": 234,
       "column": 14
     },
     "end": {
-      "line": 233,
+      "line": 237,
       "column": 3
     }
   },
@@ -719,11 +719,11 @@
     "defaultMessage": "!!!Unhide",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 234,
+      "line": 238,
       "column": 10
     },
     "end": {
-      "line": 237,
+      "line": 241,
       "column": 3
     }
   },
@@ -732,11 +732,11 @@
     "defaultMessage": "!!!Auto-hide menu bar",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 238,
+      "line": 242,
       "column": 19
     },
     "end": {
-      "line": 241,
+      "line": 245,
       "column": 3
     }
   },
@@ -745,11 +745,11 @@
     "defaultMessage": "!!!Quit",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 242,
+      "line": 246,
       "column": 8
     },
     "end": {
-      "line": 245,
+      "line": 249,
       "column": 3
     }
   },
@@ -758,11 +758,11 @@
     "defaultMessage": "!!!Add New Service...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 246,
+      "line": 250,
       "column": 17
     },
     "end": {
-      "line": 249,
+      "line": 253,
       "column": 3
     }
   },
@@ -771,11 +771,11 @@
     "defaultMessage": "!!!Add New Workspace...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 250,
+      "line": 254,
       "column": 19
     },
     "end": {
-      "line": 253,
+      "line": 257,
       "column": 3
     }
   },
@@ -784,11 +784,11 @@
     "defaultMessage": "!!!Open workspace drawer",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 254,
+      "line": 258,
       "column": 23
     },
     "end": {
-      "line": 257,
+      "line": 261,
       "column": 3
     }
   },
@@ -797,11 +797,11 @@
     "defaultMessage": "!!!Close workspace drawer",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 258,
+      "line": 262,
       "column": 24
     },
     "end": {
-      "line": 261,
+      "line": 265,
       "column": 3
     }
   },
@@ -810,11 +810,11 @@
     "defaultMessage": "!!!Activate next service...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 262,
+      "line": 266,
       "column": 23
     },
     "end": {
-      "line": 265,
+      "line": 269,
       "column": 3
     }
   },
@@ -823,11 +823,11 @@
     "defaultMessage": "!!!Activate previous service...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 266,
+      "line": 270,
       "column": 27
     },
     "end": {
-      "line": 269,
+      "line": 273,
       "column": 3
     }
   },
@@ -836,11 +836,11 @@
     "defaultMessage": "!!!Disable notifications & audio",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 270,
+      "line": 274,
       "column": 11
     },
     "end": {
-      "line": 273,
+      "line": 277,
       "column": 3
     }
   },
@@ -849,11 +849,11 @@
     "defaultMessage": "!!!Enable notifications & audio",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 274,
+      "line": 278,
       "column": 13
     },
     "end": {
-      "line": 277,
+      "line": 281,
       "column": 3
     }
   },
@@ -862,11 +862,11 @@
     "defaultMessage": "!!!Workspaces",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 278,
+      "line": 282,
       "column": 14
     },
     "end": {
-      "line": 281,
+      "line": 285,
       "column": 3
     }
   },
@@ -875,11 +875,11 @@
     "defaultMessage": "!!!Default",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 282,
+      "line": 286,
       "column": 20
     },
     "end": {
-      "line": 285,
+      "line": 289,
       "column": 3
     }
   },
@@ -888,11 +888,11 @@
     "defaultMessage": "!!!Todos",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 286,
+      "line": 290,
       "column": 9
     },
     "end": {
-      "line": 289,
+      "line": 293,
       "column": 3
     }
   },
@@ -901,11 +901,11 @@
     "defaultMessage": "!!!Open Todos drawer",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 290,
+      "line": 294,
       "column": 19
     },
     "end": {
-      "line": 293,
+      "line": 297,
       "column": 3
     }
   },
@@ -914,11 +914,11 @@
     "defaultMessage": "!!!Close Todos drawer",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 294,
+      "line": 298,
       "column": 20
     },
     "end": {
-      "line": 297,
+      "line": 301,
       "column": 3
     }
   },
@@ -927,11 +927,11 @@
     "defaultMessage": "!!!Enable Todos",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 298,
+      "line": 302,
       "column": 15
     },
     "end": {
-      "line": 301,
+      "line": 305,
       "column": 3
     }
   },
@@ -940,11 +940,11 @@
     "defaultMessage": "!!!Home",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 302,
+      "line": 306,
       "column": 17
     },
     "end": {
-      "line": 305,
+      "line": 309,
       "column": 3
     }
   }
diff --git a/src/index.js b/src/index.js
index 4da000f69..594097288 100644
--- a/src/index.js
+++ b/src/index.js
@@ -292,7 +292,7 @@ const createWindow = () => {
   });
 
   mainWindow.on('show', () => {
-    debug('Skip taskbar: false');
+    debug('Skip taskbar: true');
     mainWindow.setSkipTaskbar(false);
   });
 
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index f83bc21ad..799ba3f5a 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -282,5 +282,23 @@ export default class SettingsStore extends Store {
 
       debug('Migrated old todo setting to new custom todo setting');
     }
+
+    if (!this.all.migration['5.4.4-beta.4-settings']) {
+      this.actions.settings.update({
+        type: 'app',
+        data: {
+          automaticUpdates: !(legacySettings.noUpdates),
+        },
+      });
+
+      this.actions.settings.update({
+        type: 'migration',
+        data: {
+          '5.4.4-beta.4-settings': true,
+        },
+      });
+
+      debug('Migrated updates settings');
+    }
   }
 }