Merge branch 'release' into development

# Conflicts:
#	src/pages/shop/product/variant/[slug].jsx

1 files changed, 10 insertions, 1 deletions

diff --git a/src/lib/form/components/Merchant.jsx b/src/lib/form/components/Merchant.jsx
index 6c1af231..85f72bf8 100644
--- a/src/lib/form/components/Merchant.jsx
+++ b/src/lib/form/components/Merchant.jsx
@@ -8,6 +8,9 @@ import { toast } from 'react-hot-toast';
 import * as Yup from 'yup';
 import createLeadApi from '../api/createLeadApi';
 import PageContent from '@/lib/content/components/PageContent';
+import { useRouter } from 'next/router';
+import useAuth from '@/core/hooks/useAuth'
+
 
 const CreateMerchant = () => {
   const {
@@ -50,8 +53,14 @@ const CreateMerchant = () => {
   const [company_unit, setCompany_unit] = useState(list_unit);
 
   const recaptchaRef = useRef(null);
+  const router = useRouter()
+
+  const auth = useAuth()
 
   useEffect(() => {
+    if(auth == false) {
+      router.push('/login')
+    }
     const loadCities = async () => {
       let dataCities = await cityApi();
       dataCities = dataCities.map((city) => ({
@@ -61,7 +70,7 @@ const CreateMerchant = () => {
       setCities(dataCities);
     };
     loadCities();
-  }, []);
+  }, [auth]);
 
   const onSubmitHandler = async (values) => {
     const recaptchaValue = recaptchaRef.current.getValue();