1 files changed, 12 insertions, 1 deletions
diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js
index 8d4520fb1..7f18480cb 100644
--- a/ui/app/reducers/metamask.js
+++ b/ui/app/reducers/metamask.js
@@ -10,10 +10,14 @@ function reduceMetamask (state, action) {
   var metamaskState = extend({
     isInitialized: false,
     isUnlocked: false,
+    isEthConfirmed: false,
     currentDomain: 'example.com',
     rpcTarget: 'https://rawtestrpc.metamask.io/',
     identities: {},
     unconfTxs: {},
+    currentFiat: 'USD',
+    conversionRate: 0,
+    conversionDate: 'N/A',
   }, state.metamask)
 
   switch (action.type) {
@@ -33,7 +37,7 @@ function reduceMetamask (state, action) {
 
     case actions.AGREE_TO_ETH_WARNING:
       return extend(metamaskState, {
-        isEthConfirmed: true,
+        isEthConfirmed: !metamaskState.isEthConfirmed,
       })
 
     case actions.UNLOCK_METAMASK:
@@ -114,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