diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2016-08-10 07:33:58 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevgagser@gmail.com> | 2016-08-10 07:33:58 +0800 |
| commit | 637d3978b716a7f32cf603b70155d8db90509af2 (patch) | |
| tree | b0a3653720f49c42737ff606031c0cf280a0e9e4 /ui | |
| parent | 8acb3e6007ee62e4f7f1795478de60b614947d96 (diff) | |
| download | tangerine-wallet-browser-637d3978b716a7f32cf603b70155d8db90509af2.tar tangerine-wallet-browser-637d3978b716a7f32cf603b70155d8db90509af2.tar.gz tangerine-wallet-browser-637d3978b716a7f32cf603b70155d8db90509af2.tar.bz2 tangerine-wallet-browser-637d3978b716a7f32cf603b70155d8db90509af2.tar.lz tangerine-wallet-browser-637d3978b716a7f32cf603b70155d8db90509af2.tar.xz tangerine-wallet-browser-637d3978b716a7f32cf603b70155d8db90509af2.tar.zst tangerine-wallet-browser-637d3978b716a7f32cf603b70155d8db90509af2.zip | |
Fix default value. Add loading indication for async.
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/app/actions.js | 4 | ||||
| -rw-r--r-- | ui/app/components/eth-balance.js | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/ui/app/actions.js b/ui/app/actions.js index 2fd1ccc1c..14cbeac42 100644 --- a/ui/app/actions.js +++ b/ui/app/actions.js @@ -216,9 +216,13 @@ function revealAccount () { } } + + function setCurrentFiat (fiat) { return (dispatch) => { + dispatch(this.showLoadingIndication()) _accountManager.setCurrentFiat(fiat, (data, err) => { + dispatch(this.hideLoadingIndication()) dispatch({ type: this.SET_CURRENT_FIAT, value: { diff --git a/ui/app/components/eth-balance.js b/ui/app/components/eth-balance.js index 4ecb436ee..1a7f75db9 100644 --- a/ui/app/components/eth-balance.js +++ b/ui/app/components/eth-balance.js @@ -6,6 +6,7 @@ const formatBalance = require('../util').formatBalance const generateBalanceObject = require('../util').generateBalanceObject const Tooltip = require('./tooltip.js') +module.exports = connect(mapStateToProps)(EthBalanceComponent) function mapStateToProps (state) { return { @@ -15,9 +16,6 @@ function mapStateToProps (state) { } } -module.exports = connect(mapStateToProps)(EthBalanceComponent) - - inherits(EthBalanceComponent, Component) function EthBalanceComponent () { Component.call(this) |