diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2022-02-23 14:26:10 +0100 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2022-03-14 13:58:44 +0100 |
| commit | 8659f97d48369e3d61aee615bea06ffe30164f83 (patch) | |
| tree | 174564b1865f8c04ee4d637902b5f9cd41a41cc7 /gui/src/main | |
| parent | 7d37bfd840abfdbbf4ae0f191a3c2afe40f700c9 (diff) | |
| download | mullvadvpn-8659f97d48369e3d61aee615bea06ffe30164f83.tar.xz mullvadvpn-8659f97d48369e3d61aee615bea06ffe30164f83.zip | |
Fix DeviceConfig type to not include undefined
Diffstat (limited to 'gui/src/main')
| -rw-r--r-- | gui/src/main/daemon-rpc.ts | 6 | ||||
| -rw-r--r-- | gui/src/main/index.ts | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/gui/src/main/daemon-rpc.ts b/gui/src/main/daemon-rpc.ts index 055fadc4ef..2497bceaeb 100644 --- a/gui/src/main/daemon-rpc.ts +++ b/gui/src/main/daemon-rpc.ts @@ -46,7 +46,7 @@ import { VoucherResponse, TunnelProtocol, IDnsOptions, - DeviceConfig, + IDeviceConfig, IDevice, IDeviceRemoval, IDeviceEvent, @@ -499,7 +499,7 @@ export class DaemonRpc { await this.callEmpty(this.client.checkVolumes); } - public async getDevice(): Promise<DeviceConfig> { + public async getDevice(): Promise<IDeviceConfig | undefined> { try { const response = await this.callEmpty<grpcTypes.DeviceConfig>(this.client.getDevice); return convertFromDeviceConfig(response); @@ -1378,7 +1378,7 @@ function convertFromDeviceEvent(deviceEvent: grpcTypes.DeviceEvent): IDeviceEven }; } -function convertFromDeviceConfig(deviceConfig?: grpcTypes.DeviceConfig): DeviceConfig { +function convertFromDeviceConfig(deviceConfig?: grpcTypes.DeviceConfig): IDeviceConfig | undefined { const device = deviceConfig?.getDevice(); return ( deviceConfig && { diff --git a/gui/src/main/index.ts b/gui/src/main/index.ts index da8f3afffb..c53456cc65 100644 --- a/gui/src/main/index.ts +++ b/gui/src/main/index.ts @@ -27,7 +27,7 @@ import { DaemonEvent, IAccountData, IAppVersionInfo, - DeviceConfig, + IDeviceConfig, IDeviceRemoval, IDnsOptions, IRelayList, @@ -197,7 +197,7 @@ class ApplicationMain { }, }, }; - private deviceConfig: DeviceConfig = undefined; + private deviceConfig?: IDeviceConfig; private guiSettings = new GuiSettings(); private tunnelStateExpectation?: Expectation; |