@W-19143871 Fix for email validation on marketing consent capture: TLD must be more than 1 character.

Author: mitesh-patel-crm

packages/commerce-sdk-react/src/hooks/ShopperConsents/mutation.test.ts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-import {act} from '@testing-library/react'
+import {act, waitFor} from '@testing-library/react'
 import {ShopperConsentsTypes} from 'commerce-sdk-isomorphic'
 import nock from 'nock'
 import {
@@ -95,6 +95,7 @@ describe('Cache update behavior', () => {
         test('invalidates `getSubscriptions` query', async () => {
             mockQueryEndpoint(consentsEndpoint, baseSubscriptionResponse)
             mockMutationEndpoints(consentsEndpoint, {})
+            mockQueryEndpoint(consentsEndpoint, baseSubscriptionResponse)
             const {result} = renderHookWithProviders(() => {
                 return {
                     query: queries.useSubscriptions(queryOptions),
@@ -169,6 +170,7 @@ describe('Cache update behavior', () => {
         test('invalidates `getSubscriptions` query', async () => {
             mockQueryEndpoint(consentsEndpoint, baseSubscriptionResponse)
             mockMutationEndpoints(consentsEndpoint, {})
+            mockQueryEndpoint(consentsEndpoint, baseSubscriptionResponse)
             const {result} = renderHookWithProviders(() => {
                 return {
                     query: queries.useSubscriptions(queryOptions),
@@ -259,10 +261,10 @@ describe('Cache update behavior', () => {
             )
             await waitAndExpectSuccess(() => result.current.mutation)
 
-            // Wait for automatic refetch
-            await waitAndExpectSuccess(() => result.current.query)
-            // Should have fresh data, not stale
-            expect(result.current.query.data?.data).toHaveLength(2)
+            // Wait for refetch to complete with fresh data
+            await waitFor(() => {
+                expect(result.current.query.data?.data).toHaveLength(2)
+            })
             expect(result.current.query.data).toEqual(freshResponse)
         })
     })

packages/template-retail-react-app/app/utils/email-utils.js

@@ -13,7 +13,7 @@
  */
 export const isValidEmail = (email) => {
     const emailRegex =
-        /^[\p{L}\p{N}._!#$%&'*+/=?^`{|}~-]+@(?:[\p{L}\p{N}](?:[\p{L}\p{N}-]{0,61}[\p{L}\p{N}])?\.)+[\p{L}\p{N}](?:[\p{L}\p{N}-]{0,61}[\p{L}\p{N}])?$/u
+        /^[\p{L}\p{N}._!#$%&'*+/=?^`{|}~-]+@(?:[\p{L}\p{N}](?:[\p{L}\p{N}-]{0,61}[\p{L}\p{N}])?\.)+[\p{L}\p{N}][\p{L}\p{N}-]{0,61}[\p{L}\p{N}]$/u
 
     return emailRegex.test(email)
 }

packages/template-retail-react-app/app/utils/email-utils.test.js

@@ -150,6 +150,24 @@ describe('isValidEmail', () => {
         test('should return false for email with hyphen at end of domain part', () => {
             expect(isValidEmail('test@example-.com')).toBe(false)
         })
+
+        test('should return false for single-character TLD', () => {
+            expect(isValidEmail('test@example.o')).toBe(false)
+            expect(isValidEmail('test@example.c')).toBe(false)
+        })
+    })
+
+    describe('TLD length', () => {
+        test('should accept two-character TLDs', () => {
+            expect(isValidEmail('test@example.co')).toBe(true)
+            expect(isValidEmail('test@example.uk')).toBe(true)
+        })
+
+        test('should accept longer TLDs', () => {
+            expect(isValidEmail('test@example.com')).toBe(true)
+            expect(isValidEmail('test@example.museum')).toBe(true)
+            expect(isValidEmail('test@example.travel')).toBe(true)
+        })
     })
 })