aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts
diff options
context:
space:
mode:
authorbitpshr <mail@bitpshr.net>2018-10-30 06:51:29 +0800
committerDan Finlay <542863+danfinlay@users.noreply.github.com>2018-11-06 07:07:09 +0800
commitcc27a09a1aa676573c5b7354ba73b29ba38e08b8 (patch)
treed5bd0232fce8df024299b159c637d3ed9ca2c00a /app/scripts
parentd4171ccea51db04aa40320de8770e22203d4d6c2 (diff)
downloadtangerine-wallet-browser-cc27a09a1aa676573c5b7354ba73b29ba38e08b8.tar
tangerine-wallet-browser-cc27a09a1aa676573c5b7354ba73b29ba38e08b8.tar.gz
tangerine-wallet-browser-cc27a09a1aa676573c5b7354ba73b29ba38e08b8.tar.bz2
tangerine-wallet-browser-cc27a09a1aa676573c5b7354ba73b29ba38e08b8.tar.lz
tangerine-wallet-browser-cc27a09a1aa676573c5b7354ba73b29ba38e08b8.tar.xz
tangerine-wallet-browser-cc27a09a1aa676573c5b7354ba73b29ba38e08b8.tar.zst
tangerine-wallet-browser-cc27a09a1aa676573c5b7354ba73b29ba38e08b8.zip
rebase
Diffstat (limited to 'app/scripts')
-rw-r--r--app/scripts/inpage.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/scripts/inpage.js b/app/scripts/inpage.js
index 29811c216..ddbb43326 100644
--- a/app/scripts/inpage.js
+++ b/app/scripts/inpage.js
@@ -106,7 +106,7 @@ inpageProvider._metamask = new Proxy({
if (typeof detail.error !== 'undefined') {
reject(detail.error)
} else {
- if (!detail.caching) {
+ if (detail.caching) {
resolve(!!detail.isApproved)
} else {
resolve(isEnabled)
@@ -136,9 +136,9 @@ inpageProvider._metamask = new Proxy({
},
}, {
get: function(obj, prop) {
- !warned && console.warn('Heads up! ethereum._metamask exposes convenience methods that have ' +
+ !warned && console.warn('Heads up! ethereum._metamask exposes methods that have ' +
'not been standardized yet. This means that these methods may not be implemented ' +
- 'in other dapp browsers.')
+ 'in other dapp browsers and may be removed from MetaMask in the future.')
warned = true
return obj[prop]
},