Merge branch 'release' into CR/product_detail

# Conflicts:
#	src-migrate/modules/product-detail/components/ProductDetail.tsx

1 files changed, 6 insertions, 2 deletions

diff --git a/src-migrate/modules/product-promo/components/Modal.tsx b/src-migrate/modules/product-promo/components/Modal.tsx
index 0de672c2..1722b9df 100644
--- a/src-migrate/modules/product-promo/components/Modal.tsx
+++ b/src-migrate/modules/product-promo/components/Modal.tsx
@@ -3,8 +3,12 @@ import { Modal } from "~/components/ui/modal"
 import { useModalStore } from '../stores/useModalStore'
 import ProductPromoCategoryTab from './CategoryTab'
 import ProductPromoModalContent from './ModalContent'
+import { IProductDetail } from '~/types/product';
 
-const ProductPromoModal = () => {
+type Props = {
+  product: IProductDetail
+}
+const ProductPromoModal = ({product}:Props) => {
   const { active, closeModal } = useModalStore()
 
   return (
@@ -17,7 +21,7 @@ const ProductPromoModal = () => {
 
       <div className='h-4' />
 
-      <ProductPromoModalContent />
+      <ProductPromoModalContent product={product} />
     </Modal>
   )
 }