diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2021-07-12 10:09:43 +0200 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2021-07-12 10:09:43 +0200 |
| commit | 51c3233e7f2f7dbf11f11345b378ff58190b72fc (patch) | |
| tree | d98f0670439d2e208028e532041635c0d862196a /gui/src/shared | |
| parent | 2f303f7158be3256f94ad437b72ab8628cfceaee (diff) | |
| parent | ffe0c6e418001f532469ce307edea7b82a663cdd (diff) | |
| download | mullvadvpn-51c3233e7f2f7dbf11f11345b378ff58190b72fc.tar.xz mullvadvpn-51c3233e7f2f7dbf11f11345b378ff58190b72fc.zip | |
Merge branch 'update-to-electron-11.4.9'
Diffstat (limited to 'gui/src/shared')
| -rw-r--r-- | gui/src/shared/ipc-schema.ts | 2 | ||||
| -rw-r--r-- | gui/src/shared/notifications/error.ts | 4 | ||||
| -rw-r--r-- | gui/src/shared/notifications/no-valid-key.ts | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/gui/src/shared/ipc-schema.ts b/gui/src/shared/ipc-schema.ts index e2b3ebbed3..f463765a32 100644 --- a/gui/src/shared/ipc-schema.ts +++ b/gui/src/shared/ipc-schema.ts @@ -54,8 +54,6 @@ export interface IAppStateSnapshot { guiSettings: IGuiSettingsState; wireguardPublicKey?: IWireguardPublicKey; translations: ITranslations; - platform: NodeJS.Platform; - runningInDevelopment: boolean; windowsSplitTunnelingApplications?: IApplication[]; } diff --git a/gui/src/shared/notifications/error.ts b/gui/src/shared/notifications/error.ts index 97e5e2ce93..066c9c333e 100644 --- a/gui/src/shared/notifications/error.ts +++ b/gui/src/shared/notifications/error.ts @@ -66,7 +66,7 @@ export class ErrorNotificationProvider function getMessage(errorDetails: IErrorState, accountExpiry?: string): string { if (errorDetails.blockFailure) { if (errorDetails.cause.reason === 'set_firewall_policy_error') { - switch (process.platform ?? window.platform) { + switch (process.platform ?? window.env.platform) { case 'win32': return messages.pgettext( 'notifications', @@ -107,7 +107,7 @@ function getMessage(errorDetails: IErrorState, accountExpiry?: string): string { 'Could not configure IPv6. Disable it in the app or enable it on your device.', ); case 'set_firewall_policy_error': - switch (process.platform ?? window.platform) { + switch (process.platform ?? window.env.platform) { case 'win32': return messages.pgettext( 'notifications', diff --git a/gui/src/shared/notifications/no-valid-key.ts b/gui/src/shared/notifications/no-valid-key.ts index 8da145a1f0..6de28ab8df 100644 --- a/gui/src/shared/notifications/no-valid-key.ts +++ b/gui/src/shared/notifications/no-valid-key.ts @@ -14,7 +14,8 @@ export class NoValidKeyNotificationProvider implements InAppNotificationProvider public mayDisplay() { const usingWireGuard = this.context.tunnelProtocol === 'wireguard' || - (this.context.tunnelProtocol === 'any' && (process.platform ?? window.platform) !== 'win32'); + (this.context.tunnelProtocol === 'any' && + (process.platform ?? window.env.platform) !== 'win32'); const keyInvalid = this.context.wireGuardKey.type === 'key-not-set' || this.context.wireGuardKey.type === 'too-many-keys' || |