From 6bd054e078d0fb2ccfea296fb9b93dabc80e9c87 Mon Sep 17 00:00:00 2001
From: bc-yevhenii-buliuk <yevhenii.buliuk@bigcommerce.com>
Date: Fri, 1 Nov 2024 18:22:42 +0200
Subject: [PATCH] fix(core): fix validation message for email on account
 settings page

---
 .changeset/sweet-dragons-stare.md             |  5 +++++
 .../settings/_components/text-field.tsx       | 20 +++++++++++++------
 2 files changed, 19 insertions(+), 6 deletions(-)
 create mode 100644 .changeset/sweet-dragons-stare.md

diff --git a/.changeset/sweet-dragons-stare.md b/.changeset/sweet-dragons-stare.md
new file mode 100644
index 0000000000..94f401d920
--- /dev/null
+++ b/.changeset/sweet-dragons-stare.md
@@ -0,0 +1,5 @@
+---
+"@bigcommerce/catalyst-core": patch
+---
+
+fix validation message for email on account settings page
diff --git a/core/app/[locale]/(default)/account/(tabs)/settings/_components/text-field.tsx b/core/app/[locale]/(default)/account/(tabs)/settings/_components/text-field.tsx
index a5b2dce8bd..533c2f848e 100644
--- a/core/app/[locale]/(default)/account/(tabs)/settings/_components/text-field.tsx
+++ b/core/app/[locale]/(default)/account/(tabs)/settings/_components/text-field.tsx
@@ -49,12 +49,20 @@ export const TextField = ({
         />
       </FieldControl>
       {isRequired && (
-        <FieldMessage
-          className="absolute inset-x-0 bottom-0 inline-flex w-full text-xs font-normal text-error"
-          match="valueMissing"
-        >
-          {t(fieldNameById ?? 'empty')}
-        </FieldMessage>
+        <>
+          <FieldMessage
+            className="absolute inset-x-0 bottom-0 inline-flex w-full text-xs font-normal text-error"
+            match="valueMissing"
+          >
+            {t(fieldNameById ?? 'empty')}
+          </FieldMessage>
+          <FieldMessage
+            className="absolute inset-x-0 bottom-0 inline-flex w-full text-xs font-normal text-error"
+            match="typeMismatch"
+          >
+            {t(fieldNameById ?? 'empty')}
+          </FieldMessage>
+        </>
       )}
     </Field>
   );