From 241dbb14717a2e2dd55344402efe7478fa62ea6e Mon Sep 17 00:00:00 2001 From: HrithikSampson Date: Wed, 25 Sep 2024 17:07:38 +0530 Subject: [PATCH 1/3] fix: issue 4539, qf shown in donation success page for donations aboveor below estimated matching amount --- lang/ca.json | 4 ++-- lang/en.json | 9 ++++---- lang/es.json | 8 +++---- src/apollo/gql/gqlQF.ts | 1 + src/components/views/donate/QFToast.tsx | 29 ++++++++++++++++++------- 5 files changed, 33 insertions(+), 18 deletions(-) diff --git a/lang/ca.json b/lang/ca.json index 57add23c99..c35f5b579e 100644 --- a/lang/ca.json +++ b/lang/ca.json @@ -1341,10 +1341,10 @@ "page.donate.matching_toast.upper_valid": "Emparellament estimat", "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.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.title": "Donar", "page.donate.zero_fees": "Sense Comissions", "page.engage.discord.desc": "Uneix-te a la conversa! Discord és on el nostre equip es comunica. Presenta't, dóna'ns comentaris, descobreix com contribuir o simplement saluda!", diff --git a/lang/en.json b/lang/en.json index e586598b53..2c69ea5e0b 100644 --- a/lang/en.json +++ b/lang/en.json @@ -1339,12 +1339,12 @@ "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.matching_toast.upper_invalid": "Make it count", "page.donate.matching_toast.upper_valid": "Estimated 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.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.title": "Donate", "page.donate.zero_fees": "Zero Fees", "page.engage.discord.desc": "Join the conversation! Discord is where our team communicates. Introduce yourself, give us feedback, find out how to contribute or just say hello!", @@ -1692,6 +1692,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 index 565d6068c4..a531d1379e 100644 --- a/lang/es.json +++ b/lang/es.json @@ -1339,12 +1339,12 @@ "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.matching_toast.upper_invalid": "Haz que cuente", "page.donate.matching_toast.upper_valid": "Estimado del monto complementado", - "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.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.engage.discord.desc": "¡Únete a la conversación! Nuestro equipo se comunica en Discord. Preséntate, danos retroalimentación, descubre cómo contribuir o ¡sólo saluda!", diff --git a/src/apollo/gql/gqlQF.ts b/src/apollo/gql/gqlQF.ts index e3686d6b17..aa165d145a 100644 --- 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 index 0ee603faf3..330606de86 100644 --- a/src/components/views/donate/QFToast.tsx +++ b/src/components/views/donate/QFToast.tsx @@ -12,6 +12,7 @@ import { import { useIntl } from 'react-intl'; import { EQFElegibilityState, usePassport } from '@/hooks/usePassport'; import PassportModal from '@/components/modals/PassportModal'; +import { useRouter } from 'next/router'; const QFToast = () => { const { formatMessage, locale } = useIntl(); @@ -20,6 +21,7 @@ const QFToast = () => { const { qfEligibilityState, passportState, passportScore, currentRound } = info; const [showModal, setShowModal] = useState(false); + const router = useRouter(); const isEligible = qfEligibilityState === EQFElegibilityState.ELIGIBLE; @@ -46,22 +48,21 @@ 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', + },{ + usd_value: currentRound?.minimumValidUsdValue, })}{' '} {endDate} @@ -75,7 +76,19 @@ const QFToast = () => { {title} {description} - {!isEligible && ( + {isEligible ? ( + +