Merge branch 'release' into development

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

1 files changed, 40 insertions, 15 deletions

diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index 65d953d2..8af963fb 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -1,15 +1,18 @@
 import dynamic from 'next/dynamic';
-import MobileView from '@/core/components/views/MobileView';
-import DesktopView from '@/core/components/views/DesktopView';
 import { useRef } from 'react';
-import Seo from '@/core/components/Seo';
-import DelayRender from '@/core/components/elements/DelayRender/DelayRender';
+
 import { HeroBannerSkeleton } from '@/components/skeleton/BannerSkeleton';
 import { PopularProductSkeleton } from '@/components/skeleton/PopularProductSkeleton';
-import PromotinProgram from '@/lib/promotinProgram/components/HomePage';
-import PreferredBrandSkeleton from '@/lib/home/components/Skeleton/PreferredBrandSkeleton';
+import Seo from '@/core/components/Seo';
+import DelayRender from '@/core/components/elements/DelayRender/DelayRender';
+import DesktopView from '@/core/components/views/DesktopView';
+import MobileView from '@/core/components/views/MobileView';
 import { FlashSaleSkeleton } from '@/lib/flashSale/skeleton/FlashSaleSkeleton';
+import PreferredBrandSkeleton from '@/lib/home/components/Skeleton/PreferredBrandSkeleton';
+import PromotinProgram from '@/lib/promotinProgram/components/HomePage';
 import PagePopupIformation from '~/modules/popup-information';
+import useProductDetail from '~/modules/product-detail/stores/useProductDetail';
+import { getAuth } from '~/libs/auth';
 
 const BasicLayout = dynamic(() =>
   import('@/core/components/layouts/BasicLayout')
@@ -40,6 +43,11 @@ const FlashSale = dynamic(
     loading: () => <FlashSaleSkeleton />,
   }
 );
+
+const ProgramPromotion = dynamic(() =>
+  import('@/lib/home/components/PromotionProgram')
+);
+
 const BannerSection = dynamic(() =>
   import('@/lib/home/components/BannerSection')
 );
@@ -55,6 +63,8 @@ export default function Home() {
   const bannerRef = useRef(null);
   const wrapperRef = useRef(null);
 
+  const auth = getAuth();
+
   const handleOnLoad = () => {
     wrapperRef.current.style.height =
       bannerRef.current?.querySelector(':first-child')?.clientHeight + 'px';
@@ -74,8 +84,9 @@ export default function Home() {
         ]}
       />
 
+      <PagePopupIformation />
+
       <DesktopView>
-        <PagePopupIformation />
         <div className='container mx-auto'>
           <div
             className='flex min-h-[400px] h-[460px]'
@@ -95,10 +106,16 @@ export default function Home() {
             </div>
           </div>
 
-          <div className='my-16 flex flex-col gap-y-16'>
+          <div className='my-16 flex flex-col gap-y-8'>
             <ServiceList />
-            <PreferredBrand />
-            <FlashSale />
+            <div id='flashsale'>
+              <PreferredBrand />
+            </div>
+            {!auth?.feature?.soApproval && (
+              <>
+                <ProgramPromotion /> <FlashSale />
+              </>
+            )}
             <PromotinProgram />
             <CategoryHomeId />
             <BannerSection />
@@ -108,7 +125,6 @@ export default function Home() {
       </DesktopView>
 
       <MobileView>
-        <PagePopupIformation />
         <DelayRender renderAfter={200}>
           <HeroBanner />
         </DelayRender>
@@ -117,11 +133,20 @@ export default function Home() {
             <ServiceList />
           </DelayRender>
           <DelayRender renderAfter={400}>
-            <PreferredBrand />
-          </DelayRender>
-          <DelayRender renderAfter={600}>
-            <FlashSale />
+            <div id='flashsale'>
+              <PreferredBrand />
+            </div>
           </DelayRender>
+          {!auth?.feature?.soApproval && (
+            <>
+              <DelayRender renderAfter={400}>
+                <ProgramPromotion />
+              </DelayRender>
+              <DelayRender renderAfter={600}>
+                <FlashSale />
+              </DelayRender>
+            </>
+          )}
           <DelayRender renderAfter={600}>
             <PromotinProgram />
           </DelayRender>