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

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

This commit is contained in:
kumavis 2018-10-29 20:28:02 -04:00
commit 7ae5a23b6c

View File

@ -160,7 +160,7 @@ class CurrencyController {
log.error(new Error(`CurrencyController - Failed to parse response "${rawResponse}"`))
return
}
// set exhcange rate
// set conversion rate
if (nativeCurrency === 'ETH') {
// ETH
this.setConversionRate(Number(parsedResponse.bid))
@ -177,6 +177,7 @@ class CurrencyController {
}
} catch (err) {
// reset current conversion rate
log.warn(`MetaMask - Failed to query currency conversion:`, nativeCurrency, currentCurrency, err)
this.setConversionRate(0)
this.setConversionDate('N/A')
// throw error