m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-26 12:29:06 +01:00
Code

Fix default value. Add loading indication for async.

Browse Source
This commit is contained in:
Kevin Serrano 2016-08-09 16:33:58 -07:00
parent 8acb3e6007
commit 637d3978b7
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/scripts/metamask-controller.js
View File

@ -21,7 +21,7 @@ module.exports = class MetamaskController {
this.idStore.setStore(this.ethStore)
this.messageManager = messageManager
this.publicConfigStore = this.initPublicConfigStore
this.configManager.setCurrentFiat('usd')
this.configManager.setCurrentFiat('USD')
this.configManager.updateConversionRate()
this.scheduleConversionInterval()
}

4
ui/app/actions.js
View File

@ -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: {

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

@ -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)