Merge pull request #3602 from ethcore/jg-network-id-match

Check for network ID for live/test matching
openethereum · Nov 25, 2016 · d0d01ca · d0d01ca
2 parents 86522c8 + 6b9b31a
commit d0d01ca
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/js/src/redux/providers/status.js b/js/src/redux/providers/status.js
@@ -242,16 +242,19 @@ export default class Status {
     Promise
       .all([
         this._api.web3.clientVersion(),
+        this._api.net.version(),
         this._api.parity.defaultExtraData(),
         this._api.parity.netChain(),
         this._api.parity.netPort(),
         this._api.parity.rpcSettings(),
         newConnection ? Promise.resolve(null) : this._api.parity.enode()
       ])
       .then(([
-        clientVersion, defaultExtraData, netChain, netPort, rpcSettings, enode
+        clientVersion, netVersion, defaultExtraData, netChain, netPort, rpcSettings, enode
       ]) => {
-        const isTest = netChain === 'morden' || netChain === 'ropsten' || netChain === 'testnet';
+        const isTest =
+          netVersion === '2' || // morden
+          netVersion === '3'; // ropsten
 
         const longStatus = {
           clientVersion,