Add daita filtering of relay list

3 files changed, 18 insertions, 6 deletions

diff --git a/gui/src/renderer/components/select-location/RelayListContext.tsx b/gui/src/renderer/components/select-location/RelayListContext.tsx
index 86dd7e5467..2341932f2d 100644
--- a/gui/src/renderer/components/select-location/RelayListContext.tsx
+++ b/gui/src/renderer/components/select-location/RelayListContext.tsx
@@ -4,6 +4,7 @@ import { compareRelayLocation, RelayLocation } from '../../../shared/daemon-rpc-
 import {
   EndpointType,
   filterLocations,
+  filterLocationsByDaita,
   filterLocationsByEndPointType,
   getLocationsExpandedBySearch,
   searchForLocations,
@@ -60,6 +61,7 @@ interface RelayListContextProviderProps {
 
 export function RelayListContextProvider(props: RelayListContextProviderProps) {
   const { locationType, searchTerm } = useSelectLocationContext();
+  const daita = useSelector((state) => state.settings.wireguard.daita?.enabled ?? false);
   const fullRelayList = useSelector((state) => state.settings.relayLocations);
   const relaySettings = useNormalRelaySettings();
 
@@ -71,15 +73,15 @@ export function RelayListContextProvider(props: RelayListContextProviderProps) {
     return filterLocationsByEndPointType(fullRelayList, endpointType, relaySettings);
   }, [fullRelayList, locationType, relaySettings?.tunnelProtocol]);
 
+  const relayListForDaita = useMemo(() => {
+    return filterLocationsByDaita(relayListForEndpointType, daita);
+  }, [daita, relayListForEndpointType]);
+
   // Filters the relays to only keep the relays matching the currently selected filters, e.g.
   // ownership and providers
   const relayListForFilters = useMemo(() => {
-    return filterLocations(
-      relayListForEndpointType,
-      relaySettings?.ownership,
-      relaySettings?.providers,
-    );
-  }, [relaySettings?.ownership, relaySettings?.providers, relayListForEndpointType]);
+    return filterLocations(relayListForDaita, relaySettings?.ownership, relaySettings?.providers);
+  }, [relaySettings?.ownership, relaySettings?.providers, relayListForDaita]);
 
   // Filters the relays based on the provided search term
   const relayListForSearch = useMemo(() => {
diff --git a/gui/src/renderer/lib/filter-locations.ts b/gui/src/renderer/lib/filter-locations.ts
index 63ca56cbf2..802748680a 100644
--- a/gui/src/renderer/lib/filter-locations.ts
+++ b/gui/src/renderer/lib/filter-locations.ts
@@ -27,6 +27,15 @@ export function filterLocationsByEndPointType(
   return filterLocationsImpl(locations, getTunnelProtocolFilter(endpointType, relaySettings));
 }
 
+export function filterLocationsByDaita(
+  locations: IRelayLocationCountryRedux[],
+  daita: boolean,
+): IRelayLocationCountryRedux[] {
+  return daita
+    ? filterLocationsImpl(locations, (relay: IRelayLocationRelayRedux) => relay.daita)
+    : locations;
+}
+
 export function filterLocations(
   locations: IRelayLocationCountryRedux[],
   ownership?: Ownership,
diff --git a/gui/src/renderer/redux/settings/reducers.ts b/gui/src/renderer/redux/settings/reducers.ts
index 2f8020ebf7..18873eea20 100644
--- a/gui/src/renderer/redux/settings/reducers.ts
+++ b/gui/src/renderer/redux/settings/reducers.ts
@@ -76,6 +76,7 @@ export interface IRelayLocationRelayRedux {
   owned: boolean;
   weight: number;
   endpointType: RelayEndpointType;
+  daita: boolean;
 }
 
 export interface IRelayLocationCityRedux {