Merge branch 'release' into CR/voucher_shiping

2 files changed, 2 insertions, 2 deletions

diff --git a/src-migrate/modules/product-detail/components/Information.tsx b/src-migrate/modules/product-detail/components/Information.tsx
index 52eb6b88..75ae3c41 100644
--- a/src-migrate/modules/product-detail/components/Information.tsx
+++ b/src-migrate/modules/product-detail/components/Information.tsx
@@ -19,7 +19,7 @@ type Props = {
 
 const Information = ({ product }: Props) => {
   const querySLA = useQuery<IProductVariantSLA>({
-    queryKey: ['variant-sla', product.variants[0].id],
+    queryKey: ['variant-sla', product.variants[0]?.id],
     queryFn: () => getVariantSLA(product.variants[0].id),
     enabled: product.variant_total === 1
   })
diff --git a/src-migrate/modules/product-detail/stores/useProductDetail.ts b/src-migrate/modules/product-detail/stores/useProductDetail.ts
index 2da8835d..eb409930 100644
--- a/src-migrate/modules/product-detail/stores/useProductDetail.ts
+++ b/src-migrate/modules/product-detail/stores/useProductDetail.ts
@@ -23,7 +23,7 @@ export const useProductDetail = create<State & Action>((set, get) => ({
   askAdminUrl: '',
   isApproval : false,
   setActive: (variant) => {
-    set({ activeVariantId: variant.id, activePrice: variant.price });
+    set({ activeVariantId: variant?.id, activePrice: variant?.price });
   },
   setQuantityInput: (value: string) => {
     set({ quantityInput: value });