Integrate RelayList into Redux

3 files changed, 22 insertions, 26 deletions

diff --git a/test/components/Connect.spec.js b/test/components/Connect.spec.js
index 799692466f..4fcc3c6f60 100644
--- a/test/components/Connect.spec.js
+++ b/test/components/Connect.spec.js
@@ -150,18 +150,17 @@ const defaultProps: ConnectProps = {
         port: 'any',
       }
     },
-    relayLocations: {
-      countries: [{
-        name: 'Sweden',
-        code: 'se',
-        cities: [{
-          name: 'Malmö',
-          code: 'mma',
-          has_active_relays: true,
-          position: [0, 0],
-        }]
-      }],
-    },
+    relayLocations: [{
+      name: 'Sweden',
+      code: 'se',
+      hasActiveRelays: true,
+      cities: [{
+        name: 'Malmö',
+        code: 'mma',
+        hasActiveRelays: true,
+        position: [0, 0],
+      }]
+    }],
   },
   connection: {
     status: 'disconnected',
diff --git a/test/components/SelectLocation.spec.js b/test/components/SelectLocation.spec.js
index a33112d43b..1abdf515d9 100644
--- a/test/components/SelectLocation.spec.js
+++ b/test/components/SelectLocation.spec.js
@@ -17,18 +17,17 @@ describe('components/SelectLocation', () => {
         port: 'any',
       }
     },
-    relayLocations: {
-      countries: [{
-        name: 'Sweden',
-        code: 'se',
-        cities: [{
-          name: 'Malmö',
-          code: 'mma',
-          position: [0, 0],
-          has_active_relays: true,
-        }],
+    relayLocations: [{
+      name: 'Sweden',
+      code: 'se',
+      hasActiveRelays: true,
+      cities: [{
+        name: 'Malmö',
+        code: 'mma',
+        position: [0, 0],
+        hasActiveRelays: true,
       }],
-    },
+    }],
   };
 
   const makeProps = (state: SettingsReduxState, mergeProps: $Shape<SelectLocationProps>): SelectLocationProps => {
diff --git a/test/components/Settings.spec.js b/test/components/Settings.spec.js
index 7b4780ece2..cc38c54616 100644
--- a/test/components/Settings.spec.js
+++ b/test/components/Settings.spec.js
@@ -42,9 +42,7 @@ describe('components/Settings', () => {
         port: 1301,
       },
     },
-    relayLocations: {
-      countries: [],
-    },
+    relayLocations: [],
   };
 
   const makeProps = (anAccountState: AccountReduxState, aSettingsState: SettingsReduxState, mergeProps: $Shape<SettingsProps> = {}): SettingsProps => {