Merge pull request #126 from argentlabs/fix/argent-ww-mobile-connectors

fix: remove ensure wallet in argent mobile and argent webwallet
argentlabs · Aug 20, 2024 · 2d6a64e · 2d6a64e
2 parents f4fee9b + 071acfb
commit 2d6a64e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/src/connectors/argentMobile/index.ts b/src/connectors/argentMobile/index.ts
@@ -56,18 +56,19 @@ export class ArgentMobileBaseConnector extends Connector {
   }
 
   async ready(): Promise<boolean> {
-    // check if session is valid and retrieve the wallet
-    // if no sessions, it will show the login modal
-    await this.ensureWallet()
     if (!this._wallet) {
       return false
     }
 
-    const permissions = await this._wallet.request({
-      type: "wallet_getPermissions",
-    })
+    try {
+      const permissions = await this._wallet.request({
+        type: "wallet_getPermissions",
+      })
 
-    return (permissions as Permission[]).includes(Permission.ACCOUNTS)
+      return (permissions as Permission[]).includes(Permission.ACCOUNTS)
+    } catch {
+      return false
+    }
   }
 
   get id(): string {
@@ -150,8 +151,6 @@ export class ArgentMobileBaseConnector extends Connector {
   async request<T extends RpcMessage["type"]>(
     call: RequestFnCall<T>,
   ): Promise<RpcTypeToMessageMap[T]["result"]> {
-    this.ensureWallet()
-
     if (!this._wallet) {
       throw new ConnectorNotConnectedError()
     }

diff --git a/src/connectors/webwallet/index.ts b/src/connectors/webwallet/index.ts
@@ -54,11 +54,15 @@ export class WebWalletConnector extends Connector {
     }
 
     this._wallet = _wallet
-    const permissions = await this._wallet.request({
-      type: "wallet_getPermissions",
-    })
+    try {
+      const permissions = await this._wallet.request({
+        type: "wallet_getPermissions",
+      })
 
-    return (permissions as Permission[]).includes(Permission.ACCOUNTS)
+      return (permissions as Permission[]).includes(Permission.ACCOUNTS)
+    } catch {
+      return false
+    }
   }
 
   get id(): string {