Merge branch 'enabling-and-disabling-multihop-keeps-location-state-in-des-2944'

1 files changed, 14 insertions, 13 deletions

diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/select-location/SelectLocationViewContext.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/views/select-location/SelectLocationViewContext.tsx
index ee4b54d65a..94fe41673e 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/views/select-location/SelectLocationViewContext.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/select-location/SelectLocationViewContext.tsx
@@ -40,19 +40,29 @@ export const useSelectLocationViewContext = (): SelectLocationViewContextProps =
 type SelectLocationViewProviderProps = React.PropsWithChildren;
 
 export function SelectLocationViewProvider({ children }: SelectLocationViewProviderProps) {
-  const locationTypeSelector = useSelector((state) => state.userInterface.selectLocationView);
   const { setSelectLocationView } = useActions(userInterface);
   const [searchTerm, setSearchTerm] = React.useState('');
   const relaySettings = useNormalRelaySettings();
-  const selectedLocation = useSelectedLocation(locationTypeSelector);
+  const locationTypeSelector = useSelector((state) => state.userInterface.selectLocationView);
+
+  const locationType = React.useMemo(() => {
+    const allowEntryLocations = relaySettings?.wireguard.useMultihop;
+
+    if (allowEntryLocations) {
+      return locationTypeSelector;
+    }
+    return LocationType.exit;
+  }, [locationTypeSelector, relaySettings]);
 
-  const filteredCountries = useFilterCountryLocations(locationTypeSelector);
+  const filteredCountries = useFilterCountryLocations(locationType);
   const filteredCountryLocations = useMapReduxCountriesToCountryLocations(
-    locationTypeSelector,
+    locationType,
     filteredCountries,
   );
   const searchedCountryLocations = useSearchCountryLocations(filteredCountryLocations, searchTerm);
 
+  const selectedLocation = useSelectedLocation(locationType);
+
   const filteredCustomListLocations = useMapCustomListsToLocations(
     searchedCountryLocations,
     searchTerm,
@@ -63,15 +73,6 @@ export function SelectLocationViewProvider({ children }: SelectLocationViewProvi
     searchTerm,
   );
 
-  const locationType = React.useMemo(() => {
-    const allowEntryLocations = relaySettings?.wireguard.useMultihop;
-
-    if (allowEntryLocations) {
-      return locationTypeSelector;
-    }
-    return LocationType.exit;
-  }, [locationTypeSelector, relaySettings]);
-
   const value = React.useMemo(
     () => ({
       locationType,