Merge branch 'release' into development

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

1 files changed, 7 insertions, 14 deletions

diff --git a/src-migrate/modules/popup-information/index.tsx b/src-migrate/modules/popup-information/index.tsx
index 78e9dcf2..0d36f8e9 100644
--- a/src-migrate/modules/popup-information/index.tsx
+++ b/src-migrate/modules/popup-information/index.tsx
@@ -1,9 +1,9 @@
 import { useRouter } from 'next/router';
 import { useEffect, useState } from 'react';
-import Modal from '~/common/components/elements/Modal';
-import { getAuth } from '~/common/libs/auth';
+
+import { Modal } from "~/components/ui/modal";
+import { getAuth } from '~/libs/auth';
 import PageContent from '../page-content';
-import Link from 'next/link';
 
 const PagePopupInformation = () => {
   const router = useRouter();
@@ -12,25 +12,18 @@ const PagePopupInformation = () => {
   const [active, setActive] = useState<boolean>(false);
 
   useEffect(() => {
-    if (isHomePage && !auth) {
-      setActive(true);
-    }
+    if (isHomePage && !auth) setActive(true);
   }, [isHomePage, auth]);
   return (
     <div className='group'>
       <Modal
         active={active}
-        className='!w-fit !bg-transparent !border-none'
+        className='!w-fit !bg-transparent !border-none overflow-hidden'
         close={() => setActive(false)}
         mode='desktop'
       >
-        <div>
-          <Link href={'/register'}>
-            <PageContent path='/onbording-popup' />
-          </Link>
-          <Link href={'/register'} className='btn-yellow w-full mt-2'>
-            Daftar Sekarang
-          </Link>
+        <div className='w-[350px] md:w-[530px]' onClick={() => setActive(false)}>
+          <PageContent path='/onbording-popup' />
         </div>
       </Modal>
     </div>