diff options
| author | Frankie <frankie.pangilinan@consensys.net> | 2016-06-22 06:04:00 +0800 |
|---|---|---|
| committer | Frankie <frankie.pangilinan@consensys.net> | 2016-06-22 06:04:00 +0800 |
| commit | cf663f1104697440121d32cc6db2a8a1d5d54c5a (patch) | |
| tree | 3ed4b8b9fe8c85f3b3a5bf68482c3fb9967f2de5 /ui/app/components/eth-balance.js | |
| parent | 265725c6edd62a7f46a9b9cf5a443cf01f0ff00c (diff) | |
| parent | dc2ef967028723afe9fe1efd669754723e38a4f0 (diff) | |
| download | tangerine-wallet-browser-cf663f1104697440121d32cc6db2a8a1d5d54c5a.tar.gz tangerine-wallet-browser-cf663f1104697440121d32cc6db2a8a1d5d54c5a.tar.zst tangerine-wallet-browser-cf663f1104697440121d32cc6db2a8a1d5d54c5a.zip | |
Fix conflict
Diffstat (limited to 'ui/app/components/eth-balance.js')
| -rw-r--r-- | ui/app/components/eth-balance.js | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ui/app/components/eth-balance.js b/ui/app/components/eth-balance.js index 76b75d4c8..710d4fc8b 100644 --- a/ui/app/components/eth-balance.js +++ b/ui/app/components/eth-balance.js @@ -1,17 +1,16 @@ const Component = require('react').Component const h = require('react-hyperscript') const inherits = require('util').inherits -const parseBalance = require('../util').parseBalance const formatBalance = require('../util').formatBalance module.exports = EthBalanceComponent inherits(EthBalanceComponent, Component) -function EthBalanceComponent() { +function EthBalanceComponent () { Component.call(this) } -EthBalanceComponent.prototype.render = function() { +EthBalanceComponent.prototype.render = function () { var state = this.props var style = state.style var value = formatBalance(state.value) |