Merge branch 'new-release' into Feature/switch-account

2 files changed, 27 insertions, 22 deletions

diff --git a/src-migrate/pages/shop/cart/index.tsx b/src-migrate/pages/shop/cart/index.tsx
index c5386c91..24baa933 100644
--- a/src-migrate/pages/shop/cart/index.tsx
+++ b/src-migrate/pages/shop/cart/index.tsx
@@ -84,19 +84,19 @@ const CartPage = () => {
 
   const hasSelectedPromo = useMemo(() => {
     if (!cart) return false;
-    return cart.products.some(
+    return cart?.products?.some(
       (item) => item.cart_type === 'promotion' && item.selected
     );
   }, [cart]);
 
   const hasSelected = useMemo(() => {
     if (!cart) return false;
-    return cart.products.some((item) => item.selected);
+    return cart?.products?.some((item) => item.selected);
   }, [cart]);
 
   const hasSelectNoPrice = useMemo(() => {
     if (!cart) return false;
-    return cart.products.some(
+    return cart?.products?.some(
       (item) => item.selected && item.price.price_discount === 0
     );
   }, [cart]);
@@ -230,7 +230,7 @@ const CartPage = () => {
           </div>
 
           <div className={style['items']}>
-            {cart?.products.map((item) => (
+            {cart?.products?.map((item) => (
               <CartItemModule key={item.id} item={item} />
             ))}
 
diff --git a/src-migrate/pages/shop/promo/index.tsx b/src-migrate/pages/shop/promo/index.tsx
index febe31a4..689c2537 100644
--- a/src-migrate/pages/shop/promo/index.tsx
+++ b/src-migrate/pages/shop/promo/index.tsx
@@ -1,13 +1,14 @@
-import dynamic from 'next/dynamic'
-import React, { useState } from 'react'
-import { LazyLoadComponent } from 'react-lazy-load-image-component'
-import Hero from '~/modules/promo/components/Hero'
-import PromotionProgram from '~/modules/promo/components/PromotinProgram'
-import Voucher from '~/modules/promo/components/Voucher'
-import FlashSale from '../../../modules/promo/components/FlashSale'
-const PromoList = dynamic(() => import('../../../modules/promo/components/PromoList'));
-
-
+import dynamic from 'next/dynamic';
+import React, { useState } from 'react';
+import { LazyLoadComponent } from 'react-lazy-load-image-component';
+import Hero from '~/modules/promo/components/Hero';
+import PromotionProgram from '~/modules/promo/components/PromotinProgram';
+import Voucher from '~/modules/promo/components/Voucher';
+import FlashSale from '../../../modules/promo/components/FlashSale';
+import FlashSaleNonDisplay from '../../../modules/promo/components/FlashSaleNonDisplay';
+const PromoList = dynamic(
+  () => import('../../../modules/promo/components/PromoList')
+);
 
 const PromoPage = () => {
   const [selectedPromo, setSelectedPromo] = useState('Bundling');
@@ -17,22 +18,26 @@ const PromoPage = () => {
         <Hero />
       </LazyLoadComponent>
       <LazyLoadComponent>
-        <PromotionProgram 
-                  selectedPromo={selectedPromo} 
-                  onSelectPromo={setSelectedPromo} 
-              />
+        <PromotionProgram
+          selectedPromo={selectedPromo}
+          onSelectPromo={setSelectedPromo}
+        />
         <PromoList selectedPromo={selectedPromo} />
       </LazyLoadComponent>
-    
+
       <LazyLoadComponent>
         <FlashSale />
       </LazyLoadComponent>
       <h1 className='h-1'></h1>
       <LazyLoadComponent>
+        <FlashSaleNonDisplay />
+      </LazyLoadComponent>
+      <h1 className='h-1'></h1>
+      <LazyLoadComponent>
         <Voucher />
       </LazyLoadComponent>
     </>
-  )
-}
+  );
+};
 
-export default PromoPage
\ No newline at end of file
+export default PromoPage;