summaryrefslogtreecommitdiffhomepage
path: root/gui/src/renderer
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2019-09-03 14:34:14 +0200
committerLinus Färnstrand <linus@mullvad.net>2019-09-09 12:31:33 +0200
commit9ef235edd8d7c2f8e7a2a5bbd42d8467742172eb (patch)
treed903097cdb104b659b872f77aa961aa4df0281af /gui/src/renderer
parent82497c9bc8cf8f40ab179330a7f9d19ec7dfa057 (diff)
downloadmullvadvpn-9ef235edd8d7c2f8e7a2a5bbd42d8467742172eb.tar.xz
mullvadvpn-9ef235edd8d7c2f8e7a2a5bbd42d8467742172eb.zip
Add current_is_outdated support to Electron frontend
Diffstat (limited to 'gui/src/renderer')
-rw-r--r--gui/src/renderer/components/NotificationArea.tsx2
-rw-r--r--gui/src/renderer/containers/SettingsPage.tsx2
-rw-r--r--gui/src/renderer/redux/version/actions.ts1
-rw-r--r--gui/src/renderer/redux/version/reducers.ts4
4 files changed, 4 insertions, 5 deletions
diff --git a/gui/src/renderer/components/NotificationArea.tsx b/gui/src/renderer/components/NotificationArea.tsx
index 9e4c971a89..a0cc9e08e3 100644
--- a/gui/src/renderer/components/NotificationArea.tsx
+++ b/gui/src/renderer/components/NotificationArea.tsx
@@ -176,7 +176,7 @@ export default class NotificationArea extends Component<IProps, State> {
};
}
- if (!version.upToDate && version.nextUpgrade) {
+ if (version.currentIsOutdated && version.nextUpgrade) {
return {
visible: true,
type: 'update-available',
diff --git a/gui/src/renderer/containers/SettingsPage.tsx b/gui/src/renderer/containers/SettingsPage.tsx
index e8a9c8ee9a..eb036920c1 100644
--- a/gui/src/renderer/containers/SettingsPage.tsx
+++ b/gui/src/renderer/containers/SettingsPage.tsx
@@ -13,7 +13,7 @@ const mapStateToProps = (state: IReduxState, props: ISharedRouteProps) => ({
expiryLocale: props.locale,
appVersion: state.version.current,
consistentVersion: state.version.consistent,
- upToDateVersion: state.version.upToDate,
+ upToDateVersion: !state.version.currentIsOutdated,
isOffline: state.connection.isBlocked,
});
const mapDispatchToProps = (dispatch: ReduxDispatch, _props: ISharedRouteProps) => {
diff --git a/gui/src/renderer/redux/version/actions.ts b/gui/src/renderer/redux/version/actions.ts
index 1eefb7e62c..eb8a81a43d 100644
--- a/gui/src/renderer/redux/version/actions.ts
+++ b/gui/src/renderer/redux/version/actions.ts
@@ -1,7 +1,6 @@
import { IAppVersionInfo } from '../../../shared/daemon-rpc-types';
interface IUpdateLatestActionPayload extends IAppVersionInfo {
- upToDate: boolean;
nextUpgrade?: string;
}
diff --git a/gui/src/renderer/redux/version/reducers.ts b/gui/src/renderer/redux/version/reducers.ts
index 034e3aab59..e853bc569a 100644
--- a/gui/src/renderer/redux/version/reducers.ts
+++ b/gui/src/renderer/redux/version/reducers.ts
@@ -3,20 +3,20 @@ import { ReduxAction } from '../store';
export interface IVersionReduxState {
current: string;
currentIsSupported: boolean;
+ currentIsOutdated: boolean;
latest?: string;
latestStable?: string;
nextUpgrade?: string;
- upToDate: boolean;
consistent: boolean;
}
const initialState: IVersionReduxState = {
current: '',
currentIsSupported: true,
+ currentIsOutdated: false,
latest: undefined,
latestStable: undefined,
nextUpgrade: undefined,
- upToDate: true,
consistent: true,
};