m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Merge branch 'sentry-enhancements2' of github.com:MetaMask/metamask-extension into sentry-enhancements2

Browse Source
This commit is contained in:
kumavis 2018-10-29 20:28:02 -04:00
commit 7ae5a23b6c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/scripts/controllers/currency.js
View File

@ -139,7 +139,7 @@ class CurrencyController {
// ETH // ETH
apiUrl = `https://api.infura.io/v1/ticker/eth${currentCurrency.toLowerCase()}` apiUrl = `https://api.infura.io/v1/ticker/eth${currentCurrency.toLowerCase()}`
} else { } else {
// ETC // ETC
apiUrl = `https://min-api.cryptocompare.com/data/price?fsym=${nativeCurrency.toUpperCase()}&tsyms=${currentCurrency.toUpperCase()}` apiUrl = `https://min-api.cryptocompare.com/data/price?fsym=${nativeCurrency.toUpperCase()}&tsyms=${currentCurrency.toUpperCase()}`
} }
// attempt request // attempt request
@ -160,7 +160,7 @@ class CurrencyController {
log.error(new Error(`CurrencyController - Failed to parse response "${rawResponse}"`)) log.error(new Error(`CurrencyController - Failed to parse response "${rawResponse}"`))
return return
} }
// set exhcange rate // set conversion rate
if (nativeCurrency === 'ETH') { if (nativeCurrency === 'ETH') {
// ETH // ETH
this.setConversionRate(Number(parsedResponse.bid)) this.setConversionRate(Number(parsedResponse.bid))
@ -177,6 +177,7 @@ class CurrencyController {
} }
} catch (err) { } catch (err) {
// reset current conversion rate // reset current conversion rate
log.warn(`MetaMask - Failed to query currency conversion:`, nativeCurrency, currentCurrency, err)
this.setConversionRate(0) this.setConversionRate(0)
this.setConversionDate('N/A') this.setConversionDate('N/A')
// throw error // throw error