fix: wallet connect multi prompt (#119)

graz-sh · Sep 30, 2023 · ed2bbce · ed2bbce
2 parents f0f076c + ecdea5f
commit ed2bbce
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 7 deletions.
diff --git a/packages/graz/package.json b/packages/graz/package.json
@@ -1,7 +1,7 @@
 {
   "name": "graz",
   "description": "React hooks for Cosmos",
-  "version": "0.0.50",
+  "version": "0.0.51",
   "author": "Griko Nibras <[email protected]>",
   "repository": "https://github.com/graz-sh/graz.git",
   "homepage": "https://github.com/graz-sh/graz",

diff --git a/packages/graz/src/actions/account.ts b/packages/graz/src/actions/account.ts
@@ -6,7 +6,7 @@ import { RECONNECT_SESSION_KEY } from "../constant";
 import { grazSessionDefaultValues, useGrazInternalStore, useGrazSessionStore } from "../store";
 import type { Maybe } from "../types/core";
 import type { WalletType } from "../types/wallet";
-import { checkWallet, getWallet } from "./wallet";
+import { checkWallet, getWallet, isWalletConnect } from "./wallet";
 
 export type ConnectArgs = Maybe<{
   chain?: GrazChain;
@@ -53,8 +53,10 @@ export const connect = async (args?: ConnectArgs): Promise<ConnectResult> => {
     await wallet.init?.();
     if (!_account || activeChain?.chainId !== chain.chainId) {
       await wallet.enable(chain.chainId);
-      const account = await wallet.getKey(chain.chainId);
-      useGrazSessionStore.setState({ account });
+      if (!isWalletConnect(currentWalletType)) {
+        const account = await wallet.getKey(chain.chainId);
+        useGrazSessionStore.setState({ account });
+      }
     }
 
     useGrazInternalStore.setState({

diff --git a/packages/graz/src/actions/wallet/index.ts b/packages/graz/src/actions/wallet/index.ts
@@ -85,3 +85,12 @@ export const getWallet = (type: WalletType = useGrazInternalStore.getState().wal
 export const getAvailableWallets = (): Record<WalletType, boolean> => {
   return Object.fromEntries(WALLET_TYPES.map((type) => [type, checkWallet(type)])) as Record<WalletType, boolean>;
 };
+
+export const isWalletConnect = (type: WalletType): boolean => {
+  return (
+    type === WalletType.WALLETCONNECT ||
+    type === WalletType.WC_KEPLR_MOBILE ||
+    type === WalletType.WC_LEAP_MOBILE ||
+    type === WalletType.WC_COSMOSTATION_MOBILE
+  );
+};
diff --git a/packages/graz/src/actions/wallet/wallet-connect/index.ts b/packages/graz/src/actions/wallet/wallet-connect/index.ts
@@ -227,6 +227,7 @@ export const getWalletConnect = (params?: GetWalletConnectParams): Wallet => {
 
     const { account, activeChain } = useGrazSessionStore.getState();
     const lastSession = checkSession(chainId);
+
     if ((activeChain?.chainId !== chainId && !lastSession) || !account) {
       const { uri, approval } = await signClient.connect({
         requiredNamespaces: {
@@ -246,9 +247,20 @@ export const getWalletConnect = (params?: GetWalletConnectParams): Wallet => {
 
       const approving = async (signal: AbortSignal) => {
         if (signal.aborted) return Promise.reject(new Error("User closed wallet connect"));
-
         return new Promise((resolve, reject) => {
-          approval().then(resolve).catch(reject);
+          approval()
+            .then((d) => {
+              const sessionProperties = d.sessionProperties;
+              if (!sessionProperties) return reject(new Error("No session properties"));
+              const _acc: (Key & { chainId?: string })[] = JSON.parse(String(sessionProperties.keys));
+              const resAcc = _acc.find((i) => i.chainId === chainId);
+              if (!resAcc) return reject(new Error("No account"));
+              useGrazSessionStore.setState({
+                account: resAcc,
+              });
+              return resolve(d);
+            })
+            .catch(reject);
           signal.addEventListener("abort", () => {
             reject(new Error("User closed wallet connect"));
           });
@@ -304,7 +316,6 @@ export const getWalletConnect = (params?: GetWalletConnectParams): Wallet => {
         params: {},
       },
     });
-
     if (!result[0]) throw new Error("No wallet connect account");
     return {
       address: result[0].address,