Merge pull request #4829 from Giveth/main

Main to dev
Giveth · Oct 7, 2024 · d1efc50 · d1efc50
2 parents 150a319 + 3e164ec
commit d1efc50
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "givethdapp",
-	"version": "2.33.1",
+	"version": "2.33.2",
 	"private": true,
 	"scripts": {
 		"build": "next build",

diff --git a/src/components/views/donate/DonationCard.tsx b/src/components/views/donate/DonationCard.tsx
@@ -5,6 +5,8 @@ import {
 	Flex,
 	SublineBold,
 	brandColors,
+	IconSpark,
+	semanticColors,
 } from '@giveth/ui-design-system';
 import React, { FC, useState, useEffect } from 'react';
 import styled, { css } from 'styled-components';
@@ -192,6 +194,10 @@ export const DonationCard: FC<IDonationCardProps> = ({
 								{formatMessage({
 									id: 'label.recurring_donation',
 								})}
+								<IconSpark
+									size={28}
+									color={semanticColors.golden[500]}
+								/>
 							</Tab>
 						) : (
 							!disableRecurringDonations && (
@@ -284,6 +290,8 @@ interface ITab {
 
 const Tab = styled(BaseTab)<ITab>`
 	font-weight: 500 !important;
+	display: flex;
+	align-items: center;
 	cursor: pointer;
 	${props =>
 		props.$selected &&

diff --git a/src/components/views/project/projectDonations/ProjectTotalFundCard.tsx b/src/components/views/project/projectDonations/ProjectTotalFundCard.tsx
@@ -57,7 +57,9 @@ const ProjectTotalFundCard = ({ selectedQF }: IProjectTotalFundCardProps) => {
 	const selectedQFData = qfRounds?.find(round => round.id === selectedQF?.id);
 
 	const notDistributedFund =
-		!qfRoundHistory?.matchingFund && !selectedQF?.isActive;
+		!qfRoundHistory?.matchingFund &&
+		qfRoundHistory?.matchingFund !== 0 &&
+		!selectedQF?.isActive;
 
 	useEffect(() => {
 		if (!id) return;