Small refactoring

This commit is contained in:
Vadim Arasev 2019-01-26 16:32:36 +03:00
parent 1b7ae3e94b
commit 3ef692cfa0
7 changed files with 18 additions and 17 deletions

View File

@ -87,7 +87,7 @@ class App extends Component {
getNetIdClass() {
const { netId } = this.props.contractsStore
return netId in constants.NETWORKS && constants.NETWORKS[netId].TESTNET ? 'sokol' : ''
return netId in constants.NETWORKS && constants.NETWORKS[netId].TESTNET ? constants.SOKOL : ''
}
isNewBallotPage() {

View File

@ -72,7 +72,7 @@ export class BallotEmissionFundsMetadata extends React.Component {
render() {
const { ballotStore, contractsStore, networkBranch } = this.props
let note, explorerLink
let note
if (this.noActiveBallotExists === true) {
note = (
@ -85,11 +85,8 @@ export class BallotEmissionFundsMetadata extends React.Component {
note = <p>To be able to create a new ballot, the previous ballot of this type must be finalized.</p>
}
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}`
}
const networkName = constants.NETWORKS[contractsStore.netId].NAME.toLowerCase()
const explorerLink = `https://blockscout.com/poa/${networkName}/address/${contractsStore.emissionFunds.address}`
return (
<div className="frm-BallotEmissionFundsMetadata">

View File

@ -2,6 +2,7 @@ import React from 'react'
import { FormInput } from '../FormInput'
import { FormSelect } from '../FormSelect'
import { inject, observer } from 'mobx-react'
import { constants } from '../../utils/constants'
import { getNetworkName } from '../../utils/utils'
@inject('ballotStore', 'contractsStore')
@ -21,7 +22,7 @@ export class BallotProxyMetadata extends React.Component {
/*8*/ { value: '9', label: ballotStore.ProxyBallotType[9] } // RewardByBlock
]
if (getNetworkName(contractsStore.netId).toLowerCase() != 'sokol') {
if (getNetworkName(contractsStore.netId).toLowerCase() !== constants.SOKOL) {
options.splice(8) // keep 0-7 items and remove 8th if the network is not Sokol
}

View File

@ -2,15 +2,14 @@ import React from 'react'
import { LogoPOA } from '../LogoPOA'
import { LogoSokol } from '../LogoSokol'
import { LogoDai } from '../LogoDai'
import { constants } from '../../utils/constants'
export const Logo = ({ href = null, extraClass = '', networkBranch = '' }) => {
switch (networkBranch) {
case 'sokol':
case constants.SOKOL:
return <LogoSokol href={href} extraClass={extraClass} />
case 'dai':
case 'dai-test':
case constants.DAI:
return <LogoDai href={href} extraClass={extraClass} />
case 'poa':
default:
return <LogoPOA href={href} extraClass={extraClass} />
}

View File

@ -59,7 +59,7 @@ class AppMainRouter extends Component {
]
const networkName = constants.NETWORKS[web3Config.netId].NAME.toLowerCase()
if (networkName === 'core' || networkName === 'sokol') {
if (networkName === constants.CORE || networkName === constants.SOKOL) {
// if we're in Core or Sokol
promises.push(contractsStore.setEmissionFunds(web3Config))
promises.push(contractsStore.setVotingToManageEmissionFunds(web3Config))

View File

@ -51,23 +51,27 @@ constants.navigationData = [
}
]
constants.SOKOL = 'sokol'
constants.CORE = 'core'
constants.DAI = 'dai'
constants.NETWORKS = {
'77': {
NAME: 'Sokol',
RPC: 'https://sokol.poa.network',
BRANCH: 'sokol',
BRANCH: constants.SOKOL,
TESTNET: true
},
'99': {
NAME: 'Core',
RPC: 'https://core.poa.network',
BRANCH: 'core',
BRANCH: constants.CORE,
TESTNET: false
},
'100': {
NAME: 'Dai',
RPC: 'https://dai.poa.network',
BRANCH: 'dai',
BRANCH: constants.DAI,
TESTNET: false
}
}

View File

@ -52,7 +52,7 @@ let getWeb3 = () => {
console.log('No web3 instance injected, using Local web3.')
console.error('Metamask not found')
netId = netIdByName('core')
netId = netIdByName(constants.CORE)
const network = constants.NETWORKS[netId]