Merge pull request #1552 from MetaMask/currency-fix

Fix Currency API

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## Current Master
 
+- Fix currency API URL from cryptonator.
 - Update gasLimit params with every new block seen.
 
 ## 3.7.7 2017-6-8

app/manifest.json

@@ -58,7 +58,7 @@
     "storage",
     "clipboardWrite",
     "http://localhost:8545/",
-    "https://www.cryptonator.com/"
+    "https://api.cryptonator.com/"
   ],
   "web_accessible_resources": [
     "scripts/inpage.js"

app/scripts/controllers/currency.js

@@ -45,7 +45,7 @@ class CurrencyController {
 
   updateConversionRate () {
     const currentCurrency = this.getCurrentCurrency()
-    return fetch(`https://www.cryptonator.com/api/ticker/eth-${currentCurrency}`)
+    return fetch(`https://api.cryptonator.com/api/ticker/eth-${currentCurrency}`)
     .then(response => response.json())
     .then((parsedResponse) => {
       this.setConversionRate(Number(parsedResponse.ticker.price))

test/unit/currency-controller-test.js

@@ -36,7 +36,7 @@ describe('currency-controller', function () {
     describe('#updateConversionRate', function () {
       it('should retrieve an update for ETH to USD and set it in memory', function (done) {
         this.timeout(15000)
-        nock('https://www.cryptonator.com')
+        nock('https://api.cryptonator.com')
           .get('/api/ticker/eth-USD')
           .reply(200, '{"ticker":{"base":"ETH","target":"USD","price":"11.02456145","volume":"44948.91745289","change":"-0.01472534"},"timestamp":1472072136,"success":true,"error":""}')
 
@@ -57,7 +57,7 @@ describe('currency-controller', function () {
         this.timeout(15000)
         assert.equal(currencyController.getConversionRate(), 0)
 
-        nock('https://www.cryptonator.com')
+        nock('https://api.cryptonator.com')
           .get('/api/ticker/eth-JPY')
           .reply(200, '{"ticker":{"base":"ETH","target":"JPY","price":"11.02456145","volume":"44948.91745289","change":"-0.01472534"},"timestamp":1472072136,"success":true,"error":""}')