Merge branch 'main' into investe-truefi

Author: boundless-forest

packages/web/src/app/profile/_components/overview-item.tsx

@@ -23,11 +23,11 @@ export const OverviewItem = ({
         {title}
       </h5>
       {isLoading ? (
-        <Skeleton className="h-[20px] lg:h-[24px] w-[80px] lg:w-[100px]" />
+        <Skeleton className="h-[20px] lg:h-[24px] w-[80px] lg:w-[100px] bg-foreground/10" />
       ) : (
-        <p className="text-[16px] lg:text-[18px] font-semibold leading-[100%] text-foreground break-words">
+        <div className="text-[16px] lg:text-[18px] font-semibold leading-[100%] text-foreground break-words">
           {value || ""}
-        </p>
+        </div>
       )}
     </Link>
   ) : (
@@ -36,11 +36,11 @@ export const OverviewItem = ({
         {title}
       </h5>
       {isLoading ? (
-        <Skeleton className="h-[20px] lg:h-[24px] w-[80px] lg:w-[100px]" />
+        <Skeleton className="h-[20px] lg:h-[24px] w-[80px] lg:w-[100px] bg-foreground/10" />
       ) : (
-        <p className="text-[16px] lg:text-[18px] font-semibold leading-[100%] text-foreground break-words">
+        <div className="text-[16px] lg:text-[18px] font-semibold leading-[100%] text-foreground break-words">
           {value || ""}
-        </p>
+        </div>
       )}
     </div>
   );

packages/web/src/app/profile/_components/overview.tsx

@@ -25,8 +25,8 @@ export const Overview = ({
   isDelegateMappingsLoading,
 }: OverviewProps) => {
   const { formattedVotes, votes, isLoading } = useAddressVotes(address);
-  const daoConfig = useDaoConfig();
 
+  const daoConfig = useDaoConfig();
   const { data: dataMetrics, isLoading: isMetricsLoading } = useQuery({
     queryKey: ["dataMetrics", daoConfig?.indexer?.endpoint],
     queryFn: () =>

packages/web/src/components/delegation-table/index.tsx

@@ -1,9 +1,7 @@
 import { useMemo } from "react";
-import { useReadContract } from "wagmi";
 
-import { abi as tokenAbi } from "@/config/abi/token";
-import { useDaoConfig } from "@/hooks/useDaoConfig";
 import { useFormatGovernanceTokenAmount } from "@/hooks/useFormatGovernanceTokenAmount";
+import { useCurrentVotingPower } from "@/hooks/useSmartGetVotes";
 import type { DelegateItem } from "@/services/graphql/types";
 
 import { AddressWithAvatar } from "../address-with-avatar";
@@ -21,22 +19,8 @@ interface DelegationTableProps {
 export function DelegationTable({ address }: DelegationTableProps) {
   const formatTokenAmount = useFormatGovernanceTokenAmount();
   const { state, loadMoreData } = useDelegationData(address);
-  const daoConfig = useDaoConfig();
-  const tokenAddress = daoConfig?.contracts?.governorToken?.address as Address;
 
-  const { data: totalVotes } = useReadContract({
-    address: tokenAddress,
-    abi: tokenAbi,
-    functionName: "getVotes",
-    args: [address],
-    chainId: daoConfig?.chain?.id,
-    query: {
-      enabled:
-        Boolean(address) &&
-        Boolean(tokenAddress) &&
-        Boolean(daoConfig?.chain?.id),
-    },
-  });
+  const { data: totalVotes } = useCurrentVotingPower(address);
 
   const columns = useMemo<ColumnType<DelegateItem>[]>(
     () => [

packages/web/src/hooks/useAddressVotes.ts

@@ -1,37 +1,22 @@
 import { isNil } from "lodash-es";
-import { useReadContract } from "wagmi";
 
-import { abi as tokenAbi } from "@/config/abi/token";
 import { formatBigIntForDisplay } from "@/utils/number";
 
-import { useDaoConfig } from "./useDaoConfig";
 import { useGovernanceToken } from "./useGovernanceToken";
+import { useCurrentVotingPower } from "./useSmartGetVotes";
 
 import type { Address } from "viem";
 
 export function useAddressVotes(address: Address) {
-  const daoConfig = useDaoConfig();
-  const tokenAddress = daoConfig?.contracts?.governorToken?.address as Address;
   const { data: tokenData, isLoading: isTokenLoading } = useGovernanceToken();
 
   const {
     data: votes,
     isLoading: isVotesLoading,
     error,
     refetch,
-  } = useReadContract({
-    address: tokenAddress,
-    abi: tokenAbi,
-    functionName: "getVotes",
-    args: [address!],
-    chainId: daoConfig?.chain?.id,
-    query: {
-      enabled:
-        Boolean(address) &&
-        Boolean(tokenAddress) &&
-        Boolean(daoConfig?.chain?.id),
-    },
-  });
+  } = useCurrentVotingPower(address);
+
   const formattedVotes =
     !isNil(votes) && !isNil(tokenData?.decimals)
       ? formatBigIntForDisplay(votes, tokenData.decimals ?? 18)

packages/web/src/hooks/useMembersVotingPower.ts

@@ -1,15 +1,13 @@
 import { isNil } from "lodash-es";
-import { useAccount, useReadContract } from "wagmi";
+import { useAccount } from "wagmi";
 
-import { abi as tokenAbi } from "@/config/abi/token";
 import { formatBigIntForDisplay } from "@/utils/number";
 
-import { useDaoConfig } from "./useDaoConfig";
 import { useGovernanceParams } from "./useGovernanceParams";
 import { useGovernanceToken } from "./useGovernanceToken";
+import { useCurrentVotingPower } from "./useSmartGetVotes";
 
-import type { QueryObserverResult } from "@tanstack/react-query";
-import type { Address, ReadContractErrorType } from "viem";
+import type { Address } from "viem";
 
 interface UseVotesReturn {
   votes?: bigint;
@@ -20,37 +18,21 @@ interface UseVotesReturn {
   isLoading: boolean;
   isFetching: boolean;
   error: Error | null;
-  refetch: () => Promise<QueryObserverResult<bigint, ReadContractErrorType>>;
+  refetch: () => void;
 }
 
 export function useMyVotes(): UseVotesReturn {
   const { address } = useAccount();
-  const daoConfig = useDaoConfig();
   const { data: tokenData, isLoading: isTokenLoading } = useGovernanceToken();
   const { data: governanceParams, isLoading: isParamsLoading } =
     useGovernanceParams();
 
-  const tokenAddress = daoConfig?.contracts?.governorToken?.address as Address;
-
   const {
     data: votes,
     isLoading: isVotesLoading,
-    isFetching: isFetchingVotes,
     error,
     refetch,
-  } = useReadContract({
-    address: tokenAddress,
-    abi: tokenAbi,
-    functionName: "getVotes",
-    args: [address!],
-    chainId: daoConfig?.chain?.id,
-    query: {
-      enabled:
-        Boolean(address) &&
-        Boolean(tokenAddress) &&
-        Boolean(daoConfig?.chain?.id),
-    },
-  });
+  } = useCurrentVotingPower(address as Address);
 
   const formattedVotes =
     !isNil(votes) && !isNil(tokenData?.decimals)
@@ -75,7 +57,7 @@ export function useMyVotes(): UseVotesReturn {
     hasEnoughVotes,
     refetch,
     isLoading: isVotesLoading || isTokenLoading || isParamsLoading,
-    isFetching: isFetchingVotes,
+    isFetching: isVotesLoading,
     error,
   };
 }