diff --git a/packages/round-manager/src/features/api/payoutStrategy/payoutStrategy.ts b/packages/round-manager/src/features/api/payoutStrategy/payoutStrategy.ts index a02bd0fba9..bf7592c8c5 100644 --- a/packages/round-manager/src/features/api/payoutStrategy/payoutStrategy.ts +++ b/packages/round-manager/src/features/api/payoutStrategy/payoutStrategy.ts @@ -60,9 +60,17 @@ export const useGroupProjectsByPaymentStatus = ( const paidProjectIds = paidProjects?.map((project) => project.projectId); + const matchingDistribution = round.matchingDistribution; + + // filter out matchingDistribution with projectId "0x0DD5CC8755C6e4247364012Bb0AC99Cd5ED136D2" + const filteredMatchingDistribution = matchingDistribution?.filter( + (project) => + project.projectId !== "0x0DD5CC8755C6e4247364012Bb0AC99Cd5ED136D2" + ); + const allProjects: MatchingStatsData[] = useMemo( () => - round.matchingDistribution?.map((matchingStatsData) => { + filteredMatchingDistribution?.map((matchingStatsData) => { const anchorAddress = applications?.find( (application) => application.projectId === matchingStatsData.projectId )?.anchorAddress; @@ -83,7 +91,7 @@ export const useGroupProjectsByPaymentStatus = ( projectPayoutAddress: matchingStatsData.projectPayoutAddress, }; }) ?? [], - [round.matchingDistribution, applications] + [filteredMatchingDistribution, applications] ); useEffect(() => { diff --git a/packages/round-manager/src/features/round/ViewFundGrantees.tsx b/packages/round-manager/src/features/round/ViewFundGrantees.tsx index 1dfa6d6b55..183766ab82 100644 --- a/packages/round-manager/src/features/round/ViewFundGrantees.tsx +++ b/packages/round-manager/src/features/round/ViewFundGrantees.tsx @@ -257,6 +257,8 @@ export function PayProjectsTable(props: { }, [selectedProjects, props.projects]); function toggleAll() { + console.log("toggleAll", checked, indeterminate); + console.log("props.projects", props.projects); setSelectedProjects(checked || indeterminate ? [] : props.projects); setChecked(!checked && !indeterminate); setIndeterminate(false); @@ -365,6 +367,8 @@ export function PayProjectsTable(props: { } }; + console.log("selectedProjects", selectedProjects); + return (
@@ -424,28 +428,32 @@ export function PayProjectsTable(props: { p.projectId === project.projectId + ) ? "bg-gray-50" : undefined } > - {selectedProjects.includes(project) && ( + {selectedProjects.some( + (p) => p.projectId === project.projectId + ) && (
)} p.projectId === project.projectId + )} onChange={(e) => { setSelectedProjects( e.target.checked ? [...selectedProjects, project] : selectedProjects.filter( - (p) => - p.projectPayoutAddress !== - project.projectPayoutAddress + (p) => p.projectId !== project.projectId ) ); }} @@ -454,7 +462,9 @@ export function PayProjectsTable(props: { p.projectId === project.projectId + ) ? "text-indigo-600" : "text-gray-900" )} @@ -530,7 +540,7 @@ export function PayProjectsTable(props: { title="Warning!" body={
- You don’t have enough funds in the contract to pay out the selected + You don't have enough funds in the contract to pay out the selected grantees. Please either add more funds to the contract or select fewer grantees.