2 files changed, 9 insertions, 2 deletions
diff --git a/app/scripts/lib/idStore.js b/app/scripts/lib/idStore.js
index 2c8e9108b..94aaad1d1 100644
--- a/app/scripts/lib/idStore.js
+++ b/app/scripts/lib/idStore.js
@@ -99,6 +99,8 @@ IdentityStore.prototype.getState = function () {
     unconfMsgs: messageManager.unconfirmedMsgs(),
     messages: messageManager.getMsgList(),
     selectedAddress: configManager.getSelectedAccount(),
+    currentFiat: configManager.getCurrentFiat(),
+    currentConversion: configManager.getConversionRate(),
   }))
 }
 
@@ -199,7 +201,7 @@ IdentityStore.prototype.addUnconfirmedTransaction = function (txParams, onTxDone
     time: time,
     status: 'unconfirmed',
   }
-  
+
   console.log('addUnconfirmedTransaction:', txData)
 
   // keep the onTxDoneCb around for after approval/denial (requires user interaction)
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index bcf5203fe..1b3b69932 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -241,8 +241,13 @@ module.exports = class MetamaskController {
     try {
       this.configManager.setCurrentFiat(fiat)
       this.configManager.setConversionRate()
+      const data = {
+        conversionRate: this.configManager.getConversionRate,
+        currentFiat: this.configManager.getCurrentFiat,
+      }
+      cb(data)
     } catch (e) {
-      cb(e)
+      cb(null,e)
     }
   }