Merge branch 'master' into ui-2

js/src/FirstRun/firstRun.js

@@ -80,16 +80,23 @@ class FirstRun extends Component {
     hasAccounts: PropTypes.bool.isRequired,
     newError: PropTypes.func.isRequired,
     onClose: PropTypes.func.isRequired,
-    visible: PropTypes.bool.isRequired
+    visible: PropTypes.bool.isRequired,
+    isTest: PropTypes.bool.isRequired
   }
 
-  createStore = new CreateStore(this.context.api, {}, true, false);
+  createStore = new CreateStore(this.context.api, {}, this.props.isTest, false);
 
   state = {
     stage: 0,
     hasAcceptedTnc: false
   }
 
+  componentWillReceiveProps (nextProps) {
+    if (nextProps.isTest !== this.props.isTest) {
+      this.createStore.setIsTest(nextProps.isTest);
+    }
+  }
+
   render () {
     const { visible } = this.props;
     const { stage } = this.state;
@@ -350,9 +357,10 @@ class FirstRun extends Component {
 
 function mapStateToProps (state) {
   const { hasAccounts } = state.personal;
+  const { isTest } = state.nodeStatus;
 
   return {
-    hasAccounts
+    hasAccounts, isTest
   };
 }
 

js/src/FirstRun/firstRun.spec.js

@@ -35,6 +35,9 @@ function createRedux () {
       return {
         personal: {
           hasAccounts: false
+        },
+        nodeStatus: {
+          isTest: false
         }
       };
     }

js/src/secureApi.js

@@ -98,7 +98,7 @@ export default class SecureApi extends Api {
 
     return {
       host,
-      port: parseInt(port, 10)
+      port: port ? parseInt(port, 10) : null
     };
   }
 
@@ -109,7 +109,9 @@ export default class SecureApi extends Api {
   get dappsUrl () {
     const { port } = this._dappsAddress;
 
-    return `${this.protocol()}//${this.hostname}:${port}`;
+    return port
+      ? `${this.protocol()}//${this.hostname}:${port}`
+      : `${this.protocol()}//${this.hostname}`;
   }
 
   get hostname () {
@@ -262,7 +264,7 @@ export default class SecureApi extends Api {
           .then(() => true);
       })
       .catch((error) => {
-        log.error('unkown error in _connect', error);
+        log.error('unknown error in _connect', error);
         return false;
       });
   }