@riosst100/pwa-marketplace 3.0.0 → 3.0.3

package/src/overwrites/peregrine/lib/talons/ProductFullDetail/useProductFullDetail.js

@@ -5,6 +5,8 @@ import { useMutation, useQuery } from '@apollo/client';
 import { useCartContext } from '@magento/peregrine/lib/context/cart';
 import { useUserContext } from '@magento/peregrine/lib/context/user';
 
+import { useHistory } from 'react-router-dom';
+
 import { appendOptionsToPayload } from '@magento/peregrine/lib/util/appendOptionsToPayload';
 import { findMatchingVariant } from '@magento/peregrine/lib/util/findMatchingProductVariant';
 import { isProductConfigurable } from '@magento/peregrine/lib/util/isProductConfigurable';
@@ -336,6 +338,16 @@ export const useProductFullDetail = props => {
         isPreview
     } = props;
 
+    const history = useHistory();
+
+    const handleToastAction = useCallback(
+        (removeToast) => {
+            history.push('/cart');
+            removeToast();
+        },
+        [history]
+    );
+
     const [, { addToast }] = useToasts();
 
     const { data: productReviewData, loading: loadingProductReview, error: errorProductReview, refetch: refetchProductReviews } = useQuery(
@@ -779,6 +791,9 @@ export const useProductFullDetail = props => {
     }, [currentUser]);
 
     return {
+        addToCartResponseData,
+        errorAddingProductToCart,
+        isAddProductLoading,
         breadcrumbCategoryId,
         errorMessage: derivedErrorMessage,
         handleAddToCart,
@@ -813,6 +828,7 @@ export const useProductFullDetail = props => {
         handleSubmitReview,
         loadingCreateReview,
         errorCreateReview,
-        defaultNickname
+        defaultNickname,
+        handleToastAction
     };
 };

package/src/overwrites/venia-ui/lib/components/Breadcrumbs/breadcrumbs.js

