Fix networkId default value

src/components/Header/index.js

@@ -83,6 +83,20 @@ class BlockingWarning extends Component {
     } = this.props;
     let content = [];
 
+    const correctNetworkId = process.env.REACT_APP_NETWORK_ID || 1;
+    const correctNetwork = process.env.REACT_APP_NETWORK || 'Main Ethereum Network';
+
+    const wrongNetwork = networkId != correctNetworkId;
+
+    if (wrongNetwork && initialized) {
+      content = [
+        <div key="warning-title">You are on the wrong network</div>,
+        <div key="warning-desc" className="header__dialog__description">
+          {`Please switch to ${correctNetwork}`}
+        </div>,
+      ];
+    }
+
     if (!isConnected && initialized) {
       content = [
         <div key="warning-title">No Ethereum wallet found</div>,
@@ -110,19 +124,6 @@ class BlockingWarning extends Component {
               )
           }
         </div>,
-      ]
-    }
-
-    const correctNetworkId = process.env.REACT_APP_NETWORK_ID || 1;
-    const correctNetwork = process.env.REACT_APP_NETWORK || 'Main Ethereum Network';
-
-    const wrongNetwork = networkId != correctNetworkId;
-    if (wrongNetwork) {
-      content = [
-        <div key="warning-title">You are on the wrong network</div>,
-        <div key="warning-desc" className="header__dialog__description">
-          {`Please switch to ${correctNetwork}`}
-        </div>,
       ];
     }
 
@@ -166,7 +167,7 @@ export default connect(
   state => ({
     currentAddress: state.web3connect.account,
     initialized: state.web3connect.initialized,
-    isConnected: !!state.web3connect.account && state.web3connect.networkId == process.env.REACT_APP_NETWORK_ID,
+    isConnected: !!state.web3connect.account,
     web3: state.web3connect.web3,
     networkId: state.web3connect.networkId,
   }),

src/pages/Pool/AddLiquidity.js

@@ -576,7 +576,7 @@ class AddLiquidity extends Component {
 
 export default connect(
   state => ({
-    isConnected: Boolean(state.web3connect.account) && state.web3connect.networkId == process.env.REACT_APP_NETWORK_ID,
+    isConnected: Boolean(state.web3connect.account) && state.web3connect.networkId == (process.env.REACT_APP_NETWORK_ID||1),
     account: state.web3connect.account,
     balances: state.web3connect.balances,
     web3: state.web3connect.web3,

src/pages/Pool/CreateExchange.js

@@ -212,7 +212,7 @@ class CreateExchange extends Component {
 
 export default connect(
   state => ({
-    isConnected: Boolean(state.web3connect.account) && state.web3connect.networkId == process.env.REACT_APP_NETWORK_ID,
+    isConnected: Boolean(state.web3connect.account) && state.web3connect.networkId == (process.env.REACT_APP_NETWORK_ID||1),
     account: state.web3connect.account,
     balances: state.web3connect.balances,
     web3: state.web3connect.web3,

src/pages/Pool/RemoveLiquidity.js

@@ -298,7 +298,7 @@ class RemoveLiquidity extends Component {
 
 export default connect(
   state => ({
-    isConnected: Boolean(state.web3connect.account) && state.web3connect.networkId == process.env.REACT_APP_NETWORK_ID,
+    isConnected: Boolean(state.web3connect.account) && state.web3connect.networkId == (process.env.REACT_APP_NETWORK_ID||1),
     web3: state.web3connect.web3,
     balances: state.web3connect.balances,
     account: state.web3connect.account,

src/pages/Send/index.js

@@ -792,9 +792,9 @@ class Send extends Component {
 }
 
 export default connect(
-  state => ({
+  state => console.log(state) || ({
     balances: state.web3connect.balances,
-    isConnected: !!state.web3connect.account && state.web3connect.networkId == process.env.REACT_APP_NETWORK_ID,
+    isConnected: !!state.web3connect.account && state.web3connect.networkId == (process.env.REACT_APP_NETWORK_ID||1),
     account: state.web3connect.account,
     web3: state.web3connect.web3,
     exchangeAddresses: state.addresses.exchangeAddresses,

src/pages/Swap/index.js

@@ -769,7 +769,7 @@ class Swap extends Component {
 export default connect(
   state => ({
     balances: state.web3connect.balances,
-    isConnected: !!state.web3connect.account && state.web3connect.networkId == process.env.REACT_APP_NETWORK_ID,
+    isConnected: !!state.web3connect.account && state.web3connect.networkId == (process.env.REACT_APP_NETWORK_ID||1),
     account: state.web3connect.account,
     web3: state.web3connect.web3,
     exchangeAddresses: state.addresses.exchangeAddresses,