diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2017-03-15 08:52:03 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-15 08:52:03 +0800 |
| commit | a186e40d179d230fc1e81f7f507a5232d23ad462 (patch) | |
| tree | 91d9cbb8baa26efa462a86e9ecda460792f90996 /ui/app/actions.js | |
| parent | fcee7723e99c13b3fddcb97853dfdd771b42de14 (diff) | |
| parent | 570cc891b5386dc04462737de4df6f2adf5059c9 (diff) | |
| download | tangerine-wallet-browser-a186e40d179d230fc1e81f7f507a5232d23ad462.tar.gz tangerine-wallet-browser-a186e40d179d230fc1e81f7f507a5232d23ad462.tar.zst tangerine-wallet-browser-a186e40d179d230fc1e81f7f507a5232d23ad462.zip | |
Merge branch 'master' into i1165-predictive
Diffstat (limited to 'ui/app/actions.js')
| -rw-r--r-- | ui/app/actions.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/app/actions.js b/ui/app/actions.js index 4e0435ade..b09021577 100644 --- a/ui/app/actions.js +++ b/ui/app/actions.js @@ -71,7 +71,7 @@ var actions = { SHOW_CONF_TX_PAGE: 'SHOW_CONF_TX_PAGE', SHOW_CONF_MSG_PAGE: 'SHOW_CONF_MSG_PAGE', SET_CURRENT_FIAT: 'SET_CURRENT_FIAT', - setCurrentFiat: setCurrentFiat, + setCurrentCurrency: setCurrentCurrency, // account detail screen SHOW_SEND_PAGE: 'SHOW_SEND_PAGE', showSendPage: showSendPage, @@ -330,10 +330,10 @@ function showInfoPage () { } } -function setCurrentFiat (currencyCode) { +function setCurrentCurrency (currencyCode) { return (dispatch) => { dispatch(this.showLoadingIndication()) - log.debug(`background.setCurrentFiat`) + log.debug(`background.setCurrentCurrency`) background.setCurrentCurrency(currencyCode, (err, data) => { dispatch(this.hideLoadingIndication()) if (err) { @@ -343,7 +343,7 @@ function setCurrentFiat (currencyCode) { dispatch({ type: this.SET_CURRENT_FIAT, value: { - currentFiat: data.currentFiat, + currentCurrency: data.currentCurrency, conversionRate: data.conversionRate, conversionDate: data.conversionDate, }, |