diff --git a/public/locales/en/common.json b/public/locales/en/common.json index 732104c5..263fbf8e 100644 --- a/public/locales/en/common.json +++ b/public/locales/en/common.json @@ -209,5 +209,5 @@ "topProject": "Top Project", "top_project_standards_fulfilled": "The project inspection revealed that this project fulfilled at least 12 of the 19 Top Project <2>standards.", "standardsLink": "https://www.plant-for-the-planet.org/standards/", - "wrongEmailEntered": "Email id incorrect!" + "enterValidEmail": "Please enter a valid email" } \ No newline at end of file diff --git a/src/Donations/Components/ContactsForm.tsx b/src/Donations/Components/ContactsForm.tsx index ef11f7f0..6dbe254c 100644 --- a/src/Donations/Components/ContactsForm.tsx +++ b/src/Donations/Components/ContactsForm.tsx @@ -18,7 +18,6 @@ import { ContactDetails } from "@planet-sdk/common"; import { AddressCandidate, GeocodeSuggestion } from "src/Common/Types/arcgis"; import GiftIcon from "public/assets/icons/GiftIcon"; import { euCountries } from "src/Utils/countryUtils"; -import { z } from "zod"; import { isEmailValid } from "src/Utils/isEmailValid"; interface FormData extends ContactDetails { @@ -300,11 +299,12 @@ function ContactsForm(): ReactElement { /> )} /> - {errors.email && errors.email.type === "required" && ( - {t("emailRequired")} - )} - {errors.email && errors.email.type === "emailInvalid" && ( - {t("wrongEmailEntered")} + {errors.email && ( + + {errors.email.type === "required" + ? t("emailRequired") + : t("enterValidEmail")} + )} {/* {errors.email && errors.email.type === "validate" && ( {t("useSameEmail")} diff --git a/src/Donations/Micros/GiftForm.tsx b/src/Donations/Micros/GiftForm.tsx index 4c6a756d..a525cd46 100644 --- a/src/Donations/Micros/GiftForm.tsx +++ b/src/Donations/Micros/GiftForm.tsx @@ -150,18 +150,13 @@ export default function GiftForm(): ReactElement { /> )} /> - {errors.recipientEmail && - errors.recipientEmail.type === "required" && ( - - {t("emailRequired")} - - )} - {errors.recipientEmail && - errors.recipientEmail.type === "emailInvalid" && ( - - {t("wrongEmailEntered")} - - )} + {errors.recipientEmail && ( + + {errors.recipientEmail.type === "required" + ? t("emailRequired") + : t("enterValidEmail")} + + )}
{ )} /> {errors.email && errors.email.type === "required" && ( - {t("emailRequired")} - )} - {errors.email && errors.email.type === "emailInvalid" && ( - {t("inValidField", { - fieldName: "Email", - })} + {errors.email.type === "required" + ? t("emailRequired") + : t("inValidField", { + fieldName: "Email", + })} )}