diff options
| author |  André Oliveira <37463445+SpecialAro@users.noreply.github.com> | 2022-06-29 16:58:24 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2022-06-29 15:58:24 +0000 |
| commit | e48721b1d967c3efc08127cbdfa7efc3e321ecbd (patch) | |
| tree | 141bb18fb0884e81e1ac2bfceb1a1f774f14916e /src/components | |
| parent | Fix Cache Settings subsection styling (diff) | |
| download | ferdium-app-e48721b1d967c3efc08127cbdfa7efc3e321ecbd.tar.gz ferdium-app-e48721b1d967c3efc08127cbdfa7efc3e321ecbd.tar.zst ferdium-app-e48721b1d967c3efc08127cbdfa7efc3e321ecbd.zip | |
Fix toggle for pre-release updates on Ubuntu (#393)
Fixes #391
Diffstat (limited to 'src/components')
| -rw-r--r-- | src/components/settings/settings/EditSettingsForm.js | 74 |
1 files changed, 36 insertions, 38 deletions
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index 3ccb37494..a8fdea2fb 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js | |||
| @@ -932,46 +932,44 @@ class EditSettingsForm extends Component { | |||
| 932 | <Toggle field={form.$('automaticUpdates')} /> | 932 | <Toggle field={form.$('automaticUpdates')} /> |
| 933 | {automaticUpdates && ( | 933 | {automaticUpdates && ( |
| 934 | <> | 934 | <> |
| 935 | {(isMac || isWindows || process.env.APPIMAGE) && ( | 935 | <> |
| 936 | <> | 936 | <div> |
| 937 | <div> | 937 | <Toggle field={form.$('beta')} /> |
| 938 | <Toggle field={form.$('beta')} /> | 938 | {updateIsReadyToInstall ? ( |
| 939 | {updateIsReadyToInstall ? ( | 939 | <Button |
| 940 | <Button | 940 | label={intl.formatMessage(messages.buttonInstallUpdate)} |
| 941 | label={intl.formatMessage(messages.buttonInstallUpdate)} | 941 | onClick={installUpdate} |
| 942 | onClick={installUpdate} | 942 | /> |
| 943 | /> | 943 | ) : ( |
| 944 | ) : ( | 944 | <Button |
| 945 | <Button | 945 | buttonType="secondary" |
| 946 | buttonType="secondary" | 946 | label={intl.formatMessage(updateButtonLabelMessage)} |
| 947 | label={intl.formatMessage(updateButtonLabelMessage)} | 947 | onClick={checkForUpdates} |
| 948 | onClick={checkForUpdates} | 948 | disabled={ |
| 949 | disabled={ | 949 | !automaticUpdates || |
| 950 | !automaticUpdates || | 950 | isCheckingForUpdates || |
| 951 | isCheckingForUpdates || | 951 | isUpdateAvailable || |
| 952 | isUpdateAvailable || | 952 | !isOnline |
| 953 | !isOnline | 953 | } |
| 954 | } | 954 | loaded={!isCheckingForUpdates || !isUpdateAvailable} |
| 955 | loaded={!isCheckingForUpdates || !isUpdateAvailable} | 955 | /> |
| 956 | /> | 956 | )} |
| 957 | )} | 957 | <br /> |
| 958 | <br /> | 958 | </div> |
| 959 | </div> | 959 | <p> |
| 960 | {intl.formatMessage(messages.currentVersion)} {ferdiumVersion} | ||
| 961 | </p> | ||
| 962 | {noUpdateAvailable && ( | ||
| 960 | <p> | 963 | <p> |
| 961 | {intl.formatMessage(messages.currentVersion)} {ferdiumVersion} | 964 | {intl.formatMessage(messages.updateStatusUpToDate)}. |
| 962 | </p> | 965 | </p> |
| 963 | {noUpdateAvailable && ( | 966 | )} |
| 964 | <p> | 967 | {updateFailed && ( |
| 965 | {intl.formatMessage(messages.updateStatusUpToDate)}. | 968 | <Infobox type="danger" icon="alert"> |
| 966 | </p> | 969 | An error occurred (check the console for more details) |
| 967 | )} | 970 | </Infobox> |
| 968 | {updateFailed && ( | 971 | )} |
| 969 | <Infobox type="danger" icon="alert"> | 972 | </> |
| 970 | An error occurred (check the console for more details) | ||
| 971 | </Infobox> | ||
| 972 | )} | ||
| 973 | </> | ||
| 974 | )} | ||
| 975 | {showServicesUpdatedInfoBar ? ( | 973 | {showServicesUpdatedInfoBar ? ( |
| 976 | <> | 974 | <> |
| 977 | <p> | 975 | <p> |