Update frontend according to changes in management interface

4 files changed, 15 insertions, 7 deletions

diff --git a/gui/src/main/daemon-rpc.ts b/gui/src/main/daemon-rpc.ts
index ba83c206a3..10159ad49e 100644
--- a/gui/src/main/daemon-rpc.ts
+++ b/gui/src/main/daemon-rpc.ts
@@ -880,12 +880,14 @@ function convertFromSettings(settings: grpcTypes.Settings): ISettings | undefine
   const relaySettings = convertFromRelaySettings(settings.getRelaySettings())!;
   const bridgeSettings = convertFromBridgeSettings(settingsObject.bridgeSettings!);
   const tunnelOptions = convertFromTunnelOptions(settingsObject.tunnelOptions!);
+  const splitTunnel = settingsObject.splitTunnel ?? { enableExclusions: false, appsList: [] };
   return {
     ...settings.toObject(),
     bridgeState,
     relaySettings,
     bridgeSettings,
     tunnelOptions,
+    splitTunnel,
   };
 }
 
diff --git a/gui/src/main/index.ts b/gui/src/main/index.ts
index 77382451ea..1c981adf11 100644
--- a/gui/src/main/index.ts
+++ b/gui/src/main/index.ts
@@ -129,8 +129,10 @@ class ApplicationMain {
     autoConnect: false,
     blockWhenDisconnected: false,
     showBetaReleases: false,
-    splitTunnel: false,
-    splitTunnelAppsList: [],
+    splitTunnel: {
+      enableExclusions: false,
+      appsList: [],
+    },
     relaySettings: {
       normal: {
         location: 'any',
@@ -732,7 +734,7 @@ class ApplicationMain {
     this.notificationController.notifyTunnelState(
       newState,
       this.settings.blockWhenDisconnected,
-      this.settings.splitTunnel && this.settings.splitTunnelAppsList.length > 0,
+      this.settings.splitTunnel.enableExclusions && this.settings.splitTunnel.appsList.length > 0,
       this.accountData?.expiry,
     );
 
@@ -767,7 +769,7 @@ class ApplicationMain {
       IpcMainEventChannel.settings.notify(this.windowController.webContents, newSettings);
 
       if (windowsSplitTunneling) {
-        consumePromise(this.updateSplitTunnelingApplications(newSettings.splitTunnelAppsList));
+        consumePromise(this.updateSplitTunnelingApplications(newSettings.splitTunnel.appsList));
       }
     }
 
diff --git a/gui/src/renderer/app.tsx b/gui/src/renderer/app.tsx
index a32ca8e95c..677286c092 100644
--- a/gui/src/renderer/app.tsx
+++ b/gui/src/renderer/app.tsx
@@ -742,7 +742,7 @@ export default class AppRenderer {
     reduxSettings.updateWireguardMtu(newSettings.tunnelOptions.wireguard.mtu);
     reduxSettings.updateBridgeState(newSettings.bridgeState);
     reduxSettings.updateDnsOptions(newSettings.tunnelOptions.dns);
-    reduxSettings.updateSplitTunnelingState(newSettings.splitTunnel);
+    reduxSettings.updateSplitTunnelingState(newSettings.splitTunnel.enableExclusions);
 
     this.setRelaySettings(newSettings.relaySettings);
     this.setBridgeSettings(newSettings.bridgeSettings);
diff --git a/gui/src/shared/daemon-rpc-types.ts b/gui/src/shared/daemon-rpc-types.ts
index aa325035d4..4c806b11b8 100644
--- a/gui/src/shared/daemon-rpc-types.ts
+++ b/gui/src/shared/daemon-rpc-types.ts
@@ -316,8 +316,7 @@ export interface ISettings {
   tunnelOptions: ITunnelOptions;
   bridgeSettings: BridgeSettings;
   bridgeState: BridgeState;
-  splitTunnel: boolean;
-  splitTunnelAppsList: string[];
+  splitTunnel: SplitTunnelSettings;
 }
 
 export type KeygenEvent = INewWireguardKey | KeygenFailure;
@@ -334,6 +333,11 @@ export interface IWireguardPublicKey {
 
 export type BridgeState = 'auto' | 'on' | 'off';
 
+export type SplitTunnelSettings = {
+  enableExclusions: boolean;
+  appsList: string[];
+};
+
 export interface IBridgeConstraints {
   location: Constraint<RelayLocation>;
 }