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

Merge branch 'master' of github.com:MetaMask/metamask-plugin into ConfirmationStyle

Browse Source
This commit is contained in:
kumavis 2016-07-07 13:41:32 -07:00
commit 0bb8b8cacc
2 changed files with 48 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,8 @@ const Component = require('react').Component
const h = require('react-hyperscript') const h = require('react-hyperscript')
const inherits = require('util').inherits const inherits = require('util').inherits
const formatBalance = require('../util').formatBalance const formatBalance = require('../util').formatBalance
const generateBalanceObject = require('../util').generateBalanceObject
const Tooltip = require('./tooltip.js')
module.exports = EthBalanceComponent module.exports = EthBalanceComponent
inherits(EthBalanceComponent, Component) inherits(EthBalanceComponent, Component)
@ -32,15 +33,19 @@ EthBalanceComponent.prototype.render = function () {
} }
EthBalanceComponent.prototype.renderBalance = function (value) { EthBalanceComponent.prototype.renderBalance = function (value) {
const props = this.props const props = this.props
if (value === 'None') return value if (value === 'None') return value
var balanceObj = generateBalanceObject(value)
var balance = value.split(' ')[0] var balance = balanceObj.balance
var label = value.split(' ')[1] var label = balanceObj.label
var tagName = props.inline ? 'span' : 'div' var tagName = props.inline ? 'span' : 'div'
var topTag = props.inline ? 'div' : '.flex-column' var topTag = props.inline ? 'div' : '.flex-column'
return ( return (
h(Tooltip, {
position: 'bottom',
title: value.split(' ')[0],
}, [
h(topTag, { h(topTag, {
style: { style: {
alignItems: 'flex-end', alignItems: 'flex-end',
@ -59,7 +64,17 @@ EthBalanceComponent.prototype.renderBalance = function (value) {
color: props.labelColor || '#AEAEAE', color: props.labelColor || '#AEAEAE',
fontSize: props.fontSize || '12px', fontSize: props.fontSize || '12px',
}, },
}, [
h('div', balance),
h('div', {
style: {
color: '#AEAEAE',
fontSize: '12px',
},
}, label), }, label),
]),
]) ])
])
) )
} }

12
ui/app/util.js
View File

@ -27,6 +27,7 @@ module.exports = {
numericBalance: numericBalance, numericBalance: numericBalance,
parseBalance: parseBalance, parseBalance: parseBalance,
formatBalance: formatBalance, formatBalance: formatBalance,
generateBalanceObject: generateBalanceObject,
dataSize: dataSize, dataSize: dataSize,
readableDate: readableDate, readableDate: readableDate,
ethToWei: ethToWei, ethToWei: ethToWei,
@ -128,6 +129,17 @@ function formatBalance (balance, decimalsToKeep) {
return formatted return formatted
} }
function generateBalanceObject (formattedBalance) {
var balance = formattedBalance.split(' ')[0]
var label = formattedBalance.split(' ')[1]
var beforeDecimal = balance.split('.')[0]
var afterDecimal = balance.split('.')[1]
if (beforeDecimal === '0' && afterDecimal.substr(0, 5) === '00000') { balance = '< 0.00001' }
return { balance, label }
}
function dataSize (data) { function dataSize (data) {
var size = data ? ethUtil.stripHexPrefix(data).length : 0 var size = data ? ethUtil.stripHexPrefix(data).length : 0
return size + ' bytes' return size + ' bytes'