summaryrefslogtreecommitdiffhomepage
path: root/gui/src/shared
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2024-05-29 12:56:03 +0200
committerDavid Lönnhager <david.l@mullvad.net>2024-05-29 12:56:03 +0200
commit596286dffee268327265879469588f8760cd43a6 (patch)
tree97176e347d6fb96143c573fc4b651604e01e512d /gui/src/shared
parent2b04fed8d6a486d97af47f1add45b0eeb1071db8 (diff)
parent6289b4c7feb587e8fe2a9a4be175a8bd1aafa9f7 (diff)
downloadmullvadvpn-596286dffee268327265879469588f8760cd43a6.tar.xz
mullvadvpn-596286dffee268327265879469588f8760cd43a6.zip
Merge branch 'macos-add-split-tunnel-error-info'
Diffstat (limited to 'gui/src/shared')
-rw-r--r--gui/src/shared/notifications/error.ts17
1 files changed, 13 insertions, 4 deletions
diff --git a/gui/src/shared/notifications/error.ts b/gui/src/shared/notifications/error.ts
index 673d6cea28..1d36b7e1de 100644
--- a/gui/src/shared/notifications/error.ts
+++ b/gui/src/shared/notifications/error.ts
@@ -183,10 +183,18 @@ function getMessage(errorState: ErrorState): string {
'Your device is offline. The tunnel will automatically connect once your device is back online.',
);
case ErrorStateCause.splitTunnelError:
- return messages.pgettext(
- 'notifications',
- 'Unable to communicate with Mullvad kernel driver. Try reconnecting or send a problem report.',
- );
+ switch (process.platform ?? window.env.platform) {
+ case 'darwin':
+ return messages.pgettext(
+ 'notifications',
+ 'Failed to enable split tunneling. Please try again or disable it.',
+ );
+ default:
+ return messages.pgettext(
+ 'notifications',
+ 'Unable to communicate with Mullvad kernel driver. Try reconnecting or send a problem report.',
+ );
+ }
}
}
}
@@ -265,6 +273,7 @@ function getActions(errorState: ErrorState): InAppNotificationAction | void {
},
};
} else if (errorState.cause === ErrorStateCause.splitTunnelError) {
+ // TODO: macos: handle this and full disk access error
return {
type: 'troubleshoot-dialog',
troubleshoot: {