From 94d23ec21a3fa9583b08a983d5eeaea1a860f4b0 Mon Sep 17 00:00:00 2001 From: kemuru <102478601+kemuru@users.noreply.github.com> Date: Thu, 26 Dec 2024 15:34:25 +0100 Subject: [PATCH] fix: fix chainid bug in refetch --- .../src/hooks/queries/useDisputeTemplateFromId.ts | 2 ++ web/src/components/ErrorFallback.tsx | 2 ++ web/src/hooks/queries/useAllCasesQuery.ts | 8 +++++++- web/src/hooks/queries/useCasesQuery.ts | 3 +++ web/src/hooks/queries/useClassicAppealQuery.ts | 2 ++ web/src/hooks/queries/useCounter.ts | 9 ++++++++- web/src/hooks/queries/useCourtDetails.ts | 8 +++++++- web/src/hooks/queries/useCourtPolicyURI.ts | 2 ++ web/src/hooks/queries/useCourtTree.ts | 8 +++++++- web/src/hooks/queries/useDisputeDetailsQuery.ts | 2 ++ web/src/hooks/queries/useDisputeMaintenanceQuery.ts | 2 ++ web/src/hooks/queries/useDisputeTemplateFromId.ts | 2 ++ web/src/hooks/queries/useDrawQuery.ts | 2 ++ web/src/hooks/queries/useEvidences.ts | 2 ++ web/src/hooks/queries/useHomePageBlockQuery.ts | 2 ++ web/src/hooks/queries/useHomePageQuery.ts | 2 ++ web/src/hooks/queries/useJurorStakeDetailsQuery.ts | 8 +++++++- web/src/hooks/queries/useLabelInfoQuery.ts | 2 ++ web/src/hooks/queries/useTopUsersByCoherenceScore.ts | 2 ++ web/src/hooks/queries/useUser.ts | 2 ++ web/src/hooks/queries/useVotingHistory.ts | 8 +++++++- web/src/layout/Header/navbar/Menu/Settings/index.tsx | 1 + web/src/pages/GetPnk/Widget.tsx | 1 + 23 files changed, 76 insertions(+), 6 deletions(-) diff --git a/web-devtools/src/hooks/queries/useDisputeTemplateFromId.ts b/web-devtools/src/hooks/queries/useDisputeTemplateFromId.ts index fc33ae2b7..2ce242bd2 100644 --- a/web-devtools/src/hooks/queries/useDisputeTemplateFromId.ts +++ b/web-devtools/src/hooks/queries/useDisputeTemplateFromId.ts @@ -1,6 +1,7 @@ import { useQuery } from "@tanstack/react-query"; import { useGraphqlBatcher } from "context/GraphqlBatcher"; +import { DEFAULT_CHAIN } from "consts/chains"; import { isUndefined } from "utils/isUndefined"; import { graphql } from "src/graphql-generated"; @@ -29,6 +30,7 @@ export const useDisputeTemplateFromId = (templateId?: string) => { await graphqlBatcher.fetch({ id: crypto.randomUUID(), document: disputeTemplateQuery, + chainId: DEFAULT_CHAIN, variables: { id: templateId?.toString() }, isDisputeTemplate: true, }), diff --git a/web/src/components/ErrorFallback.tsx b/web/src/components/ErrorFallback.tsx index dd1428839..d4de78367 100644 --- a/web/src/components/ErrorFallback.tsx +++ b/web/src/components/ErrorFallback.tsx @@ -28,6 +28,7 @@ const ErrorContainer = styled.div` flex-direction: column; justify-content: center; align-items: center; + ${landscapeStyle( () => css` flex-direction: row; @@ -42,6 +43,7 @@ const InfoWrapper = styled.div` gap: 32px; align-items: center; flex: 1; + ${landscapeStyle( () => css` align-items: start; diff --git a/web/src/hooks/queries/useAllCasesQuery.ts b/web/src/hooks/queries/useAllCasesQuery.ts index 49cc787c8..09ceabdf1 100644 --- a/web/src/hooks/queries/useAllCasesQuery.ts +++ b/web/src/hooks/queries/useAllCasesQuery.ts @@ -1,6 +1,7 @@ import { useQuery } from "@tanstack/react-query"; import { useGraphqlBatcher } from "context/GraphqlBatcher"; +import { DEFAULT_CHAIN } from "consts/chains"; import { graphql } from "src/graphql"; import { AllCasesQuery } from "src/graphql/graphql"; @@ -21,6 +22,11 @@ export const useAllCasesQuery = () => { return useQuery({ queryKey: [`allCasesQuery`], queryFn: async () => - await graphqlBatcher.fetch({ id: crypto.randomUUID(), document: allCasesQuery, variables: {} }), + await graphqlBatcher.fetch({ + id: crypto.randomUUID(), + document: allCasesQuery, + chainId: DEFAULT_CHAIN, + variables: {}, + }), }); }; diff --git a/web/src/hooks/queries/useCasesQuery.ts b/web/src/hooks/queries/useCasesQuery.ts index daa6ac6a2..76103a1a5 100644 --- a/web/src/hooks/queries/useCasesQuery.ts +++ b/web/src/hooks/queries/useCasesQuery.ts @@ -2,6 +2,7 @@ import { useQuery } from "@tanstack/react-query"; import { Address } from "viem"; import { useGraphqlBatcher } from "context/GraphqlBatcher"; +import { DEFAULT_CHAIN } from "consts/chains"; import { isUndefined } from "utils/index"; import { graphql } from "src/graphql"; @@ -77,6 +78,7 @@ export const useCasesQuery = (skip = 0, first = 3, where?: Dispute_Filter, sortO await graphqlBatcher.fetch({ id: crypto.randomUUID(), document: isUndefined(where) ? casesQuery : casesQueryWhere, + chainId: DEFAULT_CHAIN, variables: { first, skip, @@ -98,6 +100,7 @@ export const useMyCasesQuery = (user?: Address, skip = 0, where?: Dispute_Filter await graphqlBatcher.fetch({ id: crypto.randomUUID(), document: isUndefined(where) ? myCasesQuery : myCasesQueryWhere, + chainId: DEFAULT_CHAIN, variables: { skip, id: user?.toLowerCase(), diff --git a/web/src/hooks/queries/useClassicAppealQuery.ts b/web/src/hooks/queries/useClassicAppealQuery.ts index d12a76238..0b5a5908d 100644 --- a/web/src/hooks/queries/useClassicAppealQuery.ts +++ b/web/src/hooks/queries/useClassicAppealQuery.ts @@ -2,6 +2,7 @@ import { useQuery } from "@tanstack/react-query"; import { REFETCH_INTERVAL } from "consts/index"; import { useGraphqlBatcher } from "context/GraphqlBatcher"; +import { DEFAULT_CHAIN } from "consts/chains"; import { graphql } from "src/graphql"; import { ClassicAppealQuery } from "src/graphql/graphql"; @@ -49,6 +50,7 @@ export const useClassicAppealQuery = (id?: string | number) => { ? await graphqlBatcher.fetch({ id: crypto.randomUUID(), document: classicAppealQuery, + chainId: DEFAULT_CHAIN, variables: { disputeID: id?.toString(), orderBy: "timestamp", diff --git a/web/src/hooks/queries/useCounter.ts b/web/src/hooks/queries/useCounter.ts index a03e05231..a36021a86 100644 --- a/web/src/hooks/queries/useCounter.ts +++ b/web/src/hooks/queries/useCounter.ts @@ -1,6 +1,7 @@ import { useQuery } from "@tanstack/react-query"; import { useGraphqlBatcher } from "context/GraphqlBatcher"; +import { DEFAULT_CHAIN } from "consts/chains"; import { graphql } from "src/graphql"; import { CounterQuery } from "src/graphql/graphql"; @@ -28,6 +29,12 @@ export const useCounterQuery = () => { return useQuery({ queryKey: [`useCounterQuery`], - queryFn: async () => await graphqlBatcher.fetch({ id: crypto.randomUUID(), document: counterQuery, variables: {} }), + queryFn: async () => + await graphqlBatcher.fetch({ + id: crypto.randomUUID(), + document: counterQuery, + chainId: DEFAULT_CHAIN, + variables: {}, + }), }); }; diff --git a/web/src/hooks/queries/useCourtDetails.ts b/web/src/hooks/queries/useCourtDetails.ts index 296d4aa09..f8ebe579c 100644 --- a/web/src/hooks/queries/useCourtDetails.ts +++ b/web/src/hooks/queries/useCourtDetails.ts @@ -1,6 +1,7 @@ import { useQuery } from "@tanstack/react-query"; import { REFETCH_INTERVAL } from "consts/index"; +import { DEFAULT_CHAIN } from "consts/chains"; import { useGraphqlBatcher } from "context/GraphqlBatcher"; import { graphql } from "src/graphql"; @@ -37,6 +38,11 @@ export const useCourtDetails = (id?: string) => { enabled: isEnabled, refetchInterval: REFETCH_INTERVAL, queryFn: async () => - await graphqlBatcher.fetch({ id: crypto.randomUUID(), document: courtDetailsQuery, variables: { id } }), + await graphqlBatcher.fetch({ + id: crypto.randomUUID(), + document: courtDetailsQuery, + chainId: DEFAULT_CHAIN, + variables: { id }, + }), }); }; diff --git a/web/src/hooks/queries/useCourtPolicyURI.ts b/web/src/hooks/queries/useCourtPolicyURI.ts index 6f866b1c2..88de3d3c7 100644 --- a/web/src/hooks/queries/useCourtPolicyURI.ts +++ b/web/src/hooks/queries/useCourtPolicyURI.ts @@ -1,6 +1,7 @@ import { useQuery } from "@tanstack/react-query"; import { useGraphqlBatcher } from "context/GraphqlBatcher"; +import { DEFAULT_CHAIN } from "consts/chains"; import { isUndefined } from "utils/index"; import { graphql } from "src/graphql"; @@ -29,6 +30,7 @@ export const useCourtPolicyURI = (id?: string | number) => { ? await graphqlBatcher.fetch({ id: crypto.randomUUID(), document: courtPolicyURIQuery, + chainId: DEFAULT_CHAIN, variables: { courtID: id.toString() }, }) : undefined, diff --git a/web/src/hooks/queries/useCourtTree.ts b/web/src/hooks/queries/useCourtTree.ts index dffab3e2a..027e68e1d 100644 --- a/web/src/hooks/queries/useCourtTree.ts +++ b/web/src/hooks/queries/useCourtTree.ts @@ -1,6 +1,7 @@ import { useQuery } from "@tanstack/react-query"; import { useGraphqlBatcher } from "context/GraphqlBatcher"; +import { DEFAULT_CHAIN } from "consts/chains"; import { graphql } from "src/graphql"; import { CourtTreeQuery } from "src/graphql/graphql"; @@ -40,7 +41,12 @@ export const useCourtTree = () => { return useQuery({ queryKey: ["courtTreeQuery"], queryFn: async () => - await graphqlBatcher.fetch({ id: crypto.randomUUID(), document: courtTreeQuery, variables: {} }), + await graphqlBatcher.fetch({ + id: crypto.randomUUID(), + document: courtTreeQuery, + chainId: DEFAULT_CHAIN, + variables: {}, + }), }); }; diff --git a/web/src/hooks/queries/useDisputeDetailsQuery.ts b/web/src/hooks/queries/useDisputeDetailsQuery.ts index c5b359d08..6cd7c5cc0 100644 --- a/web/src/hooks/queries/useDisputeDetailsQuery.ts +++ b/web/src/hooks/queries/useDisputeDetailsQuery.ts @@ -1,6 +1,7 @@ import { useQuery } from "@tanstack/react-query"; import { REFETCH_INTERVAL } from "consts/index"; +import { DEFAULT_CHAIN } from "consts/chains"; import { useGraphqlBatcher } from "context/GraphqlBatcher"; import { graphql } from "src/graphql"; @@ -50,6 +51,7 @@ export const useDisputeDetailsQuery = (id?: string | number) => { await graphqlBatcher.fetch({ id: crypto.randomUUID(), document: disputeDetailsQuery, + chainId: DEFAULT_CHAIN, variables: { disputeID: id?.toString() }, }), }); diff --git a/web/src/hooks/queries/useDisputeMaintenanceQuery.ts b/web/src/hooks/queries/useDisputeMaintenanceQuery.ts index 0703804d2..cf3479ac4 100644 --- a/web/src/hooks/queries/useDisputeMaintenanceQuery.ts +++ b/web/src/hooks/queries/useDisputeMaintenanceQuery.ts @@ -1,6 +1,7 @@ import { useQuery } from "@tanstack/react-query"; import { useGraphqlBatcher } from "context/GraphqlBatcher"; +import { DEFAULT_CHAIN } from "consts/chains"; import { graphql } from "src/graphql"; import { DisputeMaintenanceQuery } from "src/graphql/graphql"; @@ -44,6 +45,7 @@ const useDisputeMaintenanceQuery = (id?: string) => { await graphqlBatcher.fetch({ id: crypto.randomUUID(), document: disputeMaintenance, + chainId: DEFAULT_CHAIN, variables: { disputeId: id?.toString(), disputeIdAsString: id?.toString() }, }), }); diff --git a/web/src/hooks/queries/useDisputeTemplateFromId.ts b/web/src/hooks/queries/useDisputeTemplateFromId.ts index f6c1b0b79..f4b835164 100644 --- a/web/src/hooks/queries/useDisputeTemplateFromId.ts +++ b/web/src/hooks/queries/useDisputeTemplateFromId.ts @@ -1,6 +1,7 @@ import { useQuery } from "@tanstack/react-query"; import { useGraphqlBatcher } from "context/GraphqlBatcher"; +import { DEFAULT_CHAIN } from "consts/chains"; import { isUndefined } from "utils/index"; import { graphql } from "src/graphql"; @@ -29,6 +30,7 @@ export const useDisputeTemplateFromId = (templateId?: string) => { await graphqlBatcher.fetch({ id: crypto.randomUUID(), document: disputeTemplateQuery, + chainId: DEFAULT_CHAIN, variables: { id: templateId?.toString() }, isDisputeTemplate: true, }), diff --git a/web/src/hooks/queries/useDrawQuery.ts b/web/src/hooks/queries/useDrawQuery.ts index 07c9a36e3..0f642ccda 100644 --- a/web/src/hooks/queries/useDrawQuery.ts +++ b/web/src/hooks/queries/useDrawQuery.ts @@ -1,6 +1,7 @@ import { useQuery } from "@tanstack/react-query"; import { useGraphqlBatcher } from "context/GraphqlBatcher"; +import { DEFAULT_CHAIN } from "consts/chains"; import { graphql } from "src/graphql"; import { DrawQuery } from "src/graphql/graphql"; @@ -31,6 +32,7 @@ export const useDrawQuery = (address?: string | null, disputeID?: string, roundI await graphqlBatcher.fetch({ id: crypto.randomUUID(), document: drawQuery, + chainId: DEFAULT_CHAIN, variables: { address, disputeID, roundID }, }), }); diff --git a/web/src/hooks/queries/useEvidences.ts b/web/src/hooks/queries/useEvidences.ts index 3123163b9..a6666e8f5 100644 --- a/web/src/hooks/queries/useEvidences.ts +++ b/web/src/hooks/queries/useEvidences.ts @@ -1,6 +1,7 @@ import { useQuery } from "@tanstack/react-query"; import { REFETCH_INTERVAL } from "consts/index"; +import { DEFAULT_CHAIN } from "consts/chains"; import { useGraphqlBatcher } from "context/GraphqlBatcher"; import { transformSearch } from "utils/transformSearch"; @@ -56,6 +57,7 @@ export const useEvidences = (evidenceGroup?: string, keywords?: string) => { const result = await graphqlBatcher.fetch({ id: crypto.randomUUID(), document: document, + chainId: DEFAULT_CHAIN, variables: { evidenceGroupID: evidenceGroup?.toString(), keywords: transformedKeywords }, }); diff --git a/web/src/hooks/queries/useHomePageBlockQuery.ts b/web/src/hooks/queries/useHomePageBlockQuery.ts index 6bf142549..fd546cf96 100644 --- a/web/src/hooks/queries/useHomePageBlockQuery.ts +++ b/web/src/hooks/queries/useHomePageBlockQuery.ts @@ -1,6 +1,7 @@ import { useQuery } from "@tanstack/react-query"; import { useGraphqlBatcher } from "context/GraphqlBatcher"; +import { DEFAULT_CHAIN } from "consts/chains"; import { isUndefined } from "utils/index"; import { graphql } from "src/graphql"; @@ -72,6 +73,7 @@ export const useHomePageBlockQuery = (blockNumber: number | undefined, allTime: const data = await graphqlBatcher.fetch({ id: crypto.randomUUID(), document: homePageBlockQuery, + chainId: DEFAULT_CHAIN, variables: { blockNumber: targetBlock }, }); diff --git a/web/src/hooks/queries/useHomePageQuery.ts b/web/src/hooks/queries/useHomePageQuery.ts index 3ebfec2dc..0baa438f6 100644 --- a/web/src/hooks/queries/useHomePageQuery.ts +++ b/web/src/hooks/queries/useHomePageQuery.ts @@ -1,5 +1,6 @@ import { useQuery } from "@tanstack/react-query"; +import { DEFAULT_CHAIN } from "consts/chains"; import { useGraphqlBatcher } from "context/GraphqlBatcher"; import { graphql } from "src/graphql"; @@ -40,6 +41,7 @@ export const useHomePageQuery = (timeframe: number) => { const data = await graphqlBatcher.fetch({ id: crypto.randomUUID(), document: homePageQuery, + chainId: DEFAULT_CHAIN, variables: { timeframe: timeframe.toString() }, }); return data; diff --git a/web/src/hooks/queries/useJurorStakeDetailsQuery.ts b/web/src/hooks/queries/useJurorStakeDetailsQuery.ts index 51b54c51a..205b09d9a 100644 --- a/web/src/hooks/queries/useJurorStakeDetailsQuery.ts +++ b/web/src/hooks/queries/useJurorStakeDetailsQuery.ts @@ -1,6 +1,7 @@ import { useQuery } from "@tanstack/react-query"; import { REFETCH_INTERVAL } from "consts/index"; +import { DEFAULT_CHAIN } from "consts/chains"; import { useGraphqlBatcher } from "context/GraphqlBatcher"; import { graphql } from "src/graphql"; @@ -30,6 +31,11 @@ export const useJurorStakeDetailsQuery = (userId?: string) => { enabled: isEnabled, refetchInterval: REFETCH_INTERVAL, queryFn: async () => - await graphqlBatcher.fetch({ id: crypto.randomUUID(), document: jurorStakeDetailsQuery, variables: { userId } }), + await graphqlBatcher.fetch({ + id: crypto.randomUUID(), + document: jurorStakeDetailsQuery, + chainId: DEFAULT_CHAIN, + variables: { userId }, + }), }); }; diff --git a/web/src/hooks/queries/useLabelInfoQuery.ts b/web/src/hooks/queries/useLabelInfoQuery.ts index f34cc8f56..6a042ddee 100644 --- a/web/src/hooks/queries/useLabelInfoQuery.ts +++ b/web/src/hooks/queries/useLabelInfoQuery.ts @@ -1,5 +1,6 @@ import { useQuery } from "@tanstack/react-query"; +import { DEFAULT_CHAIN } from "consts/chains"; import { useGraphqlBatcher } from "context/GraphqlBatcher"; import { graphql } from "src/graphql"; @@ -49,6 +50,7 @@ export const useLabelInfoQuery = (address?: string | null, disputeID?: string) = await graphqlBatcher.fetch({ id: crypto.randomUUID(), document: labelQuery, + chainId: DEFAULT_CHAIN, variables: { address, disputeID }, }), }); diff --git a/web/src/hooks/queries/useTopUsersByCoherenceScore.ts b/web/src/hooks/queries/useTopUsersByCoherenceScore.ts index add534914..cd533bb5f 100644 --- a/web/src/hooks/queries/useTopUsersByCoherenceScore.ts +++ b/web/src/hooks/queries/useTopUsersByCoherenceScore.ts @@ -1,6 +1,7 @@ import { useQuery } from "@tanstack/react-query"; import { useGraphqlBatcher } from "context/GraphqlBatcher"; +import { DEFAULT_CHAIN } from "consts/chains"; import { isUndefined } from "utils/index"; import { graphql } from "src/graphql"; @@ -32,6 +33,7 @@ export const useTopUsersByCoherenceScore = (first = 5) => { ? await graphqlBatcher.fetch({ id: crypto.randomUUID(), document: topUsersByCoherenceScoreQuery, + chainId: DEFAULT_CHAIN, variables: { first: first, orderBy: "coherenceScore", diff --git a/web/src/hooks/queries/useUser.ts b/web/src/hooks/queries/useUser.ts index d453035c9..08b6f0699 100644 --- a/web/src/hooks/queries/useUser.ts +++ b/web/src/hooks/queries/useUser.ts @@ -1,6 +1,7 @@ import { useQuery } from "@tanstack/react-query"; import { Address } from "viem"; +import { DEFAULT_CHAIN } from "consts/chains"; import { useGraphqlBatcher } from "context/GraphqlBatcher"; import { graphql } from "src/graphql"; @@ -62,6 +63,7 @@ export const useUserQuery = (address?: Address, where?: Dispute_Filter) => { await graphqlBatcher.fetch({ id: crypto.randomUUID(), document: query, + chainId: DEFAULT_CHAIN, variables: { address: address?.toLowerCase(), where }, }), }); diff --git a/web/src/hooks/queries/useVotingHistory.ts b/web/src/hooks/queries/useVotingHistory.ts index 4991412dd..4c3c6e35c 100644 --- a/web/src/hooks/queries/useVotingHistory.ts +++ b/web/src/hooks/queries/useVotingHistory.ts @@ -1,6 +1,7 @@ import { useQuery } from "@tanstack/react-query"; import { REFETCH_INTERVAL } from "consts/index"; +import { DEFAULT_CHAIN } from "consts/chains"; import { useGraphqlBatcher } from "context/GraphqlBatcher"; import { graphql } from "src/graphql"; @@ -57,6 +58,11 @@ export const useVotingHistory = (disputeID?: string) => { enabled: isEnabled, refetchInterval: REFETCH_INTERVAL, queryFn: async () => - await graphqlBatcher.fetch({ id: crypto.randomUUID(), document: votingHistoryQuery, variables: { disputeID } }), + await graphqlBatcher.fetch({ + id: crypto.randomUUID(), + chainId: DEFAULT_CHAIN, + document: votingHistoryQuery, + variables: { disputeID }, + }), }); }; diff --git a/web/src/layout/Header/navbar/Menu/Settings/index.tsx b/web/src/layout/Header/navbar/Menu/Settings/index.tsx index 3e2588826..24b366d09 100644 --- a/web/src/layout/Header/navbar/Menu/Settings/index.tsx +++ b/web/src/layout/Header/navbar/Menu/Settings/index.tsx @@ -53,6 +53,7 @@ const StyledTabs = styled(Tabs)` width: 86vw; max-width: 660px; align-self: center; + ${landscapeStyle( () => css` width: ${responsiveSize(300, 424, 300)}; diff --git a/web/src/pages/GetPnk/Widget.tsx b/web/src/pages/GetPnk/Widget.tsx index 449281e1d..efb8a4f35 100644 --- a/web/src/pages/GetPnk/Widget.tsx +++ b/web/src/pages/GetPnk/Widget.tsx @@ -16,6 +16,7 @@ const WidgetContainer = styled.div` } } `; + const getWidgetConfig = (theme: Theme): WidgetConfig => ({ fromChain: 1, toChain: 42161,