From 7665bd5f2216233b486d9f1288eff33ab9d25e2e Mon Sep 17 00:00:00 2001 From: divine-comedian Date: Mon, 7 Oct 2024 14:36:26 -0600 Subject: [PATCH 1/2] add sparkle ion recurring donation --- src/components/views/donate/DonationCard.tsx | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/components/views/donate/DonationCard.tsx b/src/components/views/donate/DonationCard.tsx index 2619db9d48..46524157ee 100644 --- 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 = ({ {formatMessage({ id: 'label.recurring_donation', })} + ) : ( !disableRecurringDonations && ( @@ -284,6 +290,8 @@ interface ITab { const Tab = styled(BaseTab)` font-weight: 500 !important; + display: flex; + align-items: center; cursor: pointer; ${props => props.$selected && From 3ebbbafa2b03cea7620bb81e03c4dea20c3a798d Mon Sep 17 00:00:00 2001 From: Ramin Date: Tue, 8 Oct 2024 01:01:18 +0330 Subject: [PATCH 2/2] Projects with $0 in QF round matching show "matching funds coming soon..." --- package.json | 2 +- .../views/project/projectDonations/ProjectTotalFundCard.tsx | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 2bd212f0f8..d155dec6e3 100644 --- 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/project/projectDonations/ProjectTotalFundCard.tsx b/src/components/views/project/projectDonations/ProjectTotalFundCard.tsx index 9b55d2d712..00bd992b54 100644 --- 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;