aboutsummaryrefslogtreecommitdiffstats
path: root/src/components
diff options
context:
space:
mode:
authorLibravatar kytwb <kytwb@pm.me>2021-12-18 02:16:55 +0100
committerLibravatar kytwb <kytwb@pm.me>2021-12-18 02:16:55 +0100
commit547d462243b26b3c1ee1dcf040f7d63081a1a4af (patch)
treed91463319ccf0ab906d1aa873244808df1e27df9 /src/components
parentUpgrade electron-updater from 4.6.2 to 4.6.5 (diff)
downloadferdium-app-547d462243b26b3c1ee1dcf040f7d63081a1a4af.tar.gz
ferdium-app-547d462243b26b3c1ee1dcf040f7d63081a1a4af.tar.zst
ferdium-app-547d462243b26b3c1ee1dcf040f7d63081a1a4af.zip
Better error handling for autoUpdater
Diffstat (limited to 'src/components')
-rw-r--r--src/components/settings/settings/EditSettingsForm.js12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 1757ac297..eab65f5e5 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -12,6 +12,7 @@ import Toggle from '../../ui/Toggle';
12import ToggleRaw from '../../ui/ToggleRaw'; 12import ToggleRaw from '../../ui/ToggleRaw';
13import Select from '../../ui/Select'; 13import Select from '../../ui/Select';
14import Input from '../../ui/Input'; 14import Input from '../../ui/Input';
15import Infobox from '../../ui/Infobox';
15 16
16import { 17import {
17 DEFAULT_APP_SETTINGS, 18 DEFAULT_APP_SETTINGS,
@@ -193,6 +194,7 @@ class EditSettingsForm extends Component {
193 isUpdateAvailable: PropTypes.bool.isRequired, 194 isUpdateAvailable: PropTypes.bool.isRequired,
194 noUpdateAvailable: PropTypes.bool.isRequired, 195 noUpdateAvailable: PropTypes.bool.isRequired,
195 updateIsReadyToInstall: PropTypes.bool.isRequired, 196 updateIsReadyToInstall: PropTypes.bool.isRequired,
197 updateFailed: PropTypes.bool.isRequired,
196 isClearingAllCache: PropTypes.bool.isRequired, 198 isClearingAllCache: PropTypes.bool.isRequired,
197 onClearAllCache: PropTypes.func.isRequired, 199 onClearAllCache: PropTypes.func.isRequired,
198 getCacheSize: PropTypes.func.isRequired, 200 getCacheSize: PropTypes.func.isRequired,
@@ -242,6 +244,7 @@ class EditSettingsForm extends Component {
242 isUpdateAvailable, 244 isUpdateAvailable,
243 noUpdateAvailable, 245 noUpdateAvailable,
244 updateIsReadyToInstall, 246 updateIsReadyToInstall,
247 updateFailed,
245 isClearingAllCache, 248 isClearingAllCache,
246 onClearAllCache, 249 onClearAllCache,
247 getCacheSize, 250 getCacheSize,
@@ -800,7 +803,9 @@ class EditSettingsForm extends Component {
800 <br /> 803 <br />
801 </div> 804 </div>
802 )} 805 )}
803 {intl.formatMessage(messages.currentVersion)} {ferdiVersion} 806 <p>
807 {intl.formatMessage(messages.currentVersion)} {ferdiVersion}
808 </p>
804 {noUpdateAvailable && ( 809 {noUpdateAvailable && (
805 <> 810 <>
806 <br /> 811 <br />
@@ -808,6 +813,11 @@ class EditSettingsForm extends Component {
808 {intl.formatMessage(messages.updateStatusUpToDate)} 813 {intl.formatMessage(messages.updateStatusUpToDate)}
809 </> 814 </>
810 )} 815 )}
816 {updateFailed && (
817 <Infobox type="danger" icon="alert">
818 An error occured (check the console for more details)
819 </Infobox>
820 )}
811 <p className="settings__message"> 821 <p className="settings__message">
812 <Icon icon={mdiGithub} /> 822 <Icon icon={mdiGithub} />
813 Ferdi is based on{' '} 823 Ferdi is based on{' '}