badge fix on donation card and alt card

Giveth · Oct 3, 2024 · 47f272a · 47f272a
1 parent ec44675
commit 47f272a
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 18 deletions.
diff --git a/src/components/project-card/ProjectCard.tsx b/src/components/project-card/ProjectCard.tsx
@@ -96,7 +96,7 @@ const ProjectCard = (props: IProjectCard) => {
 
 	const { activeStartedRound, activeQFRound } = getActiveRound(qfRounds);
 	const hasFooter = activeStartedRound || verified || isGivbackEligible;
-
+	const showVerifiedBadge = verified || isGivbackEligible;
 	const {
 		allocatedFundUSDPreferred,
 		allocatedFundUSD,
@@ -341,17 +341,7 @@ const ProjectCard = (props: IProjectCard) => {
 						<Hr />
 						<PaddedRow $justifyContent='space-between'>
 							<Flex gap='16px'>
-								{isGivbackEligible && (
-									<Flex $alignItems='center' gap='4px'>
-										<IconGIVBack16
-											color={brandColors.giv[500]}
-										/>
-										<GivbackEligibleText>
-											GIVbacks
-										</GivbackEligibleText>
-									</Flex>
-								)}
-								{verified && (
+								{showVerifiedBadge && (
 									<Flex $alignItems='center' gap='4px'>
 										<IconVerifiedBadge16
 											color={semanticColors.jade[500]}
@@ -363,6 +353,16 @@ const ProjectCard = (props: IProjectCard) => {
 										</VerifiedText>
 									</Flex>
 								)}
+								{isGivbackEligible && (
+									<Flex $alignItems='center' gap='4px'>
+										<IconGIVBack16
+											color={brandColors.giv[500]}
+										/>
+										<GivbackEligibleText>
+											GIVbacks
+										</GivbackEligibleText>
+									</Flex>
+								)}
 								{activeStartedRound && (
 									<QFBadge>
 										{activeStartedRound?.name}

diff --git a/src/components/project-card/ProjectCardAlt.tsx b/src/components/project-card/ProjectCardAlt.tsx
@@ -33,6 +33,7 @@ const ProjectCard = (props: IProjectCard) => {
 		description,
 		image,
 		verified,
+		isGivbackEligible,
 		adminUser,
 		slug,
 		organization,
@@ -44,7 +45,7 @@ const ProjectCard = (props: IProjectCard) => {
 		adminUser?.walletAddress,
 		adminUser?.avatar,
 	);
-
+	const showVerifiedBadge = verified || isGivbackEligible;
 	return (
 		<Wrapper $isNew={isNew}>
 			<ImagePlaceholder>
@@ -58,7 +59,9 @@ const ProjectCard = (props: IProjectCard) => {
 				isAbsolute={true}
 			/>
 			{!isNew && (
-				<BadgeContainer>{verified && <VerifiedBadge />}</BadgeContainer>
+				<BadgeContainer>
+					{showVerifiedBadge && <VerifiedBadge />}
+				</BadgeContainer>
 			)}
 			<CardBody $isNew={isNew}>
 				<InternalLink href={slugToProjectView(slug)}>

diff --git a/src/components/views/donate/DonatePageProjectDescription.tsx b/src/components/views/donate/DonatePageProjectDescription.tsx
@@ -82,7 +82,7 @@ export const DonatePageProjectDescription: FC<
 					<GivBackBadge />
 				</Flex>
 			)}
-			{projectData?.verified && (
+			{(projectData?.verified || projectData?.isGivbackEligible) && (
 				<Flex>
 					<VerifiedBadge />
 				</Flex>

diff --git a/src/components/views/donate/common/EligibilityBadges.tsx b/src/components/views/donate/common/EligibilityBadges.tsx
@@ -36,11 +36,11 @@ const EligibilityBadges: FC<IEligibilityBadges> = props => {
 	const { isConnected, chain } = useGeneralWallet();
 	const { activeStartedRound, project } = useDonateData();
 	const { formatMessage } = useIntl();
-	const { verified } = project || {};
+	const { isGivbackEligible } = project || {};
 	const router = useRouter();
 	const isStellar = router.query.chain === ChainType.STELLAR.toLowerCase();
 	const isTokenGivbacksEligible = token?.isGivbackEligible;
-	const isProjectGivbacksEligible = !!verified;
+	const isProjectGivbacksEligible = !!isGivbackEligible;
 	const networkId = isStellar
 		? config.STELLAR_NETWORK_NUMBER
 		: (chain as Chain)?.id

diff --git a/src/components/views/project/ProjectGIVbackToast.tsx b/src/components/views/project/ProjectGIVbackToast.tsx
@@ -41,8 +41,8 @@ const ProjectGIVbackToast = () => {
 	const { projectData, isAdmin, activateProject } = useProjectContext();
 	const verStatus = projectData?.verificationFormStatus;
 	const projectStatus = projectData?.status.name;
-	const isVerified = projectData?.verified;
 	const isGivbackEligible = projectData?.isGivbackEligible;
+	const isVerified = projectData?.verified;
 	const { givbackFactor } = projectData || {};
 	const isOwnerGivbackEligible = isGivbackEligible && isAdmin;
 	const isOwnerNotVerified = !isGivbackEligible && isAdmin;