Redid the settings state and inlined a few components

1 files changed, 12 insertions, 2 deletions

diff --git a/app/lib/backend.js b/app/lib/backend.js
index 89a895b4c4..7e5e21708f 100644
--- a/app/lib/backend.js
+++ b/app/lib/backend.js
@@ -317,11 +317,13 @@ export class Backend {
 
         const host = constraints.host === 'any'
           ? defaultServer
-          : constraints.host || defaultServer;
+          : constraints.host.only || defaultServer;
 
+        const openvpn = constraints.tunnel.openvpn;
         this._store.dispatch(settingsActions.updateRelay({
           host: host,
-          tunnel: constraints.tunnel,
+          port: this._apiToReduxConstraints(openvpn.port),
+          protocol: this._apiToReduxConstraints(openvpn.protocol),
         }));
       })
       .catch( e => {
@@ -329,6 +331,14 @@ export class Backend {
       });
   }
 
+  _apiToReduxConstraints(constraint: *): * {
+    if (typeof(constraint) === 'object') {
+      return constraint.only;
+    } else {
+      return constraint;
+    }
+  }
+
   /**
    * Start reachability monitoring for online/offline detection
    * This is currently done via HTML5 APIs but will be replaced later