Merge branch 'fix-block-reason-in-gui'

2 files changed, 4 insertions, 8 deletions

diff --git a/gui/packages/desktop/src/renderer/errors.js b/gui/packages/desktop/src/renderer/errors.js
index 32ec75b105..a6f103357a 100644
--- a/gui/packages/desktop/src/renderer/errors.js
+++ b/gui/packages/desktop/src/renderer/errors.js
@@ -6,7 +6,7 @@ export class BlockedError extends Error {
   constructor(reason: BlockReason) {
     const message = (function() {
       switch (reason) {
-        case 'enable_ipv6_error':
+        case 'ipv6_unavailable':
           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';
@@ -14,8 +14,6 @@ export class BlockedError extends 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)}`;
       }
diff --git a/gui/packages/desktop/src/renderer/lib/daemon-rpc.js b/gui/packages/desktop/src/renderer/lib/daemon-rpc.js
index 198a3e764d..fcfcf6744a 100644
--- a/gui/packages/desktop/src/renderer/lib/daemon-rpc.js
+++ b/gui/packages/desktop/src/renderer/lib/daemon-rpc.js
@@ -42,11 +42,10 @@ const LocationSchema = object({
 });
 
 export type BlockReason =
-  | 'enable_ipv6_error'
+  | 'ipv6_unavailable'
   | 'set_security_policy_error'
   | 'start_tunnel_error'
-  | 'no_matching_relay'
-  | 'no_account_token';
+  | 'no_matching_relay';
 
 export type TunnelState = 'connecting' | 'connected' | 'disconnecting' | 'disconnected' | 'blocked';
 
@@ -228,11 +227,10 @@ const AccountDataSchema = object({
 });
 
 const allBlockReasons: Array<BlockReason> = [
-  'enable_ipv6_error',
+  'ipv6_unavailable',
   'set_security_policy_error',
   'start_tunnel_error',
   'no_matching_relay',
-  'no_account_token',
 ];
 const TunnelStateTransitionSchema = oneOf(
   object({