aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Finlay <flyswatter@users.noreply.github.com>2017-01-18 04:14:27 +0800
committerGitHub <noreply@github.com>2017-01-18 04:14:27 +0800
commit1f2840a7beff0cde617f1caf7cb7070507c81f7d (patch)
tree4b53230af166215f932b0d5c3ac17888946c85ca
parenta245fb7d22a5fe08c4fc8c2c1c64d406805018a8 (diff)
parentc53932a19a77516110a45d7b201b85dc6ea71a47 (diff)
downloadtangerine-wallet-browser-1f2840a7beff0cde617f1caf7cb7070507c81f7d.tar
tangerine-wallet-browser-1f2840a7beff0cde617f1caf7cb7070507c81f7d.tar.gz
tangerine-wallet-browser-1f2840a7beff0cde617f1caf7cb7070507c81f7d.tar.bz2
tangerine-wallet-browser-1f2840a7beff0cde617f1caf7cb7070507c81f7d.tar.lz
tangerine-wallet-browser-1f2840a7beff0cde617f1caf7cb7070507c81f7d.tar.xz
tangerine-wallet-browser-1f2840a7beff0cde617f1caf7cb7070507c81f7d.tar.zst
tangerine-wallet-browser-1f2840a7beff0cde617f1caf7cb7070507c81f7d.zip
Merge pull request #1017 from MetaMask/conversion-api-err
Conversion api err
-rw-r--r--.eslintrc4
-rw-r--r--app/scripts/lib/config-manager.js2
2 files changed, 3 insertions, 3 deletions
diff --git a/.eslintrc b/.eslintrc
index 72b3d3e6d..ffa4cd574 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -44,7 +44,7 @@
"eol-last": 1,
"eqeqeq": [2, "allow-null"],
"generator-star-spacing": [2, { "before": true, "after": true }],
- "handle-callback-err": [2, "^(err|error)$" ],
+ "handle-callback-err": [1, "^(err|error)$" ],
"indent": [2, 2, { "SwitchCase": 1 }],
"jsx-quotes": [2, "prefer-single"],
"key-spacing": [2, { "beforeColon": false, "afterColon": true }],
@@ -145,6 +145,6 @@
"wrap-iife": [2, "any"],
"yield-star-spacing": [2, "both"],
"yoda": [2, "never"],
- "prefer-const": 1
+ "prefer-const": 1,
}
}
diff --git a/app/scripts/lib/config-manager.js b/app/scripts/lib/config-manager.js
index 3a1f12ac0..e927c78ec 100644
--- a/app/scripts/lib/config-manager.js
+++ b/app/scripts/lib/config-manager.js
@@ -306,7 +306,7 @@ ConfigManager.prototype.updateConversionRate = function () {
this.setConversionPrice(parsedResponse.ticker.price)
this.setConversionDate(parsedResponse.timestamp)
}).catch((err) => {
- console.error('Error in conversion.', err)
+ console.warn('MetaMask - Failed to query currency conversion.')
this.setConversionPrice(0)
this.setConversionDate('N/A')
})