diff options
author | Kevin Serrano <kevgagser@gmail.com> | 2016-07-22 01:15:34 +0800 |
---|---|---|
committer | Kevin Serrano <kevgagser@gmail.com> | 2016-07-22 01:15:34 +0800 |
commit | 4a9d5b1c258912acedd6f1e89fb632526d9c910b (patch) | |
tree | e8a35826a47995c7fb8a32e30950a304e7a3c1ab /ui | |
parent | 491b9cddc5fe1a7d0899d29c9a53aa71f04b9b28 (diff) | |
download | tangerine-wallet-browser-4a9d5b1c258912acedd6f1e89fb632526d9c910b.tar tangerine-wallet-browser-4a9d5b1c258912acedd6f1e89fb632526d9c910b.tar.gz tangerine-wallet-browser-4a9d5b1c258912acedd6f1e89fb632526d9c910b.tar.bz2 tangerine-wallet-browser-4a9d5b1c258912acedd6f1e89fb632526d9c910b.tar.lz tangerine-wallet-browser-4a9d5b1c258912acedd6f1e89fb632526d9c910b.tar.xz tangerine-wallet-browser-4a9d5b1c258912acedd6f1e89fb632526d9c910b.tar.zst tangerine-wallet-browser-4a9d5b1c258912acedd6f1e89fb632526d9c910b.zip |
Add data field to pass up parameters up to reducer.
Diffstat (limited to 'ui')
-rw-r--r-- | ui/app/actions.js | 6 | ||||
-rw-r--r-- | ui/app/reducers/metamask.js | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/ui/app/actions.js b/ui/app/actions.js index c9a5401d3..c5fd2df08 100644 --- a/ui/app/actions.js +++ b/ui/app/actions.js @@ -212,10 +212,14 @@ function revealAccount () { function setCurrentFiat (fiat) { return (dispatch) => { dispatch(this.showLoadingIndication()) - _accountManager.setCurrentFiat(fiat, (err) => { + _accountManager.setCurrentFiat(fiat, (data, err) => { dispatch(this.hideLoadingIndication()) dispatch({ type: this.SET_CURRENT_FIAT, + value: { + currentFiat: data.currentFiat, + conversionRate: data.conversionRate, + } }) }) } diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js index f3ef8eb11..d5d17135f 100644 --- a/ui/app/reducers/metamask.js +++ b/ui/app/reducers/metamask.js @@ -109,6 +109,12 @@ function reduceMetamask (state, action) { var identities = extend(metamaskState.identities, id) return extend(metamaskState, { identities }) + case actions.SET_CURRENT_FIAT: + return extend(metaMaskState, { + currentFiat: action.value.currentFiat, + conversionRate: action.value.conversionRate, + }) + default: return metamaskState |