Merge branch 'beta-notifications'

2 files changed, 4 insertions, 6 deletions

diff --git a/gui/src/main/daemon-rpc.ts b/gui/src/main/daemon-rpc.ts
index 8fb299ebaa..494b9d9b4a 100644
--- a/gui/src/main/daemon-rpc.ts
+++ b/gui/src/main/daemon-rpc.ts
@@ -288,7 +288,6 @@ const tunnelStateSchema = oneOf(
 
 const appVersionInfoSchema = partialObject({
   current_is_supported: boolean,
-  current_is_outdated: boolean,
   latest_stable: string,
   latest: string,
 });
@@ -337,6 +336,7 @@ const settingsSchema = partialObject({
   allow_lan: boolean,
   auto_connect: boolean,
   block_when_disconnected: boolean,
+  show_beta_releases: maybe(boolean),
   bridge_settings: bridgeSettingsSchema,
   bridge_state: enumeration('on', 'auto', 'off'),
   relay_settings: relaySettingsSchema,
diff --git a/gui/src/main/index.ts b/gui/src/main/index.ts
index 6e325156f3..741bca5493 100644
--- a/gui/src/main/index.ts
+++ b/gui/src/main/index.ts
@@ -91,6 +91,7 @@ class ApplicationMain {
     allowLan: false,
     autoConnect: false,
     blockWhenDisconnected: false,
+    showBetaReleases: undefined,
     relaySettings: {
       normal: {
         location: 'any',
@@ -137,7 +138,6 @@ class ApplicationMain {
 
   private upgradeVersion: IAppUpgradeInfo = {
     currentIsSupported: true,
-    currentIsOutdated: false,
     latestStable: '',
     latest: '',
     nextUpgrade: undefined,
@@ -739,16 +739,14 @@ class ApplicationMain {
   }
 
   private setLatestVersion(latestVersionInfo: IAppVersionInfo) {
-    function isBeta(version: string) {
-      return version.includes('-');
-    }
+    const settings = this.settings;
 
     function nextUpgrade(
       current: string,
       latest: string,
       latestStable: string,
     ): string | undefined {
-      if (isBeta(current)) {
+      if (settings.showBetaReleases) {
         return current === latest ? undefined : latest;
       } else {
         return current === latestStable ? undefined : latestStable;