Pull minor taho updates + add window close timeout

background/services/provider-bridge/index.ts

@@ -353,11 +353,24 @@ export default class ProviderBridgeService extends BaseService<Events> {
     permissionRequest: PermissionRequest
   ): Promise<unknown> {
     this.emitter.emit("requestPermission", permissionRequest)
-    await showExtensionPopup(AllowedQueryParamPage.dappPermission)
-
-    return new Promise((resolve) => {
+    const permissionPromise = new Promise((resolve) => {
       this.#pendingPermissionsRequests[permissionRequest.origin] = resolve
+
+      showExtensionPopup(AllowedQueryParamPage.dappPermission, {}, () => {
+        resolve("Time to move on")
+      })
     })
+
+    const result = await permissionPromise
+
+    if (this.#pendingPermissionsRequests[permissionRequest.origin]) {
+      // Just in case this is a different promise, go ahead and resolve it with
+      // the same result.
+      this.#pendingPermissionsRequests[permissionRequest.origin](result)
+      delete this.#pendingPermissionsRequests[permissionRequest.origin]
+    }
+
+    return result
   }
 
   async grantPermission(permission: PermissionRequest): Promise<void> {
@@ -374,11 +387,7 @@ export default class ProviderBridgeService extends BaseService<Events> {
     }
 
     await this.db.setPermission(permission)
-
-    if (this.#pendingPermissionsRequests[permission.origin]) {
-      this.#pendingPermissionsRequests[permission.origin](permission)
-      delete this.#pendingPermissionsRequests[permission.origin]
-    }
+    this.#pendingPermissionsRequests[permission.origin]?.(permission)
   }
 
   async denyOrRevokePermission(permission: PermissionRequest): Promise<void> {

background/services/provider-bridge/show-popup.ts

@@ -3,7 +3,8 @@ import { AllowedQueryParamPageType } from "@pelagus-provider/provider-bridge-sha
 
 export default async function showExtensionPopup(
   url: AllowedQueryParamPageType,
-  additionalOptions: { [key: string]: string } = {}
+  additionalOptions: { [key: string]: string } = {},
+  onClose?: () => void,
 ): Promise<browser.Windows.Window> {
   const { left = 0, top, width = 1920 } = await browser.windows.getCurrent()
   const popupWidth = 384
@@ -24,5 +25,19 @@ export default async function showExtensionPopup(
     focused: true,
   }
 
-  return browser.windows.create(params)
+
+  const window = await browser.windows.create(params)
+
+  if (onClose !== undefined) {
+    const listener = (windowId: number) => {
+      if (windowId === window.id) {
+        onClose()
+
+        browser.windows.onRemoved.removeListener(listener)
+      }
+    }
+    browser.windows.onRemoved.addListener(listener)
+  }
+
+  return window
 }

ui/pages/DAppConnectRequest.tsx

@@ -50,7 +50,7 @@ export default function DAppConnectRequest(): ReactElement {
       )
     }
     window.onbeforeunload = null
-    window.close()
+    setTimeout(() => window.close(), 300)
   }, [dispatch, permission, currentAccountTotal])
 
   const deny = useCallback(async () => {