Merge branch 'new-release' into CR/redis

1 files changed, 6 insertions, 4 deletions

diff --git a/src-migrate/pages/shop/cart/index.tsx b/src-migrate/pages/shop/cart/index.tsx
index c5386c91..70a28073 100644
--- a/src-migrate/pages/shop/cart/index.tsx
+++ b/src-migrate/pages/shop/cart/index.tsx
@@ -35,6 +35,8 @@ const CartPage = () => {
   const [hasChanged, setHasChanged] = useState(false);
   const prevCartRef = useRef<CartItem[] | null>(null);
 
+  console.log('ini cart', cart);
+
   useEffect(() => {
     const handleScroll = () => {
       setIsTop(window.scrollY < 200);
@@ -84,19 +86,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 +232,7 @@ const CartPage = () => {
           </div>
 
           <div className={style['items']}>
-            {cart?.products.map((item) => (
+            {cart?.products?.map((item) => (
               <CartItemModule key={item.id} item={item} />
             ))}