Merge branch 'macos-add-dns-server'

4 files changed, 24 insertions, 0 deletions

diff --git a/gui/locales/messages.pot b/gui/locales/messages.pot
index eb403901d0..faf84e7b08 100644
--- a/gui/locales/messages.pot
+++ b/gui/locales/messages.pot
@@ -620,6 +620,10 @@ msgctxt "navigation-bar"
 msgid "Settings"
 msgstr ""
 
+msgctxt "notifications"
+msgid " Unable to activate macOS network check module. Close any programs that might be using port 53, or disable \"Allow macOS network check\"."
+msgstr ""
+
 #. The system notification displayed to the user when the account credit is close to expiry.
 #. Available placeholder:
 #. %(duration)s - remaining time, e.g. "2 days"
@@ -678,6 +682,10 @@ msgid "Disconnected and unsecure"
 msgstr ""
 
 msgctxt "notifications"
+msgid "Failed to read system DNS configuration."
+msgstr ""
+
+msgctxt "notifications"
 msgid "Reconnecting"
 msgstr ""
 
diff --git a/gui/src/main/daemon-rpc.ts b/gui/src/main/daemon-rpc.ts
index c12ee53eff..a2416e9943 100644
--- a/gui/src/main/daemon-rpc.ts
+++ b/gui/src/main/daemon-rpc.ts
@@ -827,6 +827,10 @@ function convertFromTunnelStateErrorCause(
     }
     case grpcTypes.ErrorState.Cause.SPLIT_TUNNEL_ERROR:
       return { reason: 'split_tunnel_error' };
+    case grpcTypes.ErrorState.Cause.FILTERING_RESOLVER_ERROR:
+      return { reason: 'filtering_resolver_error' };
+    case grpcTypes.ErrorState.Cause.READ_SYSTEM_DNS_CONFIG:
+      return { reason: 'read_system_dns_config' };
     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 8e42147f43..300af97660 100644
--- a/gui/src/shared/daemon-rpc-types.ts
+++ b/gui/src/shared/daemon-rpc-types.ts
@@ -40,6 +40,8 @@ export type ErrorStateCause =
         | 'set_dns_error'
         | 'start_tunnel_error'
         | 'is_offline'
+        | 'filtering_resolver_error'
+        | 'read_system_dns_config'
         | 'split_tunnel_error';
     }
   | { reason: 'set_firewall_policy_error'; details: FirewallPolicyError }
diff --git a/gui/src/shared/notifications/error.ts b/gui/src/shared/notifications/error.ts
index 066c9c333e..22fd1858dc 100644
--- a/gui/src/shared/notifications/error.ts
+++ b/gui/src/shared/notifications/error.ts
@@ -138,6 +138,16 @@ function getMessage(errorDetails: IErrorState, accountExpiry?: string): string {
           'notifications',
           "Your device is offline. Try connecting when it's back online.",
         );
+      case 'filtering_resolver_error':
+        // TODO: Figure out a better error message to show to users
+        return messages.pgettext(
+          'notifications',
+          ' Unable to activate macOS network check module. Close any programs that might be using port 53, or disable "Allow macOS network check".',
+        );
+      case 'read_system_dns_config':
+        // TODO: Figure out a better error message to show to users
+        return messages.pgettext('notifications', 'Failed to read system DNS configuration.');
+
       case 'split_tunnel_error':
         return messages.pgettext(
           'notifications',