aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/reducers
diff options
context:
space:
mode:
authorFrankie <frankie.pangilinan@consensys.net>2016-08-19 02:06:32 +0800
committerFrankie <frankie.pangilinan@consensys.net>2016-08-19 02:06:32 +0800
commitefa61f2cf892eb1383fcfacd60d906e76dbaa757 (patch)
tree4e19f1abbadc02f861f0b54027954bf9cb6b5fac /ui/app/reducers
parent752d16f6c072b0dd54eb245209881a25ff06cb8e (diff)
parent90d6bec3ed51ba4b2d4696132642a4d97712dec9 (diff)
downloadtangerine-wallet-browser-efa61f2cf892eb1383fcfacd60d906e76dbaa757.tar.gz
tangerine-wallet-browser-efa61f2cf892eb1383fcfacd60d906e76dbaa757.tar.zst
tangerine-wallet-browser-efa61f2cf892eb1383fcfacd60d906e76dbaa757.zip
Merge branch 'master' into shapeshiftTx
Diffstat (limited to 'ui/app/reducers')
-rw-r--r--ui/app/reducers/metamask.js10
1 files changed, 10 insertions, 0 deletions
diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js
index 4eef20f56..7f18480cb 100644
--- a/ui/app/reducers/metamask.js
+++ b/ui/app/reducers/metamask.js
@@ -15,6 +15,9 @@ function reduceMetamask (state, action) {
rpcTarget: 'https://rawtestrpc.metamask.io/',
identities: {},
unconfTxs: {},
+ currentFiat: 'USD',
+ conversionRate: 0,
+ conversionDate: 'N/A',
}, state.metamask)
switch (action.type) {
@@ -115,6 +118,13 @@ 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,
+ conversionDate: action.value.conversionDate,
+ })
+
default:
return metamaskState