Skip to content

Commit

Permalink
Merge branch 'develop' into drpc-integration
Browse files Browse the repository at this point in the history
  • Loading branch information
mateodaza authored Nov 28, 2024
2 parents 642f6ca + 511b7f9 commit ec3e376
Show file tree
Hide file tree
Showing 25 changed files with 1,778 additions and 158 deletions.
24 changes: 22 additions & 2 deletions lang/ca.json
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,24 @@
"label.eligible_networks_for_matching": "Xarxes aptes per a la concordança QF",
"label.email": "correu electrònic",
"label.email_address": "Adreça electrònica",
"label.email_verified": "Correu electrònic verificat",
"label.email_verify": "Verifica el correu electrònic",
"label.email_already_verified": "El teu correu electrònic ha estat verificat. Ara pots desar la informació del teu perfil.",
"label.email_used": "Aquesta adreça de correu electrònic s'utilitzarà per enviar-te comunicacions importants.",
"label.email_used_another": "Aquest correu electrònic ja ha estat verificat en un altre perfil!",
"label.email_sent_to": "Codi de verificació enviat a {email}",
"label.email_please_verify": "Si us plau, verifica el teu correu electrònic. Introdueix el codi de confirmació enviat al teu correu.",
"label.email_get_resend": "No has rebut el correu electrònic? Revisa la teva carpeta de correu brossa o <button>Torna a enviar el codi de verificació!</button>",
"label.email_confirm_code": "Confirma el codi",
"label.email_verify_banner": " <button>Actualitza el teu perfil</button> i verifica la propietat de la teva adreça de correu electrònic per recuperar l'accés als teus projectes.",
"label.email_actions_text": "Verifica el teu correu electrònic per gestionar els teus projectes!",
"label.email_error_verify": "Error de verificació del correu electrònic",
"label.email_modal_verify_your": "Verifica la teva adreça de correu electrònic",
"label.email_modal_need_verify": "Hauràs de verificar la teva adreça de correu electrònic abans de poder crear un nou projecte.",
"label.email_modal_verifying": "Verificar la teva adreça de correu electrònic assegura que puguem comunicar-nos amb tu sobre qualsevol canvi important a la plataforma. La teva adreça de correu electrònic no es compartirà públicament.",
"label.email_modal_to_verifying": "Per verificar la teva adreça de correu electrònic, edita el teu perfil i actualitza el teu correu electrònic.",
"label.email_modal_button": "Actualitza el perfil",
"label.email_tooltip": "Edita el teu perfil des de \"El meu compte\" i verifica la teva adreça de correu electrònic per continuar",
"label.enable_change": "Habilita el canvi",
"label.enable_recurring_donations": "Habilitar Donacions Recurrents",
"label.ends_on": "acaba el",
Expand Down Expand Up @@ -610,7 +628,7 @@
"label.loading": "Carregant",
"label.loading_data": "Carregant Dades",
"label.location": "Ubicació",
"label.location_optional": "ubicació (opcional)",
"label.location_optional": "Ubicació (opcional)",
"label.locekd_giv": "GIV Bloquejat",
"label.locked_for": "Bloquejat per",
"label.locked_giv_details": "Detalls del GIV bloquejat",
Expand Down Expand Up @@ -1179,6 +1197,7 @@
"label.verified_status_for": "Elegibilitat per a GIVbacks per a",
"label.verify_email_address": "Verificar correu electrònic",
"label.verify_your_project": "Formulari d'Elegibilitat per a GIVbacks",
"label.resume_your_project": "Reprèn el formulari de GIVbacks",
"label.verify_your_project.modal.four": "requereix alguna informació addicional sobre el teu projecte i l'impacte previst de la teva organització.",
"label.verify_your_project.modal.one": "El programa GIVbacks és un concepte revolucionari que recompensa els donants de projectes elegibles per a GIVbacks amb tokens GIV. En sol·licitar que el teu projecte obtingui l'estat de 'Elegible per a GIVbacks', podràs fer que el teu projecte destaqui i fomentar més donacions. Fer que el teu projecte sigui elegible per a GIVbacks també construeix una relació de confiança amb els teus donants demostrant la legitimitat del teu projecte i mostrant que els fons s'estan utilitzant per crear un canvi positiu.",
"label.verify_your_project.modal.three": "procés de verificació ",
Expand All @@ -1204,7 +1223,7 @@
"label.wallet": "CARTERA",
"label.wallet_connect": "Connexió de la cartera",
"label.want_to_use_another_wallet": "Vols usar una altra cartera?",
"label.website_or_url": "lloc web o URL",
"label.website_or_url": "Lloc web o URL",
"label.week": "setmana",
"label.welcome_giver": "Benvingut, Giver",
"label.welcome_to_the": "Benvingut a",
Expand Down Expand Up @@ -1678,6 +1697,7 @@
"project.givback_toast.title.verified_public_2": " del valor de la teva donació!",
"project.givback_toast.title.verified_public_3": "Rep recompenses de fins a {percent}%",
"project.givback_toast.title.verified_public_not_eligible": "Impulsa aquest projecte amb GIVpower!",
"project.givback_toast.complete_eligibility": "Completa el teu formulari d’elegibilitat per als GIVbacks",
"projects_all": "Tots els Projectes",
"projects_all_desc": "SUPORT A PROJECTES GLOBALS DE BÉS PÚBLICS, SOSTENIBILITAT I REGENERACIÓ AMB CRYPTODONACIONS",
"projects_art-and-culture": "Art i Cultura",
Expand Down
26 changes: 23 additions & 3 deletions lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -381,8 +381,26 @@
"label.elevate_projects": "Elevate Projects",
"label.eligible_for_matching": "Eligible for Matching",
"label.eligible_networks_for_matching": "Eligible networks for QF matching",
"label.email": "email",
"label.email": "Email",
"label.email_address": "Email Address",
"label.email_verified": "Email Verified",
"label.email_verify": "Verify Email",
"label.email_already_verified": "Your email has been verified. You can now save your profile information.",
"label.email_used": "This email address will be used to send you important communications.",
"label.email_used_another": "This email that has already been verified on another profile!",
"label.email_sent_to": "Verification code sent to {email}",
"label.email_please_verify": "Please Verify your email. Enter the confirmation code sent to your email.",
"label.email_get_resend": "Didn't get the email? Check your spam folder or <button>Resend Verification Code!</button>",
"label.email_confirm_code": "Confirm Code",
"label.email_verify_banner": " <button>Update your profile</button> & verify ownership of your email address to regain access to your projects.",
"label.email_actions_text": "Verify your email to manage your projects!",
"label.email_error_verify": "Error verification email",
"label.email_modal_verify_your": "Verify your email address",
"label.email_modal_need_verify": "You'll need to verify your email address before being able to create a new project.",
"label.email_modal_verifying": "Verifying your email address ensures we can communicate with you about any important changes on the platform. Your email address will not be shared publicly.",
"label.email_modal_to_verifying": "To verify your email address edit your profile and update your email.",
"label.email_modal_button": "Update profile",
"label.email_tooltip": "Edit your profile from \"My Account\" and verify your email address to continue",
"label.enable_change": "Enable Change",
"label.enable_recurring_donations": "Enable Recurring Donations",
"label.ends_on": "ends on",
Expand Down Expand Up @@ -610,7 +628,7 @@
"label.loading": "Loading",
"label.loading_data": "Loading Data",
"label.location": "Location",
"label.location_optional": "location (optional)",
"label.location_optional": "Location (optional)",
"label.locekd_giv": "Locked GIV",
"label.locked_for": "Locked for",
"label.locked_giv_details": "Locked GIV Details",
Expand Down Expand Up @@ -1179,6 +1197,7 @@
"label.verified_status_for": "GIVbacks Eligibility for",
"label.verify_email_address": "Verify email address",
"label.verify_your_project": "GIVbacks Eligibility Form",
"label.resume_your_project": "Resume GIVbacks Form",
"label.verify_your_project.modal.four": "requires some additional information about your project and the intended impact of your organization.",
"label.verify_your_project.modal.one": "The GIVbacks program is a revolutionary concept that rewards donors to GIVbacks eligible projects with GIV tokens. By applying your project for 'GIVbacks Eligible' status, you will be able to make your project stand out and encourage more donations. Getting your project GIVbacks eligible also builds a relationship of trust with your donors by demonstrating your project's legitimacy and showing that the funds are being used to create positive change.",
"label.verify_your_project.modal.three": "GIVbacks eligibility process ",
Expand All @@ -1204,7 +1223,7 @@
"label.wallet": "WALLET",
"label.wallet_connect": "Wallet Connect",
"label.want_to_use_another_wallet": "Want to use another wallet?",
"label.website_or_url": "website or url",
"label.website_or_url": "Website or url",
"label.week": "week",
"label.welcome_giver": "Welcome, Giver",
"label.welcome_to_the": "Welcome to the",
Expand Down Expand Up @@ -1679,6 +1698,7 @@
"project.givback_toast.title.verified_public_2": " of your donation value!",
"project.givback_toast.title.verified_public_3": "Get rewarded with up to {percent}%",
"project.givback_toast.title.verified_public_not_eligible": "Boost this project with GIVpower!",
"project.givback_toast.complete_eligibility": "Complete your GIVbacks Eligibility form",
"projects_all": "All Projects",
"projects_all_desc": "SUPPORT GLOBAL PROJECTS IN PUBLIC GOODS, SUSTAINABILITY, AND REGENERATION WITH CRYPTO DONATIONS",
"projects_art-and-culture": "Art & Culture",
Expand Down
20 changes: 20 additions & 0 deletions lang/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,24 @@
"label.eligible_networks_for_matching": "Redes elegibles para la asignación de QF",
"label.email": "Email",
"label.email_address": "Dirección de Email",
"label.email_verified": "Correo electrónico verificado",
"label.email_verify": "Verificar correo electrónico",
"label.email_already_verified": "Tu correo electrónico ha sido verificado. Ahora puedes guardar la información de tu perfil.",
"label.email_used": "Esta dirección de correo electrónico se utilizará para enviarte comunicaciones importantes.",
"label.email_used_another": "¡Este correo electrónico ya ha sido verificado en otro perfil!",
"label.email_sent_to": "Código de verificación enviado a {email}",
"label.email_please_verify": "Por favor, verifica tu correo electrónico. Ingresa el código de confirmación enviado a tu correo.",
"label.email_get_resend": "¿No recibiste el correo electrónico? Revisa tu carpeta de spam o <button>¡Reenviar código de verificación!</button>",
"label.email_confirm_code": "Confirmar código",
"label.email_verify_banner": " <button>Actualiza tu perfil</button> y verifica la propiedad de tu dirección de correo electrónico para recuperar el acceso a tus proyectos.",
"label.email_actions_text": "¡Verifica tu correo electrónico para gestionar tus proyectos!",
"label.email_error_verify": "Error de verificación del correo electrónico",
"label.email_modal_verify_your": "Verifica tu dirección de correo electrónico",
"label.email_modal_need_verify": "Necesitarás verificar tu dirección de correo electrónico antes de poder crear un nuevo proyecto.",
"label.email_modal_verifying": "Verificar tu dirección de correo electrónico asegura que podamos comunicarnos contigo sobre cualquier cambio importante en la plataforma. Tu dirección de correo electrónico no se compartirá públicamente.",
"label.email_modal_to_verifying": "Para verificar tu dirección de correo electrónico, edita tu perfil y actualiza tu correo electrónico.",
"label.email_modal_button": "Actualizar perfil",
"label.email_tooltip": "Edita tu perfil desde \"Mi cuenta\" y verifica tu dirección de correo electrónico para continuar",
"label.enable_change": "Ayuda al Cambio",
"label.enable_recurring_donations": "Habilitar Donaciones Recurrentes",
"label.ends_on": "termina el",
Expand Down Expand Up @@ -1179,6 +1197,7 @@
"label.verified_status_for": "Elegibilidad para GIVbacks para",
"label.verify_email_address": "Verificar email",
"label.verify_your_project": "Formulario de Elegibilidad para GIVbacks",
"label.resume_your_project": "Reanudar el formulario de GIVbacks",
"label.verify_your_project.modal.four": "requiere un poco de información adicional sobre tu proyecto y el impacto previsto de tu organización.",
"label.verify_your_project.modal.one": "El programa GIVbacks es un concepto revolucionario que recompensa a los donantes de proyectos elegibles para GIVbacks con tokens GIV. Al aplicar para que tu proyecto obtenga el estado de 'Elegible para GIVbacks', podrás hacer que tu proyecto se destaque y fomentar más donaciones. Hacer que tu proyecto sea elegible para GIVbacks también construye una relación de confianza con tus donantes al demostrar la legitimidad de tu proyecto y mostrar que los fondos se están utilizando para crear un cambio positivo.",
"label.verify_your_project.modal.three": "proceso de verificación ",
Expand Down Expand Up @@ -1679,6 +1698,7 @@
"project.givback_toast.title.verified_public_2": " del valor de tu donación!",
"project.givback_toast.title.verified_public_3": "Recibe recompensas de hasta {percent}%",
"project.givback_toast.title.verified_public_not_eligible": "Boostea este proyecto con GIVpower!",
"project.givback_toast.complete_eligibility": "Complete su formulario de elegibilidad para GIVbacks",
"projects_all": "Todos los proyectos",
"projects_all_desc": "APOYE PROYECTOS GLOBALES EN BIENES PÚBLICOS, SOSTENIBILIDAD Y REGENERACIÓN CON CRIPTODONACIONES",
"projects_art-and-culture": "Arte & Cultura",
Expand Down
2 changes: 0 additions & 2 deletions pages/project/[projectIdSlug]/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ import { ProjectProvider } from '@/context/project.context';
const ProjectRoute: FC<IProjectBySlug> = ({ project }) => {
useReferral();

console.log({ project });

return (
<ProjectProvider project={project}>
<ProjectIndex />
Expand Down
15 changes: 15 additions & 0 deletions src/apollo/gql/gqlUser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -256,3 +256,18 @@ export const FETCH_USERS_GIVPOWER_BY_ADDRESS = `
}
}
}`;

export const SEND_USER_EMAIL_CONFIRMATION_CODE_FLOW = gql`
mutation SendUserEmailConfirmationCodeFlow($email: String!) {
sendUserEmailConfirmationCodeFlow(email: $email)
}
`;

export const SEND_USER_CONFIRMATION_CODE_FLOW = gql`
mutation SendUserConfirmationCodeFlow(
$verifyCode: String!
$email: String!
) {
sendUserConfirmationCodeFlow(verifyCode: $verifyCode, email: $email)
}
`;
1 change: 1 addition & 0 deletions src/apollo/types/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,7 @@ export interface IUser {
wasReferred?: boolean;
isReferrer?: boolean;
chainvineId?: string;
isEmailVerified?: boolean;
}

export interface IPassportInfo {
Expand Down
5 changes: 5 additions & 0 deletions src/components/Header/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import { ETheme } from '@/features/general/general.slice';
import {
setShowCompleteProfile,
setShowSearchModal,
setShowVerifyEmailModal,
} from '@/features/modal/modal.slice';
import { slugToProjectView } from '@/lib/routeCreators';
import { useModalCallback } from '@/hooks/useModalCallback';
Expand Down Expand Up @@ -138,6 +139,10 @@ const Header: FC<IHeader> = () => {
openWalletConnectModal();
} else if (!isSignedIn) {
signInThenCreate();
} else if (!isUserRegistered(userData)) {
dispatch(setShowCompleteProfile(true));
} else if (!userData?.isEmailVerified) {
dispatch(setShowVerifyEmailModal(true));
} else if (isUserRegistered(userData)) {
router.push(Routes.CreateProject);
} else {
Expand Down
Loading

0 comments on commit ec3e376

Please sign in to comment.