fix(condo): open-condo-software#3906 updated phone validator

ArtyomVancyan · May 2, 2024 · 042cd65 · 042cd65
1 parent 03d855f
commit 042cd65
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/apps/condo/domains/common/hooks/useValidations.ts b/apps/condo/domains/common/hooks/useValidations.ts
@@ -4,7 +4,6 @@ import { useCallback, useMemo } from 'react'
 import { useIntl } from '@open-condo/next/intl'
 
 import { SPECIAL_CHAR_REGEXP, MULTIPLE_EMAILS_REGEX } from '@condo/domains/common/constants/regexps'
-import { normalizePhone } from '@condo/domains/common/utils/phone'
 import { isValidTin } from '@condo/domains/organization/utils/tin.utils'
 
 
@@ -38,29 +37,24 @@ export const useValidations: UseValidations = (settings = {}) => {
     const intl = useIntl()
     const ThisFieldIsRequiredMessage = intl.formatMessage({ id: 'FieldIsRequired' })
     const MobilePhoneIsNotValidMessage = intl.formatMessage({ id: 'global.input.error.wrongMobilePhone' })
-    const PhoneIsNotValidMessage = intl.formatMessage({ id: 'global.input.error.wrongPhone' })
     const EmailErrorMessage = intl.formatMessage({ id: 'pages.auth.EmailIsNotValid' })
     const FieldIsTooShortMessage = intl.formatMessage({ id: 'ValueIsTooShort' })
     const FieldIsTooLongMessage = intl.formatMessage({ id: 'ValueIsTooLong' })
     const NumberIsNotValidMessage = intl.formatMessage({ id: 'NumberIsNotValid' })
     const TinValueIsInvalidMessage = intl.formatMessage({ id: 'pages.organizations.tin.InvalidValue' })
     const EmailsAreInvalidMessage = intl.formatMessage({ id: 'global.input.error.wrongEmails' })
 
-    const { allowLandLine } = settings
-
     const requiredValidator: Rule = useMemo(() => ({
         required: true,
         message: ThisFieldIsRequiredMessage,
     }), [ThisFieldIsRequiredMessage])
 
     const phoneValidator: Rule = useMemo(() => ({
-        validator: (_, value) => {
-            if (!value) return Promise.resolve()
-            const v = normalizePhone(value, allowLandLine)
-            if (!v) return Promise.reject(allowLandLine ? PhoneIsNotValidMessage : MobilePhoneIsNotValidMessage)
-            return Promise.resolve()
+        validator: (_, { valid }) => {
+            if (valid()) return Promise.resolve()
+            return Promise.reject(MobilePhoneIsNotValidMessage)
         },
-    }), [MobilePhoneIsNotValidMessage, PhoneIsNotValidMessage, allowLandLine])
+    }), [MobilePhoneIsNotValidMessage])
 
     const emailValidator: Rule = useMemo(() => ({
         type: 'email',