Only filter locations for first wg hop

1 files changed, 24 insertions, 2 deletions

diff --git a/gui/src/renderer/lib/filter-locations.ts b/gui/src/renderer/lib/filter-locations.ts
index 802748680a..78126f1fb4 100644
--- a/gui/src/renderer/lib/filter-locations.ts
+++ b/gui/src/renderer/lib/filter-locations.ts
@@ -1,6 +1,13 @@
-import { Ownership, RelayEndpointType, RelayLocation } from '../../shared/daemon-rpc-types';
+import {
+  LiftedConstraint,
+  Ownership,
+  RelayEndpointType,
+  RelayLocation,
+  TunnelProtocol,
+} from '../../shared/daemon-rpc-types';
 import { relayLocations } from '../../shared/gettext';
 import {
+  LocationType,
   RelayLocationCityWithVisibility,
   RelayLocationCountryWithVisibility,
   RelayLocationRelayWithVisibility,
@@ -30,12 +37,27 @@ export function filterLocationsByEndPointType(
 export function filterLocationsByDaita(
   locations: IRelayLocationCountryRedux[],
   daita: boolean,
+  locationType: LocationType,
+  tunnelProtocol: LiftedConstraint<TunnelProtocol>,
+  multihop: boolean,
 ): IRelayLocationCountryRedux[] {
-  return daita
+  return daitaFilterActive(daita, locationType, tunnelProtocol, multihop)
     ? filterLocationsImpl(locations, (relay: IRelayLocationRelayRedux) => relay.daita)
     : locations;
 }
 
+export function daitaFilterActive(
+  daita: boolean,
+  locationType: LocationType,
+  tunnelProtocol: LiftedConstraint<TunnelProtocol>,
+  multihop: boolean,
+) {
+  const isEntry = multihop
+    ? locationType === LocationType.entry
+    : locationType === LocationType.exit;
+  return daita && isEntry && tunnelProtocol !== 'openvpn';
+}
+
 export function filterLocations(
   locations: IRelayLocationCountryRedux[],
   ownership?: Ownership,