add check for email has length before validating confirmEmail

guardian · Jan 31, 2025 · e14e34c · e14e34c
1 parent 83fa2a6
commit e14e34c
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/support-frontend/assets/pages/[countryGroupId]/checkout/components/PersonalDetailsFields.tsx b/support-frontend/assets/pages/[countryGroupId]/checkout/components/PersonalDetailsFields.tsx
@@ -55,7 +55,9 @@ export function PersonalDetailsFields({
 					}}
 					onBlur={(event) => {
 						event.target.checkValidity();
-						confirmEmailRef.current?.querySelector('input')?.checkValidity();
+						if (email.length > 0) {
+							confirmEmailRef.current?.querySelector('input')?.checkValidity();
+						}
 					}}
 					readOnly={isEmailAddressReadOnly}
 					name="email"
@@ -105,8 +107,10 @@ export function PersonalDetailsFields({
 							} else {
 								if (validityState.valueMissing) {
 									setConfirmedEmailError('Please confirm your email address.');
-								} else {
+								} else if (validityState.patternMismatch) {
 									setConfirmedEmailError('The email addresses do not match.');
+								} else {
+									setConfirmedEmailError('Please enter a valid email address.');
 								}
 							}
 						}}