optimize query key for unknown networks

masa-finance · Feb 22, 2023 · fccd61a · fccd61a
1 parent 973f02d
commit fccd61a
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 23 deletions.
diff --git a/src/provider/masa-context-provider.tsx b/src/provider/masa-context-provider.tsx
@@ -9,7 +9,7 @@ import {
   useSoulnames,
   useWallet,
 } from './modules';
-import { ethers } from 'ethers';
+import { providers, Signer, utils, Wallet } from 'ethers';
 import { MASA_CONTEXT, MasaShape } from './masa-context';
 
 export interface ArweaveConfig {
@@ -25,7 +25,7 @@ export interface MasaContextProviderProps extends MasaShape {
   children: React.ReactNode;
   company?: string;
   environmentName?: EnvironmentNameEx;
-  signer?: ethers.Wallet | ethers.Signer;
+  signer?: Wallet | Signer;
   noWallet?: boolean;
   arweaveConfig?: ArweaveConfig;
   verbose?: boolean;
@@ -44,9 +44,7 @@ export const MasaContextProvider = ({
 }: MasaContextProviderProps): JSX.Element => {
   const [masaInstance, setMasaInstance] = useState<Masa | null>(null);
 
-  const [provider, setProvider] = useState<
-    ethers.Wallet | ethers.Signer | null
-  >(null);
+  const [provider, setProvider] = useState<Wallet | Signer | null>(null);
   const [missingProvider, setMissingProvider] = useState<boolean>();
 
   const [isModalOpen, setModalOpen] = useState(false);
@@ -62,7 +60,7 @@ export const MasaContextProvider = ({
   }: {
     walletAddress: string | undefined;
     isLoading: boolean;
-    network: ethers.providers.Network | null;
+    network: providers.Network | null;
   } = useWallet(masaInstance, provider);
 
   const {
@@ -185,7 +183,7 @@ export const MasaContextProvider = ({
           params: [
             {
               ...networkDetails,
-              chainId: ethers.utils.hexValue(networkDetails.chainId),
+              chainId: utils.hexValue(networkDetails.chainId),
             },
           ],
         });
@@ -203,7 +201,7 @@ export const MasaContextProvider = ({
         if (typeof window !== 'undefined') {
           await window?.ethereum?.request({
             method: 'wallet_switchEthereumChain',
-            params: [{ chainId: ethers.utils.hexValue(chainId) }],
+            params: [{ chainId: utils.hexValue(chainId) }],
           });
           console.log(`switched to chainId: ${chainId} successfully`);
         }

diff --git a/src/provider/modules/credit-scores/credit-scores.ts b/src/provider/modules/credit-scores/credit-scores.ts
@@ -26,8 +26,8 @@ export const useCreditScores = (
   isLoading: boolean;
   error: unknown;
 } => {
-  const queryKey: string = useMemo(() => {
-    return `credit-scores-${walletAddress}-${masa?.config.network}`;
+  const queryKey: (string | undefined)[] = useMemo(() => {
+    return ['credit-scores', walletAddress, masa?.config.network];
   }, [walletAddress, masa]);
 
   const {
@@ -36,7 +36,12 @@ export const useCreditScores = (
     isLoading,
     error,
   } = useQuery(queryKey, () => masa?.creditScore.list(), {
-    enabled: !!masa && !!walletAddress && !!identity?.identityId,
+    enabled:
+      !!masa &&
+      masa.config.network !== 'unknown' &&
+      !!walletAddress &&
+      !!identity?.identityId,
+    retry: false,
   });
 
   const handleCreateCreditScore = useCallback(async (): Promise<

diff --git a/src/provider/modules/green/green.ts b/src/provider/modules/green/green.ts
@@ -41,7 +41,8 @@ export const useGreen = (
     isLoading,
     error,
   } = useQuery(queryKey, () => masa?.green.list(), {
-    enabled: !!masa && !!walletAddress,
+    enabled: !!masa && masa.config.network !== 'unknown' && !!walletAddress,
+    retry: false,
     onSuccess: (
       greens: {
         tokenId: BigNumber;

diff --git a/src/provider/modules/identity/identity.ts b/src/provider/modules/identity/identity.ts
@@ -29,7 +29,8 @@ export const useIdentity = (
     isLoading,
     error,
   } = useQuery(queryKey, () => masa?.identity.load(walletAddress), {
-    enabled: !!masa && !!walletAddress,
+    enabled: !!masa && masa.config.network !== 'unknown' && !!walletAddress,
+    retry: false,
     onSuccess: (identity: { identityId?: BigNumber; address?: string }) => {
       console.log({ identity });
     },

diff --git a/src/provider/modules/soulnames/soulnames.ts b/src/provider/modules/soulnames/soulnames.ts
@@ -18,18 +18,24 @@ export const useSoulnames = (
   isLoading: boolean;
   error: unknown;
 } => {
-  const queryKey: string = useMemo(() => {
-    return `soulnames-${walletAddress}-${masa?.config.network}`;
+  const queryKey: (string | undefined)[] = useMemo(() => {
+    return ['soulnames', walletAddress, masa?.config.network];
   }, [walletAddress, masa]);
 
   console.log(queryKey);
+
   const {
     data: soulnames,
     status,
     isLoading,
     error,
   } = useQuery(queryKey, () => masa?.soulName.list(), {
-    enabled: !!masa && !!walletAddress && !!identity?.identityId,
+    enabled:
+      !!masa &&
+      masa.config.network !== 'unknown' &&
+      !!walletAddress &&
+      !!identity?.identityId,
+    retry: false,
   });
 
   return { soulnames, status, isLoading, error };

diff --git a/src/provider/modules/wallet/wallet.ts b/src/provider/modules/wallet/wallet.ts
@@ -1,21 +1,21 @@
 import { useQuery } from 'react-query';
 import { Masa } from '@masa-finance/masa-sdk';
-import { ethers } from 'ethers';
+import { providers, Signer, Wallet } from 'ethers';
 import { useCallback, useEffect, useMemo, useState } from 'react';
 
 export const useWallet = (
   masa: Masa | null,
-  provider: ethers.Wallet | ethers.Signer | null
+  provider: Wallet | Signer | null
 ): {
   walletAddress: string | undefined;
   status: string;
   isLoading: boolean;
   error: unknown;
-  network: ethers.providers.Network | null;
+  network: providers.Network | null;
 } => {
-  const queryKey: (string | undefined)[] = useMemo(() => {
-    return ['wallet', masa?.config.network];
-  }, [masa]);
+  const queryKey: (string | Signer | null)[] = useMemo(() => {
+    return ['wallet', provider];
+  }, [provider]);
 
   const {
     data: walletAddress,
@@ -27,7 +27,7 @@ export const useWallet = (
     retry: false,
   });
 
-  const [network, setNetwork] = useState<ethers.providers.Network | null>(null);
+  const [network, setNetwork] = useState<providers.Network | null>(null);
 
   const loadNetwork = useCallback(async () => {
     if (provider) {