summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2021-03-01 13:44:10 +0100
committerOskar Nyberg <oskar@mullvad.net>2021-03-01 13:44:10 +0100
commit10878d01b27aed6e1ba976e6a59302edd84ab888 (patch)
treeb98b1f88da2ca0e5641c542564a98f70b67927ef
parent37cd7452ca7eea9e2ae008d5dd90b45c4ae392e9 (diff)
parent9a7b74dd86c02dbb54ee302ab586bb2ee0d45d50 (diff)
downloadmullvadvpn-10878d01b27aed6e1ba976e6a59302edd84ab888.tar.xz
mullvadvpn-10878d01b27aed6e1ba976e6a59302edd84ab888.zip
Merge branch 'change-desktop-notification-priority'
-rw-r--r--gui/src/renderer/components/NotificationArea.tsx3
1 files changed, 2 insertions, 1 deletions
diff --git a/gui/src/renderer/components/NotificationArea.tsx b/gui/src/renderer/components/NotificationArea.tsx
index c087d9984a..2c2de14b35 100644
--- a/gui/src/renderer/components/NotificationArea.tsx
+++ b/gui/src/renderer/components/NotificationArea.tsx
@@ -53,7 +53,6 @@ export default function NotificationArea(props: IProps) {
new NoValidKeyNotificationProvider({ tunnelProtocol, wireGuardKey }),
new InconsistentVersionNotificationProvider({ consistent: version.consistent }),
new UnsupportedVersionNotificationProvider(version),
- new UpdateAvailableNotificationProvider(version),
];
if (accountExpiry) {
@@ -62,6 +61,8 @@ export default function NotificationArea(props: IProps) {
);
}
+ notificationProviders.push(new UpdateAvailableNotificationProvider(version));
+
const notificationProvider = notificationProviders.find((notification) =>
notification.mayDisplay(),
);