Fix TS build errors

1 files changed, 12 insertions, 4 deletions

diff --git a/gui/src/main/daemon-rpc.ts b/gui/src/main/daemon-rpc.ts
index 8eef8848e2..21c320cc77 100644
--- a/gui/src/main/daemon-rpc.ts
+++ b/gui/src/main/daemon-rpc.ts
@@ -447,8 +447,16 @@ export class DaemonRpc {
 
   public async setDnsOptions(dns: IDnsOptions): Promise<void> {
     const dnsOptions = new grpcTypes.DnsOptions();
-    dnsOptions.setCustom(dns.custom);
-    dnsOptions.setAddressesList(dns.addresses);
+    if (dns.custom) {
+      const customOptions = new grpcTypes.CustomDnsOptions();
+      customOptions.setAddressesList(dns.addresses);
+      dnsOptions.setCustom(customOptions);
+    } else {
+      const defaultOptions = new grpcTypes.DefaultDnsOptions();
+      defaultOptions.setBlockAds(false);
+      defaultOptions.setBlockTrackers(false);
+      dnsOptions.setDefault(defaultOptions);
+    }
 
     await this.call<grpcTypes.DnsOptions, Empty>(this.client.setDnsOptions, dnsOptions);
   }
@@ -1029,8 +1037,8 @@ function convertFromTunnelOptions(tunnelOptions: grpcTypes.TunnelOptions.AsObjec
       enableIpv6: tunnelOptions.generic!.enableIpv6,
     },
     dns: {
-      custom: tunnelOptions.dnsOptions?.custom ?? false,
-      addresses: tunnelOptions.dnsOptions?.addressesList ?? [],
+      custom: !!tunnelOptions.dnsOptions?.custom,
+      addresses: tunnelOptions.dnsOptions?.custom?.addressesList ?? [],
     },
   };
 }