Merge branch 'develop' into PWA-3117

magento · Sep 27, 2023 · f6182cc · f6182cc
2 parents 664b1ed + 297ba0d
commit f6182cc
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/packages/peregrine/lib/talons/ProductFullDetail/productFullDetail.gql.ce.js b/packages/peregrine/lib/talons/ProductFullDetail/productFullDetail.gql.ce.js
@@ -11,6 +11,10 @@ export const ADD_PRODUCT_TO_CART = gql`
                 ...CartTriggerFragment
                 ...MiniCartFragment
             }
+            user_errors {
+                code
+                message
+            }
         }
     }
     ${CartTriggerFragment}

diff --git a/packages/peregrine/lib/talons/ProductFullDetail/useProductFullDetail.js b/packages/peregrine/lib/talons/ProductFullDetail/useProductFullDetail.js
@@ -289,7 +289,11 @@ export const useProductFullDetail = props => {
 
     const [
         addProductToCart,
-        { error: errorAddingProductToCart, loading: isAddProductLoading }
+        {
+            data: addToCartResponseData,
+            error: errorAddingProductToCart,
+            loading: isAddProductLoading
+        }
     ] = useMutation(operations.addProductToCartMutation);
 
     const breadcrumbCategoryId = useMemo(
@@ -556,12 +560,14 @@ export const useProductFullDetail = props => {
             deriveErrorMessage([
                 errorAddingSimpleProduct,
                 errorAddingConfigurableProduct,
-                errorAddingProductToCart
+                errorAddingProductToCart,
+                ...(addToCartResponseData?.addProductsToCart?.user_errors || [])
             ]),
         [
             errorAddingConfigurableProduct,
             errorAddingProductToCart,
-            errorAddingSimpleProduct
+            errorAddingSimpleProduct,
+            addToCartResponseData
         ]
     );
 

diff --git a/packages/venia-ui/lib/components/CartPage/ProductListing/EditModal/productForm.js b/packages/venia-ui/lib/components/CartPage/ProductListing/EditModal/productForm.js
@@ -91,6 +91,7 @@ const ProductForm = props => {
                     }}
                     errors={Array.from(errors.values())}
                     scrollOnError={false}
+                    allowErrorMessages={true}
                 />
                 <ProductDetail
                     item={cartItem}