Merge pull request #689 from MetaMask/i#688

Fix for where fiat conversion does not persist when switching networks

2 files changed, 4 insertions, 1 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a0ff662fe..84a074480 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Current Master
 
+- Fix bug where chosen FIAT exchange rate does no persist when switching networks
+
 ## 2.13.1 2016-09-23
 
 - Fix a bug with estimating gas on Parity
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 2b10c8c35..9e1a885ae 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -22,7 +22,8 @@ module.exports = class MetamaskController {
     this.idStore.setStore(this.ethStore)
     this.messageManager = messageManager
     this.publicConfigStore = this.initPublicConfigStore()
-    this.configManager.setCurrentFiat('USD')
+    var currentFiat = this.configManager.getCurrentFiat() || 'USD'
+    this.configManager.setCurrentFiat(currentFiat)
     this.configManager.updateConversionRate()
     this.scheduleConversionInterval()
   }