diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2021-02-07 18:01:09 +0100 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2021-02-09 15:59:58 +0100 |
| commit | 15b6d4840ebbb9b8cc364e59ca32c273dbab0104 (patch) | |
| tree | 81b4de48bff51654c47470a5a8668bed50aab8cb /gui/src/shared | |
| parent | ed81bda75445b88337e6d52792a507efc8415661 (diff) | |
| download | mullvadvpn-15b6d4840ebbb9b8cc364e59ca32c273dbab0104.tar.xz mullvadvpn-15b6d4840ebbb9b8cc364e59ca32c273dbab0104.zip | |
Open correct part of download page when running a beta version
Diffstat (limited to 'gui/src/shared')
| -rw-r--r-- | gui/src/shared/daemon-rpc-types.ts | 1 | ||||
| -rw-r--r-- | gui/src/shared/notifications/unsupported-version.ts | 8 | ||||
| -rw-r--r-- | gui/src/shared/notifications/update-available.ts | 8 |
3 files changed, 13 insertions, 4 deletions
diff --git a/gui/src/shared/daemon-rpc-types.ts b/gui/src/shared/daemon-rpc-types.ts index 597220e6c8..07a75c07ff 100644 --- a/gui/src/shared/daemon-rpc-types.ts +++ b/gui/src/shared/daemon-rpc-types.ts @@ -291,6 +291,7 @@ export interface IShadowsocksProxySettings { export interface IAppVersionInfo { supported: boolean; suggestedUpgrade?: string; + suggestedIsBeta?: boolean; } export interface ISettings { diff --git a/gui/src/shared/notifications/unsupported-version.ts b/gui/src/shared/notifications/unsupported-version.ts index f324c38291..2560119c4c 100644 --- a/gui/src/shared/notifications/unsupported-version.ts +++ b/gui/src/shared/notifications/unsupported-version.ts @@ -11,6 +11,7 @@ interface UnsupportedVersionNotificationContext { supported: boolean; consistent: boolean; suggestedUpgrade?: string; + suggestedIsBeta?: boolean; } export class UnsupportedVersionNotificationProvider @@ -27,7 +28,7 @@ export class UnsupportedVersionNotificationProvider critical: true, action: { type: 'open-url', - url: links.download, + url: this.context.suggestedIsBeta ? links.betaDownload : links.download, text: messages.pgettext('notifications', 'Upgrade'), }, presentOnce: { value: true, name: this.constructor.name }, @@ -40,7 +41,10 @@ export class UnsupportedVersionNotificationProvider indicator: 'error', title: messages.pgettext('in-app-notifications', 'UNSUPPORTED VERSION'), subtitle: this.getMessage(), - action: { type: 'open-url', url: links.download }, + action: { + type: 'open-url', + url: this.context.suggestedIsBeta ? links.betaDownload : links.download, + }, }; } diff --git a/gui/src/shared/notifications/update-available.ts b/gui/src/shared/notifications/update-available.ts index 220f371e88..83c5d2348d 100644 --- a/gui/src/shared/notifications/update-available.ts +++ b/gui/src/shared/notifications/update-available.ts @@ -9,6 +9,7 @@ import { interface UpdateAvailableNotificationContext { suggestedUpgrade?: string; + suggestedIsBeta?: boolean; } export class UpdateAvailableNotificationProvider @@ -28,7 +29,10 @@ export class UpdateAvailableNotificationProvider 'in-app-notifications', 'Install the latest app version to stay up to date.', ), - action: { type: 'open-url', url: links.download }, + action: { + type: 'open-url', + url: this.context.suggestedIsBeta ? links.betaDownload : links.download, + }, }; } @@ -41,7 +45,7 @@ export class UpdateAvailableNotificationProvider critical: false, action: { type: 'open-url', - url: links.download, + url: this.context.suggestedIsBeta ? links.betaDownload : links.download, text: messages.pgettext('notifications', 'Upgrade'), }, presentOnce: { value: true, name: this.constructor.name }, |