Fix order of validation for phone extensions

bcgov · Jan 11, 2025 · 8f2a599 · 8f2a599
1 parent 8a61792
commit 8f2a599
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/frontend/src/common/helpers/phone/validatePhoneExtension.ts b/frontend/src/common/helpers/phone/validatePhoneExtension.ts
@@ -9,7 +9,8 @@ import { invalidExtension, invalidExtensionLength } from "../validationMessages"
 export const validatePhoneExtension = (ext?: Nullable<string>) => {
   if (!ext) return true; // empty or not-provided phone extension is acceptable
 
+  if (ext.length > 5) return invalidExtensionLength(5);
+
   // Must have exactly 1-5 digits
-  if (!/^[0-9]{1,5}$/.test(ext)) return invalidExtension();
-  return ext.length <= 5 || invalidExtensionLength(5);
+  return /^[0-9]{1,5}$/.test(ext) || invalidExtension();
 };