[FIX] Do not fetch project donors outside AW

client/src/hooks/queries/donors/useProjectDonors.ts

@@ -39,16 +39,9 @@ export default function useProjectDonors(
   });
 
   return useQuery({
-    enabled: !!projectAddress && (epoch !== undefined || !!(currentEpoch && currentEpoch > 1)),
-    queryFn: () =>
-      apiGetProjectDonors(
-        projectAddress,
-        epoch || (isDecisionWindowOpen ? currentEpoch! - 1 : currentEpoch!),
-      ),
-    queryKey: QUERY_KEYS.projectDonors(
-      projectAddress,
-      epoch || (isDecisionWindowOpen ? currentEpoch! - 1 : currentEpoch!),
-    ),
+    enabled: !!projectAddress && (!!currentEpoch && currentEpoch > 1) && (isDecisionWindowOpen === true || epoch !== undefined),
+    queryFn: () => apiGetProjectDonors(projectAddress, epoch || currentEpoch! - 1),
+    queryKey: QUERY_KEYS.projectDonors(projectAddress, epoch || currentEpoch! - 1),
     select: response => mapDataToProjectDonors(response),
     staleTime: Infinity,
     ...options,

client/src/hooks/queries/donors/useProjectsDonors.ts

@@ -12,6 +12,7 @@ import { mapDataToProjectDonors } from './utils';
 export default function useProjectsDonors(epoch?: number): {
   data: { [key: string]: ProjectDonor[] };
   isFetching: boolean;
+  isSuccess: boolean;
 } {
   const { data: currentEpoch } = useCurrentEpoch();
   const { data: projectsAddresses } = useProjectsContract(epoch);
@@ -21,16 +22,13 @@ export default function useProjectsDonors(epoch?: number): {
 
   const projectsDonorsResults: UseQueryResult<ProjectDonor[]>[] = useQueries({
     queries: (projectsAddresses || []).map(projectAddress => ({
-      enabled: !!projectsAddresses && isDecisionWindowOpen !== undefined,
-      queryFn: () =>
-        apiGetProjectDonors(
-          projectAddress,
-          epoch || (isDecisionWindowOpen ? currentEpoch! - 1 : currentEpoch!),
-        ),
-      queryKey: QUERY_KEYS.projectDonors(
-        projectAddress,
-        epoch || (isDecisionWindowOpen ? currentEpoch! - 1 : currentEpoch!),
-      ),
+      enabled:
+        !!projectsAddresses &&
+        !!currentEpoch &&
+        currentEpoch > 1 &&
+        (isDecisionWindowOpen === true || epoch !== undefined),
+      queryFn: () => apiGetProjectDonors(projectAddress, epoch || currentEpoch! - 1),
+      queryKey: QUERY_KEYS.projectDonors(projectAddress, epoch || currentEpoch! - 1),
       select: response => mapDataToProjectDonors(response),
     })),
   });
@@ -46,6 +44,7 @@ export default function useProjectsDonors(epoch?: number): {
     return {
       data: {},
       isFetching,
+      isSuccess: false,
     };
   }
 
@@ -57,5 +56,7 @@ export default function useProjectsDonors(epoch?: number): {
       };
     }, {}),
     isFetching: false,
+    // Ensures projectsDonorsResults is actually fetched with data, and not just an object with undefined values.
+    isSuccess: !projectsDonorsResults.some(element => !element.isSuccess),
   };
 }

client/src/hooks/queries/useProjectsIpfsWithRewards.ts

@@ -1,3 +1,4 @@
+import env from 'env';
 import { ExtendedProject } from 'types/extended-project';
 import getSortedElementsByTotalValueOfAllocationsAndAlphabetical from 'utils/getSortedElementsByTotalValueOfAllocationsAndAlphabetical';
 
@@ -18,7 +19,7 @@ export default function useProjectsIpfsWithRewards(epoch?: number): {
   isFetching: boolean;
 } {
   // TODO OCT-1270 TODO OCT-1312 Remove this override.
-  const epochOverrideForDataFetch = epoch === 2 ? 3 : epoch;
+  const epochOverrideForDataFetch = env.network === 'Mainnet' && epoch === 2 ? 3 : epoch;
 
   const { data: projectsAddresses, isFetching: isFetchingProjectsContract } =
     useProjectsContract(epochOverrideForDataFetch);
@@ -31,7 +32,12 @@ export default function useProjectsIpfsWithRewards(epoch?: number): {
     isFetching: isFetchingMatchedProjectRewards,
     isRefetching: isRefetchingMatchedProjectRewards,
   } = useMatchedProjectRewards(epoch);
-  const { data: projectsDonors, isFetching: isFetchingProjectsDonors } = useProjectsDonors(epoch);
+
+  const {
+    data: projectsDonors,
+    isFetching: isFetchingProjectsDonors,
+    isSuccess: isSuccessProjectsDonors,
+  } = useProjectsDonors(epoch);
 
   const isFetching =
     isFetchingProjectsContract ||
@@ -54,10 +60,11 @@ export default function useProjectsIpfsWithRewards(epoch?: number): {
      * passed threshold. For those that did not, we reduce on their donors and get the value.
      */
     const totalValueOfAllocations =
-      projectMatchedProjectRewards?.sum ||
-      projectsDonors[project.address].reduce((acc, curr) => acc + curr.amount, BigInt(0));
+      projectMatchedProjectRewards?.sum || isSuccessProjectsDonors
+        ? projectsDonors[project.address].reduce((acc, curr) => acc + curr.amount, BigInt(0))
+        : BigInt(0);
     return {
-      numberOfDonors: projectsDonors[project.address].length,
+      numberOfDonors: isSuccessProjectsDonors ? projectsDonors[project.address].length : 0,
       percentage: projectMatchedProjectRewards?.percentage,
       totalValueOfAllocations,
       ...project,