Merged in Feature/popup_cart (pull request #73)

Feature/popup cart

2 files changed, 12 insertions, 4 deletions

diff --git a/src/lib/product/api/productSimilarApi.js b/src/lib/product/api/productSimilarApi.js
index c1bccd59..a008ce5d 100644
--- a/src/lib/product/api/productSimilarApi.js
+++ b/src/lib/product/api/productSimilarApi.js
@@ -21,10 +21,14 @@ const productSimilarApi = async ({ query, source }) => {
   const dataProductSimilar = await axios(
     `${process.env.NEXT_PUBLIC_SELF_HOST}/api/shop/search?q=${query}&page=1&orderBy=popular-weekly&operation=OR`
   )
-  dataProductSimilar.data.response.products = [
-    ...dataflashSale,
-    ...dataProductSimilar.data.response.products,
-  ];
+  if (dataflashSale) {
+    dataProductSimilar.data.response.products = [
+      ...dataflashSale,
+      ...dataProductSimilar.data.response.products
+    ]
+  } else {
+    dataProductSimilar.data.response.products = [...dataProductSimilar.data.response.products]
+  }
   return dataProductSimilar.data.response
 }
 
diff --git a/src/lib/product/components/Product/ProductDesktop.jsx b/src/lib/product/components/Product/ProductDesktop.jsx
index 937f2746..6da289bc 100644
--- a/src/lib/product/components/Product/ProductDesktop.jsx
+++ b/src/lib/product/components/Product/ProductDesktop.jsx
@@ -22,6 +22,7 @@ import ImageNext from 'next/image'
 import CountDown2 from '@/core/components/elements/CountDown/CountDown2'
 import { LazyLoadComponent } from 'react-lazy-load-image-component'
 import ColumnsSLA from './ColumnsSLA'
+import { useProductCartContext } from '@/contexts/ProductCartContext'
 
 const ProductDesktop = ({ products, wishlist, toggleWishlist }) => {
   const router = useRouter()
@@ -39,6 +40,8 @@ const ProductDesktop = ({ products, wishlist, toggleWishlist }) => {
   const [selectVariantPromoActive, setSelectVariantPromoActive] = useState(null)
   const [backgorundFlashSale, setBackgorundFlashSale] = useState(null)
 
+  const {setRefreshCart , refreshCart} = useProductCartContext()
+
   const getLowestPrice = useCallback(() => {
     const prices = product.variants.map((variant) => variant.price)
     const lowest = prices.reduce((lowest, price) => {
@@ -116,6 +119,7 @@ const ProductDesktop = ({ products, wishlist, toggleWishlist }) => {
 
     let source = 'cart'
     updateCart(variantId, quantity, source)
+    setRefreshCart(true)
     setAddCartAlert(true)
   }