Update RelaySettingsRedux

2 files changed, 22 insertions, 16 deletions

diff --git a/app/redux/settings/actions.js b/app/redux/settings/actions.js
index 4cc4910e01..74f8f120f7 100644
--- a/app/redux/settings/actions.js
+++ b/app/redux/settings/actions.js
@@ -1,15 +1,15 @@
 // @flow
 
-import type { RelaySettings } from './reducers';
+import type { RelaySettingsRedux } from './reducers';
 
 export type UpdateRelayAction = {
   type: 'UPDATE_RELAY',
-  relay: RelaySettings,
+  relay: RelaySettingsRedux,
 };
 
 export type SettingsAction = UpdateRelayAction;
 
-function updateRelay(relay: RelaySettings): UpdateRelayAction {
+function updateRelay(relay: RelaySettingsRedux): UpdateRelayAction {
   return {
     type: 'UPDATE_RELAY',
     relay: relay,
diff --git a/app/redux/settings/reducers.js b/app/redux/settings/reducers.js
index 2754088d1b..56548a8d12 100644
--- a/app/redux/settings/reducers.js
+++ b/app/redux/settings/reducers.js
@@ -1,24 +1,33 @@
 // @flow
 
-import { defaultServer } from '../../config';
-
 import type { ReduxAction } from '../store';
+import type { RelayProtocol, RelayLocation } from '../../lib/ipc-facade';
 
-export type RelaySettings = {
+export type RelaySettingsRedux = {|
+    normal: {
+      location: 'any' | RelayLocation,
+      port: 'any' | number,
+      protocol: 'any' | RelayProtocol,
+    }
+|} | {|
+  custom_tunnel_endpoint: {
     host: string,
     port: number,
-    protocol: 'tcp' | 'udp',
-};
+    protocol: RelayProtocol,
+  }
+|};
 
 export type SettingsReduxState = {
-  relaySettings: RelaySettings
+  relaySettings: RelaySettingsRedux
 };
 
 const initialState: SettingsReduxState = {
   relaySettings: {
-    host: defaultServer,
-    port: 1301,
-    protocol: 'udp',
+    normal: {
+      location: 'any',
+      port: 'any',
+      protocol: 'any',
+    }
   },
 };
 
@@ -26,10 +35,7 @@ export default function(state: SettingsReduxState = initialState, action: ReduxA
 
   if (action.type === 'UPDATE_RELAY') {
     return { ...state,
-      relaySettings: {
-        ...state.relaySettings,
-        ...action.relay,
-      },
+      relaySettings: action.relay,
     };
   }