From 877cfe9b530e7a577b914a2de7c529d8d2cb5573 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Wed, 9 Nov 2016 18:26:10 +0100
Subject: [PATCH] Fix signer token updates (#3302)

* Manual bump of package.json (recovery)

* Debug

* Simplify status connections
---
 js/src/redux/providers/status.js      | 12 +++---------
 js/src/secureApi.js                   |  4 ++--
 js/src/views/Connection/connection.js |  2 +-
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/js/src/redux/providers/status.js b/js/src/redux/providers/status.js
index 0e2bf6866..9f47517f5 100644
--- a/js/src/redux/providers/status.js
+++ b/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 = () => {
diff --git a/js/src/secureApi.js b/js/src/secureApi.js
index 62454e7ac..6bb9d38ea 100644
--- a/js/src/secureApi.js
+++ b/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();
diff --git a/js/src/views/Connection/connection.js b/js/src/views/Connection/connection.js
index 07fc8f18a..2929b38b8 100644
--- a/js/src/views/Connection/connection.js
+++ b/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 });
   }
 }