0.0.49 (#114)

graz-sh · Aug 31, 2023 · 4a174ed · 4a174ed
2 parents 398a299 + 29316dd
commit 4a174ed
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 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.48",
+  "version": "0.0.49",
   "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/wallet/metamask-snap/index.ts b/packages/graz/src/actions/wallet/metamask-snap/index.ts
@@ -218,7 +218,18 @@ export const getMetamaskSnap = (params?: GetMetamaskSnap): Wallet => {
     };
 
     const experimentalSuggestChain = async (..._args: Parameters<Keplr["experimentalSuggestChain"]>) => {
-      await Promise.reject(new Error("Metamask does not support experimentalSuggestChain"));
+      await ethereum.request({
+        method: "wallet_invokeSnap",
+        params: {
+          snapId: params.id,
+          request: {
+            method: "suggestChain",
+            params: {
+              chainInfo: _args[0],
+            },
+          },
+        },
+      });
     };
 
     return {

diff --git a/packages/graz/src/provider/events.tsx b/packages/graz/src/provider/events.tsx
@@ -2,6 +2,7 @@ import type { FC } from "react";
 import { useEffect } from "react";
 
 import { reconnect } from "../actions/account";
+import { checkWallet } from "../actions/wallet";
 import { getCosmostation } from "../actions/wallet/cosmostation";
 import { getKeplr } from "../actions/wallet/keplr";
 import { getLeap } from "../actions/wallet/leap";
@@ -21,10 +22,12 @@ export const useGrazEvents = () => {
     typeof window !== "undefined" && window.sessionStorage.getItem(RECONNECT_SESSION_KEY) === "Active";
   const { _reconnect, _onReconnectFailed, _reconnectConnector } = useGrazInternalStore();
   const { activeChain, wcSignClient } = useGrazSessionStore();
+  const isReconnectConnectorReady = checkWallet(_reconnectConnector || undefined);
 
   useEffect(() => {
     // will reconnect on refresh
     if (_reconnectConnector) {
+      if (!isReconnectConnectorReady) return;
       if (isSessionActive && Boolean(activeChain)) {
         void reconnect({
           onError: _onReconnectFailed,
@@ -38,10 +41,11 @@ export const useGrazEvents = () => {
     }
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+  }, [isReconnectConnectorReady]);
 
   useEffect(() => {
     if (_reconnectConnector) {
+      if (!isReconnectConnectorReady) return;
       if (_reconnectConnector === WalletType.COSMOSTATION) {
         getCosmostation().subscription?.(() => {
           void reconnect({
@@ -74,7 +78,7 @@ export const useGrazEvents = () => {
     }
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [_reconnectConnector, wcSignClient]);
+  }, [_reconnectConnector, wcSignClient, isReconnectConnectorReady]);
 
   return null;
 };

diff --git a/packages/graz/src/provider/index.tsx b/packages/graz/src/provider/index.tsx
@@ -42,8 +42,8 @@ export const GrazProvider: FC<GrazProviderProps> = ({ children, grazOptions, deb
   return (
     <QueryClientProvider key="graz-provider" client={queryClient} {...props}>
       <ClientOnly>
-        <GrazEvents />
         {children}
+        <GrazEvents />
       </ClientOnly>
       {debug ? <ReactQueryDevtools initialIsOpen={false} position="bottom-right" /> : null}
     </QueryClientProvider>