merge

1 files changed, 10 insertions, 8 deletions

diff --git a/app/scripts/controllers/token-rates.js b/app/scripts/controllers/token-rates.js
index 867d36433..6b6265dba 100644
--- a/app/scripts/controllers/token-rates.js
+++ b/app/scripts/controllers/token-rates.js
@@ -1,6 +1,8 @@
 const ObservableStore = require('obs-store')
 const log = require('loglevel')
 const normalizeAddress = require('eth-sig-util').normalize
+const ethUtil = require('ethereumjs-util')
+
 
 // By default, poll every 3 minutes
 const DEFAULT_INTERVAL = 180 * 1000
@@ -28,16 +30,16 @@ class TokenRatesController {
   async updateExchangeRates () {
     if (!this.isActive) { return }
     const contractExchangeRates = {}
-    const nativeCurrency = this.currency ? this.currency.getState().nativeCurrency.toUpperCase() : 'ETH'
-    const pairs = this._tokens.map(token => `pairs[]=${token.address}/${nativeCurrency}`)
-    const query = pairs.join('&')
+    const nativeCurrency = this.currency ? this.currency.getState().nativeCurrency.toLowerCase() : 'eth'
+    const pairs = this._tokens.map(token => token.address).join(',')
+    const query = `contract_addresses=${pairs}&vs_currencies=${nativeCurrency}`
     if (this._tokens.length > 0) {
       try {
-        const response = await fetch(`https://exchanges.balanc3.net/pie?${query}&autoConversion=false`)
-        const { prices = [] } = await response.json()
-        prices.forEach(({ pair, price }) => {
-          const address = pair.split('/')[0]
-          contractExchangeRates[normalizeAddress(address)] = typeof price === 'number' ? price : 0
+        const response = await fetch(`https://api.coingecko.com/api/v3/simple/token_price/ethereum?${query}`)
+        const prices = await response.json()
+        this._tokens.forEach(token => {
+          const price = prices[token.address.toLowerCase()] || prices[ethUtil.toChecksumAddress(token.address)]
+          contractExchangeRates[normalizeAddress(token.address)] = price ? price[nativeCurrency] : 0
         })
       } catch (error) {
         log.warn(`MetaMask - TokenRatesController exchange rate fetch failed.`, error)