Merge branch 'master' into Feature/SLA

# Conflicts:
#	src/lib/product/components/Product/ProductDesktop.jsx
#	src/lib/product/components/Product/ProductMobile.jsx

1 files changed, 7 insertions, 0 deletions

diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index 9900e405..12d2ab46 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -6,6 +6,7 @@ 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'
 
 const BasicLayout = dynamic(() => import('@/core/components/layouts/BasicLayout'))
 const HeroBanner = dynamic(() => import('@/components/ui/HeroBanner'), {
@@ -71,6 +72,9 @@ export default function Home() {
             <DelayRender renderAfter={600}>
               <FlashSale />
             </DelayRender>
+            <DelayRender renderAfter={600}>
+              <PromotinProgram />
+            </DelayRender>
             <DelayRender renderAfter={1000}>
               <CategoryHomeId />
               <BannerSection />
@@ -93,6 +97,9 @@ export default function Home() {
           <DelayRender renderAfter={600}>
             <FlashSale />
           </DelayRender>
+          <DelayRender renderAfter={600}>
+              <PromotinProgram />
+            </DelayRender>
           <DelayRender renderAfter={800}>
             <PopularProduct />
           </DelayRender>