Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

deverification copy changes #4790

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

deverification copy changes #4790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f96d0e8
copy changes
divine-comedian Sep 25, 2024
cfdd496
Merge branch 'develop' into deverification-fixes-laurensfeedback
divine-comedian Sep 26, 2024
19de1b4
fix missing translation in catalan
divine-comedian Sep 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions lang/ca.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,10 +308,10 @@
"label.deposit_confirmed": "Dipòsit confirmat",
"label.deposit_or_stream_balance": "Diposita Tokens o utilitza el Saldo de Transmissió",
"label.deposit_token_use_balance": "Diposita Tokens o utilitza el Saldo de Transmissió",
"label.devouch.attest_on_devouch": "Certifica a DeVouch",
"label.devouch.if_you_are_eligible": "Si ets un verificador elegible de Giveth, pots avalar la legitimitat d'aquest projecte, potencialment augmentant els beneficis que rep a Giveth.",
"label.devouch.go_to_devouch": "Anar a DeVouch",
"label.devouch.description.vouch_this_project": "Amb DeVouch, pots assenyalar el teu suport a aquest projecte testificant la seva legitimitat, cosa que potencialment augmentarà els beneficis que rep a Giveth.",
"label.devouch.learn_more_about_devouch": "Més informació sobre DeVouch i la verificació descentralitzada",
"label.devouch.view_this_project": "Veure aquest projecte a DeVouch",
"label.devouch.title.vouch_this_project": "Avalar aquest Projecte",
"label.didnt_get_the_givdrop": "No has rebut el GIVdrop?",
"label.did_the_donation_but_not_confirmed": "He fet la donació però no està confirmada.",
"label.discover_our_roadmap": "descobreix la nostra planificació estratègica",
Expand Down Expand Up @@ -1661,10 +1661,13 @@
"project.givback_toast.description.non_verified_owner_rejected_2": " o al suport de Discord per a més instruccions.",
"project.givback_toast.description.non_verified_owner_submitted": "Notícies emocionants! La teva sol·licitud ha estat enviada i està a la cua per ser revisada pel nostre equip de revisió d'elegibilitat per a GIVbacks. Et respondrem en un termini d'1-2 setmanes.",
"project.givback_toast.description.non_verified_public": "Actualment, els GIVbacks només s'atorguen per donacions fetes a projectes elegibles per a GIVbacks a Ethereum. La teva contribució segueix sent important, fins i tot si no genera GIVbacks!",
"project.givback_toast.description.verified_owner": "Potencia el teu projecte per augmentar el seu percentatge de GIVbacks i ajudar-lo a aparèixer més amunt a la pàgina de projectes!",
"project.givback_toast.description.verified_public": "Les donacions a Ethereum a projectes elegibles per a GIVbacks són recompensades amb GIV. Impulsa aquest projecte per augmentar el seu percentatge de recompenses i fer-lo més visible a la pàgina de projectes!", "project.givback_toast.title.non_verified_owner": "El teu projecte està creant o donant suport a béns públics?",
"project.givback_toast.description.verified_owner_not_eligible": "El teu projecte ha estat avalat pels Verificadors de Giveth i ara pot beneficiar-se de GIVpower. Fes stake i bloqueja els teus tokens GIV per impulsar aquest projecte i fer-lo més visible a la pàgina de projectes. No obstant això, donar a aquest projecte no generarà GIVbacks per als donants.",
"project.givback_toast.title.non_verified_owner_cancelled": "Estat Cancel·lat",
"project.givback_toast.description.verified_owner": "Potencia el teu projecte per augmentar el seu percentatge de GIVbacks i ajudar-lo a aparèixer més amunt a la pàgina de projectes!",
"project.givback_toast.description.verified_owner.note": "Com a propietari d'aquest projecte, no rebràs GIVbacks per donar-hi.",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think project.givback_toast.description.verified_owner.note is not ised in the app.

