Merge branch 'master' of https://gitlab.chiefsoft.net/MyFit/www-myfit into myfit-import_images

src/component/Contact/Main.js

@@ -117,14 +117,10 @@ const Main = ({ brdcum }) => {
 
   //CALLS THE API AFTER COMPONENT LOADS
   useEffect(() => {
-    allCountry().then((data) => setCountries(Object.keys(data.data))).catch((err)=>console.log(err.message));
+    allCountry().then((data) => setCountries(Object.entries(data.data))).catch((err)=>console.log(err.message));
   }, []);
 
 
-  // useEffect(() => {
-  //   myData
-  // }, [myData]);
-
   return (
     <>
       {brdcum.b1 && (
@@ -202,7 +198,7 @@ const Main = ({ brdcum }) => {
                   maxLenght={35}
                   value={values.name}
                   onChange={onChange}
-                  pattern="^$|^[a-zA-Z]+( [a-zA-Z]+)?$+( [a-zA-Z]+)?$"
+                  pattern="^\w+( \w+)$"
                 />
 
                 <FormInput
@@ -230,8 +226,8 @@ const Main = ({ brdcum }) => {
                       countries.map((country, index) => (
                         <option
                           key={index}
-                          value={country}>
+                          value={country[0]}>
-                          {country}
+                          {country[1]}
                         </option>
                       ))}
                   </select>