Redid the settings state and inlined a few components

2 files changed, 15 insertions, 9 deletions

diff --git a/app/containers/AdvancedSettingsPage.js b/app/containers/AdvancedSettingsPage.js
index 22dbdf8ec1..ecb78eb218 100644
--- a/app/containers/AdvancedSettingsPage.js
+++ b/app/containers/AdvancedSettingsPage.js
@@ -5,17 +5,18 @@ import settingsActions from '../redux/settings/actions';
 import log from 'electron-log';
 
 const mapStateToProps = (state) => {
+  const contraints = state.settings.relayConstraints;
   return {
-    protocol: tryOrElse( () => state.settings.relayConstraints.tunnel.openvpn.protocol.only, 'Automatic'),
-    port: tryOrElse( () => state.settings.relayConstraints.tunnel.openvpn.port.only, 'Automatic'),
+    protocol: anyToAuto(contraints.protocol),
+    port: anyToAuto(contraints.port),
   };
 };
 
-function tryOrElse(toTry, orElse) {
-  try {
-    return toTry() || orElse;
-  } catch (e) {
-    return orElse;
+function anyToAuto(constraint) {
+  if (constraint === 'any') {
+    return 'Automatic';
+  } else {
+    return constraint;
   }
 }
 
@@ -42,7 +43,10 @@ const mapDispatchToProps = (dispatch, props) => {
       };
 
       backend.updateRelayConstraints(update)
-        .then( () => dispatch(settingsActions.updateRelay(update)))
+        .then( () => dispatch(settingsActions.updateRelay({
+          port: typeof(portConstraint) === 'object' ? portConstraint.only : portConstraint,
+          protocol: typeof(protConstraint) === 'object' ? protConstraint.only : protConstraint,
+        })))
         .catch( e => log.error('Failed updating relay constraints', e.message));
     },
   };
diff --git a/app/containers/SelectLocationPage.js b/app/containers/SelectLocationPage.js
index 9e5551130c..7ca2f1eb0a 100644
--- a/app/containers/SelectLocationPage.js
+++ b/app/containers/SelectLocationPage.js
@@ -22,7 +22,9 @@ const mapDispatchToProps = (dispatch, props) => {
         };
 
         backend.updateRelayConstraints(update)
-          .then( () => dispatch(settingsActions.updateRelay(update)))
+          .then( () => dispatch(settingsActions.updateRelay({
+            host: preferredServer,
+          })))
           .then( () => backend.connect())
           .catch( e => log.error('Failed updating relay constraints', e.message));