diff --git a/src/App.js b/src/App.js index 7fe8cf3..ac18fb0 100644 --- a/src/App.js +++ b/src/App.js @@ -7,7 +7,7 @@ import { Route } from 'react-router-dom' import { inject, observer } from 'mobx-react' import swal from 'sweetalert2' import { messages } from './messages' -import { isTestnet } from './helpers' +import { constants } from './constants' @inject('commonStore', 'contractsStore') @observer @@ -124,8 +124,8 @@ class App extends Component { } getNetIdClass() { - const { contractsStore } = this.props - return isTestnet(contractsStore.netId) ? 'sokol' : '' + const { netId } = this.props.contractsStore + return netId in constants.NETWORKS && constants.NETWORKS[netId].TESTNET ? 'sokol' : '' } render() { @@ -142,6 +142,8 @@ class App extends Component { '' ) + const isTestnet = contractsStore.netId in constants.NETWORKS && constants.NETWORKS[contractsStore.netId].TESTNET + return (
{loading} @@ -155,7 +157,7 @@ class App extends Component { {search}
diff --git a/src/Loading.js b/src/Loading.js index 11ea1c1..b2a46d0 100644 --- a/src/Loading.js +++ b/src/Loading.js @@ -9,16 +9,11 @@ const styles = netId => { backgroundColor: 'rgba(47, 109, 99, 0.8)' } - switch (netId) { - case constants.NETID_SOKOL: - case constants.NETID_DAI_TEST: - return sokol - case constants.NETID_CORE: - case constants.NETID_DAI: - return core - default: - return {} + if (netId in constants.NETWORKS) { + return constants.NETWORKS[netId].TESTNET ? sokol : core } + + return core } const Loading = ({ netId }) => (
diff --git a/src/components/BallotEmissionFundsCard.jsx b/src/components/BallotEmissionFundsCard.jsx index c6862d6..6efc995 100644 --- a/src/components/BallotEmissionFundsCard.jsx +++ b/src/components/BallotEmissionFundsCard.jsx @@ -7,7 +7,7 @@ import { BallotCard } from './BallotCard.jsx' export class BallotEmissionFundsCard extends React.Component { render() { const { id, votingState, pos, contractsStore } = this.props - const amount = contractsStore.web3Instance.fromWei(votingState.amount, 'ether') + const amount = contractsStore.web3Instance.utils.fromWei(votingState.amount, 'ether') return (
diff --git a/src/components/BallotEmissionFundsMetadata.jsx b/src/components/BallotEmissionFundsMetadata.jsx index 163e512..72ee76a 100644 --- a/src/components/BallotEmissionFundsMetadata.jsx +++ b/src/components/BallotEmissionFundsMetadata.jsx @@ -16,7 +16,7 @@ export class BallotEmissionFundsMetadata extends React.Component { getEmissionFundsBalance = async () => { const { contractsStore } = this.props this.emissionFundsBalance = - contractsStore.web3Instance.fromWei(await contractsStore.emissionFunds.balance(), 'ether') + ' POA' + contractsStore.web3Instance.utils.fromWei(await contractsStore.emissionFunds.balance(), 'ether') + ' POA' } @action('Get VotingToManageEmissionFunds.noActiveBallotExists') @@ -82,7 +82,7 @@ export class BallotEmissionFundsMetadata extends React.Component { } else if (this.noActiveBallotExists !== true) { note =

To be able to create a new ballot, the previous ballot of this type must be finalized.

} - if (contractsStore.netId === constants.NETID_SOKOL) { + if (constants.NETWORKS[contractsStore.netId].NAME.toLowerCase() === 'sokol') { explorerLink = `https://sokol.poaexplorer.com/address/search/${contractsStore.emissionFunds.address}` } else { explorerLink = `https://poaexplorer.com/address/${contractsStore.emissionFunds.address}` diff --git a/src/components/Footer.jsx b/src/components/Footer.jsx index 57e662d..9315ab4 100644 --- a/src/components/Footer.jsx +++ b/src/components/Footer.jsx @@ -2,10 +2,10 @@ import React from 'react' import moment from 'moment' import { Link } from 'react-router-dom' import Socials from './Socials.jsx' -import { isTestnet } from '../helpers' +import { constants } from '../constants' export const Footer = ({ netId }) => { - const footerClassName = isTestnet(netId) ? 'sokol' : '' + const footerClassName = netId in constants.NETWORKS && constants.NETWORKS[netId].TESTNET ? 'sokol' : '' return (