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>

1 files changed, 30 insertions, 22 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>