@digigov/form 1.1.5-496927f3 → 1.2.0-01ea6f24

package/src/Questions/__snapshots__/index.spec.tsx.snap

@@ -55,13 +55,13 @@ exports[`renders the Questions 1`] = `
           <ForwardRef(BackLink)>
             <ForwardRef(Base)
               as="a"
-              className="govgr-back-link"
+              className="ds-back-link"
               onClick={[Function]}
               printHidden={true}
               tabIndex={0}
             >
               <a
-                className="govgr-back-link govgr-print-hidden"
+                className="ds-back-link ds-print-hidden"
                 onClick={[Function]}
                 tabIndex={0}
               >
@@ -73,18 +73,18 @@ exports[`renders the Questions 1`] = `
                     icon="caret"
                   >
                     <ForwardRef(SvgIcon)
-                      className="govgr-svg-icon--caret"
+                      className="ds-svg-icon--caret"
                     >
                       <ForwardRef(Base)
                         aria-hidden="true"
                         as="svg"
-                        className="govgr-svg-icon--caret govgr-svg-icon"
+                        className="ds-svg-icon--caret ds-svg-icon"
                         focusable="false"
                         viewBox="0 0 24 24"
                       >
                         <svg
                           aria-hidden="true"
-                          className="govgr-svg-icon--caret govgr-svg-icon"
+                          className="ds-svg-icon--caret ds-svg-icon"
                           focusable="false"
                           viewBox="0 0 24 24"
                         >
@@ -108,19 +108,19 @@ exports[`renders the Questions 1`] = `
         <ForwardRef(PageTitleContainer)>
           <ForwardRef(Base)
             as="div"
-            className="govgr-page-title"
+            className="ds-page-title"
           >
             <div
-              className="govgr-page-title"
+              className="ds-page-title"
             >
               <ForwardRef(PageTitleCaption)>
                 <ForwardRef(HeadingCaption)>
                   <ForwardRef(Base)
                     as="span"
-                    className="govgr-caption-lg"
+                    className="ds-caption-lg"
                   >
                     <span
-                      className="govgr-caption-lg"
+                      className="ds-caption-lg"
                     >
                       intro.caption
                     </span>
@@ -132,10 +132,10 @@ exports[`renders the Questions 1`] = `
                   <ForwardRef(Heading)>
                     <ForwardRef(Base)
                       as="h1"
-                      className="govgr-heading-xl"
+                      className="ds-heading-xl"
                     >
                       <h1
-                        className="govgr-heading-xl"
+                        className="ds-heading-xl"
                       >
                         intro.title
                       </h1>
@@ -152,10 +152,10 @@ exports[`renders the Questions 1`] = `
       <ForwardRef(Paragraph)>
         <ForwardRef(Base)
           as="p"
-          className="govgr-body"
+          className="ds-body"
         >
           <p
-            className="govgr-body"
+            className="ds-body"
           >
             This is the intro
           </p>
@@ -211,11 +211,11 @@ exports[`renders the Questions 1`] = `
           >
             <ForwardRef(Base)
               as="form"
-              className="govgr-form"
+              className="ds-form"
               onSubmit={[Function]}
             >
               <form
-                className="govgr-form"
+                className="ds-form"
                 onSubmit={[Function]}
               >
                 <Field
@@ -240,7 +240,7 @@ exports[`renders the Questions 1`] = `
                               "name": "name",
                               "ref": <input
                                 aria-required="true"
-                                class="govgr-input"
+                                class="ds-input"
                                 name="name"
                                 type="text"
                               />,
@@ -357,24 +357,24 @@ exports[`renders the Questions 1`] = `
                         error={false}
                       >
                         <ForwardRef(Grid)
-                          className="govgr-field"
+                          className="ds-field"
                           item={true}
                           xs={12}
                         >
                           <ForwardRef(Base)
                             as="div"
-                            className="govgr-field xs:govgr-grid__col-span-12"
+                            className="ds-field xs:ds-grid__col-span-12"
                           >
                             <div
