Merge branch 'detect-missing-tap-adapter'

2 files changed, 5 insertions, 1 deletions

diff --git a/gui/packages/desktop/src/main/daemon-rpc.js b/gui/packages/desktop/src/main/daemon-rpc.js
index 26da6e14af..bb55e5d335 100644
--- a/gui/packages/desktop/src/main/daemon-rpc.js
+++ b/gui/packages/desktop/src/main/daemon-rpc.js
@@ -52,7 +52,8 @@ export type BlockReason =
         | 'set_dns_error'
         | 'start_tunnel_error'
         | 'no_matching_relay'
-        | 'is_offline',
+        | 'is_offline'
+        | 'tap_adapter_problem',
     }
   | { reason: 'auth_failed', details: ?string };
 
@@ -314,6 +315,7 @@ const TunnelStateTransitionSchema = oneOf(
           'start_tunnel_error',
           'no_matching_relay',
           'is_offline',
+          'tap_adapter_problem',
         ),
       }),
       object({
diff --git a/gui/packages/desktop/src/renderer/components/NotificationArea.js b/gui/packages/desktop/src/renderer/components/NotificationArea.js
index 646dd236c2..3eba431a52 100644
--- a/gui/packages/desktop/src/renderer/components/NotificationArea.js
+++ b/gui/packages/desktop/src/renderer/components/NotificationArea.js
@@ -55,6 +55,8 @@ function getBlockReasonMessage(blockReason: BlockReason): string {
       return 'No relay server matches the current settings';
     case 'is_offline':
       return 'This device is offline, no tunnels can be established';
+    case 'tap_adapter_problem':
+      return "Unable to detect a working TAP adapter on this device. If you've disabled it, enable it again. Otherwise, please reinstall the app";
     default:
       return `Unknown error: ${(blockReason.reason: empty)}`;
   }