m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-22 18:00:18 +01:00
Code

Cleanup

Browse Source
This commit is contained in:
bitpshr 2018-11-07 11:31:21 -05:00 committed by Dan Finlay
parent a224b71837
commit 718393f89a
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/scripts/inpage.js
View File

@ -54,12 +54,12 @@ var inpageProvider = new MetamaskInpageProvider(metamaskStream)
inpageProvider.setMaxListeners(100)
// set up a listener for when MetaMask is locked
onMessage('metamasksetlocked', ({ data: { type } }) => { isEnabled = false })
onMessage('metamasksetlocked', () => { isEnabled = false })
// augment the provider with its enable method
inpageProvider.enable = function ({ force } = {}) {
return new Promise((resolve, reject) => {
providerHandle = ({ data: { type, error } }) => {
providerHandle = ({ data: { error } }) => {
if (typeof error !== 'undefined') {
reject(error)
} else {
@ -119,16 +119,12 @@ inpageProvider._metamask = new Proxy({
* @returns {Promise<boolean>} - Promise resolving to true if this domain has been previously approved
*/
isApproved: function() {
return new Promise((resolve, reject) => {
isApprovedHandle = ({ data: { caching, isApproved, error, type } }) => {
if (typeof error !== 'undefined') {
reject(error)
return new Promise((resolve) => {
isApprovedHandle = ({ data: { caching, isApproved } }) => {
if (caching) {
resolve(!!isApproved)
} else {
if (caching) {
resolve(!!isApproved)
} else {
resolve(false)
}
resolve(false)
}
}
onMessage('ethereumisapproved', isApprovedHandle, true)
@ -142,13 +138,9 @@ inpageProvider._metamask = new Proxy({
* @returns {Promise<boolean>} - Promise resolving to true if MetaMask is currently unlocked
*/
isUnlocked: function () {
return new Promise((resolve, reject) => {
isUnlockedHandle = ({ data: { isUnlocked, error, type } }) => {
if (typeof error !== 'undefined') {
reject(error)
} else {
resolve(!!isUnlocked)
}
return new Promise((resolve) => {
isUnlockedHandle = ({ data: { isUnlocked } }) => {
resolve(!!isUnlocked)
}
onMessage('metamaskisunlocked', isUnlockedHandle, true)
window.postMessage({ type: 'METAMASK_IS_UNLOCKED' }, '*')