Merge branch 'develop' of github.com:Giveth/giveth-dapps-v2 into 4539…

…_user_donates_less_than_minimum_$ Update Branch
Giveth · Sep 27, 2024 · 00459c3 · 00459c3
2 parents 12045c5 + 4f8fb2c
commit 00459c3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/lang/ca.json b/lang/ca.json
@@ -564,7 +564,7 @@
 	"label.invalid_ens_address": "Adreça ENS no vàlida",
 	"label.in_december_2021": "al desembre de 2021 va proporcionar una nova manera de finançar les nostres iniciatives per evolucionar la filantropia.",
 	"label.in_order_to_ensure_that_you_are_a_representative": "Per assegurar-nos que realment ets un representant del projecte pel qual estàs sol·licitant, et demanem que publiquis o compartisques un enllaç al teu projecte de Giveth des del Twitter de l'organització, el lloc web, Github o un altre fòrum públic propietat de l'organització.",
-	"label.isGivbackEligible": "Apte per a Givbacks",
+	"label.isGivbackEligible": "Apte per a GIVbacks",
 	"label.is_already_being_used_for_a_project": "ja s'està utilitzant per a un projecte",
 	"label.is_your_project_part_of_a_non_profit": "El teu projecte forma part d'una organització sense ànim de lucre registrada?",
 	"label.it_wont_take_long": "No trigarà gaire!",

diff --git a/src/components/VerificationBadge.tsx b/src/components/VerificationBadge.tsx
@@ -10,7 +10,9 @@ interface IProps {
 const VerificationBadge: FC<IProps> = ({ isVerified, verificationStatus }) => {
 	const verStatus = isVerified
 		? EVerificationStatus.VERIFIED
-		: verificationStatus;
+		: verificationStatus !== EVerificationStatus.VERIFIED
+			? verificationStatus
+			: '';
 
 	let label, badgeStatus;
 	switch (verStatus) {
@@ -22,11 +24,10 @@ const VerificationBadge: FC<IProps> = ({ isVerified, verificationStatus }) => {
 			label = 'Submitted';
 			badgeStatus = EBadgeStatus.GIVETH;
 			break;
-		// NOTE: Commenting this as we should only display according to GIVback eligibility
-		// case EVerificationStatus.VERIFIED:
-		// 	label = 'Eligible';
-		// 	badgeStatus = EBadgeStatus.SUCCESS;
-		// 	break;
+		case EVerificationStatus.VERIFIED:
+			label = 'Eligible';
+			badgeStatus = EBadgeStatus.SUCCESS;
+			break;
 		case EVerificationStatus.DRAFT:
 			label = 'Incomplete';
 			badgeStatus = EBadgeStatus.WARNING;

diff --git a/src/components/views/landings/GIVBacks/HowGIVbacksWork.tsx b/src/components/views/landings/GIVBacks/HowGIVbacksWork.tsx
@@ -15,7 +15,7 @@ const HowGIVbacksWork = () => {
 		<Wrapper>
 			<H4 weight={700}>How Do GIVbacks Work?</H4>
 			<H5>
-				Givbacks are built on the principles of transparency, trust, and
+				GIVbacks are built on the principles of transparency, trust, and
 				reward:
 			</H5>
 			<OrderedBullets>