When masa instance is not ready rise loading flag

masa-finance · Feb 14, 2023 · 5b4a0cb · 5b4a0cb
1 parent 7974c4b
commit 5b4a0cb
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 21 deletions.
diff --git a/src/provider/masa-context-provider.tsx b/src/provider/masa-context-provider.tsx
@@ -11,6 +11,7 @@ import {
 } from './modules';
 import { ethers } from 'ethers';
 import { MASA_CONTEXT, MasaShape } from './masa-context';
+import { queryClient } from './masa-query-client';
 
 export interface ArweaveConfig {
   port?: string;
@@ -97,6 +98,7 @@ export const MasaContextProvider = ({
 
   const loading = useMemo(() => {
     return (
+      !masaInstance ||
       sessionLoading ||
       creditScoreLoading ||
       identityLoading ||
@@ -109,8 +111,10 @@ export const MasaContextProvider = ({
     identityLoading,
     walletLoading,
     greenLoading,
+    masaInstance
   ]);
 
+
   useEffect(() => {
     if (externalSigner) {
       setProvider(externalSigner);
@@ -146,8 +150,9 @@ export const MasaContextProvider = ({
 
   useEffect(() => {
     const loadMasa = async (): Promise<void> => {
+      if (!provider) return;
       const masa: Masa | null = await createNewMasa({
-        newWallet: noWallet ? null : provider,
+        newWallet: provider,
         environmentName,
         arweaveConfig,
         verbose,
@@ -157,6 +162,8 @@ export const MasaContextProvider = ({
     };
 
     void loadMasa();
+
+    queryClient.invalidateQueries('green');
   }, [
     provider,
     noWallet,

diff --git a/src/provider/modules/green/green.ts b/src/provider/modules/green/green.ts
@@ -31,29 +31,36 @@ export const useGreen = (
   isLoading: boolean;
   error: unknown;
 } => {
-  const queryKey: string = useMemo(() => {
-    return `green-${walletAddress}-${masa?.config.network}`;
+  const queryKey: any[] = useMemo(() => {
+    return ['green', walletAddress, masa?.config.network];
   }, [walletAddress, masa]);
 
   const {
     data: greens,
     status,
     isLoading,
     error,
-  } = useQuery(queryKey, () => masa?.green.list(), {
-    enabled: !!masa && !!walletAddress,
-    onSuccess: (
-      greens: {
-        tokenId: BigNumber;
-        tokenUri: string;
-        metadata?: IGreen | undefined;
-      }[]
-    ) => {
-      if (masa?.config.verbose) {
-        console.log({ greens, network: masa?.config.network });
-      }
+  } = useQuery(
+    queryKey,
+    async () => {
+      const list = await masa?.green.list();
+      return list
     },
-  });
+    {
+      enabled: !!masa && !!walletAddress,
+      onSuccess: (
+        greens: {
+          tokenId: BigNumber;
+          tokenUri: string;
+          metadata?: IGreen | undefined;
+        }[]
+      ) => {
+        if (masa?.config.verbose) {
+          console.log({ greens, network: masa?.config.network });
+        }
+      },
+    }
+  );
 
   const handleCreateGreen = useCallback(
     async (

diff --git a/src/provider/modules/identity/identity.ts b/src/provider/modules/identity/identity.ts
@@ -19,8 +19,8 @@ export const useIdentity = (
   isLoading: boolean;
   error: unknown;
 } => {
-  const queryKey: string = useMemo(() => {
-    return `identity-${walletAddress}-${masa?.config.network}`;
+  const queryKey: any[] = useMemo(() => {
+    return ['identity', walletAddress, masa?.config.network];
   }, [walletAddress, masa]);
   const {
     data: identity,
@@ -36,7 +36,7 @@ export const useIdentity = (
 
   const handlePurchaseIdentity = useCallback(async () => {
     await masa?.identity.create();
-    await queryClient.invalidateQueries(`identity-${walletAddress}`);
+    await queryClient.invalidateQueries(`identity`);
   }, [masa, walletAddress]);
 
   return { identity, handlePurchaseIdentity, status, isLoading, error };

diff --git a/src/provider/modules/wallet/wallet.ts b/src/provider/modules/wallet/wallet.ts
@@ -13,8 +13,8 @@ export const useWallet = (
   error: unknown;
   chain?: null | ethers.providers.Network;
 } => {
-  const queryKey: string = useMemo(() => {
-    return `wallet-${masa?.config.network}`;
+  const queryKey: any[] = useMemo(() => {
+    return ['wallet', masa?.config.network];
   }, [masa]);
 
   const {