Merge pull request #4813 from Giveth/sort-rounds-in-project-page

Sort rounds in project page
Giveth · Oct 4, 2024 · 58ebadf · 58ebadf
2 parents 92e7be9 + 88a190f
commit 58ebadf
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/components/views/project/projectDonations/QfRoundSelector.tsx b/src/components/views/project/projectDonations/QfRoundSelector.tsx
@@ -37,9 +37,13 @@ export const QfRoundSelector: FC<IQfRoundSelectorProps> = ({
 	const navigationNextRef = useRef(null);
 
 	const sortedRounds =
-		projectData?.qfRounds?.sort(
-			(a, b) => Number(b.isActive) - Number(a.isActive),
-		) || [];
+		projectData?.qfRounds?.sort((a: IQFRound, b: IQFRound) => {
+			const activeFirstCompare = Number(b.isActive) - Number(a.isActive);
+			if (activeFirstCompare === 0) {
+				return new Date(b.beginDate) > new Date(a.beginDate) ? 1 : -1;
+			}
+			return activeFirstCompare;
+		}) || [];
 
 	const isRecurringSelected = projectDonationSwiperState.isRecurringSelected;
 	const selectedQF = projectDonationSwiperState.selectedQF;