m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-23 18:41:38 +01:00
Code

Merge branch 'i1616-AddTokenAdding' into i784-SendTokenButton

Browse Source
This commit is contained in:
Dan Finlay 2017-06-24 02:42:03 -04:00
commit 58e993ff29
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,7 @@ module.exports = TokenList
inherits(TokenList, Component)
function TokenList () {
this.state = {
tokens: null,
tokens: [],
isLoading: true,
network: null,
}
@ -164,12 +164,9 @@ TokenList.prototype.componentWillUpdate = function (nextProps) {
}
}
TokenList.prototype.updateBalances = function (tokenData) {
const desired = this.props.tokens.map(token => token.address)
const heldTokens = tokenData.filter(token => {
const held = token.balance !== '0' && token.string !== '0.000'
const preferred = desired.includes(normalizeAddress(token.address))
return held || preferred
TokenList.prototype.updateBalances = function (tokens) {
const heldTokens = tokens.filter(token => {
return token.balance !== '0' && token.string !== '0.000'
})
this.setState({ tokens: heldTokens, isLoading: false })
}