remove interchain-query from example/vote-proposal

Author: Eason Smith

examples/vote-proposal/hooks/index.ts

@@ -1,5 +1,4 @@
 export * from './useTx';
 export * from './useModal';
 export * from './useVoting';
-export * from './useVotingData';
-export * from './useQueryHooks';
+export * from './useVotingData';

examples/vote-proposal/hooks/useQueryHooks.ts

@@ -3,10 +3,12 @@ import { useChain } from '@interchain-kit/react';
 import { useQueries } from '@tanstack/react-query';
 import { ProposalStatus } from 'interchainjs/cosmos/gov/v1beta1/gov';
 import { Proposal as ProposalV1 } from 'interchainjs/cosmos/gov/v1/gov';
-import { useQueryHooks } from '.';
 import { getTitle, paginate, parseQuorum } from '@/utils';
 import { useGetVote } from '@interchainjs/react/cosmos/gov/v1/query.rpc.react';
 import { defaultContext } from '@tanstack/react-query';
+import { useGetProposals } from '@interchainjs/react/cosmos/gov/v1/query.rpc.react';
+import { useGetPool } from '@interchainjs/react/cosmos/staking/v1beta1/query.rpc.react';
+import { useGetParams } from '@interchainjs/react/cosmos/gov/v1/query.rpc.react';
 
 (BigInt.prototype as any).toJSON = function () {
   return this.toString();
@@ -38,51 +40,56 @@ export function processProposals(proposals: ProposalV1[]) {
 
 export function useVotingData(chainName: string) {
   const [isLoading, setIsLoading] = useState(false);
-  const { address } = useChain(chainName);
-  const { cosmos, isReady, isFetching } = useQueryHooks(chainName);
+  const { address, rpcEndpoint } = useChain(chainName);
 
-  // cosmos.gov.v1.useProposals
-
-  const proposalsQuery = cosmos.gov.v1.useProposals({
+  const proposalsQuery = useGetProposals({
+    clientResolver: rpcEndpoint,
     request: {
       voter: '',
       depositor: '',
       pagination: paginate(50n, true),
       proposalStatus: ProposalStatus.PROPOSAL_STATUS_UNSPECIFIED,
     },
     options: {
-      enabled: isReady,
+      context: defaultContext,
+      enabled: !!rpcEndpoint,
       staleTime: Infinity,
       select: ({ proposals }) => processProposals(proposals),
     },
   });
 
-  const bondedTokensQuery = cosmos.staking.v1beta1.usePool({
+  const bondedTokensQuery = useGetPool({
+    clientResolver: rpcEndpoint,
     options: {
-      enabled: isReady,
+      context: defaultContext,
+      enabled: !!rpcEndpoint,
       staleTime: Infinity,
       select: ({ pool }) => pool?.bondedTokens,
     },
   });
 
-  const quorumQuery = cosmos.gov.v1.useParams({
+  const quorumQuery = useGetParams({
+    clientResolver: rpcEndpoint,
     request: { paramsType: 'tallying' },
     options: {
-      enabled: isReady,
+      context: defaultContext,
+      enabled: !!rpcEndpoint,
       staleTime: Infinity,
       select: ({ tallyParams }) => parseQuorum(tallyParams?.quorum as any),
     },
   });
 
-  const votedProposalsQuery = cosmos.gov.v1.useProposals({
+  const votedProposalsQuery = useGetProposals({
+    clientResolver: rpcEndpoint,
     request: {
       voter: address || '/', // use '/' to differentiate from proposalsQuery
       depositor: '',
       pagination: paginate(50n, true),
       proposalStatus: ProposalStatus.PROPOSAL_STATUS_UNSPECIFIED,
     },
     options: {
-      enabled: isReady && Boolean(address),
+      context: defaultContext,
+      enabled: !!rpcEndpoint && Boolean(address),
       select: ({ proposals }) => proposals,
       keepPreviousData: true,
     },
@@ -138,8 +145,10 @@ export function useVotingData(chainName: string) {
     singleQueries.votedProposals.isFetching ||
     votesQueries.some(({ isFetching }) => isFetching);
 
+  const isFetching = proposalsQuery.isFetching || votedProposalsQuery.isFetching || bondedTokensQuery.isFetching || quorumQuery.isFetching
+
   const loading =
-    isFetching || isStaticQueriesFetching || isDynamicQueriesFetching;
+    isFetching || isStaticQueriesFetching || isDynamicQueriesFetching
 
   useEffect(() => {
     // no loading when refetching
@@ -154,12 +163,12 @@ export function useVotingData(chainName: string) {
   };
 
   const singleQueriesData = useMemo(() => {
-    if (isStaticQueriesFetching || !isReady) return;
+    if (isStaticQueriesFetching || !proposalsQuery.isFetched || !votedProposalsQuery.isFetched) return;
 
     return Object.fromEntries(
       Object.entries(singleQueries).map(([key, query]) => [key, query.data])
     ) as SingleQueriesData;
-  }, [isStaticQueriesFetching, isReady]);
+  }, [isStaticQueriesFetching, proposalsQuery.isFetched, votedProposalsQuery.isFetched]);
 
   const votes = useMemo(() => {
     const votesEntries = votesQueries