diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2020-11-10 21:15:20 +0100 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2020-11-10 21:15:20 +0100 |
| commit | aed5e13c1859ea0988b823b0b5a11ece50a2acc1 (patch) | |
| tree | 0b227b61e4ca92f6978705f5f4e90e2e56720b5d /gui/src/renderer | |
| parent | 0e3aae1adcc24ff6bd003480bbb22a608d1e3c7c (diff) | |
| parent | b2075de931dc3cea7e59e8d5e0328333af6e5b42 (diff) | |
| download | mullvadvpn-aed5e13c1859ea0988b823b0b5a11ece50a2acc1.tar.xz mullvadvpn-aed5e13c1859ea0988b823b0b5a11ece50a2acc1.zip | |
Merge branch 'add-no-valid-key-notification'
Diffstat (limited to 'gui/src/renderer')
| -rw-r--r-- | gui/src/renderer/components/NotificationArea.tsx | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/gui/src/renderer/components/NotificationArea.tsx b/gui/src/renderer/components/NotificationArea.tsx index 8e14cdf68a..012fa89d57 100644 --- a/gui/src/renderer/components/NotificationArea.tsx +++ b/gui/src/renderer/components/NotificationArea.tsx @@ -3,13 +3,14 @@ import log from 'electron-log'; import React, { useCallback } from 'react'; import { useSelector } from 'react-redux'; import { - CloseToAccountExpiryNotificationProvider, BlockWhenDisconnectedNotificationProvider, + CloseToAccountExpiryNotificationProvider, ConnectingNotificationProvider, ErrorNotificationProvider, InAppNotificationProvider, InconsistentVersionNotificationProvider, NotificationAction, + NoValidKeyNotificationProvider, ReconnectingNotificationProvider, UnsupportedVersionNotificationProvider, UpdateAvailableNotificationProvider, @@ -38,12 +39,19 @@ export default function NotificationArea(props: IProps) { const blockWhenDisconnected = useSelector( (state: IReduxState) => state.settings.blockWhenDisconnected, ); + const tunnelProtocol = useSelector((state: IReduxState) => + 'normal' in state.settings.relaySettings + ? state.settings.relaySettings.normal.tunnelProtocol + : undefined, + ); + const wireGuardKey = useSelector((state: IReduxState) => state.settings.wireguardKeyState); const notificationProviders: InAppNotificationProvider[] = [ new ConnectingNotificationProvider({ tunnelState }), new ReconnectingNotificationProvider(tunnelState), new BlockWhenDisconnectedNotificationProvider({ tunnelState, blockWhenDisconnected }), new ErrorNotificationProvider({ tunnelState, accountExpiry }), + new NoValidKeyNotificationProvider({ tunnelProtocol, wireGuardKey }), new InconsistentVersionNotificationProvider({ consistent: version.consistent }), new UnsupportedVersionNotificationProvider(version), new UpdateAvailableNotificationProvider(version), |
