fix: remove entities from provider, add isLoadingWallet

masa-finance · Sep 28, 2023 · aa55109 · aa55109
1 parent 3974b6f
commit aa55109
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 24 deletions.
diff --git a/src/provider/masa-client-provider.tsx b/src/provider/masa-client-provider.tsx
@@ -22,20 +22,23 @@ export interface MasaClientProviderValue {
 export const MasaClientContext = createContext({} as MasaClientProviderValue);
 
 export const MasaClientProvider = ({ children }: { children: ReactNode }) => {
-  const { masa, masaAddress } = useMasaClient();
+  const {
+    // masa,
+    masaAddress,
+  } = useMasaClient();
   const queryClient = useMasaQueryClient();
   const {
-    session,
+    // session,
+    // loginSession,
     hasSession,
     checkLogin,
-    loginSession,
     logoutSession,
     sessionAddress,
   } = useSession();
   const { identity, getIdentity } = useIdentity();
-  const { creditScores } = useCreditScores();
-  const { soulnames } = useSoulNames();
-  const { greens } = useGreen();
+  // const { creditScores } = useCreditScores();
+  // const { soulnames } = useSoulNames();
+  // const { greens } = useGreen();
 
   useIdentityListen({ identity, getIdentity, sessionAddress });
   // useSessionListen();
@@ -65,26 +68,26 @@ export const MasaClientProvider = ({ children }: { children: ReactNode }) => {
   const masaClientProviderValue: MasaClientProviderValue = useMemo(
     () =>
       ({
-        masa,
-        session,
-        sessionAddress,
-        loginSession,
-        logoutSession,
-        identity,
-        soulnames,
-        creditScores,
-        greens,
+        // masa,
+        // session,
+        // sessionAddress,
+        // loginSession,
+        // logoutSession,
+        // identity,
+        // soulnames,
+        // creditScores,
+        // greens,
       }) as MasaClientProviderValue,
     [
-      masa,
-      identity,
-      session,
-      sessionAddress,
-      loginSession,
-      logoutSession,
-      soulnames,
-      creditScores,
-      greens,
+      // masa,
+      // identity,
+      // session,
+      // sessionAddress,
+      // loginSession,
+      // logoutSession,
+      // soulnames,
+      // creditScores,
+      // greens,
     ]
   );
   return (

diff --git a/src/wallet-client/wallet/use-wallet.ts b/src/wallet-client/wallet/use-wallet.ts
@@ -42,6 +42,8 @@ export interface UseWalletReturn {
   disconnectAsync?: () => void;
   isLoadingSigner?: boolean;
   isLoadingBalance?: boolean;
+  isLoadingWallet?: boolean;
+  isLoadingOrConnectingWallet?: boolean;
   balance?: string;
   setPreviousAddress: React.Dispatch<
     React.SetStateAction<`0x${string}` | undefined>
@@ -122,6 +124,16 @@ const useWallet = (): UseWalletReturn => {
   const hasAddress = useMemo(() => !!address, [address]);
   const walletName = useMemo(() => connector?.name, [connector]);
 
+  const isLoadingWallet = useMemo(
+    () => isLoadingSigner || isLoadingWalletClient,
+    [isLoadingSigner, isLoadingWalletClient]
+  );
+
+  const isLoadingOrConnectingWallet = useMemo(
+    () => isLoadingWallet || isConnecting,
+    [isLoadingWallet, isConnecting]
+  );
+
   const useWalletValue = useMemo(
     () => ({
       address,
@@ -149,6 +161,9 @@ const useWallet = (): UseWalletReturn => {
       balance,
       setPreviousAddress,
       setCompareAddress,
+
+      isLoadingWallet,
+      isLoadingOrConnectingWallet,
     }),
     [
       address,
@@ -176,6 +191,8 @@ const useWallet = (): UseWalletReturn => {
       balance,
       setPreviousAddress,
       setCompareAddress,
+      isLoadingWallet,
+      isLoadingOrConnectingWallet,
     ]
   );