Remove daita filter notice when using use_anywhere

mullvad · Aug 20, 2024 · 7ea6b55 · 7ea6b55
1 parent 6a84cae
commit 7ea6b55
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/gui/src/renderer/components/select-location/RelayListContext.tsx b/gui/src/renderer/components/select-location/RelayListContext.tsx
@@ -66,7 +66,6 @@ export function RelayListContextProvider(props: RelayListContextProviderProps) {
 
   const fullRelayList = useSelector((state) => state.settings.relayLocations);
   const relaySettings = useNormalRelaySettings();
-  const multihop = relaySettings?.wireguard.useMultihop ?? false;
 
   // Filters the relays to only keep the ones of the desired endpoint type, e.g. "wireguard",
   // "openvpn" or "bridge"
@@ -79,7 +78,8 @@ export function RelayListContextProvider(props: RelayListContextProviderProps) {
   const relayListForDaita = useMemo(() => {
     return filterLocationsByDaita(
       relayListForEndpointType,
-      daita && (!useAnywhere || multihop),
+      daita,
+      useAnywhere,
       locationType,
       relaySettings?.tunnelProtocol ?? 'any',
       relaySettings?.wireguard.useMultihop ?? false,

diff --git a/gui/src/renderer/components/select-location/SelectLocation.tsx b/gui/src/renderer/components/select-location/SelectLocation.tsx
@@ -68,8 +68,10 @@ export default function SelectLocation() {
   const providers = relaySettings?.providers ?? [];
   const filteredProviders = useFilteredProviders(providers, ownership);
   const daita = useSelector((state) => state.settings.wireguard.daita?.enabled ?? false);
+  const useAnywhere = useSelector((state) => state.settings.wireguard.daita?.useAnywhere ?? false);
   const showDaitaFilter = daitaFilterActive(
     daita,
+    useAnywhere,
     locationType,
     relaySettings?.tunnelProtocol ?? 'any',
     relaySettings?.wireguard.useMultihop ?? false,

diff --git a/gui/src/renderer/lib/filter-locations.ts b/gui/src/renderer/lib/filter-locations.ts
@@ -37,25 +37,27 @@ export function filterLocationsByEndPointType(
 export function filterLocationsByDaita(
   locations: IRelayLocationCountryRedux[],
   daita: boolean,
+  useAnywhere: boolean,
   locationType: LocationType,
   tunnelProtocol: LiftedConstraint<TunnelProtocol>,
   multihop: boolean,
 ): IRelayLocationCountryRedux[] {
-  return daitaFilterActive(daita, locationType, tunnelProtocol, multihop)
+  return daitaFilterActive(daita, useAnywhere, locationType, tunnelProtocol, multihop)
     ? filterLocationsImpl(locations, (relay: IRelayLocationRelayRedux) => relay.daita)
     : locations;
 }
 
 export function daitaFilterActive(
   daita: boolean,
+  useAnywhere: boolean,
   locationType: LocationType,
   tunnelProtocol: LiftedConstraint<TunnelProtocol>,
   multihop: boolean,
 ) {
   const isEntry = multihop
     ? locationType === LocationType.entry
     : locationType === LocationType.exit;
-  return daita && isEntry && tunnelProtocol !== 'openvpn';
+  return daita && (!useAnywhere || multihop) && isEntry && tunnelProtocol !== 'openvpn';
 }
 
 export function filterLocations(