Merge pull request #4775 from Giveth/4539_user_donates_less_than_mini…

…mum_$ fix: issue 4539, qf shown in donation success page for estimated matching amount
Giveth · Sep 30, 2024 · 3b54119 · 3b54119
2 parents dd33339 + 2527b3f
commit 3b54119
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 23 deletions.
diff --git a/lang/ca.json b/lang/ca.json
@@ -1350,12 +1350,14 @@
 	"page.donate.matching_toast.bottom_invalid_p1": "Només donacions de més de",
 	"page.donate.matching_toast.bottom_invalid_p2": "són elegibles per a l'aparellament.",
 	"page.donate.matching_toast.bottom_valid": "Els fons de finançament es destinaran al projecte seleccionat després que acabi la ronda. Dona a més projectes per rebre més finançament!",
-	"page.donate.passport_toast.description.eligible": "La teva donació és elegible per ser emparellada! Després del",
-	"page.donate.passport_toast.description.eligible_2": ", totes les donacions seran revisades per a la protecció contra frau i els fons d'emparellament seran enviats als projectes. Estigues atent a les notificacions :)",
-	"page.donate.passport_toast.description.non_eligible": "Obtén el teu emparellament de donació amb finançament quadràtic!\nComproveu la vostra elegibilitat QF abans",
+	"page.donate.matching_toast.upper_invalid": "Fes que compti",
+	"page.donate.matching_toast.upper_valid": "Emparellament estimat",
+	"page.donate.passport_toast.description.eligible": "Sou elegible per a QF! Sempre que les vostres donacions siguin almenys $",
+	"page.donate.passport_toast.description.eligible_2": ", són aptes per ser emparellats",
+	"page.donate.passport_toast.description.non_eligible": "Les donacions superiors a ${usd_value} són aptes per ser igualades amb finançament quadràtic.\nVerifiqueu la vostra elegibilitat de QF abans",
 	"page.donate.passport_toast.description.not_connected": "Obtén el teu emparellament de donació amb finançament quadràtic!\nVerifica el teu Gitcoin Passport abans de",
 	"page.donate.passport_toast.title.eligible": "Finançament Quadràtic",
-	"page.donate.passport_toast.title.non_eligible": "No et perdis l'emparellament!",
+	"page.donate.passport_toast.title.non_eligible": "No us ho perdeu!",
 	"page.donate.makes_you_eligible_for_givbacks": "${value} et fan elegible per a GIVbacks",
 	"page.donate.unlocks_matching_funds": "${value} desbloquegen fons coincidents",
 	"page.donate.project_not_eligible_for_qf": "El projecte no és elegible per a la concordança QF.",

diff --git a/lang/en.json b/lang/en.json
@@ -1348,12 +1348,14 @@
 	"page.donate.matching_toast.bottom_invalid_p1": "Only donations more than",
 	"page.donate.matching_toast.bottom_invalid_p2": "are eligible for matching.",
 	"page.donate.matching_toast.bottom_valid": "Matching funds will be sent to the selected project after the round ends. Donate to more projects to receive higher matching!",
-	"page.donate.passport_toast.description.eligible": "Your donation is eligible to be matched! After the",
-	"page.donate.passport_toast.description.eligible_2": ", all donations will be reviewed for fraud protection and matching funds will be sent to the projects.  Stay tuned for notifications :)",
-	"page.donate.passport_toast.description.non_eligible": "Get your donation matched with quadratic funding!\nCheck your QF Eligibility before",
+	"page.donate.matching_toast.upper_invalid": "Make it count",
+	"page.donate.matching_toast.upper_valid": "Estimated matching",
+	"page.donate.passport_toast.description.eligible": "You are QF-eligible! As long as your donations are at least $",
+	"page.donate.passport_toast.description.eligible_2": ", they are eligible to be matched in ",
+	"page.donate.passport_toast.description.non_eligible": "Donations above ${usd_value} are eligible to be matched with quadratic funding.\nVerify your QF Eligibility before ",
 	"page.donate.passport_toast.description.not_connected": "Get your donation matched with quadratic funding!\nVerify your Gitcoin Passport before",
 	"page.donate.passport_toast.title.eligible": "Quadratic Funding",
-	"page.donate.passport_toast.title.non_eligible": "Don’t miss out on matching!",
+	"page.donate.passport_toast.title.non_eligible": "Don't miss out!",
 	"page.donate.makes_you_eligible_for_givbacks": "${value} makes you eligible for GIVbacks",
 	"page.donate.unlocks_matching_funds": "${value} unlocks matching funds",
 	"page.donate.donations_will_be_matched": "Donation will be matched",
@@ -1708,6 +1710,7 @@
 	"projects_technology": "Technology",
 	"projects_technology_desc": "Support technology projects with a focus on tech, research and desci.",
 	"public-goods": "Public Goods",
+	"qf_donor_eligibility.banner.link.back_to_project": "Back to projects",
 	"qf_donor_eligibility.banner.link.check_eligibility": "Check Eligibility",
 	"qf_donor_eligibility.banner.link.recheck_eligibility": "Re-check Eligibility",
 	"real-estate": "Real Estate",

