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

Fix rendering of loose accounts

Browse Source
This commit is contained in:
Dan Finlay 2016-12-23 17:22:46 -08:00
parent f6748f043d
commit c05e04c611
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/app/accounts/account-list-item.js
View File

@ -50,7 +50,7 @@ AccountListItem.prototype.render = function () {
}, },
}, ethUtil.toChecksumAddress(identity.address)), }, ethUtil.toChecksumAddress(identity.address)),
h(EthBalance, { h(EthBalance, {
value: account.balance, value: account && account.balance,
style: { style: {
lineHeight: '7px', lineHeight: '7px',
marginTop: '10px', marginTop: '10px',
@ -76,7 +76,7 @@ AccountListItem.prototype.indicateIfLoose = function () {
try { // Sometimes keyrings aren't loaded yet: try { // Sometimes keyrings aren't loaded yet:
const type = this.props.keyring.type const type = this.props.keyring.type
const isLoose = type !== 'HD Key Tree' const isLoose = type !== 'HD Key Tree'
return isLoose ? h('.pending-dot', 'LOOSE') : null return isLoose ? h('.keyring-label', 'LOOSE') : null
} catch (e) { return } } catch (e) { return }
} }

4
ui/app/components/eth-balance.js
View File

@ -15,9 +15,10 @@ function EthBalanceComponent () {
EthBalanceComponent.prototype.render = function () { EthBalanceComponent.prototype.render = function () {
var props = this.props var props = this.props
let { value } = props
var style = props.style var style = props.style
var needsParse = this.props.needsParse !== undefined ? this.props.needsParse : true var needsParse = this.props.needsParse !== undefined ? this.props.needsParse : true
const value = formatBalance(props.value, 6, needsParse) value = value ? formatBalance(value, 6, needsParse) : '...'
var width = props.width var width = props.width
return ( return (
@ -38,6 +39,7 @@ EthBalanceComponent.prototype.render = function () {
EthBalanceComponent.prototype.renderBalance = function (value) { EthBalanceComponent.prototype.renderBalance = function (value) {
var props = this.props var props = this.props
if (value === 'None') return value if (value === 'None') return value
if (value === '...') return value
var balanceObj = generateBalanceObject(value, props.shorten ? 1 : 3) var balanceObj = generateBalanceObject(value, props.shorten ? 1 : 3)
var balance var balance
var splitBalance = value.split(' ') var splitBalance = value.split(' ')