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

Auto populate token list with popular token balances

Half implements #175

Things to do:
- Add ability to add tokens to the list.
- Persist the token tab selection (so it is an implicit preference)
- Check what's up with the token-tracker polling, it seems like it is not waiting the interval.
This commit is contained in:
Dan Finlay 2017-06-13 17:47:56 -07:00
parent de500250c4
commit 108c4ab2c5
7 changed files with 68 additions and 32 deletions

View File

@ -39,7 +39,7 @@ function mapStateToProps (state) {
inherits(AccountDetailScreen, Component)
function AccountDetailScreen () {
this.state = {}
this.state = { tabSelection: 'history' }
Component.call(this)
}
@ -251,13 +251,7 @@ AccountDetailScreen.prototype.subview = function () {
}
AccountDetailScreen.prototype.tabSections = function () {
var subview
try {
subview = this.props.accountDetail.subview
} catch (e) {
subview = null
}
const tabSelection = this.state.tabSelection
return h('section.tabSection', [
h(TabBar, {
@ -265,7 +259,7 @@ AccountDetailScreen.prototype.tabSections = function () {
{ content: 'History', key: 'history' },
{ content: 'Tokens', key: 'tokens' },
],
defaultTab: subview || 'history',
defaultTab: tabSelection || 'history',
tabSelected: (key) => {
this.setState({ tabSelection: key })
},
@ -276,12 +270,13 @@ AccountDetailScreen.prototype.tabSections = function () {
}
AccountDetailScreen.prototype.tabSwitchView = function () {
const userAddress = this.props.address
const props = this.props
const { address, network } = props
const tabSelection = this.state.tabSelection || 'history'
switch (tabSelection) {
case 'tokens':
return h(TokenList, { userAddress })
return h(TokenList, { userAddress: address, network })
default:
return this.transactionList()
}

View File

@ -23,7 +23,9 @@ IdenticonComponent.prototype.render = function () {
h('div', {
key: 'identicon-' + this.props.address,
style: {
display: 'inline-block',
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
height: diameter,
width: diameter,
borderRadius: diameter / 2,
@ -40,8 +42,8 @@ IdenticonComponent.prototype.componentDidMount = function () {
if (!address) return
var container = findDOMNode(this)
var diameter = props.diameter || this.defaultDiameter
var diameter = props.diameter || this.defaultDiameter
if (!isNode) {
var img = iconFactory.iconForAddress(address, diameter)
container.appendChild(img)

View File

@ -33,3 +33,4 @@ TabBar.prototype.render = function () {
}))
)
}

View File

@ -12,11 +12,19 @@ function TokenCell () {
TokenCell.prototype.render = function () {
const props = this.props
const { address, symbol, string, network } = props
log.info({ address, symbol, string })
const { address, symbol, string, network, userAddress } = props
log.info({ address, symbol, string, network })
return (
h('li.token-cell', [
h('li.token-cell', {
style: { cursor: network === '1' ? 'pointer' : 'default' },
onClick: (event) => {
const url = urlFor(address, userAddress, network)
if (url) {
navigateTo(url)
}
},
}, [
h(Identicon, {
diameter: 50,
@ -29,3 +37,11 @@ TokenCell.prototype.render = function () {
)
}
function navigateTo (url) {
global.platform.openWindow({ url })
}
function urlFor (tokenAddress, address, network) {
return `https://etherscan.io/token/${tokenAddress}?a=${address}`
}

View File

@ -3,35 +3,49 @@ const h = require('react-hyperscript')
const inherits = require('util').inherits
const TokenTracker = require('eth-token-tracker')
const TokenCell = require('./token-cell.js')
const contracts = require('eth-contract-metadata')
const Loading = require('./loading')
const tokens = []
for (let address in contracts) {
const contract = contracts[address]
if (contract.erc20) {
contract.address = address
tokens.push(contract)
}
}
module.exports = TokenList
inherits(TokenList, Component)
function TokenList () {
// Hard coded for development for now:
const tokens = [
{ address: '0x48c80F1f4D53D5951e5D5438B54Cba84f29F32a5', symbol: 'REP', balance: 'aa'},
{ address: '0xc66ea802717bfb9833400264dd12c2bceaa34a6d', symbol: 'MKR', balance: '1000', decimals: 18},
{ address: '0xa74476443119A942dE498590Fe1f2454d7D4aC0d', symbol: 'GOL', balance: 'ff'},
{ address: '0xaec2e87e0a235266d9c5adc9deb4b2e29b54d009', symbol: 'SNGLS', balance: '0' },
]
this.state = { tokens }
this.state = { tokens, isLoading: true }
Component.call(this)
}
TokenList.prototype.render = function () {
const tokens = this.state.tokens
const state = this.state
const { tokens, isLoading } = state
const { userAddress } = this.props
if (isLoading) return h(Loading, { isLoading })
const network = this.props.network
const tokenViews = tokens.map((tokenData) => {
tokenData.network = network
tokenData.userAddress = userAddress
return h(TokenCell, tokenData)
})
return (
h('ol', [h('style', `
h('ol', {
style: {
height: '302px',
overflowY: 'auto',
},
}, [h('style', `
li.token-cell {
display: flex;
@ -54,19 +68,26 @@ TokenList.prototype.render = function () {
}
TokenList.prototype.componentDidMount = function () {
if (!global.ethereumProvider) return
const { userAddress } = this.props
this.tracker = new TokenTracker({
userAddress,
provider: web3.currentProvider,
provider: global.ethereumProvider,
tokens: this.state.tokens,
pollingInterval: 8000,
})
this.setState({ tokens: this.tracker.serialize() })
this.tracker.on('update', (tokenData) => this.setState({ tokens: tokenData }))
this.tracker.on('update', (tokenData) => {
const heldTokens = tokenData.filter(token => token.balance !== '0' && token.string !== '0.000')
this.setState({ tokens: heldTokens, isLoading: false })
})
this.tracker.updateBalances()
}
TokenList.prototype.componentWillUnmount = function () {
if (!this.tracker) return
this.tracker.stop()
}

View File

@ -155,3 +155,4 @@ InfoScreen.prototype.render = function () {
InfoScreen.prototype.navigateTo = function (url) {
global.platform.openWindow({ url })
}

View File

@ -44,7 +44,7 @@ IconFactory.prototype.generateNewIdenticon = function (address, diameter) {
// util
function iconExistsFor (address) {
return (contractMap.address) && isValidAddress(address) && (contractMap[address].logo)
return contractMap[address] && isValidAddress(address) && contractMap[address].logo
}
function imageElFor (address) {
@ -53,7 +53,7 @@ function imageElFor (address) {
const path = `images/contract/${fileName}`
const img = document.createElement('img')
img.src = path
img.style.width = '100%'
img.style.width = '75%'
return img
}