diff options
| author | Thomas Huang <tmashuang@users.noreply.github.com> | 2019-06-05 05:55:56 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-05 05:55:56 +0800 |
| commit | be911711942914e7f6df535afff1a3ee87e23b6f (patch) | |
| tree | bbd890e0a6a1bd72d2560e734ce66ed42a294722 /app/scripts/inpage.js | |
| parent | 3d7bdd6ecb5e8e17cb8ccf83f56ad389971332c1 (diff) | |
| parent | 28e030a11d75df81e16f3ebf726bfc59fcee679e (diff) | |
| download | tangerine-wallet-browser-be911711942914e7f6df535afff1a3ee87e23b6f.tar tangerine-wallet-browser-be911711942914e7f6df535afff1a3ee87e23b6f.tar.gz tangerine-wallet-browser-be911711942914e7f6df535afff1a3ee87e23b6f.tar.bz2 tangerine-wallet-browser-be911711942914e7f6df535afff1a3ee87e23b6f.tar.lz tangerine-wallet-browser-be911711942914e7f6df535afff1a3ee87e23b6f.tar.xz tangerine-wallet-browser-be911711942914e7f6df535afff1a3ee87e23b6f.tar.zst tangerine-wallet-browser-be911711942914e7f6df535afff1a3ee87e23b6f.zip | |
Merge pull request #6683 from MetaMask/develop
Merge dev to master
Diffstat (limited to 'app/scripts/inpage.js')
| -rw-r--r-- | app/scripts/inpage.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/scripts/inpage.js b/app/scripts/inpage.js index a4fb552f1..fb16dd43d 100644 --- a/app/scripts/inpage.js +++ b/app/scripts/inpage.js @@ -33,8 +33,8 @@ inpageProvider.setMaxListeners(100) inpageProvider.enable = function ({ force } = {}) { return new Promise((resolve, reject) => { inpageProvider.sendAsync({ method: 'eth_requestAccounts', params: [force] }, (error, response) => { - if (error) { - reject(error) + if (error || response.error) { + reject(error || response.error) } else { resolve(response.result) } |