diff options
| author | Emīls Piņķis <emils@mullvad.net> | 2018-09-06 12:37:04 +0100 |
|---|---|---|
| committer | Emīls Piņķis <emils@mullvad.net> | 2018-09-06 15:29:49 +0100 |
| commit | 23d446f0efc39ad3047ddc2212832b0ca6185dca (patch) | |
| tree | fdf132ca200e340ff89bbdd59a2bb9c8e680f476 /gui/packages | |
| parent | 041b0a42a12dcf51a2ec17b09dc997c339b51f85 (diff) | |
| download | mullvadvpn-23d446f0efc39ad3047ddc2212832b0ca6185dca.tar.xz mullvadvpn-23d446f0efc39ad3047ddc2212832b0ca6185dca.zip | |
Fix relay list schema
Diffstat (limited to 'gui/packages')
| -rw-r--r-- | gui/packages/desktop/src/renderer/app.js | 4 | ||||
| -rw-r--r-- | gui/packages/desktop/src/renderer/lib/daemon-rpc.js | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/gui/packages/desktop/src/renderer/app.js b/gui/packages/desktop/src/renderer/app.js index 6cf203f4cb..3384a6d3c8 100644 --- a/gui/packages/desktop/src/renderer/app.js +++ b/gui/packages/desktop/src/renderer/app.js @@ -339,13 +339,13 @@ export default class AppRenderer { const storedLocations = locations.countries.map((country) => ({ name: country.name, code: country.code, - hasActiveRelays: country.cities.some((city) => city.has_active_relays), + hasActiveRelays: country.cities.some((city) => city.relays.length > 0), cities: country.cities.map((city) => ({ name: city.name, code: city.code, latitude: city.latitude, longitude: city.longitude, - hasActiveRelays: city.has_active_relays, + hasActiveRelays: city.relays.length > 0, relays: city.relays, })), })); diff --git a/gui/packages/desktop/src/renderer/lib/daemon-rpc.js b/gui/packages/desktop/src/renderer/lib/daemon-rpc.js index 7a3a0bb030..7b5eb86f3a 100644 --- a/gui/packages/desktop/src/renderer/lib/daemon-rpc.js +++ b/gui/packages/desktop/src/renderer/lib/daemon-rpc.js @@ -191,7 +191,6 @@ export type RelayListCity = { code: string, latitude: number, longitude: number, - has_active_relays: boolean, relays: Array<RelayListHostname>, }; @@ -214,7 +213,6 @@ const RelayListSchema = object({ code: string, latitude: number, longitude: number, - has_active_relays: boolean, relays: arrayOf( object({ hostname: string, |