core: fix account detection when wallet not authorized

**Summary** When the wallet is not authorized, the `account` method throws. This commit handles that case.
apibara · Oct 30, 2023 · cc5e5c9 · cc5e5c9
1 parent 404747a
commit cc5e5c9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/packages/core/src/connectors/injected.ts b/packages/core/src/connectors/injected.ts
@@ -123,6 +123,8 @@ export class InjectedConnector extends Connector {
     const account = this._wallet.account.address;
     const chainId = await this.chainId();
 
+    this.emit("connect", { account, chainId });
+
     return {
       account,
       chainId,

diff --git a/packages/core/src/hooks/useAccount.ts b/packages/core/src/hooks/useAccount.ts
@@ -90,7 +90,13 @@ export function useAccount({
 
     for (const connector of connectors) {
       if (!connector.available()) continue;
-      const connAccount = await connector.account();
+
+      // If the connector is not authorized, `.account()` will throw.
+      let connAccount;
+      try {
+        connAccount = await connector.account();
+      } catch {}
+
       if (connAccount && connAccount?.address === connectedAccount.address) {
         if (state.isDisconnected && onConnect !== undefined) {
           onConnect({ address: connectedAccount.address, connector });