diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2022-01-04 10:35:16 +0100 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2022-01-04 10:35:16 +0100 |
| commit | 85405bdf3fe64fdade01b417debbae7d908d0f8a (patch) | |
| tree | a5ebcaa8de6da83fa24fdfd0b8adc4be9a9170c6 | |
| parent | c372d087fe76538fcf3f0e593576fc28570442c1 (diff) | |
| parent | e454d49f750133725a2bff0743fec7674726128a (diff) | |
| download | mullvadvpn-85405bdf3fe64fdade01b417debbae7d908d0f8a.tar.xz mullvadvpn-85405bdf3fe64fdade01b417debbae7d908d0f8a.zip | |
Merge branch 'wireguard-ui-fixes'
| -rw-r--r-- | gui/src/renderer/components/LocationList.tsx | 4 | ||||
| -rw-r--r-- | gui/src/renderer/containers/SelectLocationPage.tsx | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/gui/src/renderer/components/LocationList.tsx b/gui/src/renderer/components/LocationList.tsx index 855efdc066..be29c2c1dc 100644 --- a/gui/src/renderer/components/LocationList.tsx +++ b/gui/src/renderer/components/LocationList.tsx @@ -430,10 +430,10 @@ export class RelayLocations extends React.PureComponent< ), }; }) - .sort((a, b) => a.name.localeCompare(b.name, this.props.locale)), + .sort((a, b) => a.label.localeCompare(b.label, this.props.locale)), }; }) - .sort((a, b) => a.name.localeCompare(b.name, this.props.locale)); + .sort((a, b) => a.label.localeCompare(b.label, this.props.locale)); } private formatRowName( diff --git a/gui/src/renderer/containers/SelectLocationPage.tsx b/gui/src/renderer/containers/SelectLocationPage.tsx index 1effeac473..e6c2199820 100644 --- a/gui/src/renderer/containers/SelectLocationPage.tsx +++ b/gui/src/renderer/containers/SelectLocationPage.tsx @@ -30,12 +30,12 @@ const mapStateToProps = (state: IReduxState, props: IHistoryProps & IAppContext) if (tunnelProtocol === 'openvpn' && 'normal' in state.settings.bridgeSettings) { selectedBridgeLocation = state.settings.bridgeSettings.normal.location; } else if ('normal' in relaySettings) { + multihopEnabled = relaySettings.normal.wireguard.useMultihop; + const entryLocation = relaySettings.normal.wireguard.entryLocation; - if (entryLocation !== 'any') { + if (multihopEnabled && entryLocation !== 'any') { selectedEntryLocation = entryLocation; } - - multihopEnabled = relaySettings.normal.wireguard.useMultihop; } const allowEntrySelection = |