Merge branch 'openvpn-2.5'

3 files changed, 5 insertions, 5 deletions

diff --git a/gui/src/main/daemon-rpc.ts b/gui/src/main/daemon-rpc.ts
index c7f4ce8608..ffb455365c 100644
--- a/gui/src/main/daemon-rpc.ts
+++ b/gui/src/main/daemon-rpc.ts
@@ -776,8 +776,8 @@ function convertFromTunnelStateErrorCause(
       return { reason: 'ipv6_unavailable' };
     case grpcTypes.ErrorState.Cause.START_TUNNEL_ERROR:
       return { reason: 'start_tunnel_error' };
-    case grpcTypes.ErrorState.Cause.TAP_ADAPTER_PROBLEM:
-      return { reason: 'tap_adapter_problem' };
+    case grpcTypes.ErrorState.Cause.VIRTUAL_ADAPTER_PROBLEM:
+      return { reason: 'virtual_adapter_problem' };
     case grpcTypes.ErrorState.Cause.SET_FIREWALL_POLICY_ERROR:
       return {
         reason: 'set_firewall_policy_error',
diff --git a/gui/src/shared/daemon-rpc-types.ts b/gui/src/shared/daemon-rpc-types.ts
index bac978f7d6..95d8758088 100644
--- a/gui/src/shared/daemon-rpc-types.ts
+++ b/gui/src/shared/daemon-rpc-types.ts
@@ -38,7 +38,7 @@ export type ErrorStateCause =
         | 'set_dns_error'
         | 'start_tunnel_error'
         | 'is_offline'
-        | 'tap_adapter_problem';
+        | 'virtual_adapter_problem';
     }
   | { reason: 'set_firewall_policy_error'; details: FirewallPolicyError }
   | { reason: 'tunnel_parameter_error'; details: TunnelParameterError }
diff --git a/gui/src/shared/notifications/error.ts b/gui/src/shared/notifications/error.ts
index d9fd12de1a..672dc27b94 100644
--- a/gui/src/shared/notifications/error.ts
+++ b/gui/src/shared/notifications/error.ts
@@ -117,10 +117,10 @@ function getMessage(errorDetails: IErrorState, accountExpiry?: string): string {
           'notifications',
           "Your device is offline. Try connecting when it's back online.",
         );
-      case 'tap_adapter_problem':
+      case 'virtual_adapter_problem':
         return messages.pgettext(
           'notifications',
-          'Unable to detect a working TAP adapter on this device. Try enabling it. Otherwise, please reinstall the app.',
+          'Unable to detect a working virtual adapter on this device. Try enabling it. Otherwise, please reinstall the app.',
         );
     }
   }