Merge branch 'check-ipv6-enabled'

2 files changed, 20 insertions, 16 deletions

diff --git a/gui/packages/desktop/src/renderer/errors.js b/gui/packages/desktop/src/renderer/errors.js
index b333f66221..32ec75b105 100644
--- a/gui/packages/desktop/src/renderer/errors.js
+++ b/gui/packages/desktop/src/renderer/errors.js
@@ -4,22 +4,24 @@ import type { BlockReason } from './lib/daemon-rpc';
 
 export class BlockedError extends Error {
   constructor(reason: BlockReason) {
-    switch (reason) {
-      case 'set_security_policy_error':
-        super('Failed to apply security policy');
-        break;
-      case 'start_tunnel_error':
-        super('Failed to start tunnel connection');
-        break;
-      case 'no_matching_relay':
-        super('No relay server matches the current settings');
-        break;
-      case 'no_account_token':
-        super('No account token configured');
-        break;
-      default:
-        super(`Unknown error: ${(reason: empty)}`);
-    }
+    const message = (function() {
+      switch (reason) {
+        case 'enable_ipv6_error':
+          return 'Could not configure IPv6, please enable it on your system or disable it in the app';
+        case 'set_security_policy_error':
+          return 'Failed to apply security policy';
+        case 'start_tunnel_error':
+          return 'Failed to start tunnel connection';
+        case 'no_matching_relay':
+          return 'No relay server matches the current settings';
+        case 'no_account_token':
+          return 'No account token configured';
+        default:
+          return `Unknown error: ${(reason: empty)}`;
+      }
+    })();
+
+    super(message);
   }
 }
 
diff --git a/gui/packages/desktop/src/renderer/lib/daemon-rpc.js b/gui/packages/desktop/src/renderer/lib/daemon-rpc.js
index aa9f020826..7a3a0bb030 100644
--- a/gui/packages/desktop/src/renderer/lib/daemon-rpc.js
+++ b/gui/packages/desktop/src/renderer/lib/daemon-rpc.js
@@ -42,6 +42,7 @@ const LocationSchema = object({
 });
 
 export type BlockReason =
+  | 'enable_ipv6_error'
   | 'set_security_policy_error'
   | 'start_tunnel_error'
   | 'no_matching_relay'
@@ -245,6 +246,7 @@ const AccountDataSchema = object({
 });
 
 const allBlockReasons: Array<BlockReason> = [
+  'enable_ipv6_error',
   'set_security_policy_error',
   'start_tunnel_error',
   'no_matching_relay',