diff --git a/app/dapp.js b/app/dapp.js index f24f98f..0d6167f 100644 --- a/app/dapp.js +++ b/app/dapp.js @@ -3,6 +3,7 @@ import 'typeface-roboto' import Toggle from 'react-toggle'; import EmbarkJS from 'Embark/EmbarkJS'; import TestToken from 'Embark/contracts/TestToken'; +import { startCase } from 'lodash'; import UsernameRegistrar from 'Embark/contracts/UsernameRegistrar'; import NameLookup from './components/ens/nameLookup'; import AdminMode from './components/AdminMode'; @@ -22,8 +23,17 @@ const symbols = { 'main': 'SNT' } -const Web3RenderContent = ({ network, history, match }) => ( - +const isReady = (network, environment) => { + if (!network || !environment) return; + const formattedNetwork = network.toLowerCase(); + if (formattedNetwork.includes('main') || formattedNetwork.includes('live')) { + if (environment === 'livenet') return true + } + return formattedNetwork.inclues(environment.toLowerCase()); +} + +const Web3RenderContent = ({ network, history, match, environment }) => ( +
@@ -52,12 +62,15 @@ class App extends React.Component { componentDidMount(){ EmbarkJS.onReady((err) => { - getNetworkType().then(network => { this.setState({ network })}); + getNetworkType().then(network => { + const { environment } = EmbarkJS + this.setState({ network, environment }) + }); }); } render() { - const { admin, network } = this.state; + const { admin, network, environment } = this.state; return ( @@ -71,7 +84,7 @@ class App extends React.Component { ( - + )}/>
diff --git a/config/contracts.js b/config/contracts.js index cba383d..6d2b4c5 100644 --- a/config/contracts.js +++ b/config/contracts.js @@ -76,7 +76,7 @@ module.exports = { "address": "0x744d70fdbe2ba4cf95131626614a1763df805b9e" }, "UsernameRegistrar": { - "address": "0xDBf9038cf5Aaa030890790dB87E746E00Fc352b3" + "address": "0xDB5ac1a559b02E12F29fC0eC0e37Be8E046DEF49" }, "MerkleProof": { "address": "0x713ED9846463235df08D92B886938651105D3940"