Merge branch 'release' into development

# Conflicts:
#	src/pages/shop/product/variant/[slug].jsx

1 files changed, 25 insertions, 0 deletions

diff --git a/src-migrate/modules/product-promo/components/Modal.tsx b/src-migrate/modules/product-promo/components/Modal.tsx
new file mode 100644
index 00000000..0de672c2
--- /dev/null
+++ b/src-migrate/modules/product-promo/components/Modal.tsx
@@ -0,0 +1,25 @@
+import React from 'react'
+import { Modal } from "~/components/ui/modal"
+import { useModalStore } from '../stores/useModalStore'
+import ProductPromoCategoryTab from './CategoryTab'
+import ProductPromoModalContent from './ModalContent'
+
+const ProductPromoModal = () => {
+  const { active, closeModal } = useModalStore()
+
+  return (
+    <Modal
+      active={active}
+      close={closeModal}
+      title='Promo Tersedia'
+    >
+      <ProductPromoCategoryTab />
+
+      <div className='h-4' />
+
+      <ProductPromoModalContent />
+    </Modal>
+  )
+}
+
+export default ProductPromoModal
\ No newline at end of file