m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Refresh token balance on network change

Browse Source
This commit is contained in:
Dan Finlay 2017-06-14 15:17:46 -07:00
parent b7b9e0c1ac
commit 6fda78cd2b
3 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/scripts/controllers/transactions.js
View File

@ -389,7 +389,6 @@ module.exports = class TransactionController extends EventEmitter {
this.emit(`${txMeta.id}:${status}`, txId) this.emit(`${txMeta.id}:${status}`, txId)
if (status === 'submitted' || status === 'rejected') { if (status === 'submitted' || status === 'rejected') {
this.emit(`${txMeta.id}:finished`, txMeta) this.emit(`${txMeta.id}:finished`, txMeta)
} }
this.updateTx(txMeta) this.updateTx(txMeta)
this.emit('updateBadge') this.emit('updateBadge')

2
package.json
View File

@ -67,7 +67,7 @@
"eth-query": "^2.1.1", "eth-query": "^2.1.1",
"eth-sig-util": "^1.1.1", "eth-sig-util": "^1.1.1",
"eth-simple-keyring": "^1.1.1", "eth-simple-keyring": "^1.1.1",
"eth-token-tracker": "^1.0.6", "eth-token-tracker": "^1.0.7",
"ethereumjs-tx": "^1.3.0", "ethereumjs-tx": "^1.3.0",
"ethereumjs-util": "ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9", "ethereumjs-util": "ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9",
"ethereumjs-wallet": "^0.6.0", "ethereumjs-wallet": "^0.6.0",

27
ui/app/components/token-list.js
View File

@ -7,7 +7,7 @@ const contracts = require('eth-contract-metadata')
const Loading = require('./loading') const Loading = require('./loading')
const tokens = [] const tokens = []
for (let address in contracts) { for (const address in contracts) {
const contract = contracts[address] const contract = contracts[address]
if (contract.erc20) { if (contract.erc20) {
contract.address = address contract.address = address
@ -19,7 +19,7 @@ module.exports = TokenList
inherits(TokenList, Component) inherits(TokenList, Component)
function TokenList () { function TokenList () {
this.state = { tokens, isLoading: true } this.state = { tokens, isLoading: true, network: null }
Component.call(this) Component.call(this)
} }
@ -68,17 +68,23 @@ TokenList.prototype.render = function () {
} }
TokenList.prototype.componentDidMount = function () { TokenList.prototype.componentDidMount = function () {
this.createFreshTokenTracker()
}
TokenList.prototype.createFreshTokenTracker = function () {
if (this.tracker) {
this.tracker.stop()
}
if (!global.ethereumProvider) return if (!global.ethereumProvider) return
const { userAddress } = this.props const { userAddress } = this.props
this.tracker = new TokenTracker({ this.tracker = new TokenTracker({
userAddress, userAddress,
provider: global.ethereumProvider, provider: global.ethereumProvider,
tokens: this.state.tokens, tokens: tokens,
pollingInterval: 8000, pollingInterval: 8000,
}) })
this.setState({ tokens: this.tracker.serialize() })
this.tracker.on('update', (tokenData) => { this.tracker.on('update', (tokenData) => {
this.updateBalances(tokenData) this.updateBalances(tokenData)
}) })
@ -92,6 +98,17 @@ TokenList.prototype.componentDidMount = function () {
}) })
} }
TokenList.prototype.componentWillUpdate = function (nextProps) {
if (nextProps.network === 'loading') return
const oldNet = this.props.network
const newNet = nextProps.network
if (oldNet && newNet && newNet !== oldNet) {
this.setState({ isLoading: true })
this.createFreshTokenTracker()
}
}
TokenList.prototype.updateBalances = function (tokenData) { TokenList.prototype.updateBalances = function (tokenData) {
const heldTokens = tokenData.filter(token => token.balance !== '0' && token.string !== '0.000') const heldTokens = tokenData.filter(token => token.balance !== '0' && token.string !== '0.000')
this.setState({ tokens: heldTokens, isLoading: false }) this.setState({ tokens: heldTokens, isLoading: false })