Commit c33adf51 authored by Chi Kei Chan's avatar Chi Kei Chan

Fix header

parent bd28ef8d
...@@ -75,25 +75,12 @@ function isMobile() { ...@@ -75,25 +75,12 @@ function isMobile() {
} }
class BlockingWarning extends Component { class BlockingWarning extends Component {
state = {
networkId: 0,
};
componentWillReceiveProps(nextProps) {
const { web3 } = nextProps;
const { networkId } = this.state;
if (!networkId) {
web3.eth.net.getId((_, networkId) => this.setState({ networkId }))
}
}
render () { render () {
const { const {
isConnected, isConnected,
initialized, initialized,
networkId,
} = this.props; } = this.props;
const { networkId } = this.state;
let content = []; let content = [];
if (!isConnected && initialized) { if (!isConnected && initialized) {
...@@ -128,6 +115,8 @@ class BlockingWarning extends Component { ...@@ -128,6 +115,8 @@ class BlockingWarning extends Component {
const correctNetworkId = process.env.REACT_APP_NETWORK_ID || 1; const correctNetworkId = process.env.REACT_APP_NETWORK_ID || 1;
const correctNetwork = process.env.REACT_APP_NETWORK || 'Main Ethereum Network'; const correctNetwork = process.env.REACT_APP_NETWORK || 'Main Ethereum Network';
console.log({correctNetworkId, correctNetwork, networkId })
const wrongNetwork = networkId != correctNetworkId; const wrongNetwork = networkId != correctNetworkId;
if (wrongNetwork) { if (wrongNetwork) {
content = [ content = [
...@@ -180,5 +169,6 @@ export default connect( ...@@ -180,5 +169,6 @@ export default connect(
initialized: state.web3connect.initialized, initialized: state.web3connect.initialized,
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,
web3: state.web3connect.web3, web3: state.web3connect.web3,
networkId: state.web3connect.networkId,
}), }),
)(Header); )(Header);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment