summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJoakim Hulthe <joakim@hulthe.net>2024-11-28 15:33:01 +0100
committerJoakim Hulthe <joakim.hulthe@mullvad.net>2024-11-28 16:42:07 +0100
commitc1873022df8d1b6c2434b3bb50cb8bb76631e37e (patch)
treeeaf0075a97161bce510b5ea233fb562c1aeca863
parentc4f7af2e0dd19bd8b735315cb9148585421e68a3 (diff)
downloadmullvadvpn-c1873022df8d1b6c2434b3bb50cb8bb76631e37e.tar.xz
mullvadvpn-c1873022df8d1b6c2434b3bb50cb8bb76631e37e.zip
Fix hidden Entry view when using bridge mode
-rw-r--r--desktop/packages/mullvad-vpn/src/renderer/components/select-location/SelectLocationContainer.tsx10
1 files changed, 8 insertions, 2 deletions
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/select-location/SelectLocationContainer.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/select-location/SelectLocationContainer.tsx
index 1c4c8e2349..06ad9faf98 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/select-location/SelectLocationContainer.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/select-location/SelectLocationContainer.tsx
@@ -28,13 +28,19 @@ export default function SelectLocationContainer() {
const { setSelectLocationView } = useActions(userInterface);
const [searchTerm, setSearchTerm] = useState('');
const relaySettings = useNormalRelaySettings();
+ const bridgeState = useSelector((state) => state.settings.bridgeState);
const locationType = useMemo(() => {
- if (relaySettings?.wireguard.useMultihop) {
+ const multihopEnabled =
+ relaySettings?.tunnelProtocol !== 'openvpn' && relaySettings?.wireguard.useMultihop;
+ const bridgeModeEnabled = relaySettings?.tunnelProtocol === 'openvpn' && bridgeState === 'on';
+ const allowEntryLocations = multihopEnabled || bridgeModeEnabled;
+
+ if (allowEntryLocations) {
return locationTypeSelector;
}
return LocationType.exit;
- }, [locationTypeSelector, relaySettings]);
+ }, [locationTypeSelector, relaySettings, bridgeState]);
const value = useMemo(
() => ({