Don't pop-up notifications after network switch

js/src/api/transport/http/http.js

@@ -46,19 +46,33 @@ export default class Http extends JsonRpcBase {
     };
   }
 
+  _setConnected () {
+    if (!this._connected) {
+      this._connected = true;
+      this.emit('open');
+    }
+  }
+
+  _setDisconnected () {
+    if (this._connected) {
+      this._connected = false;
+      this.emit('close');
+    }
+  }
+
   execute (method, ...params) {
     const request = this._encodeOptions(method, params);
 
     return fetch(this._url, request)
       .catch((error) => {
-        this._connected = false;
+        this._setDisconnected();
         throw error;
       })
       .then((response) => {
-        this._connected = true;
+        this._setConnected();
 
         if (response.status !== 200) {
-          this._connected = false;
+          this._setDisconnected();
           this.error(JSON.stringify({ status: response.status, statusText: response.statusText }));
           console.error(`${method}(${JSON.stringify(params)}): ${response.status}: ${response.statusText}`);
 

js/src/api/transport/http/http.spec.js

@@ -37,6 +37,26 @@ describe('api/transport/Http', () => {
     });
   });
 
+  describe('transport emitter', () => {
+    it('emits close event', (done) => {
+      transport.once('close', () => {
+        done();
+      });
+
+      transport.execute('eth_call');
+    });
+
+    it('emits open event', (done) => {
+      mockHttp([{ method: 'eth_call', reply: { result: '' } }]);
+
+      transport.once('open', () => {
+        done();
+      });
+
+      transport.execute('eth_call');
+    });
+  });
+
   describe('transport', () => {
     const RESULT = ['this is some result'];
 

js/src/api/transport/jsonRpcBase.js

@@ -14,8 +14,12 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-export default class JsonRpcBase {
+import EventEmitter from 'eventemitter3';
+
+export default class JsonRpcBase extends EventEmitter {
   constructor () {
+    super();
+
     this._id = 1;
     this._debug = false;
     this._connected = false;

js/src/api/transport/ws/ws.js

@@ -124,13 +124,13 @@ export default class Ws extends JsonRpcBase {
   }
 
   _onOpen = (event) => {
-    console.log('ws:onOpen');
-
     this._connected = true;
     this._connecting = false;
     this._autoConnect = true;
     this._retries = 0;
 
+    this.emit('open');
+
     Object.keys(this._messages)
       .filter((id) => this._messages[id].queued)
       .forEach(this._send);
@@ -148,6 +148,8 @@ export default class Ws extends JsonRpcBase {
     event.timestamp = Date.now();
     this._lastError = event;
 
+    this.emit('close');
+
     if (this._autoConnect) {
       const timeout = this.retryTimeout;
 

js/src/api/transport/ws/ws.spec.js

@@ -21,6 +21,37 @@ describe('api/transport/Ws', () => {
   let transport;
   let scope;
 
+  describe('transport emitter', () => {
+    const connect = () => {
+      const scope = mockWs();
+      const transport = new Ws(TEST_WS_URL);
+
+      return { transport, scope };
+    };
+
+    it('emits open event', (done) => {
+      const { transport, scope } = connect();
+
+      transport.once('open', () => {
+        done();
+      });
+
+      scope.stop();
+    });
+
+    it('emits close event', (done) => {
+      const { transport, scope } = connect();
+
+      transport.once('open', () => {
+        scope.server.close();
+      });
+
+      transport.once('close', () => {
+        done();
+      });
+    });
+  });
+
   describe('transport', () => {
     let result;
 

js/src/redux/providers/balancesActions.js

@@ -31,7 +31,7 @@ const ETH = {
   image: imagesEthereum
 };
 
-function setBalances (_balances) {
+function setBalances (_balances, skipNotifications = false) {
   return (dispatch, getState) => {
     const state = getState();
 
@@ -65,12 +65,12 @@ function setBalances (_balances) {
           const oldValue = nextTokens[tokenIndex].value;
 
           // If received a token/eth (old value < new value), notify
-          if (oldValue.lt(value) && accounts[address]) {
+          if (oldValue.lt(value) && accounts[address] && !skipNotifications) {
             const account = accounts[address];
             const txValue = value.minus(oldValue);
 
             const redirectToAccount = () => {
-              const route = `/account/${account.address}`;
+              const route = `/accounts/${account.address}`;
               dispatch(push(route));
             };
 
@@ -170,7 +170,7 @@ export function fetchTokens (_tokenIds) {
   };
 }
 
-export function fetchBalances (_addresses) {
+export function fetchBalances (_addresses, skipNotifications = false) {
   return (dispatch, getState) => {
     const { api, personal } = getState();
     const { visibleAccounts, accounts } = personal;
@@ -192,7 +192,7 @@ export function fetchBalances (_addresses) {
           balances[addr] = accountsBalances[idx];
         });
 
-        dispatch(setBalances(balances));
+        dispatch(setBalances(balances, skipNotifications));
         updateTokensFilter(addresses)(dispatch, getState);
       })
       .catch((error) => {
@@ -326,7 +326,7 @@ export function queryTokensFilter (tokensFilter) {
   };
 }
 
-export function fetchTokensBalances (_addresses = null, _tokens = null) {
+export function fetchTokensBalances (_addresses = null, _tokens = null, skipNotifications = false) {
   return (dispatch, getState) => {
     const { api, personal, balances } = getState();
     const { visibleAccounts, accounts } = personal;
@@ -348,7 +348,7 @@ export function fetchTokensBalances (_addresses = null, _tokens = null) {
           balances[addr] = tokensBalances[idx];
         });
 
-        dispatch(setBalances(balances));
+        dispatch(setBalances(balances, skipNotifications));
       })
       .catch((error) => {
         console.warn('balances::fetchTokensBalances', error);

js/src/redux/providers/chainMiddleware.js

@@ -14,6 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
+import { fetchBalances, fetchTokensBalances } from './balancesActions';
 import { showSnackbar } from './snackbarActions';
 import { DEFAULT_NETCHAIN } from './statusReducer';
 
@@ -29,6 +30,10 @@ export default class ChainMiddleware {
 
           if (newChain !== nodeStatus.netChain && nodeStatus.netChain !== DEFAULT_NETCHAIN) {
             store.dispatch(showSnackbar(`Switched to ${newChain}. Please reload the page.`, 60000));
+
+            // Fetch the new balances without notifying the user of any change
+            store.dispatch(fetchBalances(null, true));
+            store.dispatch(fetchTokensBalances(null, null, true));
           }
         }
       }