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/reducers | |
| parent | fcee7723e99c13b3fddcb97853dfdd771b42de14 (diff) | |
| parent | 570cc891b5386dc04462737de4df6f2adf5059c9 (diff) | |
| download | tangerine-wallet-browser-a186e40d179d230fc1e81f7f507a5232d23ad462.tar tangerine-wallet-browser-a186e40d179d230fc1e81f7f507a5232d23ad462.tar.gz tangerine-wallet-browser-a186e40d179d230fc1e81f7f507a5232d23ad462.tar.bz2 tangerine-wallet-browser-a186e40d179d230fc1e81f7f507a5232d23ad462.tar.lz tangerine-wallet-browser-a186e40d179d230fc1e81f7f507a5232d23ad462.tar.xz tangerine-wallet-browser-a186e40d179d230fc1e81f7f507a5232d23ad462.tar.zst tangerine-wallet-browser-a186e40d179d230fc1e81f7f507a5232d23ad462.zip | |
Merge branch 'master' into i1165-predictive
Diffstat (limited to 'ui/app/reducers')
| -rw-r--r-- | ui/app/reducers/metamask.js | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js index 10d3b0461..2b5151466 100644 --- a/ui/app/reducers/metamask.js +++ b/ui/app/reducers/metamask.js @@ -13,9 +13,6 @@ function reduceMetamask (state, action) { rpcTarget: 'https://rawtestrpc.metamask.io/', identities: {}, unapprovedTxs: {}, - currentFiat: 'USD', - conversionRate: 0, - conversionDate: 'N/A', noActiveNotices: true, lastUnreadNotice: undefined, frequentRpcList: [], @@ -127,7 +124,7 @@ function reduceMetamask (state, action) { case actions.SET_CURRENT_FIAT: return extend(metamaskState, { - currentFiat: action.value.currentFiat, + currentCurrency: action.value.currentCurrency, conversionRate: action.value.conversionRate, conversionDate: action.value.conversionDate, }) |