aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/controllers/token-rates.js
diff options
context:
space:
mode:
authorHsuan Lee <hsuan@cobinhood.com>2018-12-10 18:57:44 +0800
committerHsuan Lee <hsuan@cobinhood.com>2018-12-10 19:02:47 +0800
commitc0ede3738ebc693d035943ecd226f991eb9149c1 (patch)
treeb318f6afda470984c198cea0248bb354f14a1bd4 /app/scripts/controllers/token-rates.js
parent283c23101dd614d50f4ab9c866727d13b131a3dd (diff)
downloaddexon-wallet-c0ede3738ebc693d035943ecd226f991eb9149c1.tar.gz
dexon-wallet-c0ede3738ebc693d035943ecd226f991eb9149c1.tar.zst
dexon-wallet-c0ede3738ebc693d035943ecd226f991eb9149c1.zip
Fix rebase errors
Diffstat (limited to 'app/scripts/controllers/token-rates.js')
-rw-r--r--app/scripts/controllers/token-rates.js5
1 files changed, 1 insertions, 4 deletions
diff --git a/app/scripts/controllers/token-rates.js b/app/scripts/controllers/token-rates.js
index 9d38278e..5017b687 100644
--- a/app/scripts/controllers/token-rates.js
+++ b/app/scripts/controllers/token-rates.js
@@ -47,8 +47,6 @@ class TokenRatesController {
}
/**
-<<<<<<< HEAD
-=======
* Fetches a token exchange rate by address
*
* @param {String} address - Token contract address
@@ -59,13 +57,12 @@ class TokenRatesController {
const json = await response.json()
return json && json.length ? json[0].averagePrice : 0
} catch (error) {
- warn(`DekuSan - TokenRatesController exchange rate fetch failed for ${address}.`, error)
+ log.warn(`DekuSan - TokenRatesController exchange rate fetch failed for ${address}.`, error)
return 0
}
}
/**
->>>>>>> Complete onboarding flow
* @type {Number}
*/
set interval (interval) {