diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2021-08-17 12:59:42 +0200 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2021-08-17 13:00:06 +0200 |
| commit | b43b45007fb69430b502a443c18bcd4c96aa0f91 (patch) | |
| tree | d5cca3468c47365f4b6dcff93c36703533489e4a /gui/src | |
| parent | 5dd3bba0df21f080ec4a174087bef2178eaa16e1 (diff) | |
| download | mullvadvpn-b43b45007fb69430b502a443c18bcd4c96aa0f91.tar.xz mullvadvpn-b43b45007fb69430b502a443c18bcd4c96aa0f91.zip | |
Add filtering of bridge locations
Diffstat (limited to 'gui/src')
| -rw-r--r-- | gui/src/renderer/components/FilterByProvider.tsx | 8 | ||||
| -rw-r--r-- | gui/src/renderer/containers/SelectLocationPage.tsx | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/gui/src/renderer/components/FilterByProvider.tsx b/gui/src/renderer/components/FilterByProvider.tsx index 5ed0843757..f90baf89b5 100644 --- a/gui/src/renderer/components/FilterByProvider.tsx +++ b/gui/src/renderer/components/FilterByProvider.tsx @@ -43,7 +43,11 @@ export default function FilterByProvider() { const history = useHistory(); const { updateRelaySettings } = useAppContext(); - const relayList = useSelector((state) => state.settings.relayLocations); + const serverList = useSelector((state) => + state.settings.relayLocations.concat( + state.settings.bridgeState === 'on' ? state.settings.bridgeLocations : [], + ), + ); const providerConstraint = useSelector((state) => { if ('normal' in state.settings.relaySettings) { return state.settings.relaySettings.normal.providers; @@ -53,7 +57,7 @@ export default function FilterByProvider() { }); const [providers, setProviders] = useState(() => { - const providers = relayList.flatMap((country) => + const providers = serverList.flatMap((country) => country.cities.flatMap((city) => city.relays.map((relay) => relay.provider)), ); const uniqueProviders = removeDuplicates(providers).sort((a, b) => a.localeCompare(b)); diff --git a/gui/src/renderer/containers/SelectLocationPage.tsx b/gui/src/renderer/containers/SelectLocationPage.tsx index e930dec0fe..ea931c8ea9 100644 --- a/gui/src/renderer/containers/SelectLocationPage.tsx +++ b/gui/src/renderer/containers/SelectLocationPage.tsx @@ -40,7 +40,7 @@ const mapStateToProps = (state: IReduxState) => { selectedExitLocation, selectedBridgeLocation, relayLocations: filterLocationsByProvider(state.settings.relayLocations, providers), - bridgeLocations: state.settings.bridgeLocations, + bridgeLocations: filterLocationsByProvider(state.settings.bridgeLocations, providers), locationScope, allowBridgeSelection, providers, |