From 6758f68ceabb0ea80c4bc0e47bdddf3ffec6a86d Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Fri, 3 Mar 2017 19:49:46 +0100
Subject: [PATCH] Update testnet detection (#4746)

---
 js/src/dapps/basiccoin/services.js | 2 +-
 js/src/dapps/registry/actions.js   | 9 +++++----
 js/src/redux/providers/status.js   | 8 +++++---
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/js/src/dapps/basiccoin/services.js b/js/src/dapps/basiccoin/services.js
index b854708e313..f3e83c4822d 100644
--- a/js/src/dapps/basiccoin/services.js
+++ b/js/src/dapps/basiccoin/services.js
@@ -121,7 +121,7 @@ export function attachInstances () {
     ])
     .then(([registryAddress, netChain]) => {
       const registry = api.newContract(abis.registry, registryAddress).instance;
-      isTest = ['morden', 'ropsten', 'testnet'].includes(netChain);
+      isTest = ['kovan', 'morden', 'ropsten', 'testnet'].includes(netChain);
 
       console.log(`contract was found at registry=${registryAddress}`);
       console.log(`running on ${netChain}, isTest=${isTest}`);
diff --git a/js/src/dapps/registry/actions.js b/js/src/dapps/registry/actions.js
index 44977a7fa9b..a798dd363c0 100644
--- a/js/src/dapps/registry/actions.js
+++ b/js/src/dapps/registry/actions.js
@@ -37,10 +37,11 @@ export const setIsTestnet = (isTestnet) => ({ type: 'set isTestnet', isTestnet }
 export const fetchIsTestnet = () => (dispatch) =>
   api.net.version()
     .then((netVersion) => {
-      dispatch(setIsTestnet(
-        netVersion === '2' || // morden
-        netVersion === '3' // ropsten
-      ));
+      dispatch(setIsTestnet([
+        '2', // morden
+        '3', // ropsten
+        '42' // kovan
+      ].includes(netVersion)));
     })
     .catch((err) => {
       console.error('could not check if testnet');
diff --git a/js/src/redux/providers/status.js b/js/src/redux/providers/status.js
index 8456f2d9a82..d1a17532bf3 100644
--- a/js/src/redux/providers/status.js
+++ b/js/src/redux/providers/status.js
@@ -288,9 +288,11 @@ export default class Status {
       .then(([
         netPeers, clientVersion, netVersion, defaultExtraData, netChain, netPort, rpcSettings, enode, upgradeStatus
       ]) => {
-        const isTest =
-          netVersion === '2' || // morden
-          netVersion === '3'; // ropsten
+        const isTest = [
+          '2', // morden
+          '3', // ropsten
+          '42' // kovan
+        ].includes(netVersion);
 
         const longStatus = {
           netPeers,