diff --git a/lang/es.json b/lang/es.json
@@ -1348,12 +1348,14 @@
 	"page.donate.matching_toast.bottom_invalid_p1": "Sólo las donaciones superiores a",
 	"page.donate.matching_toast.bottom_invalid_p2": "son subvencionables.",
 	"page.donate.matching_toast.bottom_valid": "Los fondos de emparejamiento se enviarán al proyecto seleccionado después de que termine la ronda. ¡Dona a más proyectos para recibir un mayor emparejamiento!",
-	"page.donate.passport_toast.description.eligible": "¡Tu donación es elegible para ser complementada! Después de la",
-	"page.donate.passport_toast.description.eligible_2": ", todas las donaciones serán revisadas para protección contra fraudes y los fondos de complementarios se enviarán a los proyectos. ¡Mantente atento a las notificaciones! :)",
-	"page.donate.passport_toast.description.non_eligible": "¡Haz que tu donación sea complementada con financiamiento cuadrático!\nCompruebe su elegibilidad QF antes de",
+	"page.donate.matching_toast.upper_invalid": "Haz que cuente",
+	"page.donate.matching_toast.upper_valid": "Estimado del monto complementado",
+	"page.donate.passport_toast.description.eligible": "¡Eres elegible para QF! Siempre que tus donaciones sean de al menos $",
+	"page.donate.passport_toast.description.eligible_2": ", son elegibles para ser emparejados en",
+	"page.donate.passport_toast.description.non_eligible": "Las donaciones superiores a ${usd_value} son elegibles para ser igualadas con fondos cuadráticos.\nVerifique su elegibilidad para QF antes",
 	"page.donate.passport_toast.description.not_connected": "¡Haz que tu donación sea complementada con financiamiento cuadrático! Verifica tu Gitcoin Passport antes de",
 	"page.donate.passport_toast.title.eligible": "Financiamiento Cuadrático",
-	"page.donate.passport_toast.title.non_eligible": "¡No te pierdas la oportunidad!",
+	"page.donate.passport_toast.title.non_eligible": "¡No te lo pierdas!",
 	"page.donate.title": "Donar",
 	"page.donate.zero_fees": "Sin Comisiones",
 	"page.donate.makes_you_eligible_for_givbacks": "${value} te hacen elegible para recibir GIVbacks",

diff --git a/src/apollo/gql/gqlQF.ts b/src/apollo/gql/gqlQF.ts
@@ -18,6 +18,7 @@ export const QF_ROUNDS_QUERY = `
 			allocatedFundUSDPreferred
 			allocatedTokenSymbol
 			minMBDScore
+			minimumValidUsdValue
 		}
 `;
 

diff --git a/src/components/views/donate/QFToast.tsx b/src/components/views/donate/QFToast.tsx
@@ -10,6 +10,7 @@ import {
 	FlexCenter,
 } from '@giveth/ui-design-system';
 import { useIntl } from 'react-intl';
+import { useRouter } from 'next/router';
 import { EQFElegibilityState, usePassport } from '@/hooks/usePassport';
 import PassportModal from '@/components/modals/PassportModal';
 
@@ -20,6 +21,7 @@ const QFToast = () => {
 	const { qfEligibilityState, passportState, passportScore, currentRound } =
 		info;
 	const [showModal, setShowModal] = useState<boolean>(false);
+	const router = useRouter();
 
 	const isEligible = qfEligibilityState === EQFElegibilityState.ELIGIBLE;
 
@@ -46,23 +48,25 @@ const QFToast = () => {
 			formatMessage({
 				id: 'page.donate.passport_toast.description.eligible',
 			}) +
-			' ' +
-			currentRound?.name +
+			currentRound?.minimumValidUsdValue +
 			' ' +
 			formatMessage({
-				id: 'label.ends_on',
+				id: 'page.donate.passport_toast.description.eligible_2',
 			}) +
 			' ' +
-			endDate +
-			formatMessage({
-				id: 'page.donate.passport_toast.description.eligible_2',
-			});
+			currentRound?.name +
+			'.';
 	} else {
 		description = (
 			<>
-				{formatMessage({
-					id: 'page.donate.passport_toast.description.non_eligible',
-				})}{' '}
+				{formatMessage(
+					{
+						id: 'page.donate.passport_toast.description.non_eligible',
+					},
+					{
+						usd_value: currentRound?.minimumValidUsdValue,
+					},
+				)}{' '}
 				<span>{endDate}</span>
 			</>
 		);
@@ -75,7 +79,19 @@ const QFToast = () => {
 					{title}
 				</Title>
 				<Description>{description}</Description>
-				{!isEligible && (
+				{isEligible ? (
+					<FlexCenter>
+						<Button
+							label={formatMessage({
+								id: 'qf_donor_eligibility.banner.link.back_to_project',
+							})}
+							buttonType='primary'
+							size='small'
+							icon={<IconExternalLink16 />}
+							onClick={() => router.push('/qf')}
+						/>
+					</FlexCenter>
+				) : (
 					<FlexCenter>
 						<Button
 							label={formatMessage({