"project.givback_toast.description.verified_owner_not_eligible": "El teu projecte ha estat avalat pels Verificadors de Giveth i ara pot beneficiar-se de GIVpower. {stakeLock} per obtenir GIVpower i millorar la posició d'aquest projecte a la pàgina de projectes. Nota: Aquest projecte pot ser impulsat, però no genera GIVbacks.",
"project.givback_toast.description.verified_public": "Les donacions de ${value} o més són elegibles per a GIVbacks. Impulsa aquest projecte per augmentar el seu percentatge de recompenses i visibilitat a la pàgina de projectes.",
"project.givback_toast.description.verified_public_not_eligible": "{stakeLock} per obtenir GIVpower i millorar la posició d'aquest projecte a la pàgina de projectes. Nota: Aquest projecte pot ser impulsat, però no genera GIVbacks.",
"project.givback_toast.title.non_verified_owner": "El teu projecte està creant o donant suport a béns públics?",
"project.givback_toast.title.non_verified_owner_cancelled": "Estat Cancel·lat",
"project.givback_toast.title.non_verified_owner_deactive": "Mode Desactivat",
"project.givback_toast.title.non_verified_owner_draft": "Publica el teu projecte avui!",
"project.givback_toast.title.non_verified_owner_incomplete": "Sol·licitud Incompleta",
Expand All @@ -1673,8 +1676,8 @@
"project.givback_toast.title.non_verified_public": "Per què no hi ha GIVbacks?",
"project.givback_toast.title.verified_public_1": "Rep recompenses de fins a ",
"project.givback_toast.title.verified_owner": "Les donacions de {value}$ o més són elegibles per a reemborsaments de fins a un {percent}%!",
"project.givback_toast.title.verified_owner_not_eligible": "El teu projecte ha estat avalat",
"project.givback_toast.title.verified_public_2": " del valor de la teva donació!",
"project.givback_toast.title.verified_owner_not_eligible": "El teu projecte ha estat avalat",
"project.givback_toast.title.verified_public_2": " del valor de la teva donació!",
"project.givback_toast.title.verified_public_not_eligible": "Impulsa aquest projecte amb GIVpower!",
"projects_all": "Tots els Projectes",
"projects_all_desc": "SUPORT A PROJECTES GLOBALS DE BÉS PÚBLICS, SOSTENIBILITAT I REGENERACIÓ AMB CRYPTODONACIONS",
Expand Down
23 changes: 12 additions & 11 deletions lang/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,10 +308,10 @@
"label.deposit_confirmed": "Deposit confirmed",
"label.deposit_or_stream_balance": "Deposit Tokens or use Stream Balance",
"label.deposit_token_use_balance": "Deposit Tokens or use Stream Balance",
"label.devouch.attest_on_devouch": "Attest on Devouch",
"label.devouch.if_you_are_eligible": "If you are an eligible Giveth Verifier you can vouch for this project's legitimacy, potentially increasing the benefits it receives on Giveth.",
"label.devouch.go_to_devouch": "Go to DeVouch",
"label.devouch.title.vouch_this_project": "Vouch for this Project",
"label.devouch.description.vouch_this_project": "With DeVouch, you can signal your support for this project by attesting to its legitimacy, potentially increasing the benefits it receives on Giveth.",
"label.devouch.learn_more_about_devouch": "Learn more about DeVouch & Decentralized Verification",
"label.devouch.view_this_project": "View this Project on DeVouch",
"label.didnt_get_the_givdrop": "Didn’t get the GIVdrop?",
"label.did_the_donation_but_not_confirmed": "I did the donation but it's not confirmed.",
"label.discover_our_roadmap": "discover our roadmap",
Expand Down Expand Up @@ -1661,21 +1661,22 @@
"project.givback_toast.description.non_verified_owner_rejected_2": " or Discord support for more instructions.",
"project.givback_toast.description.non_verified_owner_submitted": "Exciting news! Your application has been submitted and is in the queue for review by our GIVbacks Eligibility review team. We will get back to you with a response within 1-2 weeks.",
"project.givback_toast.description.non_verified_public": "GIVbacks are currently only awarded for donations made to GIVbacks Eligible projects on Ethereum. Your contribution still matters, even if it doesn't generate GIVbacks!",
"project.givback_toast.description.verified_owner": "Boost your project to increase its GIVbacks percentage and help it appear higher on the projects page!",
"project.givback_toast.description.verified_public": "Donations of ${value} or more are eligible for GIVbacks. Boost this project to increase its rewards percentage and visibility on the projects page!",
"project.givback_toast.description.verified_owner_not_eligible": "Your project has been vouched for by Giveth Verifiers and can now benefit from GIVpower! Stake and lock your GIV tokens to boost this project and make it more visible on the projects page. However, donating to this project won't yield GIVbacks to donors.",
"project.givback_toast.title.non_verified_owner": "Is your project creating or supporting public goods?",
"project.givback_toast.description.verified_public_not_eligible": "{stakeLock} your GIV tokens to get GIVpower. Boost this project make it more visible on the projects page! Note that while this project is eligible to be boosted with GIVpower, it will not yield GIVbacks to it's donors.",
"project.givback_toast.title.non_verified_owner_cancelled": "Project Cancelled",
"project.givback_toast.description.verified_owner": "Boost your project to increase its GIVbacks percentage and help it appear higher on the projects page!",
"project.givback_toast.description.verified_owner.note": "As the owner of this project, you won’t get GIVbacks for donating to it.",
"project.givback_toast.description.verified_owner_not_eligible": "Your project has been vouched for by Giveth Verifiers and can now benefit from GIVpower! {stakeLock} to get GIVpower and boost this project's position on the projects page! Note: This project can be boosted, but does not yield GIVbacks.",
"project.givback_toast.description.verified_public": "Donations of ${value} or more are eligible for GIVbacks. Boost this project to increase its rewards percentage and visibility on the projects page!",
"project.givback_toast.description.verified_public_not_eligible": "{stakeLock} to get GIVpower and boost this project's position on the projects page! Note: This project can be boosted, but does not yield GIVbacks.",
"project.givback_toast.title.non_verified_owner": "Is your project creating or supporting public goods?",
"project.givback_toast.title.non_verified_owner_cancelled": "Project Cancelled",
"project.givback_toast.title.non_verified_owner_deactive": "Project Deactivated",
"project.givback_toast.title.non_verified_owner_draft": "Publish your project today!",
"project.givback_toast.title.non_verified_owner_incomplete": "Application incomplete",
"project.givback_toast.title.non_verified_owner_rejected": "We couldn't approve your project as GIVbacks eligible",
"project.givback_toast.title.non_verified_owner_submitted": "Application submitted",
"project.givback_toast.title.non_verified_public": "Why no GIVbacks?",
"project.givback_toast.title.verified_public_1": "Get rewarded with up to ",
"project.givback_toast.title.verified_owner_not_eligible": "Your project has been Vouched for",
"project.givback_toast.title.verified_owner": "Donations of ${value} or more qualify for GIVbacks with up to {percent}%!",
"project.givback_toast.title.verified_owner_not_eligible": "Your project has been Vouched for",
"project.givback_toast.title.verified_owner": "Donations of ${value} or more qualify for GIVbacks with up to {percent}%!",
"project.givback_toast.title.verified_public_2": " of your donation value!",
"project.givback_toast.title.verified_public_not_eligible": "Boost this project with GIVpower!",
"projects_all": "All Projects",
Expand Down
21 changes: 11 additions & 10 deletions lang/es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,10 +308,10 @@
"label.deposit_confirmed": "Depósito confirmado",
"label.deposit_or_stream_balance": "Deposita Tokens o usa el Saldo de Transmisión",
"label.deposit_token_use_balance": "Deposita Tokens o usa el Saldo de Transmisión",
"label.devouch.attest_on_devouch": "Certificar en DeVouch",
"label.devouch.if_you_are_eligible": "Si eres un verificador elegible de Giveth, puedes avalar la legitimidad de este proyecto, potencialmente aumentando los beneficios que recibe en Giveth.",
"label.devouch.go_to_devouch": "Ir a DeVouch",
"label.devouch.description.vouch_this_project": "Con DeVouch, puedes señalar tu apoyo a este proyecto atestiguando su legitimidad, lo que potencialmente aumentará los beneficios que recibe en Giveth.",
"label.devouch.learn_more_about_devouch": "Más información sobre DeVouch y la verificación descentralizada",
"label.devouch.view_this_project": "Ver este proyecto en DeVouch",
"label.devouch.title.vouch_this_project": "Avalar este Proyecto",
"label.didnt_get_the_givdrop": "¿No has recibido el GIVdrop?",
"label.did_the_donation_but_not_confirmed": "Hice la donación pero no está confirmada.",
"label.discover_our_roadmap": "descubre nuestra hoja de ruta",
Expand Down Expand Up @@ -1661,11 +1661,12 @@
"project.givback_toast.description.non_verified_owner_rejected_2": " o al soporte de Discord para más instrucciones.",
"project.givback_toast.description.non_verified_owner_submitted": "¡Noticias emocionantes! Tu solicitud ha sido enviada y está en la cola para ser revisada por nuestro equipo de revisión de elegibilidad para GIVbacks. Te responderemos en un plazo de 1-2 semanas.",
"project.givback_toast.description.non_verified_public": "Actualmente, los GIVbacks solo se otorgan por donaciones hechas a proyectos elegibles para GIVbacks en Ethereum. ¡Tu contribución sigue siendo importante, incluso si no genera GIVbacks!",
"project.givback_toast.description.verified_owner": "Impulsa tu proyecto para aumentar la cantidad de GIVbacks que reciben tus donantes en Ethereum y aumentar su visibilidad entre otros proyectos.",
"project.givback_toast.description.verified_owner_not_eligible": "Tu proyecto ha sido avalado por los Verificadores de Giveth y ahora puede beneficiarse de GIVpower. Haz stake y bloquea tus tokens GIV para impulsar este proyecto y hacerlo más visible en la página de proyectos. Sin embargo, donar a este proyecto no generará GIVbacks para los donantes.",
"project.givback_toast.description.verified_public": "Las donaciones de ${value} o más son elegibles para recibir GIVbacks. ¡Impulsa este proyecto para aumentar su porcentaje de recompensas y su visibilidad en la página de proyectos!",
"project.givback_toast.description.verified_public_not_eligible": "{stakeLock} tus GIV tokens para obtener GIVpower. ¡Impulsa este proyecto para hacerlo más visible en la página de proyectos! Ten en cuenta que aunque este proyecto es elegible para ser impulsado con GIVpower, no generará GIVbacks para sus donantes.",
"project.givback_toast.title.non_verified_owner": "¿Tu proyecto está creando o apoyando bienes públicos?",
"project.givback_toast.description.verified_owner": "Impulsa tu proyecto para aumentar la cantidad de GIVbacks que reciben tus donantes en Ethereum y aumentar su visibilidad entre otros proyectos.",
"project.givback_toast.description.verified_owner.note": "Como propietario de este proyecto, no recibirás GIVbacks por donar a él.",
"project.givback_toast.description.verified_owner_not_eligible": "Tu proyecto ha sido avalado por los Verificadores de Giveth y ahora puede beneficiarse de GIVpower. {stakeLock} para obtener GIVpower y mejorar la posición de este proyecto en la página de proyectos. Nota: Este proyecto puede ser impulsado, pero no genera GIVbacks.",
"project.givback_toast.description.verified_public": "Las donaciones de ${value} o más son elegibles para recibir GIVbacks. ¡Impulsa este proyecto para aumentar su porcentaje de recompensas y su visibilidad en la página de proyectos!",
"project.givback_toast.description.verified_public_not_eligible": "{stakeLock} para obtener GIVpower y mejorar la posición de este proyecto en la página de proyectos. Nota: Este proyecto puede ser impulsado, pero no genera GIVbacks.",
"project.givback_toast.title.non_verified_owner": "¿Tu proyecto está creando o apoyando bienes públicos?",
"project.givback_toast.title.non_verified_owner_cancelled": "Estado Cancelado",
"project.givback_toast.title.non_verified_owner_deactive": "Modo Desactivado",
"project.givback_toast.title.non_verified_owner_draft": "¡Publica tu proyecto hoy!",
Expand All @@ -1675,8 +1676,8 @@
"project.givback_toast.title.non_verified_public": "¿Por qué no GIVbacks?",
"project.givback_toast.title.verified_public_1": "¡Recibe recompensas de hasta ",
"project.givback_toast.title.verified_owner": "¡Las donaciones de ${value} o más califican para GIVbacks con hasta un {percent}%!",
"project.givback_toast.title.verified_owner_not_eligible": "Tu proyecto ha sido avalado",
"project.givback_toast.title.verified_public_2": " del valor de tu donación!",
"project.givback_toast.title.verified_owner_not_eligible": "Tu proyecto ha sido avalado",
"project.givback_toast.title.verified_public_2": " del valor de tu donación!",
"project.givback_toast.title.verified_public_not_eligible": "Boostea este proyecto con GIVpower!",
"projects_all": "Todos los proyectos",
"projects_all_desc": "APOYE PROYECTOS GLOBALES EN BIENES PÚBLICOS, SOSTENIBILIDAD Y REGENERACIÓN CON CRIPTODONACIONES",
Expand Down
6 changes: 3 additions & 3 deletions src/components/views/project/ProjectDevouchBox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ const ProjectDevouchBox = () => {
<TextContent>
<Title>
{formatMessage({
id: 'label.devouch.view_this_project',
id: 'label.devouch.title.vouch_this_project',
})}
</Title>
<Description>
{formatMessage({
id: 'label.devouch.if_you_are_eligible',
id: 'label.devouch.description.vouch_this_project',
})}{' '}
<ExternalLink href={links.DEVOUCH_DOCS}>
<LearnMore>
Expand All @@ -62,7 +62,7 @@ const ProjectDevouchBox = () => {
>
<OutlineButton
label={formatMessage({
id: 'label.devouch.attest_on_devouch',
id: 'label.devouch.go_to_devouch',
})}
leftIcon={
<IconExternalLink
Expand Down
17 changes: 13 additions & 4 deletions src/components/views/project/ProjectGIVbackToast.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ const ProjectGIVbackToast = () => {
},
{
stakeLock: (
<InnerLink href={Routes.GIVeconomy} target='_blank'>
<InnerLink href={Routes.GIVfarm} target='_blank'>
{formatMessage({ id: 'label.stake_and_lock' })}{' '}
</InnerLink>
),
Expand All @@ -242,9 +242,18 @@ const ProjectGIVbackToast = () => {
title = formatMessage({
id: `${useIntlTitle}verified_owner_not_eligible`,
});
description = formatMessage({
id: `${useIntlDescription}verified_owner_not_eligible`,
});
description = formatMessage(
{
id: `${useIntlDescription}verified_owner_not_eligible`,
},
{
stakeLock: (
<InnerLink href={Routes.GIVfarm} target='_blank'>
{formatMessage({ id: 'label.stake_and_lock' })}{' '}
</InnerLink>
),
},
);
link = links.GIVPOWER_DOC;
Button = (
<OutlineButton
Expand Down
4 changes: 3 additions & 1 deletion src/components/views/project/projectGIVPower/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ const ProjectGIVPowerIndex: FC<IProjectGIVPowerIndexProps> = () => {
const { isBoostingsLoading, boostersData, projectData } =
useProjectContext();
const hasGivPower = boostersData ? boostersData.totalCount > 0 : false;

const isVerified = projectData?.verified;
const isGivbackEligible = projectData?.isGivbackEligible;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe you can safely remove these new variables.

const isVerifiedNotGivbacksEligible = isVerified && !isGivbackEligible;
if (isBoostingsLoading) return <WrappedSpinner size={250} />;

return hasGivPower ? (
Expand Down
Loading