@@ -106,7 +106,7 @@ const Breadcrumbs = props => {
     currentFilter && currentFilter.length && currentFilter.map((filter, index) => {
         currentProduct ? (
             filterBreadcrumbsElement.push(
-                <span key={index}>
+                <Fragment key={index}>
                     <span className={classes.divider}>{DELIMITER}</span>
                     <Link
                         className={classes.link}
@@ -115,12 +115,12 @@ const Breadcrumbs = props => {
                     >
                         {filter.label}
                     </Link>
-                </span>
+                </Fragment>
             )
         ) : (
             customPage ? (
                 filterBreadcrumbsElement.push(
-                    <span key={index}>
+                    <Fragment key={index}>
                         <span className={classes.divider}>{DELIMITER}</span>
                         <Link
                             className={classes.link}
@@ -129,14 +129,14 @@ const Breadcrumbs = props => {
                         >
                             {filter.label}
                         </Link>
-                    </span>
+                    </Fragment>
                 )
             ) : filterBreadcrumbsElement.push(
                 index == lastIndex ?
-                    <span key={index}>
+                    <Fragment key={index}>
                         <span className={classes.divider}>{DELIMITER}</span>
                         <span className={cn(classes.currentCategory, 'text-blue-700 font-medium')}>{filter.label}</span>
-                    </span> : <span key={index}>
+                    </Fragment> : <Fragment key={index}>
                         <span className={classes.divider}>{DELIMITER}</span>
                         <Link
                             className={classes.link}
@@ -145,13 +145,13 @@ const Breadcrumbs = props => {
                         >
                             {filter.label}
                         </Link>
-                    </span>
+                    </Fragment>
             )
         );
     });
 
     const currentCategoryLink = currentCategory == "dCollectible Card Games" ? '' : (customPage || currentProduct || currentFilter && currentFilter.length ? (
-        <>
+        <Fragment>
             <span className={classes.divider}>{DELIMITER}</span>
             <Link
                 className={classes.link}
@@ -160,12 +160,12 @@ const Breadcrumbs = props => {
             >
                 {currentCategory}
             </Link>
-        </>
+        </Fragment>
     ) : (
-        <>
+        <Fragment>
             <span className={classes.divider}>{DELIMITER}</span>
             <span className={cn(classes.currentCategory, 'text-blue-700 font-medium')}>{currentCategory}</span>
-        </>
+        </Fragment>
     ));
 
     const currentProductNode = currentProduct ? (

package/src/overwrites/venia-ui/lib/components/CartPage/PriceSummary/priceSummary.js

@@ -28,9 +28,9 @@ import cn from 'classnames';
  * import PriceSummary from "@magento/venia-ui/lib/components/CartPage/PriceSummary";
  */
 const PriceSummary = props => {
-    const { isUpdating, sellerUrl } = props;
+    const { isUpdating, sellerUrl, setIsProceedToCheckout, isProceedToCheckout } = props;
     const classes = useStyle(defaultClasses, props.classes);
-    const talonProps = usePriceSummary();
+    const talonProps = usePriceSummary({ setIsProceedToCheckout });
 
     const {
         handleProceedToCheckout,
@@ -39,7 +39,8 @@ const PriceSummary = props => {
         hasItems,
         isCheckout,
         isLoading,
-        flatData
+        flatData,
+        initCheckoutSplitCartLoading
     } = talonProps;
     const { formatMessage } = useIntl();
 
@@ -87,7 +88,7 @@ const PriceSummary = props => {
             defaultMessage: 'Estimated Total'
         });
 
-    const proceedToCheckoutButton = !isCheckout ? (
+    const proceedToCheckoutButton = (
         <div className={cn(classes.checkoutButton_container, 'block !mt-6 !min-h-auto')}>
             <Button
                 disabled={isPriceUpdating}
@@ -106,7 +107,24 @@ const PriceSummary = props => {
                 />
             </Button>
         </div>
-    ) : null;
+    );
+
+    const loadingCheckoutButton = (
+        <div className={cn(classes.checkoutButton_container, 'block !mt-6 !min-h-auto')}>
+            <Button
+                disabled={true}
+                priority={'high'}
+                onKeyDown={handleEnterKeyPress}
+                data-cy="PriceSummary-checkoutButton"
+                classes={{
+                    rootClass: 'w-full',
+                    content: 'font-medium text-[16px] capitalize',
+                }}
+            >
+                Loading Checkout...
+            </Button>
+        </div>
+    );
 
     return (
         <div className={cn(classes.root, 'pb-6 px-3')} data-cy="PriceSummary-root">
@@ -207,7 +225,7 @@ const PriceSummary = props => {
                     </ul>
                 </div>
             )}
-            {proceedToCheckoutButton}
+            {isProceedToCheckout ? loadingCheckoutButton : proceedToCheckoutButton}
         </div>
     );
 };

package/src/overwrites/venia-ui/lib/components/CartPage/ProductListing/productListing.js

@@ -31,6 +31,8 @@ const ProductListing = props => {
         setIsCartUpdating,
         fetchCartDetails,
         isCartUpdating,
+        setIsProceedToCheckout,
+        isProceedToCheckout,
         hasItems
     } = props;
 
@@ -50,10 +52,10 @@ const ProductListing = props => {
     if (isLoading) {
         return (
             <LoadingIndicator>
-                <FormattedMessage
+                {/* <FormattedMessage
                     id={'productListing.loading'}
                     defaultMessage={'Fetching Cart...'}
-                />
+                /> */}
             </LoadingIndicator>
         );
     }
@@ -91,8 +93,10 @@ const ProductListing = props => {
                 activeEditItem={activeEditItem}
                 isLoading={isLoading}
                 hasItems={hasItems}
+                setIsProceedToCheckout={setIsProceedToCheckout}
                 key={index}
                 error={error}
+                isProceedToCheckout={isProceedToCheckout}
                 setActiveEditItem={setActiveEditItem}
                 wishlistConfig={wishlistConfig}
                 setIsCartUpdating={setIsCartUpdating} 

package/src/overwrites/venia-ui/lib/components/CartPage/ProductListingBySeller/productListingBySeller.js

@@ -37,6 +37,8 @@ const ProductListingBySeller = props => {
         setIsCartUpdating,
         fetchCartDetails,
         activeEditItem,
+        setIsProceedToCheckout,
+        isProceedToCheckout,
         setActiveEditItem,
         wishlistConfig,
         isLoading,
@@ -80,7 +82,7 @@ const ProductListingBySeller = props => {
         ));
  
         const priceSummary = hasItems ? (
-            <PriceSummary isUpdating={isCartUpdating} sellerUrl={seller.seller_url} />
+            <PriceSummary isProceedToCheckout={isProceedToCheckout} setIsProceedToCheckout={setIsProceedToCheckout} setIsCartUpdating={setIsCartUpdating} isUpdating={isCartUpdating} sellerUrl={seller.seller_url} />
         ) : null;
         return (
             <Fragment>

package/src/overwrites/venia-ui/lib/components/CartPage/cartPage.js

@@ -14,6 +14,7 @@ import PriceSummary from './PriceSummary';
 import ProductListing from './ProductListing';
 import defaultClasses from './cartPage.module.css';
 import cn from 'classnames';
+import { useHistory } from 'react-router-dom';
 
 const CheckIcon = <Icon size={20} src={Check} />;
 
@@ -45,19 +46,31 @@ const CartPage = props => {
         onAddToWishlistSuccess,
         setIsCartUpdating,
         shouldShowLoadingIndicator,
-        wishlistSuccessProps
+        isProceedToCheckout,
+        setIsProceedToCheckout,
+        wishlistSuccessProps,
+        isGuestCheckout
     } = talonProps;
-
+    
     const classes = useStyle(defaultClasses, props.classes);
     const { formatMessage } = useIntl();
     const [, { addToast }] = useToasts();
 
+    const history = useHistory();
+
+    useEffect(() => {
+        if (isGuestCheckout) {
+            history.push('/sign-in');
+        }
+    }, [isGuestCheckout, history]);
+
     useEffect(() => {
         if (wishlistSuccessProps) {
             addToast({ ...wishlistSuccessProps, icon: CheckIcon });
         }
     }, [addToast, wishlistSuccessProps]);
 
+
     if (shouldShowLoadingIndicator) {
         return fullPageLoadingIndicator;
     }
@@ -70,7 +83,9 @@ const CartPage = props => {
         <ProductListing
             onAddToWishlistSuccess={onAddToWishlistSuccess}
             setIsCartUpdating={setIsCartUpdating}
+            isProceedToCheckout={isProceedToCheckout}
             fetchCartDetails={fetchCartDetails}
+            setIsProceedToCheckout={setIsProceedToCheckout}
             isCartUpdating={isCartUpdating}
             hasItems={hasItems}
         />
@@ -93,7 +108,7 @@ const CartPage = props => {
             <StoreTitle>
                 {formatMessage({
                     id: 'cartPage.title',
-                    defaultMessage: 'Cart'
+                    defaultMessage: 'Shopping Cart'
                 })}
             </StoreTitle>
             <div className={cn(classes.heading_container, 'mb-[30px]')}>
@@ -104,7 +119,7 @@ const CartPage = props => {
                 >
                     <FormattedMessage
                         id={'cartPage.heading'}
-                        defaultMessage={'Cart'}
+                        defaultMessage={'Shopping Cart'}
                     />
                 </h1>
                 <div className={classes.stockStatusMessageContainer}>
@@ -127,3 +142,4 @@ const CartPage = props => {
 };
 
 export default CartPage;
+

package/src/overwrites/venia-ui/lib/components/CheckoutPage/OrderSummary/orderSummary.js

@@ -12,7 +12,7 @@ const OrderSummary = props => {
             <h2 aria-live="polite" className="text-[16px] font-medium mb-4">
                 <FormattedMessage
                     id={'checkoutPage.orderSummary'}
-                    defaultMessage={'Summary'}
+                    defaultMessage={'Order Summary'}
                 />
             </h2>
             <PriceSummary isUpdating={props.isUpdating} />

package/src/overwrites/venia-ui/lib/components/CheckoutPage/PaymentInformation/paymentInformation.js

@@ -49,7 +49,7 @@ const PaymentInformation = props => {
             <LoadingIndicator classes={{ root: classes.loading }}>
                 <FormattedMessage
                     id={'checkoutPage.loadingPaymentInformation'}
-                    defaultMessage={'Fetching Payment Information'}
+                    defaultMessage={'Fetching Payment Method'}
                 />
             </LoadingIndicator>
         );

package/src/overwrites/venia-ui/lib/components/CheckoutPage/PaymentInformation/paymentMethods.js

@@ -180,7 +180,7 @@ const PaymentMethods = props => {
             <h5 className={classes.cardTitle}>
                 {formatMessage({
                     id: 'checkoutPage.paymentInformation',
-                    defaultMessage: 'Payment Information'
+                    defaultMessage: 'Payment Method'
                 })}
             </h5>
             <RadioGroup

package/src/overwrites/venia-ui/lib/components/CheckoutPage/PriceAdjustments/priceAdjustments.js

@@ -1,11 +1,14 @@
-import React, { Suspense } from 'react';
+import React, { Suspense, useCallback, useState } from 'react';
 import { useIntl } from 'react-intl';
 import { func } from 'prop-types';
+import { useMutation, useQuery } from '@apollo/client';
+import { useCartContext } from '@magento/peregrine/lib/context/cart';
 
 import { useStyle } from '@magento/venia-ui/lib/classify';
 import LoadingIndicator from '@magento/venia-ui/lib/components/LoadingIndicator';
 import { Accordion, Section } from '@magento/venia-ui/lib/components/Accordion';
-import CouponCode from '@magento/venia-ui/lib/components/CartPage/PriceAdjustments/CouponCode';
+import SellerCouponCheckout from '@riosst100/pwa-marketplace/src/components/SellerCoupon/sellerCouponCheckout';
+import couponCodeOperations from '@magento/peregrine/lib/talons/CartPage/PriceAdjustments/CouponCode/couponCode.gql';
 import GiftCardSection from '@magento/venia-ui/lib/components/CartPage/PriceAdjustments/giftCardSection';
 import GiftOptionsSection from '@magento/venia-ui/lib/components/CartPage/PriceAdjustments/giftOptionsSection';
 
@@ -20,8 +23,44 @@ import cn from 'classnames';
 const PriceAdjustments = props => {
     const classes = useStyle(defaultClasses, props.classes);
 
-    const { setPageIsUpdating } = props;
+    const { setPageIsUpdating, couponData, couponLoading, couponError } = props;
     const { formatMessage } = useIntl();
+    const [{ cartId }] = useCartContext();
+    const [applyCoupon, { loading: applyingCoupon }] = useMutation(couponCodeOperations.applyCouponMutation);
+    const [removeCoupon, { loading: removingCoupon }] = useMutation(couponCodeOperations.removeCouponMutation);
+    const { data: appliedData, loading: appliedLoading } = useQuery(
+        couponCodeOperations.getAppliedCouponsQuery,
+        { variables: { cartId }, skip: !cartId }
+    );
+    const [sectionOpen, setSectionOpen] = useState(false);
+
+    const handleApplyFromClaim = useCallback(async (item) => {
+        if (!item?.code || !cartId) return;
+        try {
+            setPageIsUpdating(true);
+            await applyCoupon({
+                variables: { cartId, couponCode: item.code }
+            });
+        } catch (e) {
+            // silent; error surfaced by apollo links/toasts if configured
+        } finally {
+            setPageIsUpdating(false);
+        }
+    }, [applyCoupon, cartId, setPageIsUpdating]);
+
+    const handleRemoveCoupon = useCallback(async () => {
+        if (!cartId) return;
+        try {
+            setPageIsUpdating(true);
+            await removeCoupon({ variables: { cartId } });
+        } catch (e) {
+            // silent
+        } finally {
+            setPageIsUpdating(false);
+        }
+    }, [removeCoupon, cartId, setPageIsUpdating]);
+
+    const appliedCoupons = appliedData?.cart?.applied_coupons || [];
 
     return (
         <div className={classes.root}>
@@ -36,17 +75,46 @@ const PriceAdjustments = props => {
                     id={'coupon_code'}
                     title={formatMessage({
                         id: 'checkoutPage.couponCode',
-                        defaultMessage: 'Enter Coupon Code'
+                        defaultMessage: 'Apply Coupon Code'
                     })}
                     classes={{
                         root: cn('border border-gray-100 rounded-md max-w-[400px] p-2.5'),
-                        title: 'text-[16px] font-medium',
+                        title: 'text-[16px] font-medium cursor-pointer',
                         title_wrapper: 'gap-sm grid grid-cols-1 grid-flow-col h-[38px] items-center justify-items-start',
                         contents_container: 'p-0'
                     }}
+                    onClick={() => setSectionOpen(prev => !prev)}
                 >
                     <Suspense fallback={<LoadingIndicator />}>
-                        <CouponCode setIsCartUpdating={setPageIsUpdating} />
+                        {sectionOpen && (
+                            <SellerCouponCheckout
+                                couponData={couponData}
+                                couponLoading={couponLoading || applyingCoupon || appliedLoading || removingCoupon}
+                                couponError={couponError}
+                                autoOpen={true}
+                                closeOnClaim={true}
+                                onSelectCoupon={handleApplyFromClaim}
+                                onTriggerRender={() => null}
+                            />
+                        )}
+                        {appliedCoupons.length > 0 && (
+                            <div className="mt-3 flex items-center gap-2 flex-wrap">
+                                {appliedCoupons.map(c => (
+                                    <div key={c.code} className="flex items-center gap-2 bg-[#fff8f1] border border-[#ffb891] rounded px-2 py-1 text-sm font-medium text-[#f76b1c]">
+                                        <span>{c.code}</span>
+                                        <button
+                                            type="button"
+                                            onClick={handleRemoveCoupon}
+                                            disabled={removingCoupon}
+                                            className="text-[#a94442] hover:text-[#f26313] disabled:opacity-50"
+                                            aria-label={formatMessage({ id: 'checkoutPage.removeCoupon', defaultMessage: 'Remove coupon' })}
+                                        >
+                                            ×
+                                        </button>
+                                    </div>
+                                ))}
+                            </div>
+                        )}
                     </Suspense>
                 </Section>
                 <GiftCardSection setIsCartUpdating={setPageIsUpdating} />

package/src/overwrites/venia-ui/lib/components/CheckoutPage/ShippingInformation/shippingInformation.js

@@ -50,7 +50,7 @@ const ShippingInformation = props => {
             <LoadingIndicator classes={{ root: classes.loading }}>
                 <FormattedMessage
                     id={'shippingInformation.loading'}
-                    defaultMessage={'Fetching Shipping Information...'}
+                    defaultMessage={'Fetching Shipping Address...'}
                 />
             </LoadingIndicator>
         );
@@ -68,7 +68,7 @@ const ShippingInformation = props => {
                 <h5 className={classes.cardTitle}>
                     <FormattedMessage
                         id={'shippingInformation.cardTitle'}
-                        defaultMessage={'Shipping Information'}
+                        defaultMessage={'Shipping Address'}
                     />
                 </h5>
                 <LinkButton
@@ -100,7 +100,7 @@ const ShippingInformation = props => {
             >
                 <FormattedMessage
                     id={'shippingInformation.editTitle'}
-                    defaultMessage={'Shipping Information'}
+                    defaultMessage={'Shipping Address'}
                 />
             </h3>
             <div className={classes.editWrapper}>

package/src/overwrites/venia-ui/lib/components/CheckoutPage/checkoutPage.js

@@ -1,4 +1,5 @@
-import React, { Fragment, useEffect } from 'react';
+import React, { Fragment, useEffect, useMemo } from 'react';
+import { useQuery } from '@apollo/client';
 import { shape, string } from 'prop-types';
 import { FormattedMessage, useIntl } from 'react-intl';
 import { AlertCircle as AlertCircleIcon } from 'react-feather';
@@ -28,9 +29,11 @@ import ShippingInformation from './ShippingInformation';
 import OrderConfirmationPage from './OrderConfirmationPage';
 import ItemsReview from './ItemsReview';
 import GoogleReCaptcha from '@magento/venia-ui/lib/components/GoogleReCaptcha';
+import { GET_COUPON_CODE_QUERY } from '@riosst100/pwa-marketplace/src/talons/Seller/seller.gql';
 
 import defaultClasses from './checkoutPage.module.css';
 import ScrollAnchor from '@magento/venia-ui/lib/components/ScrollAnchor/scrollAnchor';
+import { useHistory } from 'react-router-dom';
 
 const errorIcon = <Icon src={AlertCircleIcon} size={20} />;
 
@@ -84,6 +87,21 @@ const CheckoutPage = props => {
 
     const [, { addToast }] = useToasts();
 
+    const history = useHistory();
+
+    
+    useEffect(() => {
+        if (isGuestCheckout) {
+            history.push('/sign-in');
+        }
+    }, [isGuestCheckout, history]);
+
+    useEffect(() => {
+        if (!isLoading && !isUpdating && !cartItems.length && isCartEmpty) {
+            history.push('/cart');
+        }
+    }, [isCartEmpty, isLoading, isUpdating, cartItems, history]);
+
     useEffect(() => {
         if (hasError) {
             const message =
@@ -115,6 +133,34 @@ const CheckoutPage = props => {
 
     let checkoutContent;
 
+    const sellerUrls = useMemo(() => {
+        if (!cartItems || !cartItems.length) return [];
+        const urls = cartItems
+            .map(item => item?.seller?.seller_url)
+            .filter(Boolean);
+        return Array.from(new Set(urls));
+    }, [cartItems]);
+
+    const sellerUrl = sellerUrls[0] || null;
+
+    const {
+        data: couponData,
+        loading: couponLoading,
+        error: couponError
+    } = useQuery(GET_COUPON_CODE_QUERY, {
+        variables: {
+            sellerUrl,
+            pageSize: 20,
+            currentPage: 1,
+            filters: {
+                is_public: { eq: '1' }
+            }
+        },
+        skip: !sellerUrl,
+        fetchPolicy: 'cache-and-network',
+        nextFetchPolicy: 'cache-first'
+    });
+
     const heading = isGuestCheckout
         ? formatMessage({
             id: 'checkoutPage.guestCheckout',
@@ -240,7 +286,12 @@ const CheckoutPage = props => {
         const priceAdjustmentsSection =
             checkoutStep === CHECKOUT_STEP.PAYMENT ? (
                 <div className={classes.price_adjustments_container}>
-                    <PriceAdjustments setPageIsUpdating={setIsUpdating} />
+                    <PriceAdjustments
+                        setPageIsUpdating={setIsUpdating}
+                        couponData={couponData}
+                        couponLoading={couponLoading}
+                        couponError={couponError}
+                    />
                 </div>
             ) : null;
 

package/src/overwrites/venia-ui/lib/components/CheckoutPage/checkoutPage.module.css

@@ -2,7 +2,7 @@
     composes: mx-0 from global;
     composes: my-0 from global;
     composes: px-0 from global;
-    composes: py-md from global;
+    /* composes: py-md from global; */
 }
 
 /* prettier-ignore */

package/src/overwrites/venia-ui/lib/components/FilterModal/FilterList/filterItemRadio.js

@@ -44,7 +44,6 @@ const FilterItemRadio = props => {
             classes={classes}
             id={`item-${group}-${value}`}
             label={title}
-            isSubFilter={isSubFilter}
             value={value}
             onChange={handleOnchange}
             data-cy="FilterDefault-radio"
@@ -74,7 +73,7 @@ FilterItemRadio.propTypes = {
         path: string
     }).isRequired,
     onApply: func,
-    labels: instanceOf(Map).isRequired
+    labels: instanceOf(WeakMap).isRequired
 };
 
 export default FilterItemRadio;

package/src/overwrites/venia-ui/lib/components/FilterModal/FilterList/filterItemRadioGroup.js

@@ -45,32 +45,15 @@ const FilterItemRadioGroup = props => {
             // }
             
             return (
-                <>
-                    <FilterItemRadio
-                        key={code}
-                        filterApi={filterApi}
-                        filterState={filterState}
-                        group={group}
-                        item={item}
-                        onApply={onApply}
-                        labels={labels}
-                    />
-                    {/* {subFilter && <FilterBlock
-                        key={subFilter.key}
-                        filterApi={subFilter.filterApi}
-                        filterState={subFilter.filterState}
-                        filterFrontendInput={subFilter.filterFrontendInput}
-                        group={subFilter.group}
-                        allowedSubFilters={newAllowedSubFilters}
-                        subFilterItems={subFilterItems}
-                        isSubFilter={true}
-                        items={subFilter.items}
-                        name={''}
-                        onApply={subFilter.onApply}
-                        initialOpen={true}
-                    />} */}
-                    {/* {subFilterBlock} */}
-                </>
+                <FilterItemRadio
+                    key={index}
+                    filterApi={filterApi}
+                    filterState={filterState}
+                    group={group}
+                    item={item}
+                    onApply={onApply}
+                    labels={labels}
+                />
             );
         });
     }, [filterApi, allowedSubFilters, subFilter, filterState, group, items, labels, onApply,isListExpanded,itemCountToShow]);
@@ -122,7 +105,7 @@ FilterItemRadioGroup.propTypes = {
         })
     ).isRequired,
     onApply: func,
-    labels: instanceOf(Map).isRequired
+    labels: instanceOf(WeakMap).isRequired
 };
 
 export default FilterItemRadioGroup;

package/src/overwrites/venia-ui/lib/components/FilterModal/FilterList/subFilterItemRadioGroup.js

@@ -85,7 +85,7 @@ SubFilterItemRadioGroup.propTypes = {
         })
     ).isRequired,
     onApply: func,
-    labels: instanceOf(Map).isRequired
+    labels: instanceOf(WeakMap).isRequired
 };
 
 export default SubFilterItemRadioGroup;