Commit e57301e5 authored by serapath's avatar serapath

FIX indicator

parent 1b88139f
'use strict'
var $ = require('jquery')
var yo = require('yo-yo')
var detectNetwork = require('../../lib/detect-network')
var helper = require('../../lib/helper.js')
var txExecution = require('../execution/txExecution')
var txFormat = require('../execution/txFormat')
......@@ -383,12 +382,9 @@ function settings (appAPI, appEvents) {
// SETTINGS HTML
var net = yo`<span class=${css.network}></span>`
const updateNetwork = () => {
detectNetwork((err, { id, name } = {}) => {
executionContext.detectNetwork((err, { id, name } = {}) => {
if (err) console.error(err)
console.log(`update network[${id}] name: ${name}`)
net.innerHTML = `
<i class="${css.networkItem} fa fa-plug" aria-hidden="true"></i> ${name}(${id || '-'})
`
net.innerHTML = `<i class="${css.networkItem} fa fa-plug" aria-hidden="true"></i> ${name}(${id || '-'})`
})
}
updateNetwork()
......
......@@ -91,7 +91,21 @@ function ExecutionContext () {
}
this.web3 = function () {
return this.isVM() ? web3VM : web3
return this.isVM() ? web3VM.web3 : web3
}
this.detectNetwork = function (callback) {
this.web3().version.getNetwork((err, id) => {
var name = null
if (err) name = 'Unknown'
else if (id === '1') name = 'Main'
else if (id === '2') name = 'Morden (deprecated)'
else if (id === '3') name = 'Ropsten'
else if (id === '4') name = 'Rinkeby'
else if (id === '42') name = 'Kovan'
else name = 'Unknown'
callback(err, { id, name })
})
}
this.internalWeb3 = function () {
......
var executionContext = require('../execution-context')
window.executionContext = executionContext
module.exports = detectNetwork
function detectNetwork (callback) {
var web3provider = executionContext.web3()
var get = web3provider.version ? web3provider.version.getNetwork : web3provider.web3.version.getNetwork
get((err, id) => {
var name = null
if (err) name = 'Unknown'
else if (id === '1') name = 'Main'
else if (id === '2') name = 'Morden (deprecated)'
else if (id === '3') name = 'Ropsten'
else if (id === '4') name = 'Rinkeby'
else if (id === '42') name = 'Kovan'
else name = 'Unknown'
callback(err, { id, name })
})
}
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