diff options
| author | brunobar79 <brunobar79@gmail.com> | 2018-11-07 09:21:19 +0800 |
|---|---|---|
| committer | brunobar79 <brunobar79@gmail.com> | 2018-11-07 09:21:19 +0800 |
| commit | c651212025ab7cd0309d96be6687c1eba35ab9fa (patch) | |
| tree | fa5a6020daae332c5df47bdee3492e8a079375e3 /ui/app/components/eth-balance.js | |
| parent | 9c1b2108f69334884473eb95758e2d1c02c984d6 (diff) | |
| parent | 7f944923d170d6e7e04f6e238d2fd5f80abe3161 (diff) | |
| download | tangerine-wallet-browser-c651212025ab7cd0309d96be6687c1eba35ab9fa.tar.gz tangerine-wallet-browser-c651212025ab7cd0309d96be6687c1eba35ab9fa.tar.zst tangerine-wallet-browser-c651212025ab7cd0309d96be6687c1eba35ab9fa.zip | |
fix merge conflicts
Diffstat (limited to 'ui/app/components/eth-balance.js')
| -rw-r--r-- | ui/app/components/eth-balance.js | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/ui/app/components/eth-balance.js b/ui/app/components/eth-balance.js index c3d084bdc..2f6395a2d 100644 --- a/ui/app/components/eth-balance.js +++ b/ui/app/components/eth-balance.js @@ -1,5 +1,6 @@ const { Component } = require('react') const h = require('react-hyperscript') +const connect = require('react-redux').connect const { inherits } = require('util') const { formatBalance, @@ -8,7 +9,12 @@ const { const Tooltip = require('./tooltip.js') const FiatValue = require('./fiat-value.js') -module.exports = EthBalanceComponent +module.exports = connect(mapStateToProps)(EthBalanceComponent) +function mapStateToProps (state) { + return { + ticker: state.metamask.ticker, + } +} inherits(EthBalanceComponent, Component) function EthBalanceComponent () { @@ -17,9 +23,9 @@ function EthBalanceComponent () { EthBalanceComponent.prototype.render = function () { const props = this.props - const { value, style, width, needsParse = true } = props + const { ticker, value, style, width, needsParse = true } = props - const formattedValue = value ? formatBalance(value, 6, needsParse) : '...' + const formattedValue = value ? formatBalance(value, 6, needsParse, ticker) : '...' return ( |