diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2024-01-31 11:43:25 +0100 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2024-01-31 11:43:25 +0100 |
| commit | 16eea5fa0fcb3fb9e4052ce52e97c49e315e0ba4 (patch) | |
| tree | a3d9bdd416410973c1a81e2e96c82d51116055c6 /gui/src | |
| parent | 962a55443b91c401f3ccbe197fd06aac7d3640aa (diff) | |
| parent | 86e92d176565d212a51d162400f85876fce56367 (diff) | |
| download | mullvadvpn-16eea5fa0fcb3fb9e4052ce52e97c49e315e0ba4.tar.xz mullvadvpn-16eea5fa0fcb3fb9e4052ce52e97c49e315e0ba4.zip | |
Merge branch 'upgrade-electron-to-28'
Diffstat (limited to 'gui/src')
| -rw-r--r-- | gui/src/main/daemon-rpc.ts | 2 | ||||
| -rw-r--r-- | gui/src/main/notification-controller.ts | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/gui/src/main/daemon-rpc.ts b/gui/src/main/daemon-rpc.ts index a14db54b52..681eb0a454 100644 --- a/gui/src/main/daemon-rpc.ts +++ b/gui/src/main/daemon-rpc.ts @@ -145,7 +145,7 @@ export class DaemonRpc { private isClosed = false; private nextSubscriptionId = 0; private subscriptions: Map<number, grpc.ClientReadableStream<grpcTypes.DaemonEvent>> = new Map(); - private reconnectionTimeout?: NodeJS.Timer; + private reconnectionTimeout?: NodeJS.Timeout; constructor(private connectionObserver?: ConnectionObserver) { this.client = new ManagementServiceClient( diff --git a/gui/src/main/notification-controller.ts b/gui/src/main/notification-controller.ts index c83fc11eff..8751ecb6ae 100644 --- a/gui/src/main/notification-controller.ts +++ b/gui/src/main/notification-controller.ts @@ -67,7 +67,8 @@ export default class NotificationController { if (usePngIcon) { const basePath = path.resolve(path.join(__dirname, '../../assets/images')); - this.notificationIcon = nativeImage.createFromPath( + // `nativeImage` is undefined when running tests + this.notificationIcon = nativeImage?.createFromPath( path.join(basePath, 'icon-notification.png'), ); } |