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

Fix issue where if given a balance that does not need to be parsed will not be parsed

Browse Source
This commit is contained in:
Frankie 2016-08-19 17:18:11 -07:00
parent 30af7e96cb
commit edfb0eb968
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,8 +15,8 @@ function EthBalanceComponent () {
EthBalanceComponent.prototype.render = function () { EthBalanceComponent.prototype.render = function () {
var state = this.props var state = this.props
var style = state.style var style = state.style
var needsParse = this.props.needsParse !== undefined ? this.props.needsParse : true
const value = formatBalance(state.value, 6) const value = formatBalance(state.value, 6, needsParse)
var width = state.width var width = state.width
return ( return (
@ -29,12 +29,13 @@ EthBalanceComponent.prototype.render = function () {
display: 'inline', display: 'inline',
width: width, width: width,
}, },
}, this.renderBalance(value, state)), }, this.renderBalance(value)),
]) ])
) )
} }
EthBalanceComponent.prototype.renderBalance = function (value, state) { EthBalanceComponent.prototype.renderBalance = function (value) {
var state = this.props
if (value === 'None') return value if (value === 'None') return value
var balanceObj = generateBalanceObject(value, state.shorten ? 1 : 3) var balanceObj = generateBalanceObject(value, state.shorten ? 1 : 3)
var balance var balance
@ -68,7 +69,7 @@ EthBalanceComponent.prototype.renderBalance = function (value, state) {
width: '100%', width: '100%',
textAlign: 'right', textAlign: 'right',
}, },
}, balance), }, this.props.incoming ? `+${balance}` : balance),
h('div', { h('div', {
style: { style: {
color: ' #AEAEAE', color: ' #AEAEAE',

2
ui/app/components/shift-list-item.js
View File

@ -99,6 +99,8 @@ ShiftListItem.prototype.renderUtilComponents = function () {
value: `${props.response.outgoingCoin}`, value: `${props.response.outgoingCoin}`,
width: '55px', width: '55px',
shorten: true, shorten: true,
needsParse: false,
incoming: true,
style: { style: {
fontSize: '15px', fontSize: '15px',
color: '#01888C', color: '#01888C',

4
ui/app/util.js
View File

@ -92,8 +92,8 @@ function parseBalance (balance) {
// Takes wei hex, returns an object with three properties. // Takes wei hex, returns an object with three properties.
// Its "formatted" property is what we generally use to render values. // Its "formatted" property is what we generally use to render values.
function formatBalance (balance, decimalsToKeep) { function formatBalance (balance, decimalsToKeep, needsParse = true) {
var parsed = parseBalance(balance) var parsed = needsParse ? parseBalance(balance) : balance.split('.')
var beforeDecimal = parsed[0] var beforeDecimal = parsed[0]
var afterDecimal = parsed[1] var afterDecimal = parsed[1]
var formatted = 'None' var formatted = 'None'