From 5fb20684412df710d893d0baddd4267986a61cef Mon Sep 17 00:00:00 2001 From: Sebastian Gerske <13647606+H34D@users.noreply.github.com> Date: Mon, 13 Feb 2023 14:13:45 +0100 Subject: [PATCH] correct warnings --- .../masa-interface/masa-interface.tsx | 12 +------ src/provider/masa-context-provider.tsx | 31 +++++++++---------- src/provider/masa-context.tsx | 4 +-- .../modules/credit-scores/credit-scores.ts | 2 +- src/provider/modules/green/green.ts | 4 +-- src/provider/modules/session/session.ts | 4 +-- src/provider/use-metamask.ts | 4 ++- 7 files changed, 25 insertions(+), 36 deletions(-) diff --git a/src/components/masa-interface/masa-interface.tsx b/src/components/masa-interface/masa-interface.tsx index 28602a71..63494742 100644 --- a/src/components/masa-interface/masa-interface.tsx +++ b/src/components/masa-interface/masa-interface.tsx @@ -30,7 +30,6 @@ export const MasaInterface = ({ isModalOpen, setModalOpen, isConnected, - loading, identity, loggedIn, closeModal, @@ -52,16 +51,7 @@ export const MasaInterface = ({ if (isConnected && loggedIn) return 'connectedState'; return 'connector'; - }, [ - loading, - isConnected, - identity, - loggedIn, - scope, - creditScores, - network, - chain, - ]); + }, [isConnected, identity, loggedIn, scope, creditScores, network, chain]); return ( <> diff --git a/src/provider/masa-context-provider.tsx b/src/provider/masa-context-provider.tsx index db7988c1..d0014191 100644 --- a/src/provider/masa-context-provider.tsx +++ b/src/provider/masa-context-provider.tsx @@ -175,23 +175,20 @@ export const MasaContextProvider = ({ chain, ]); - const addNetwork = useCallback( - async (networkDetails: Network) => { - try { - if (typeof window !== 'undefined' && networkDetails) { - await window?.ethereum?.request({ - method: 'wallet_addEthereumChain', - params: [networkDetails], - }); - } - } catch (error) { - console.error( - `error ocuured while adding new chain with chainId:${networkDetails?.chainId}` - ); + const addNetwork = useCallback(async (networkDetails: Network) => { + try { + if (typeof window !== 'undefined' && networkDetails) { + await window?.ethereum?.request({ + method: 'wallet_addEthereumChain', + params: [networkDetails], + }); } - }, - [provider] - ); + } catch (error) { + console.error( + `error ocuured while adding new chain with chainId:${networkDetails?.chainId}` + ); + } + }, []); const switchNetwork = useCallback( async (chainId: number) => { @@ -210,7 +207,7 @@ export const MasaContextProvider = ({ } } }, - [provider] + [addNetwork] ); const context = { diff --git a/src/provider/masa-context.tsx b/src/provider/masa-context.tsx index 8ed5b317..7610e33f 100644 --- a/src/provider/masa-context.tsx +++ b/src/provider/masa-context.tsx @@ -59,10 +59,10 @@ export interface MasaShape { handleCreateGreen?: ( phoneNumber: string, code: string - ) => Promise; + ) => Promise; handleGenerateGreen?: ( phoneNumber: string - ) => Promise; + ) => Promise; chain?: null | ethers.providers.Network; switchNetwork?: (chainId: number) => void; SupportedNetworks?: { [index: number]: Network }; diff --git a/src/provider/modules/credit-scores/credit-scores.ts b/src/provider/modules/credit-scores/credit-scores.ts index 375bf38f..0375dc85 100644 --- a/src/provider/modules/credit-scores/credit-scores.ts +++ b/src/provider/modules/credit-scores/credit-scores.ts @@ -47,7 +47,7 @@ export const useCreditScores = ( await queryClient.invalidateQueries(queryKey); return response?.success; - }, [masa, walletAddress, queryKey]); + }, [masa, queryKey]); return { creditScores, diff --git a/src/provider/modules/green/green.ts b/src/provider/modules/green/green.ts index d0f51260..e7e79e0e 100644 --- a/src/provider/modules/green/green.ts +++ b/src/provider/modules/green/green.ts @@ -39,7 +39,7 @@ export const useGreen = ( } => { const queryKey: string = useMemo(() => { return `green-${walletAddress}-${masa?.config.network}`; - }, [walletAddress, masa?.config.network]); + }, [walletAddress, masa]); const { data: greens, @@ -61,7 +61,7 @@ export const useGreen = ( return response; }, - [masa, walletAddress] + [masa, queryKey] ); const handleGenerateGreen = useCallback( diff --git a/src/provider/modules/session/session.ts b/src/provider/modules/session/session.ts index 11b0147c..d47f8d74 100644 --- a/src/provider/modules/session/session.ts +++ b/src/provider/modules/session/session.ts @@ -39,7 +39,7 @@ export const useSession = ( await queryClient.invalidateQueries(queryKey); await queryClient.refetchQueries(); } - }, [masa, walletAddress, queryKey]); + }, [masa, queryKey]); const logout = useCallback( async (callback?: () => void) => { @@ -51,7 +51,7 @@ export const useSession = ( callback(); } }, - [masa, walletAddress, queryKey] + [masa, queryKey] ); return { loggedIn, login, logout, status, isLoading, error }; diff --git a/src/provider/use-metamask.ts b/src/provider/use-metamask.ts index 3b4fb70a..9f990b5b 100644 --- a/src/provider/use-metamask.ts +++ b/src/provider/use-metamask.ts @@ -13,7 +13,9 @@ export const useMetamask = ({ const provider = useMemo(() => { if (typeof window !== 'undefined') { if (typeof window?.ethereum !== 'undefined') { - return new ethers.providers.Web3Provider(window?.ethereum as any); + return new ethers.providers.Web3Provider( + window?.ethereum as unknown as ethers.providers.ExternalProvider + ); } else { return null; }