-                              className="govgr-field xs:govgr-grid__col-span-12"
+                              className="ds-field xs:ds-grid__col-span-12"
                             >
                               <ForwardRef(LabelContainer)>
                                 <ForwardRef(Base)
                                   as="label"
-                                  className="govgr-label"
+                                  className="ds-label"
                                 >
                                   <label
-                                    className="govgr-label"
+                                    className="ds-label"
                                   >
                                     <Label
                                       label={
@@ -389,10 +389,10 @@ exports[`renders the Questions 1`] = `
                                       >
                                         <ForwardRef(Base)
                                           as="span"
-                                          className="govgr-heading-sm"
+                                          className="ds-heading-sm"
                                         >
                                           <span
-                                            className="govgr-heading-sm"
+                                            className="ds-heading-sm"
                                           >
                                             name.field.primary
                                           </span>
@@ -401,10 +401,10 @@ exports[`renders the Questions 1`] = `
                                       <ForwardRef(Hint)>
                                         <ForwardRef(Base)
                                           as="p"
-                                          className="govgr-hint"
+                                          className="ds-hint"
                                         >
                                           <p
-                                            className="govgr-hint"
+                                            className="ds-hint"
                                           >
                                             name.field.secondary
                                           </p>
@@ -424,7 +424,7 @@ exports[`renders the Questions 1`] = `
                                                 "name": "name",
                                                 "ref": <input
                                                   aria-required="true"
-                                                  class="govgr-input"
+                                                  class="ds-input"
                                                   name="name"
                                                   type="text"
                                                 />,
@@ -536,7 +536,7 @@ exports[`renders the Questions 1`] = `
                                         <ForwardRef(Base)
                                           aria-required={true}
                                           as="input"
-                                          className="govgr-input"
+                                          className="ds-input"
                                           disabled={false}
                                           name="name"
                                           onBlur={[Function]}
@@ -545,7 +545,7 @@ exports[`renders the Questions 1`] = `
                                         >
                                           <input
                                             aria-required={true}
-                                            className="govgr-input"
+                                            className="ds-input"
                                             disabled={false}
                                             name="name"
                                             onBlur={[Function]}
@@ -570,12 +570,12 @@ exports[`renders the Questions 1`] = `
                 >
                   <ForwardRef(Base)
                     as="button"
-                    className="govgr-btn-primary govgr-btn"
+                    className="ds-btn-primary ds-btn"
                     printHidden={true}
                     type="submit"
                   >
                     <button
-                      className="govgr-btn-primary govgr-btn govgr-print-hidden"
+                      className="ds-btn-primary ds-btn ds-print-hidden"
                       type="submit"
                     >
                       Συνέχεια

package/src/inputs/ImageInput/index.tsx

@@ -20,7 +20,7 @@ export interface Limit {
 }
 
 export const Image: React.FC<ImageProps> = React.memo(function Image({ src }) {
-  return <img src={src} className="govgr-image--ratio" />;
+  return <img src={src} className="ds-image--ratio" />;
 });
 export interface ImageInputProps extends Omit<UncontrolledFieldProps, 'extra'> {
   extra?: {
@@ -76,7 +76,7 @@ export const ImageInput: React.FC<ImageInputProps> = React.forwardRef(
               </Paragraph>
             </>
           ) : (
-            <CoreHint className="govgr-dashed--border">
+            <CoreHint className="ds-dashed--border">
               {t('upload.no_image')}
             </CoreHint>
           )}

package/src/inputs/Input/Input.stories.js

@@ -8,6 +8,7 @@ export * from '@digigov/form/inputs/Input/__stories__/Default';
 export * from '@digigov/form/inputs/Input/__stories__/Integer';
 export * from '@digigov/form/inputs/Input/__stories__/Boolean';
 export * from '@digigov/form/inputs/Input/__stories__/PhoneNumber';
+export * from '@digigov/form/inputs/Input/__stories__/LandlineNumber';
 export * from '@digigov/form/inputs/Input/__stories__/MobilePhone';
 export * from '@digigov/form/inputs/Input/__stories__/AFM';
 export * from '@digigov/form/inputs/Input/__stories__/IBAN';

package/src/inputs/Input/__stories__/LandlineNumber.tsx

@@ -0,0 +1,27 @@
+import React from 'react';
+import FormBuilder, { Field } from '@digigov/form';
+import { Button } from '@digigov/ui/form/Button';
+
+export const LandlineNumber = () => (
+  <FormBuilder
+    onSubmit={(data) => {
+      console.log(data);
+    }}
+  >
+    <Field
+      key="phone-number"
+      name="phone-number"
+      type="phone_number"
+      label={{
+        primary: 'Σταθερό τηλέφωνο',
+      }}
+      extra={{
+        countries: ['gr'],
+        phoneType:'landline',
+      }}
+      required
+    />
+    <Button type="submit">Συνέχεια</Button>
+  </FormBuilder>
+);
+export default LandlineNumber;

package/src/inputs/Input/__stories__/MobilePhone.tsx

@@ -15,6 +15,10 @@ export const MobilePhone = () => (
       label={{
         primary: 'Κινητό τηλέφωνο',
       }}
+      extra={{
+        countries: ['gr'],
+        phoneType: 'mobile',
+      }}
       required
     />
     <Button type="submit">Συνέχεια</Button>

package/src/inputs/Input/__stories__/PhoneNumber.tsx

@@ -13,7 +13,10 @@ export const PhoneNumber = () => (
       name="phone-number"
       type="phone_number"
       label={{
-        primary: 'Σταθερό τηλέφωνο',
+        primary: 'Tηλέφωνο',
+      }}
+      extra={{
+        countries: ['gr'],
       }}
       required
     />

package/src/lazy.js

@@ -0,0 +1,60 @@
+import {lazy} from 'react';
+export default {
+    'FieldBase': lazy(() => import('@digigov/form/Field/FieldBase').then((module)=> ({default: module['FieldBase']}))),
+  'FieldBaseContainer': lazy(() => import('@digigov/form/Field/FieldBaseContainer').then((module)=> ({default: module['FieldBaseContainer']}))),
+  'FieldConditional': lazy(() => import('@digigov/form/Field/FieldConditional').then((module)=> ({default: module['FieldConditional']}))),
+  'Field': lazy(() => import('@digigov/form/internal').then((module)=> ({default: module['Field']}))),
+  'FieldArray': lazy(() => import('@digigov/form/FieldArray').then((module)=> ({default: module['FieldArray']}))),
+  'FieldObject': lazy(() => import('@digigov/form/FieldObject').then((module)=> ({default: module['FieldObject']}))),
+  'FieldsetWithContext': lazy(() => import('@digigov/form/Fieldset/FieldsetWithContext').then((module)=> ({default: module['FieldsetWithContext']}))),
+  'Fieldset': lazy(() => import('@digigov/form/Fieldset').then((module)=> ({default: module['Fieldset']}))),
+  'FieldsetBody': lazy(() => import('@digigov/form/Fieldset').then((module)=> ({default: module['FieldsetBody']}))),
+  'FieldsetCaption': lazy(() => import('@digigov/form/Fieldset').then((module)=> ({default: module['FieldsetCaption']}))),
+  'FieldsetLabel': lazy(() => import('@digigov/form/Fieldset').then((module)=> ({default: module['FieldsetLabel']}))),
+  'FormBase': lazy(() => import('@digigov/form/FormBuilder/FormBuilder').then((module)=> ({default: module['FormBase']}))),
+  'FormBuilder': lazy(() => import('@digigov/form/FormBuilder/FormBuilder').then((module)=> ({default: module['FormBuilder']}))),
+  'FormContext': lazy(() => import('@digigov/form/FormContext').then((module)=> ({default: module['FormContext']}))),
+  'Checkboxes': lazy(() => import('@digigov/form/inputs/Checkboxes').then((module)=> ({default: module['Checkboxes']}))),
+  'DateInput': lazy(() => import('@digigov/form/inputs/DateInput').then((module)=> ({default: module['DateInput']}))),
+  'FileInput': lazy(() => import('@digigov/form/inputs/FileInput').then((module)=> ({default: module['FileInput']}))),
+  'Input': lazy(() => import('@digigov/form/inputs/Input').then((module)=> ({default: module['Input']}))),
+  'Label': lazy(() => import('@digigov/form/inputs/Label').then((module)=> ({default: module['Label']}))),
+  'Questions': lazy(() => import('@digigov/form/Questions/Questions').then((module)=> ({default: module['Questions']}))),
+  'Radio': lazy(() => import('@digigov/form/internal').then((module)=> ({default: module['Radio']}))),
+  'Select': lazy(() => import('@digigov/form/inputs/Select').then((module)=> ({default: module['Select']}))),
+  'Step': lazy(() => import('@digigov/form/Questions/Step/Step').then((module)=> ({default: module['Step']}))),
+  'ReviewStep': lazy(() => import('@digigov/form/Questions/Step/ReviewStep').then((module)=> ({default: module['ReviewStep']}))),
+  'StepArrayReview': lazy(() => import('@digigov/form/Questions/Step/StepArrayReview').then((module)=> ({default: module['StepArrayReview']}))),
+  'StepContext': lazy(() => import('@digigov/form/Questions/Step/StepContext').then((module)=> ({default: module['StepContext']}))),
+  'StepDescription': lazy(() => import('@digigov/form/Questions/Step/StepDescription').then((module)=> ({default: module['StepDescription']}))),
+  'StepDescriptionBase': lazy(() => import('@digigov/form/Questions/Step/StepDescription').then((module)=> ({default: module['StepDescriptionBase']}))),
+  'StepForm': lazy(() => import('@digigov/form/Questions/Step/StepForm').then((module)=> ({default: module['StepForm']}))),
+  'StepQuote': lazy(() => import('@digigov/form/Questions/Step/StepQuote').then((module)=> ({default: module['StepQuote']}))),
+  'StepTitle': lazy(() => import('@digigov/form/Questions/Step/StepTitle').then((module)=> ({default: module['StepTitle']}))),
+  'StepTitleBase': lazy(() => import('@digigov/form/Questions/Step/StepTitle').then((module)=> ({default: module['StepTitleBase']}))),
+  'StepTitleHeading': lazy(() => import('@digigov/form/Questions/Step/StepTitle').then((module)=> ({default: module['StepTitleHeading']}))),
+  'RadioButtonsGroup': lazy(() => import('@digigov/form/inputs/Radio').then((module)=> ({default: module['RadioButtonsGroup']}))),
+  'ImageInput': lazy(() => import('@digigov/form/inputs/ImageInput').then((module)=> ({default: module['ImageInput']}))),
+  'OtpInput': lazy(() => import('@digigov/form/inputs/OtpInput').then((module)=> ({default: module['OtpInput']}))),
+  'AutoCompleteInput': lazy(() => import('@digigov/form/inputs/AutoCompleteInput').then((module)=> ({default: module['AutoCompleteInput']}))),
+  'Image': lazy(() => import('@digigov/form/inputs/ImageInput').then((module)=> ({default: module['Image']}))),
+  'REMOVE_SPACES': lazy(() => import('@digigov/form/inputs/OtpInput').then((module)=> ({default: module['REMOVE_SPACES']}))),
+  'RE_DIGIT': lazy(() => import('@digigov/form/inputs/OtpInput').then((module)=> ({default: module['RE_DIGIT']}))),
+  'AddObjects': lazy(() => import('@digigov/form/MultiplicityField/add-objects').then((module)=> ({default: module['AddObjects']}))),
+  'ListObject': lazy(() => import('@digigov/form/MultiplicityField').then((module)=> ({default: module['ListObject']}))),
+  'Multiplicity': lazy(() => import('@digigov/form/MultiplicityField').then((module)=> ({default: module['Multiplicity']}))),
+  'QuestionsContext': lazy(() => import('@digigov/form/Questions/QuestionsContext').then((module)=> ({default: module['QuestionsContext']}))),
+  'AFM_VALIDATOR': lazy(() => import('@digigov/form/validators/utils/afm').then((module)=> ({default: module['AFM_VALIDATOR']}))),
+  'FILE_MAX_SIZE_VALIDATOR': lazy(() => import('@digigov/form/validators/utils/file').then((module)=> ({default: module['FILE_MAX_SIZE_VALIDATOR']}))),
+  'IBAN_VALIDATOR': lazy(() => import('@digigov/form/validators/utils/iban').then((module)=> ({default: module['IBAN_VALIDATOR']}))),
+  'IMAGE_DIMENSION_VALIDATOR': lazy(() => import('@digigov/form/validators/utils/image').then((module)=> ({default: module['IMAGE_DIMENSION_VALIDATOR']}))),
+  'OTP_VALIDATOR': lazy(() => import('@digigov/form/validators/utils/otp').then((module)=> ({default: module['OTP_VALIDATOR']}))),
+  'MOBILE_PHONE_VALIDATOR': lazy(() => import('@digigov/form/validators/utils/phone').then((module)=> ({default: module['MOBILE_PHONE_VALIDATOR']}))),
+  'PHONE_NUMBER_VALIDATOR': lazy(() => import('@digigov/form/validators/utils/phone').then((module)=> ({default: module['PHONE_NUMBER_VALIDATOR']}))),
+  'POSTALCODE_VALIDATOR': lazy(() => import('@digigov/form/validators/utils/postal_code').then((module)=> ({default: module['POSTALCODE_VALIDATOR']}))),
+  'UUID4_VALIDATOR': lazy(() => import('@digigov/form/validators/utils/uuid4').then((module)=> ({default: module['UUID4_VALIDATOR']}))),
+  'TEXT_LIMIT_VALIDATOR': lazy(() => import('@digigov/form/validators/utils/text_limit').then((module)=> ({default: module['TEXT_LIMIT_VALIDATOR']}))),
+  'INT_VALIDATOR': lazy(() => import('@digigov/form/validators/utils/int').then((module)=> ({default: module['INT_VALIDATOR']}))),
+  'NUMBER_VALIDATOR': lazy(() => import('@digigov/form/validators/utils/number').then((module)=> ({default: module['NUMBER_VALIDATOR']}))),
+
+}

package/src/validators/utils/phone.ts

@@ -1,87 +1,167 @@
-import * as gPhoneNumber from 'google-libphonenumber';
 import { FieldSpec } from '@digigov/form/types';
 import { ValidatorSchema } from '@digigov/form/validators/types';
 
 export type PhoneNumberType = 'landline' | 'mobile' | null;
+// add more countries from here libphonenumber-js/metadata.full.json
+const countryPhoneData = {
+  "GR": [
+    "30",
+    "00",
+    "5005000\\d{3}|8\\d{9,11}|(?:[269]\\d|70)\\d{8}",
+    [10, 11, 12],
+    [
+      ["(\\d{2})(\\d{4})(\\d{4})", "$1 $2 $3", ["21|7"]],
+      [
+        "(\\d{4})(\\d{6})",
+        "$1 $2",
+        ["2(?:2|3[2-57-9]|4[2-469]|5[2-59]|6[2-9]|7[2-69]|8[2-49])|5"]
+      ],
+      ["(\\d{3})(\\d{3})(\\d{4})", "$1 $2 $3", ["[2689]"]],
+      ["(\\d{3})(\\d{3,4})(\\d{5})", "$1 $2 $3", ["8"]]
+    ],
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    [
+      [
+        "2(?:1\\d\\d|2(?:2[1-46-9]|[36][1-8]|4[1-7]|5[1-4]|7[1-5]|[89][1-9])|3(?:1\\d|2[1-57]|[35][1-3]|4[13]|7[1-7]|8[124-6]|9[1-79])|4(?:1\\d|2[1-8]|3[1-4]|4[13-5]|6[1-578]|9[1-5])|5(?:1\\d|[29][1-4]|3[1-5]|4[124]|5[1-6])|6(?:1\\d|[269][1-6]|3[1245]|4[1-7]|5[13-9]|7[14]|8[1-5])|7(?:1\\d|2[1-5]|3[1-6]|4[1-7]|5[1-57]|6[135]|9[125-7])|8(?:1\\d|2[1-5]|[34][1-4]|9[1-57]))\\d{6}",
+        [10]
+      ],
+      ["68[57-9]\\d{7}|(?:69|94)\\d{8}", [10]],
+      ["800\\d{7,9}"],
+      ["90[19]\\d{7}", [10]],
+      ["70\\d{8}", [10]],
+      0,
+      ["5005000\\d{3}", [10]],
+      0,
+      0,
+      ["8(?:0[16]|12|[27]5|50)\\d{7}", [10]]
+    ]
+  ]
+}
 
-export function validatePhoneNumber(
+function expandPhoneNumberStructure(compressed) {
+  const countries = Object.keys(compressed);
+  const expanded: any = {}
+  for (const country of countries) {
+    expanded[country] = {
+      fixedLine: {
+        possibleLengths: {
+          _national:
+            compressed[country][3].map(
+              String
+            ),
+        },
+        nationalNumberPattern:
+          compressed[country][11][0][0],
+      },
+      mobile: {
+        nationalNumberPattern:
+          compressed[country][11][1][0],
+      },
+      tollFree: {
+        nationalNumberPattern:
+          compressed[country][11][2][0],
+      },
+      premiumRate: {
+        nationalNumberPattern:
+          compressed[country][11][3][0],
+      },
+      sharedCost: {
+        nationalNumberPattern:
+          compressed[country][11][9][0],
+      },
+      personalNumber: {
+        nationalNumberPattern:
+          compressed[country][11][4][0],
+      },
+      uan: {
+        nationalNumberPattern:
+          compressed[country][11][6][0],
+      },
+      id: country,
+      countryCode:
+        compressed[country][0],
+      internationalPrefix:
+        compressed[country][1],
+
+    }
+  }
+  return expanded;
+}
+const PHONENUMBER_SPEC = expandPhoneNumberStructure(countryPhoneData);
+export function discoverPhoneType(
   phoneNumber: string,
-  countries: Array<string> = ['gr'],
-  typeOfPhoneNumber: PhoneNumberType
-): boolean {
-  const phoneUtil = gPhoneNumber.PhoneNumberUtil.getInstance();
-  if (!countries || countries.length === 0) {
-    return true;
+  config: any
+): string {
+  const cleanNumber = phoneNumber
+    .replace(/\D/g, "")
+    .replace(/\s/g, "")
+    .replace(/^\+/, "")
+    .replace(new RegExp("^" + config.internationalPrefix, ""), "")
+    .replace(new RegExp("^" + config.countryCode, ""), "");
+  const categories = {
+    "landline": config.fixedLine,
+    mobile: config.mobile,
+    "toll-free": config.tollFree,
+    "premium-rate": config.premiumRate,
+  };
+
+  for (const [categoryName, categoryDetails] of Object.entries(categories)) {
+    const pattern = new RegExp(
+      "^(" + categoryDetails.nationalNumberPattern.replace(/\s/g, "") + ")$",
+      ""
+    );
+    if (cleanNumber.match(pattern)) {
+      return categoryName; // Returns the category name if the number matches the pattern
+    }
   }
+
+  // If no category matches, return 'Unknown'
+  return "unknown";
+}
+function getNumberType(phoneNumber: string, country: string) {
+  const spec = PHONENUMBER_SPEC[country.toUpperCase()];
+  if(!spec) {
+    throw new Error(`Country ${country} is not supported`);
+  }
+  const type = discoverPhoneType(phoneNumber, spec);
+  return type;
+}
+
+function isPhoneNumberValid(phoneNumber: string, countries: string[], types=['mobile', 'landline']) {
   return countries.some((country) => {
-    try {
-      const phone = phoneUtil.parse(phoneNumber, country.toUpperCase());
-      if (phoneUtil.isValidNumber(phone)) {
-        if (typeOfPhoneNumber) {
-          if (matchTypeOfPhoneNumber(phone, typeOfPhoneNumber, phoneUtil)) {
-            return true;
-          } else {
-            return false;
-          }
-        } else {
-          return true;
-        }
-      }
-      return false;
-    } catch (error) {
-      console.error(error);
-      return false;
+    const numberType = getNumberType(phoneNumber, country);
+    if (numberType && types.includes(numberType)) {
+      return true
     }
-  });
+    return false
+  })
 }
-const phoneNumberTypes = {
-  0: 'landline',
-  1: 'mobile',
-  2: 'landline_or_mobile',
-};
-export function matchTypeOfPhoneNumber(
-  phone: any,
-  type: string,
-  phoneUtil: any
+function isNumberOfType(phoneNumber: string, country: string, type: string) {
+  const numberType = getNumberType(phoneNumber, country);
+  if (numberType === type) {
+    return true
+  }
+  return false
+}
+export function validatePhoneNumber(
+  phoneNumber: string,
+  countries: Array<string> = ['gr'],
+  typeOfPhoneNumber?: PhoneNumberType
 ): boolean {
-  try {
-    const phoneNumberType = phoneUtil.getNumberType(phone);
-    const numberType = phoneNumberTypes[phoneNumberType];
-    if (numberType === 'landline_or_mobile' || numberType === type) {
-      return true;
-    } else {
-      return false;
-    }
-  } catch (error) {
-    console.error(error);
-    return false;
+  if (!countries || countries.length === 0) {
+    return true;
   }
+  return isPhoneNumberValid(phoneNumber, countries, typeOfPhoneNumber? [typeOfPhoneNumber] : undefined);
 }
+
+
 function validateMobile(value): boolean {
-  const phoneUtil = gPhoneNumber.PhoneNumberUtil.getInstance();
-  const origValue = value;
-  // probably catch all the cases with a regex instead of gphonenumber
-  if (!value.match(/^((\+|00){0,1}\d{1,3}[- ]?)?\d{10}$/)) {
-    return false;
-  }
-  try {
-    let phone;
-    try {
-      phone = phoneUtil.parse(value);
-    } catch (err) {
-      try {
-        value = '+' + value;
-        phone = phoneUtil.parse(value);
-      } catch (err) {
-        value = '+30' + origValue;
-        phone = phoneUtil.parse(value);
-      }
-    }
-    return phoneUtil.isValidNumber(phone);
-  } catch (err) {
-    console.error(err);
-    return false;
-  }
+  return isNumberOfType(value, 'gr','mobile');
 }
 
 export const MOBILE_PHONE_VALIDATOR = {
@@ -96,7 +176,7 @@ export const MOBILE_PHONE_VALIDATOR = {
 };
 
 export const PHONE_NUMBER_VALIDATOR = (field: FieldSpec): ValidatorSchema => {
-  const countryCode = field?.extra?.countries;
+  const countryCodes = field?.extra?.countries;
   const typeOfPhone: PhoneNumberType | null = field?.extra?.phoneType;
   return {
     name: 'phone-number-validator',
@@ -114,7 +194,7 @@ export const PHONE_NUMBER_VALIDATOR = (field: FieldSpec): ValidatorSchema => {
       if (!value) {
         return true;
       }
-      return validatePhoneNumber(value, countryCode, typeOfPhone);
+      return validatePhoneNumber(value, countryCodes, typeOfPhone);
     },
   };
 };