summaryrefslogtreecommitdiffhomepage
path: root/gui/src
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2021-04-29 13:36:52 +0200
committerOskar Nyberg <oskar@mullvad.net>2021-07-02 16:15:01 +0200
commit2eb54ec4ced0a13d5c3aa68bffc724d1dbf155a8 (patch)
treecd8db75b23b072aa9f2b28de6d263f8e9583ae2c /gui/src
parentdaf15f2916f99774429724aca4713734a85fee62 (diff)
downloadmullvadvpn-2eb54ec4ced0a13d5c3aa68bffc724d1dbf155a8.tar.xz
mullvadvpn-2eb54ec4ced0a13d5c3aa68bffc724d1dbf155a8.zip
Handle split-tunnel-error in frontend
Diffstat (limited to 'gui/src')
-rw-r--r--gui/src/main/daemon-rpc.ts2
-rw-r--r--gui/src/shared/daemon-rpc-types.ts7
-rw-r--r--gui/src/shared/notifications/error.ts5
3 files changed, 12 insertions, 2 deletions
diff --git a/gui/src/main/daemon-rpc.ts b/gui/src/main/daemon-rpc.ts
index fabab8ecaf..ba83c206a3 100644
--- a/gui/src/main/daemon-rpc.ts
+++ b/gui/src/main/daemon-rpc.ts
@@ -814,7 +814,7 @@ function convertFromTunnelStateErrorCause(
return { reason: 'tunnel_parameter_error', details: parameterErrorMap[state.parameterError] };
}
case grpcTypes.ErrorState.Cause.SPLIT_TUNNEL_ERROR:
- return { reason: 'start_tunnel_error' };
+ return { reason: 'split_tunnel_error' };
case grpcTypes.ErrorState.Cause.VPN_PERMISSION_DENIED:
// VPN_PERMISSION_DENIED is only ever created on Android
throw invalidErrorStateCause;
diff --git a/gui/src/shared/daemon-rpc-types.ts b/gui/src/shared/daemon-rpc-types.ts
index 95285ef884..aa325035d4 100644
--- a/gui/src/shared/daemon-rpc-types.ts
+++ b/gui/src/shared/daemon-rpc-types.ts
@@ -34,7 +34,12 @@ export type TunnelParameterError =
export type ErrorStateCause =
| {
- reason: 'ipv6_unavailable' | 'set_dns_error' | 'start_tunnel_error' | 'is_offline';
+ reason:
+ | 'ipv6_unavailable'
+ | 'set_dns_error'
+ | 'start_tunnel_error'
+ | 'is_offline'
+ | 'split_tunnel_error';
}
| { reason: 'set_firewall_policy_error'; details: FirewallPolicyError }
| { reason: 'tunnel_parameter_error'; details: TunnelParameterError }
diff --git a/gui/src/shared/notifications/error.ts b/gui/src/shared/notifications/error.ts
index 4ed97da301..97e5e2ce93 100644
--- a/gui/src/shared/notifications/error.ts
+++ b/gui/src/shared/notifications/error.ts
@@ -138,6 +138,11 @@ function getMessage(errorDetails: IErrorState, accountExpiry?: string): string {
'notifications',
"Your device is offline. Try connecting when it's back online.",
);
+ case 'split_tunnel_error':
+ return messages.pgettext(
+ 'notifications',
+ 'Unable to communicate with Mullvad kernel driver. Try reconnecting or contact support.',
+ );
}
}
}