Update GUI to not show update info if the app is too new

5 files changed, 11 insertions, 24 deletions

diff --git a/gui/src/renderer/app.tsx b/gui/src/renderer/app.tsx
index f794216206..0dc076378a 100644
--- a/gui/src/renderer/app.tsx
+++ b/gui/src/renderer/app.tsx
@@ -22,7 +22,7 @@ import configureStore from './redux/store';
 import userInterfaceActions from './redux/userinterface/actions';
 import versionActions from './redux/version/actions';
 
-import { IAppUpgradeInfo, ICurrentAppVersionInfo } from '../main';
+import { ICurrentAppVersionInfo } from '../main';
 import { loadTranslations, messages, relayLocations } from '../shared/gettext';
 import { IGuiSettingsState, SYSTEM_PREFERRED_LOCALE_KEY } from '../shared/gui-settings-state';
 import { IpcRendererEventChannel, IRelayListPair } from '../shared/ipc-event-channel';
@@ -34,6 +34,7 @@ import {
   BridgeSettings,
   BridgeState,
   IAccountData,
+  IAppVersionInfo,
   ILocation,
   IRelayList,
   ISettings,
@@ -166,7 +167,7 @@ export default class AppRenderer {
       this.setCurrentVersion(currentVersion);
     });
 
-    IpcRendererEventChannel.upgradeVersion.listen((upgradeVersion: IAppUpgradeInfo) => {
+    IpcRendererEventChannel.upgradeVersion.listen((upgradeVersion: IAppVersionInfo) => {
       this.setUpgradeVersion(upgradeVersion);
     });
 
@@ -730,7 +731,7 @@ export default class AppRenderer {
     );
   }
 
-  private setUpgradeVersion(upgradeVersion: IAppUpgradeInfo) {
+  private setUpgradeVersion(upgradeVersion: IAppVersionInfo) {
     this.reduxActions.version.updateLatest(upgradeVersion);
   }
 
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) => {
diff --git a/gui/src/renderer/redux/version/actions.ts b/gui/src/renderer/redux/version/actions.ts
index e2bb4a6513..8b3f1461f4 100644
--- a/gui/src/renderer/redux/version/actions.ts
+++ b/gui/src/renderer/redux/version/actions.ts
@@ -1,12 +1,8 @@
 import { IAppVersionInfo } from '../../../shared/daemon-rpc-types';
 
-interface IUpdateLatestActionPayload extends IAppVersionInfo {
-  nextUpgrade: string | null;
-}
-
 export interface IUpdateLatestAction {
   type: 'UPDATE_LATEST';
-  latestInfo: IUpdateLatestActionPayload;
+  latestInfo: IAppVersionInfo;
 }
 
 export interface IUpdateVersionAction {
@@ -18,7 +14,7 @@ export interface IUpdateVersionAction {
 
 export type VersionAction = IUpdateLatestAction | IUpdateVersionAction;
 
-function updateLatest(latestInfo: IUpdateLatestActionPayload): IUpdateLatestAction {
+function updateLatest(latestInfo: IAppVersionInfo): IUpdateLatestAction {
   return {
     type: 'UPDATE_LATEST',
     latestInfo,
diff --git a/gui/src/renderer/redux/version/reducers.ts b/gui/src/renderer/redux/version/reducers.ts
index fcc23c7f3d..96e8ab0aa3 100644
--- a/gui/src/renderer/redux/version/reducers.ts
+++ b/gui/src/renderer/redux/version/reducers.ts
@@ -4,9 +4,7 @@ export interface IVersionReduxState {
   current: string;
   supported: boolean;
   isBeta: boolean;
-  latest?: string;
-  latestStable?: string;
-  nextUpgrade: string | null;
+  suggestedUpgrade?: string;
   consistent: boolean;
 }
 
@@ -14,9 +12,7 @@ const initialState: IVersionReduxState = {
   current: '',
   supported: true,
   isBeta: false,
-  latest: undefined,
-  latestStable: undefined,
-  nextUpgrade: null,
+  suggestedUpgrade: undefined,
   consistent: true,
 };
 
@@ -28,10 +24,8 @@ export default function (
     case 'UPDATE_LATEST':
       return {
         ...state,
-        nextUpgrade: action.latestInfo.nextUpgrade,
         supported: action.latestInfo.supported,
-        latest: action.latestInfo.latest,
-        latestStable: action.latestInfo.latestStable,
+        suggestedUpgrade: action.latestInfo.suggestedUpgrade,
       };
 
     case 'UPDATE_VERSION':