merge master into sms-verification-modal

js/src/modals/CreateAccount/AccountDetails/accountDetails.js

@@ -58,7 +58,7 @@ export default class AccountDetails extends Component {
         readOnly
         allowCopy
         hint='the account recovery phrase'
-        label='account recovery phrase (keep safe)'
+        label='owner recovery phrase (keep private and secure, it allows full and unlimited access to the account)'
         value={ phrase } />
     );
   }

js/src/redux/providers/status.js

@@ -85,11 +85,6 @@ export default class Status {
       setTimeout(this._pollStatus, timeout);
     };
 
-    const wasConnected = this._store.getState().nodeStatus.isConnected;
-    if (isConnected !== wasConnected) {
-      this._fetchEnode();
-    }
-
     this._store.dispatch(statusCollection({ isConnected, isConnecting, needsToken, secureToken }));
 
     if (!isConnected) {
@@ -111,8 +106,7 @@ export default class Status {
         this._api.parity.netPort(),
         this._api.parity.nodeName(),
         this._api.parity.rpcSettings(),
-        this._api.eth.syncing(),
-        this._pollTraceMode()
+        this._api.eth.syncing()
       ])
       .then(([clientVersion, coinbase, defaultExtraData, extraData, gasFloorTarget, hashrate, minGasPrice, netChain, netPeers, netPort, nodeName, rpcSettings, syncing, traceMode]) => {
         const isTest = netChain === 'morden' || netChain === 'testnet';
@@ -134,12 +128,12 @@ export default class Status {
           isTest,
           traceMode
         }));
-        nextTimeout();
       })
       .catch((error) => {
         console.error('_pollStatus', error);
-        nextTimeout();
       });
+
+    nextTimeout();
   }
 
   _pollLogs = () => {

js/src/secureApi.js

@@ -23,7 +23,7 @@ export default class SecureApi extends Api {
     super(new Api.Transport.Ws(url, sysuiToken));
 
     this._isConnecting = true;
-    this._connectState = 0;
+    this._connectState = sysuiToken === 'initial' ? 1 : 0;
     this._needsToken = false;
     this._dappsPort = 8080;
     this._signerPort = 8180;
@@ -110,7 +110,7 @@ export default class SecureApi extends Api {
     console.log('SecureApi:connectSuccess', this._transport.token);
   }
 
-  updateToken (token, connectState) {
+  updateToken (token, connectState = 0) {
     this._connectState = connectState;
     this._transport.updateToken(token.replace(/[^a-zA-Z0-9]/g, ''));
     this._followConnection();

js/src/views/Connection/connection.js

@@ -128,7 +128,7 @@ class Connection extends Component {
     const { api } = this.context;
     const { token } = this.state;
 
-    api.updateToken(token);
+    api.updateToken(token, 0);
     this.setState({ token: '', validToken: false });
   }
 }