Merge branch 'fix-hidden-bridge-mode-entry-view'

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(
     () => ({