{__('Loading...')}
; diff --git a/ui/constants/action_types.js b/ui/constants/action_types.js index f3baef23b..8846c944a 100644 --- a/ui/constants/action_types.js +++ b/ui/constants/action_types.js @@ -45,6 +45,8 @@ export const DOWNLOAD_UPGRADE = 'DOWNLOAD_UPGRADE'; export const UPGRADE_DOWNLOAD_STARTED = 'UPGRADE_DOWNLOAD_STARTED'; export const UPGRADE_DOWNLOAD_COMPLETED = 'UPGRADE_DOWNLOAD_COMPLETED'; export const UPGRADE_DOWNLOAD_PROGRESSED = 'UPGRADE_DOWNLOAD_PROGRESSED'; +export const UPGRADE_INIT_INSTALL = 'UPGRADE_INIT_INSTALL'; +export const UPGRADE_INSTALL_ERROR = 'UPGRADE_INSTALL_ERROR'; export const CHECK_UPGRADE_AVAILABLE = 'CHECK_UPGRADE_AVAILABLE'; export const CHECK_UPGRADE_START = 'CHECK_UPGRADE_START'; export const CHECK_UPGRADE_SUCCESS = 'CHECK_UPGRADE_SUCCESS'; @@ -55,7 +57,10 @@ export const UPDATE_REMOTE_VERSION = 'UPDATE_REMOTE_VERSION'; export const SKIP_UPGRADE = 'SKIP_UPGRADE'; export const START_UPGRADE = 'START_UPGRADE'; export const AUTO_UPDATE_DECLINED = 'AUTO_UPDATE_DECLINED'; +export const AUTO_UPDATE_RESET = 'AUTO_UPDATE_RESET'; +export const AUTO_UPDATE_FAILED = 'AUTO_UPDATE_FAILED'; export const AUTO_UPDATE_DOWNLOADED = 'AUTO_UPDATE_DOWNLOADED'; +export const AUTO_UPDATE_DOWNLOADING = 'AUTO_UPDATE_DOWNLOADING'; export const CLEAR_UPGRADE_TIMER = 'CLEAR_UPGRADE_TIMER'; // Wallet diff --git a/ui/index.jsx b/ui/index.jsx index 1b739aad9..75b823b0e 100644 --- a/ui/index.jsx +++ b/ui/index.jsx @@ -21,6 +21,10 @@ import { doToggle3PAnalytics, doUpdateDownloadProgress, doNotifyUpdateAvailable, + doShowUpgradeInstallationError, + doAutoUpdateDownloading, + doAutoUpdateReset, + doAutoUpdateFail, } from 'redux/actions/app'; import { isURIValid } from 'util/lbryURI'; import { setSearchApi } from 'redux/actions/search'; @@ -128,10 +132,30 @@ ipcRenderer.on('open-uri-requested', (event, url, newSession) => { handleError(); }); +autoUpdater.on('download-progress', () => { + app.store.dispatch(doAutoUpdateDownloading()); +}); + +autoUpdater.on('checking-for-update', () => { + app.store.dispatch(doAutoUpdateReset()); +}); + autoUpdater.on('update-available', (e) => { app.store.dispatch(doNotifyUpdateAvailable(e)); }); +autoUpdater.on('update-downloaded', () => { + app.store.dispatch(doAutoUpdateReset()); +}); + +autoUpdater.on('error', () => { + app.store.dispatch(doAutoUpdateFail()); +}); + +ipcRenderer.on('upgrade-installing-error', () => { + app.store.dispatch(doShowUpgradeInstallationError()); +}); + ipcRenderer.on('download-progress-update', (e, p) => { app.store.dispatch(doUpdateDownloadProgress(Math.round(p.percent * 100))); }); @@ -208,6 +232,8 @@ function AppWrapper() { const enabled = makeSelectClientSetting(SETTINGS.ENABLE_PRERELEASE_UPDATES)(state); if (enabled) { autoUpdater.allowPrerelease = true; + } else { + autoUpdater.allowPrerelease = false; } } }, [persistDone]); diff --git a/ui/modal/modalAutoUpdateDownloaded/index.js b/ui/modal/modalAutoUpdateDownloaded/index.js index afe8e8fa4..299565bc6 100644 --- a/ui/modal/modalAutoUpdateDownloaded/index.js +++ b/ui/modal/modalAutoUpdateDownloaded/index.js @@ -1,13 +1,17 @@ import { connect } from 'react-redux'; import { doAutoUpdateDeclined, doHideModal } from 'redux/actions/app'; +import { selectAutoUpdateFailed, selectAutoUpdateDownloading, selectIsUpgradeAvailable } from 'redux/selectors/app'; import ModalAutoUpdateDownloaded from './view'; -const perform = dispatch => ({ +const select = (state, props) => ({ + errorWhileUpdating: selectAutoUpdateFailed(state), + isDownloading: selectAutoUpdateDownloading(state), + isUpdateAvailable: selectIsUpgradeAvailable(state), +}); + +const perform = (dispatch) => ({ closeModal: () => dispatch(doHideModal()), declineAutoUpdate: () => dispatch(doAutoUpdateDeclined()), }); -export default connect( - null, - perform -)(ModalAutoUpdateDownloaded); +export default connect(select, perform)(ModalAutoUpdateDownloaded); diff --git a/ui/modal/modalAutoUpdateDownloaded/view.jsx b/ui/modal/modalAutoUpdateDownloaded/view.jsx index aecb049b4..bef4b967c 100644 --- a/ui/modal/modalAutoUpdateDownloaded/view.jsx +++ b/ui/modal/modalAutoUpdateDownloaded/view.jsx @@ -1,5 +1,5 @@ // @flow -import React, { useState } from 'react'; +import React, { useState, useEffect } from 'react'; // @if TARGET='app' import { ipcRenderer } from 'electron'; // @endif @@ -7,16 +7,19 @@ import { Modal } from 'modal/modal'; import LastReleaseChanges from 'component/lastReleaseChanges'; type Props = { - closeModal: any => any, + closeModal: (any) => any, declineAutoUpdate: () => any, + errorWhileUpdating: boolean, + isDownloading: boolean, + isUpdateAvailable: boolean, }; const ModalAutoUpdateDownloaded = (props: Props) => { - const { closeModal, declineAutoUpdate } = props; - const [disabled, setDisabled] = useState(false); + const { closeModal, declineAutoUpdate, errorWhileUpdating, isDownloading, isUpdateAvailable } = props; + const [waitingForAutoUpdateResponse, setWaitingForAutoUpdateResponse] = useState(false); const handleConfirm = () => { - setDisabled(true); + setWaitingForAutoUpdateResponse(true); ipcRenderer.send('autoUpdateAccepted'); }; @@ -25,19 +28,24 @@ const ModalAutoUpdateDownloaded = (props: Props) => { closeModal(); }; + useEffect(() => { + setWaitingForAutoUpdateResponse(false); + }, [errorWhileUpdating, isDownloading, isUpdateAvailable]); + return ({__('There was an error while updating. Please try again.')}
}{__('There was an error during installation. Please, try again.')}
} +