2 files changed, 4 insertions, 4 deletions
diff --git a/app/scripts/controllers/currency.js b/app/scripts/controllers/currency.js
index 1f20dc005..9e696ce55 100644
--- a/app/scripts/controllers/currency.js
+++ b/app/scripts/controllers/currency.js
@@ -8,7 +8,7 @@ class CurrencyController {
 
   constructor (opts = {}) {
     const initState = extend({
-      currentCurrency: 'USD',
+      currentCurrency: 'usd',
       conversionRate: 0,
       conversionDate: 'N/A',
     }, opts.initState)
@@ -45,10 +45,10 @@ class CurrencyController {
 
   updateConversionRate () {
     const currentCurrency = this.getCurrentCurrency()
-    return fetch(`https://api.cryptonator.com/api/ticker/eth-${currentCurrency}`)
+    return fetch(`https://api.infura.io/v1/ticker/eth${currentCurrency}`)
     .then(response => response.json())
     .then((parsedResponse) => {
-      this.setConversionRate(Number(parsedResponse.ticker.price))
+      this.setConversionRate(Number(parsedResponse.bid))
       this.setConversionDate(Number(parsedResponse.timestamp))
     }).catch((err) => {
       if (err) {
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index fef16c3a9..19c65680d 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -674,4 +674,4 @@ module.exports = class MetamaskController extends EventEmitter {
       return Promise.resolve(rpcTarget)
     })
   }
-}
-\ No newline at end of file
+}