Merge branch 'add-macos-offline-state'

2 files changed, 5 insertions, 1 deletions

diff --git a/gui/packages/desktop/src/renderer/components/NotificationArea.js b/gui/packages/desktop/src/renderer/components/NotificationArea.js
index df8c63706c..936a29b5d0 100644
--- a/gui/packages/desktop/src/renderer/components/NotificationArea.js
+++ b/gui/packages/desktop/src/renderer/components/NotificationArea.js
@@ -45,6 +45,8 @@ function getBlockReasonMessage(blockReason: BlockReason): string {
       return 'Failed to start tunnel connection';
     case 'no_matching_relay':
       return 'No relay server matches the current settings';
+    case 'is_offline':
+      return 'This device is offline, no tunnels can be established';
     default:
       return `Unknown error: ${(blockReason.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 1b2bb0523e..5417ec4f21 100644
--- a/gui/packages/desktop/src/renderer/lib/daemon-rpc.js
+++ b/gui/packages/desktop/src/renderer/lib/daemon-rpc.js
@@ -50,7 +50,8 @@ export type BlockReason =
         | 'ipv6_unavailable'
         | 'set_security_policy_error'
         | 'start_tunnel_error'
-        | 'no_matching_relay',
+        | 'no_matching_relay'
+        | 'is_offline',
     }
   | { reason: 'auth_failed', details: ?string };
 
@@ -310,6 +311,7 @@ const TunnelStateTransitionSchema = oneOf(
           'set_security_policy_error',
           'start_tunnel_error',
           'no_matching_relay',
+          'is_offline',
         ),
       }),
       object({