summaryrefslogtreecommitdiffhomepage
path: root/gui/src/renderer/components
diff options
context:
space:
mode:
Diffstat (limited to 'gui/src/renderer/components')
-rw-r--r--gui/src/renderer/components/select-location/RelayListContext.tsx4
-rw-r--r--gui/src/renderer/components/select-location/SelectLocation.tsx2
2 files changed, 4 insertions, 2 deletions
diff --git a/gui/src/renderer/components/select-location/RelayListContext.tsx b/gui/src/renderer/components/select-location/RelayListContext.tsx
index 13156dd045..ba86709080 100644
--- 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
index f6cf772019..36a69667da 100644
--- 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,