Merge branch 'implement-feature-indicators-in-main-view-des-910'

2 files changed, 45 insertions, 9 deletions

diff --git a/gui/src/shared/daemon-rpc-types.ts b/gui/src/shared/daemon-rpc-types.ts
index 295db8f323..ed588ff811 100644
--- a/gui/src/shared/daemon-rpc-types.ts
+++ b/gui/src/shared/daemon-rpc-types.ts
@@ -65,7 +65,7 @@ export enum TunnelParameterError {
   customTunnelHostResolutionError,
 }
 
-export type ErrorState =
+export type ErrorStateDetails =
   | {
       cause:
         | ErrorStateCause.ipv6Unavailable
@@ -180,12 +180,48 @@ export interface ITunnelStateRelayInfo {
   location?: ILocation;
 }
 
+// The order of the variants match the priority order and can be sorted on.
+export enum FeatureIndicator {
+  daita,
+  quantumResistance,
+  multihop,
+  bridgeMode,
+  splitTunneling,
+  lockdownMode,
+  udp2tcp,
+  shadowsocks,
+  lanSharing,
+  dnsContentBlockers,
+  customDns,
+  serverIpOverride,
+  customMtu,
+  customMssFix,
+}
+
+export type DisconnectedState = { state: 'disconnected'; location?: Partial<ILocation> };
+export type ConnectingState = {
+  state: 'connecting';
+  details?: ITunnelStateRelayInfo;
+  featureIndicators?: Array<FeatureIndicator>;
+};
+export type ConnectedState = {
+  state: 'connected';
+  details: ITunnelStateRelayInfo;
+  featureIndicators?: Array<FeatureIndicator>;
+};
+export type DisconnectingState = {
+  state: 'disconnecting';
+  details: AfterDisconnect;
+  location?: Partial<ILocation>;
+};
+export type ErrorState = { state: 'error'; details: ErrorStateDetails };
+
 export type TunnelState =
-  | { state: 'disconnected'; location?: Partial<ILocation> }
-  | { state: 'connecting'; details?: ITunnelStateRelayInfo }
-  | { state: 'connected'; details: ITunnelStateRelayInfo }
-  | { state: 'disconnecting'; details: AfterDisconnect; location?: Partial<ILocation> }
-  | { state: 'error'; details: ErrorState };
+  | DisconnectedState
+  | ConnectingState
+  | ConnectedState
+  | DisconnectingState
+  | ErrorState;
 
 export interface RelayLocationCountry extends Partial<RelayLocationCustomList> {
   country: string;
diff --git a/gui/src/shared/notifications/error.ts b/gui/src/shared/notifications/error.ts
index dae080bb29..af82748d7b 100644
--- a/gui/src/shared/notifications/error.ts
+++ b/gui/src/shared/notifications/error.ts
@@ -3,8 +3,8 @@ import { sprintf } from 'sprintf-js';
 import { strings } from '../../config.json';
 import {
   AuthFailedError,
-  ErrorState,
   ErrorStateCause,
+  ErrorStateDetails,
   TunnelParameterError,
   TunnelState,
 } from '../daemon-rpc-types';
@@ -87,7 +87,7 @@ export class ErrorNotificationProvider
     }
   }
 
-  private getMessage(errorState: ErrorState): string {
+  private getMessage(errorState: ErrorStateDetails): string {
     if (errorState.blockingError) {
       if (errorState.cause === ErrorStateCause.setFirewallPolicyError) {
         switch (process.platform ?? window.env.platform) {
@@ -229,7 +229,7 @@ export class ErrorNotificationProvider
     }
   }
 
-  private getActions(errorState: ErrorState): InAppNotificationAction | void {
+  private getActions(errorState: ErrorStateDetails): InAppNotificationAction | void {
     const platform = process.platform ?? window.env.platform;
 
     if (errorState.cause === ErrorStateCause.setFirewallPolicyError && platform === 'linux') {