From 718393f89a1bf99ff15bdfe1aa5c4301fbd56621 Mon Sep 17 00:00:00 2001
From: bitpshr <mail@bitpshr.net>
Date: Wed, 7 Nov 2018 11:31:21 -0500
Subject: Cleanup

---
 app/scripts/inpage.js | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

(limited to 'app/scripts')

diff --git a/app/scripts/inpage.js b/app/scripts/inpage.js
index 785237ff5..a7c0b0416 100644
--- a/app/scripts/inpage.js
+++ b/app/scripts/inpage.js
@@ -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' }, '*')
-- 
cgit v1.2.3