ESLinter fixes after meerging of #303
This commit is contained in:
parent
7580802129
commit
a60f99b476
|
@ -102,7 +102,7 @@ function getNetworkIds ({ network }) {
|
|||
ticker = POA_TICK
|
||||
break
|
||||
case POA_SOKOL:
|
||||
netId= POA_SOKOL_CODE.toString()
|
||||
netId = POA_SOKOL_CODE.toString()
|
||||
chainId = POA_SOKOL_CHAINID
|
||||
ticker = POA_TICK
|
||||
break
|
||||
|
@ -110,7 +110,7 @@ function getNetworkIds ({ network }) {
|
|||
throw new Error(`createPocketClient - unknown network "${network}"`)
|
||||
}
|
||||
return {
|
||||
chainId, netId, ticker
|
||||
chainId, netId, ticker,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -11,17 +11,17 @@ const RSK = 'rsk'
|
|||
const RSK_TESTNET = 'rsk_testnet'
|
||||
const LOCALHOST = 'localhost'
|
||||
|
||||
const ETH_TICK = "ETH"
|
||||
const POA_TICK = "POA"
|
||||
const ETH_TICK = 'ETH'
|
||||
const POA_TICK = 'POA'
|
||||
|
||||
const MAINNET_CHAINID = "0X01"
|
||||
const ROPSTEN_CHAINID = "0x03"
|
||||
const RINKEBY_CHAINID = "0x04"
|
||||
const KOVAN_CHAINID = "0x2a"
|
||||
const GOERLI_TESTNET_CHAINID = "0X5"
|
||||
const POA_CHAINID = "0x63"
|
||||
const DAI_CHAINID = "0x64"
|
||||
const POA_SOKOL_CHAINID = "0x4D"
|
||||
const MAINNET_CHAINID = '0X01'
|
||||
const ROPSTEN_CHAINID = '0x03'
|
||||
const RINKEBY_CHAINID = '0x04'
|
||||
const KOVAN_CHAINID = '0x2a'
|
||||
const GOERLI_TESTNET_CHAINID = '0X5'
|
||||
const POA_CHAINID = '0x63'
|
||||
const DAI_CHAINID = '0x64'
|
||||
const POA_SOKOL_CHAINID = '0x4D'
|
||||
|
||||
const POA_CODE = 99
|
||||
const DAI_CODE = 100
|
||||
|
|
|
@ -59,10 +59,6 @@ const defaultProviderConfig = {
|
|||
type: defaultProviderConfigType,
|
||||
}
|
||||
|
||||
const defaultNetworkConfig = {
|
||||
ticker: 'POA',
|
||||
}
|
||||
|
||||
module.exports = class NetworkController extends EventEmitter {
|
||||
|
||||
constructor (opts = {}) {
|
||||
|
@ -185,11 +181,11 @@ module.exports = class NetworkController extends EventEmitter {
|
|||
return this.providerStore.getState()
|
||||
}
|
||||
|
||||
getDProvider(){
|
||||
getDProvider () {
|
||||
return this.dProviderStore.getState().dProvider
|
||||
}
|
||||
|
||||
setDProvider(key){
|
||||
setDProvider (key) {
|
||||
this.dProviderStore.updateState({
|
||||
dProvider: key,
|
||||
})
|
||||
|
@ -212,13 +208,13 @@ module.exports = class NetworkController extends EventEmitter {
|
|||
// pocket type-based endpointes
|
||||
const isPocket = POCKET_PROVIDER_TYPES.includes(type)
|
||||
|
||||
if (!isPocket && this.dProviderStore.getState().dProvider){
|
||||
if (!isPocket && this.dProviderStore.getState().dProvider) {
|
||||
this.dProviderStore.updateState({
|
||||
dProvider: false
|
||||
dProvider: false,
|
||||
})
|
||||
}
|
||||
|
||||
if (isPocket && this.dProviderStore.getState().dProvider){
|
||||
if (isPocket && this.dProviderStore.getState().dProvider) {
|
||||
this._configurePocketProvider(opts)
|
||||
} else if (isInfura) {
|
||||
this._configureInfuraProvider(opts)
|
||||
|
|
|
@ -31,12 +31,13 @@ class ConfigScreen extends Component {
|
|||
super(props)
|
||||
this.state = {
|
||||
loading: false,
|
||||
dProvider: props.metamask.dProviderStore.dProvider
|
||||
dProvider: props.metamask.dProviderStore.dProvider,
|
||||
}
|
||||
}
|
||||
|
||||
static propTypes = {
|
||||
dispatch: PropTypes.func,
|
||||
metamask: PropTypes.object,
|
||||
}
|
||||
|
||||
render () {
|
||||
|
@ -44,9 +45,9 @@ class ConfigScreen extends Component {
|
|||
const metamaskState = state.metamask
|
||||
const warning = state.warning
|
||||
|
||||
if(state.metamask.dProviderStore.dProvider != this.state.dProvider){
|
||||
if (state.metamask.dProviderStore.dProvider !== this.state.dProvider) {
|
||||
this.setState({
|
||||
dProvider: this.props.metamask.dProviderStore.dProvider
|
||||
dProvider: this.props.metamask.dProviderStore.dProvider,
|
||||
})
|
||||
}
|
||||
|
||||
|
@ -213,8 +214,8 @@ class ConfigScreen extends Component {
|
|||
]),
|
||||
|
||||
h('input', {
|
||||
type:'checkbox',
|
||||
name:'pocket-checkbox',
|
||||
type: 'checkbox',
|
||||
name: 'pocket-checkbox',
|
||||
checked: this.state.dProvider,
|
||||
onChange: (event) => {
|
||||
event.preventDefault()
|
||||
|
@ -277,23 +278,23 @@ class ConfigScreen extends Component {
|
|||
)
|
||||
}
|
||||
|
||||
toggleProvider(){
|
||||
toggleProvider () {
|
||||
const isPocket = POCKET_PROVIDER_TYPES.includes(this.props.metamask.provider.type)
|
||||
if (isPocket){
|
||||
if (!this.state.dProvider){
|
||||
if (isPocket) {
|
||||
if (!this.state.dProvider) {
|
||||
this.props.dispatch(actions.setDProvider(true))
|
||||
this.setState({
|
||||
dProvider: true
|
||||
dProvider: true,
|
||||
})
|
||||
} else {
|
||||
this.props.dispatch(actions.setDProvider(false))
|
||||
this.setState({
|
||||
dProvider: false
|
||||
dProvider: false,
|
||||
})
|
||||
}
|
||||
this.props.dispatch(actions.setProviderType(this.props.metamask.provider.type))
|
||||
} else {
|
||||
alert("Pocket does not support this network, using centralized provider")
|
||||
alert('Pocket does not support this network, using centralized provider')
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -355,7 +355,7 @@ function reduceMetamask (state, action) {
|
|||
case actions.SET_DPROVIDER:
|
||||
return extend(metamaskState, {
|
||||
dProviderStore: {
|
||||
dProvider : action.value,
|
||||
dProvider: action.value,
|
||||
},
|
||||
})
|
||||
|
||||
|
|
Loading…
Reference in New Issue