Fixing merge issues

arcana-network · Jan 10, 2024 · 910e61e · 910e61e
1 parent 043114b
commit 910e61e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -410,7 +410,7 @@ class AuthProvider {
       u.searchParams.set('sessionID', session.id)
 
       const popup = new Popup(u.toString())
-      await popup.open('login')
+      await popup.open()
       await this.waitForConnect()
       return
     }
@@ -427,7 +427,7 @@ class AuthProvider {
 
   private async beginLogin(url: string): Promise<EthereumProvider> {
     const popup = new Popup(url)
-    await popup.open('login')
+    await popup.open()
     return await this.waitForConnect()
   }
 

diff --git a/src/popup.ts b/src/popup.ts
@@ -5,16 +5,10 @@ class Popup {
   private window: Window | null
   constructor(public url: string) {}
 
-  public open(type: 'login'): Promise<unknown>
-  public open(type: 'request'): Promise<JsonRpcResponse<unknown>>
-  public open(type: 'login' | 'request' = 'login') {
+  public open() {
     const windowFeatures = getWindowFeatures()
     this.window = window.open(this.url, '_blank', windowFeatures)
-    if (type == 'login') {
-      return this.getWindowResponse()
-    } else {
-      return this.requestHandler()
-    }
+    return this.getWindowResponse()
   }
 
   private getWindowResponse() {