Use extensions api to close tab in permissions-connect

MetaMask · Nov 20, 2019 · 5dd3f95 · 5dd3f95
1 parent 177c05b
commit 5dd3f95
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/app/scripts/platforms/extension.js b/app/scripts/platforms/extension.js
@@ -84,6 +84,14 @@ class ExtensionPlatform {
     extension.tabs.update(tabId, {highlighted: true}, cb)
   }
 
+  closeTab (tabId) {
+    return new Promise(resolve => {
+      extension.tabs.remove(tabId, () => {
+        resolve()
+      })
+    })
+  }
+
   _showConfirmedTransaction (txMeta) {
 
     this._subscribeToNotificationClicked()

diff --git a/ui/app/pages/permissions-connect/permissions-connect.component.js b/ui/app/pages/permissions-connect/permissions-connect.component.js
@@ -51,9 +51,12 @@ export default class PermissionConnect extends Component {
       permissionAccepted: accepted,
     })
     setTimeout(() => {
-      global.platform.switchToTab(currentMetaMaskTabOpenerId, () => {
-        window.close()
-      })
+      global.platform.currentTab()
+        .then(({ id: currentTabId }) => {
+          global.platform.switchToTab(currentMetaMaskTabOpenerId, () => {
+            global.platform.closeTab(currentTabId)
+          })
+        })
     }, 2000)
   }