diff --git a/govtool/frontend/src/hooks/queries/useGetProposalsQuery.ts b/govtool/frontend/src/hooks/queries/useGetProposalsQuery.ts index bee3cd39d..a21b7b986 100644 --- a/govtool/frontend/src/hooks/queries/useGetProposalsQuery.ts +++ b/govtool/frontend/src/hooks/queries/useGetProposalsQuery.ts @@ -33,7 +33,7 @@ export const useGetProposalsQuery = ({ return allProposals.flatMap((proposal) => proposal.elements); }; - const { data, isLoading } = useQuery( + const { data, isLoading, isFetching } = useQuery( [ QUERY_KEYS.useGetProposalsKey, filters, @@ -46,16 +46,18 @@ export const useGetProposalsQuery = ({ fetchProposals, { enabled, - refetchOnWindowFocus: true, + refetchOnWindowFocus: false, + refetchOnReconnect: false, keepPreviousData: true, - cacheTime: Infinity, }, ); + const isProposalsLoading = isLoading || isFetching; + const proposals = Object.values(groupByType(data) ?? []); return { - isProposalsLoading: isLoading, + isProposalsLoading, proposals, }; };