From 056276af02c5717684e36eeeaf6a8787ea4a39e6 Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevin.serrano@consensys.net>
Date: Tue, 29 Aug 2017 16:36:05 -0700
Subject: integrate infura currency

---
 app/scripts/controllers/currency.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'app/scripts/controllers/currency.js')

diff --git a/app/scripts/controllers/currency.js b/app/scripts/controllers/currency.js
index 1f20dc005..e32f51ec2 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: 'ethusd',
       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/${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) {
-- 
cgit v1.2.3


From bd8428e9ed3e1fb386620def0739720aa8985299 Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevin.serrano@consensys.net>
Date: Mon, 18 Sep 2017 16:09:01 -0700
Subject: Comply with current currency API and add additional styling.

---
 app/scripts/controllers/currency.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/scripts/controllers/currency.js')

diff --git a/app/scripts/controllers/currency.js b/app/scripts/controllers/currency.js
index e32f51ec2..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: 'ethusd',
+      currentCurrency: 'usd',
       conversionRate: 0,
       conversionDate: 'N/A',
     }, opts.initState)
@@ -45,7 +45,7 @@ class CurrencyController {
 
   updateConversionRate () {
     const currentCurrency = this.getCurrentCurrency()
-    return fetch(`https://api.infura.io/v1/ticker/${currentCurrency}`)
+    return fetch(`https://api.infura.io/v1/ticker/eth${currentCurrency}`)
     .then(response => response.json())
     .then((parsedResponse) => {
       this.setConversionRate(Number(parsedResponse.bid))
-- 
cgit v1.2.3