Merge branch 'release' into feature/step_approval

# Conflicts:
#	src-migrate/modules/product-detail/components/PriceAction.tsx
#	src/lib/transaction/components/Transaction.jsx
#	src/pages/index.jsx

1 files changed, 6 insertions, 0 deletions

diff --git a/src-migrate/modules/product-detail/components/ProductDetail.tsx b/src-migrate/modules/product-detail/components/ProductDetail.tsx
index 6cd72353..fad35a7d 100644
--- a/src-migrate/modules/product-detail/components/ProductDetail.tsx
+++ b/src-migrate/modules/product-detail/components/ProductDetail.tsx
@@ -24,6 +24,8 @@ import SimilarSide from './SimilarSide'
 import VariantList from './VariantList'
 import { getAuth } from '~/libs/auth'
 
+import { gtagProductDetail } from '@/core/utils/googleTag'
+
 type Props = {
   product: IProductDetail
 }
@@ -37,6 +39,10 @@ const ProductDetail = ({ product }: Props) => {
   const { setAskAdminUrl, askAdminUrl, activeVariantId, setIsApproval, isApproval } = useProductDetail()
 
   useEffect(() => {
+    gtagProductDetail(product);
+  },[product])
+
+  useEffect(() => {
     const createdAskUrl = whatsappUrl({
       template: 'product',
       payload: {