fix matching distribution (#3798)

Author: 0xKurt

packages/data-layer/src/data.types.ts

@@ -381,9 +381,7 @@ export type DistributionMatch = {
 };
 
 export type RoundForManager = V2RoundWithProject & {
-  matchingDistribution: {
-    matchingDistribution: DistributionMatch[];
-  } | null;
+  matchingDistribution: DistributionMatch[];
   tags: string[];
   matchAmount: string;
   matchAmountInUsd: number;

packages/round-manager/src/features/api/payoutStrategy/payoutStrategy.ts

@@ -62,29 +62,28 @@ export const useGroupProjectsByPaymentStatus = (
 
   const allProjects: MatchingStatsData[] = useMemo(
     () =>
-      round.matchingDistribution?.matchingDistribution.map(
-        (matchingStatsData) => {
-          return {
-            projectName: matchingStatsData.projectName,
-            contributionsCount: matchingStatsData.contributionsCount,
-            matchPoolPercentage: matchingStatsData.matchPoolPercentage,
-            projectId: matchingStatsData.projectId,
-            applicationId: matchingStatsData.applicationId,
-            anchorAddress: applications?.find(
-              (application) =>
-                application.projectId === matchingStatsData.projectId
-            )?.anchorAddress,
-            matchAmountInToken: BigNumber.from(
-              matchingStatsData.matchAmountInToken
-            ),
-            originalMatchAmountInToken: BigNumber.from(
-              matchingStatsData.originalMatchAmountInToken
-            ),
-            projectPayoutAddress: matchingStatsData.projectPayoutAddress,
-          };
-        }
-      ) ?? [],
-    [round.matchingDistribution?.matchingDistribution, applications]
+      round.matchingDistribution?.map((matchingStatsData) => {
+        const anchorAddress = applications?.find(
+          (application) => application.projectId === matchingStatsData.projectId
+        )?.anchorAddress;
+
+        return {
+          projectName: matchingStatsData.projectName,
+          contributionsCount: matchingStatsData.contributionsCount,
+          matchPoolPercentage: matchingStatsData.matchPoolPercentage,
+          projectId: matchingStatsData.projectId,
+          applicationId: matchingStatsData.applicationId,
+          anchorAddress,
+          matchAmountInToken: BigNumber.from(
+            matchingStatsData.matchAmountInToken
+          ),
+          originalMatchAmountInToken: BigNumber.from(
+            matchingStatsData.originalMatchAmountInToken
+          ),
+          projectPayoutAddress: matchingStatsData.projectPayoutAddress,
+        };
+      }) ?? [],
+    [round.matchingDistribution, applications]
   );
 
   useEffect(() => {
@@ -103,11 +102,13 @@ export const useGroupProjectsByPaymentStatus = (
         let tmpProject = project;
 
         if (projectStatus === "paid") {
+          const hash = paidProjects?.find(
+            (p) => p.projectId === project.projectId
+          )?.distributionTransaction;
+
           tmpProject = {
             ...project,
-            hash:
-              paidProjects?.find((p) => p.projectId === project.projectId)
-                ?.distributionTransaction || undefined,
+            hash: hash || undefined,
             status: "",
           };
         }
@@ -118,7 +119,7 @@ export const useGroupProjectsByPaymentStatus = (
     }
 
     fetchData();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [allProjects]);
+  }, [allProjects, paidProjects, paidProjectIds]);
+
   return groupedProjects;
 };

packages/round-manager/src/features/round/ViewRoundResults/ViewRoundResults.tsx

@@ -82,7 +82,7 @@ function useRevisedMatchingFunds(
       round.matchingDistribution !== null &&
       round.readyForPayoutTransaction !== null
     ) {
-      return round.matchingDistribution.matchingDistribution.map((m) => {
+      return round.matchingDistribution.map((m) => {
         return {
           applicationId: m.applicationId,
           payoutAddress: m.projectPayoutAddress,

packages/round-manager/src/test-utils.tsx

@@ -124,8 +124,8 @@ export const makeRoundData = (overrides: Partial<Round> = {}): Round => {
     matchAmountInUsd: 0,
     fundedAmount: 0n,
     fundedAmountInUsd: 0,
-    matchingDistribution: null,
     readyForPayoutTransaction: null,
+    matchingDistribution: [],
     ...overrides,
   };
 };
@@ -192,7 +192,7 @@ export const makeDirectGrantRoundData = (
     matchAmountInUsd: 0,
     fundedAmount: 0n,
     fundedAmountInUsd: 0,
-    matchingDistribution: null,
+    matchingDistribution: [],
     readyForPayoutTransaction: null,
     ...overrides,
   };