Fix merge conflicts. Fix typos. Ensure currency immediately updated on load.

1 files changed, 17 insertions, 0 deletions

diff --git a/app/scripts/lib/config-manager.js b/app/scripts/lib/config-manager.js
index e0f389ed4..8d250e555 100644
--- a/app/scripts/lib/config-manager.js
+++ b/app/scripts/lib/config-manager.js
@@ -289,6 +289,12 @@ ConfigManager.prototype.updateConversionRate = function () {
     const parsedResponse = JSON.parse(response)
     this.setConversionPrice(parsedResponse.ticker.price)
     this.setConversionDate(parsedResponse.timestamp)
+    console.log('=================')
+    console.log('Updated currency!')
+    console.log('=================')
+    console.log(this.getConversionRate())
+    console.log(this.getCurrentFiat())
+    console.log(parsedResponse)
   }).catch((err) => {
     console.error('Error in conversion.', err)
   })
@@ -315,3 +321,14 @@ ConfigManager.prototype.getConversionDate = function () {
   var data = this.getData()
   return ('conversionDate' in data) && data.conversionDate
 }
+
+ConfigManager.prototype.setShouldntShowWarning = function (confirmed) {
+  var data = this.getData()
+  data.isEthConfirmed = confirmed
+  this.setData(data)
+}
+
+ConfigManager.prototype.getShouldntShowWarning = function () {
+  var data = this.getData()
+  return ('isEthConfirmed' in data) && data.isEthConfirmed
+}