diff options
| author | Emīls <emils@mullvad.net> | 2020-06-25 15:22:23 +0100 |
|---|---|---|
| committer | Emīls <emils@mullvad.net> | 2020-06-25 15:22:23 +0100 |
| commit | c586258b52f0d14aedc333d877484da4f3805e05 (patch) | |
| tree | 9492cde4c155fb83cef7d63627e8647af1194015 /gui/src/renderer/containers | |
| parent | 010d7a9771a980491959bbddf97214928c9e4e93 (diff) | |
| parent | c147d3b36bcd1a4be37da0aaef9d49f5ce40bcee (diff) | |
| download | mullvadvpn-c586258b52f0d14aedc333d877484da4f3805e05.tar.xz mullvadvpn-c586258b52f0d14aedc333d877484da4f3805e05.zip | |
Merge branch 'version-check-supress-notification'
Diffstat (limited to 'gui/src/renderer/containers')
| -rw-r--r-- | gui/src/renderer/containers/SettingsPage.tsx | 4 | ||||
| -rw-r--r-- | gui/src/renderer/containers/SupportPage.tsx | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/gui/src/renderer/containers/SettingsPage.tsx b/gui/src/renderer/containers/SettingsPage.tsx index 563b9136fb..fda21f1b7d 100644 --- a/gui/src/renderer/containers/SettingsPage.tsx +++ b/gui/src/renderer/containers/SettingsPage.tsx @@ -15,9 +15,7 @@ const mapStateToProps = (state: IReduxState, props: IAppContext) => ({ expiryLocale: state.userInterface.locale, appVersion: state.version.current, consistentVersion: state.version.consistent, - upToDateVersion: state.settings.showBetaReleases - ? state.version.current === state.version.latest - : state.version.current === state.version.latestStable, + upToDateVersion: state.version.suggestedUpgrade ? false : true, isOffline: state.connection.isBlocked, }); const mapDispatchToProps = (dispatch: ReduxDispatch) => { diff --git a/gui/src/renderer/containers/SupportPage.tsx b/gui/src/renderer/containers/SupportPage.tsx index d8227dd4ae..7382b9d694 100644 --- a/gui/src/renderer/containers/SupportPage.tsx +++ b/gui/src/renderer/containers/SupportPage.tsx @@ -12,9 +12,7 @@ const mapStateToProps = (state: IReduxState) => ({ defaultMessage: state.support.message, accountHistory: state.account.accountHistory, isOffline: state.connection.isBlocked, - outdatedVersion: state.settings.showBetaReleases - ? state.version.current !== state.version.latest - : state.version.current !== state.version.latestStable, + outdatedVersion: state.version.suggestedUpgrade ? true : false, }); const mapDispatchToProps = (dispatch: ReduxDispatch) => { |