npm - @riosst100/pwa-marketplace - Versions diffs - 3.1.5 → 3.1.7 - Mend

@riosst100/pwa-marketplace 3.1.5 → 3.1.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (17) hide show

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@riosst100/pwa-marketplace",
   "author": "riosst100@gmail.com",
-  "version": "3.1.5",
+  "version": "3.1.7",
   "main": "src/index.js",
   "pwa-studio": {
     "targets": {

package/src/componentOverrideMapping.js CHANGED Viewed

@@ -15,6 +15,7 @@ module.exports = componentOverrideMapping = {
     [`@magento/venia-ui/lib/components/StoreCodeRoute/storeCodeRoute.js`]: '@riosst100/pwa-marketplace/src/overwrites/venia-ui/lib/components/StoreCodeRoute/storeCodeRoute.js',
     [`@magento/peregrine/lib/talons/Adapter/useAdapter.js`]: '@riosst100/pwa-marketplace/src/overwrites/peregrine/lib/talons/Adapter/useAdapter.js',
     [`@magento/peregrine/lib/talons/Header/useStoreSwitcher.js`]: '@riosst100/pwa-marketplace/src/overwrites/peregrine/lib/talons/Header/useStoreSwitcher.js',
+    [`@magento/peregrine/lib/talons/Header/useAccountTrigger.js`]: '@riosst100/pwa-marketplace/src/overwrites/peregrine/lib/talons/Header/useAccountTrigger.js',
     [`@magento/peregrine/lib/talons/Header/storeSwitcher.gql.js`]: '@riosst100/pwa-marketplace/src/overwrites/peregrine/lib/talons/Header/storeSwitcher.gql.js',
     [`@magento/peregrine/lib/talons/CartPage/ProductListing/productListingFragments.gql.js`]: '@riosst100/pwa-marketplace/src/overwrites/peregrine/lib/talons/CartPage/ProductListing/productListingFragments.gql.js',
     [`@magento/peregrine/lib/talons/Region/useRegion.js`]: '@riosst100/pwa-marketplace/src/overwrites/peregrine/lib/talons/Region/useRegion.js',

package/src/components/MaintenancePage/index.js ADDED Viewed

	@@ -0,0 +1 @@
1	+ export { default } from './maintenancePage';

package/src/components/MaintenancePage/maintenancePage.js ADDED Viewed

@@ -0,0 +1,37 @@
+import React, { Fragment } from 'react';
+import { StoreTitle } from '@magento/venia-ui/lib/components/Head';
+import defaultClasses from './maintenancePage.module.css';
+import { useStyle } from '@magento/venia-ui/lib/classify';
+const MaintenancePage = props => {
+    const classes = useStyle(defaultClasses);
+    return (
+        <>
+            <head>
+                <meta charset="UTF-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <title>We'll Be Back Soon</title>
+            </head>
+            <body className={classes.body}>
+                <div className={classes.container}>
+                    <img src="https://seller-preprod.tcgcollective.co/media/logo/default/FullLogo_Transparent_NoBuffer_14_.png" alt="Logo" className={classes.logo} />
+                    <br />
+                    <h1 className={classes.h1}>We're Temporarily Offline</h1>
+                    <img src="https://seller-preprod.tcgcollective.co/media/maintenance.webp" alt="Logo" className={classes.logo} />
+                    <p className={classes.p}>
+                        Our website is currently undergoing scheduled maintenance. <br/>
+                        We should be back shortly. Thank you for your patience.
+                    </p>
+                    <div className={classes.footer}>
+                        &copy; <span id="year">{new Date().getFullYear()}</span> TCG Collective. All rights reserved.
+                         {/* | <a href="mailto:support@yourdomain.com">Contact Support</a> */}
+                    </div>
+                </div>
+            </body>
+        </>
+    );
+}
+export default MaintenancePage;

package/src/components/MaintenancePage/maintenancePage.module.css ADDED Viewed

@@ -0,0 +1,45 @@
+.body {
+    background-color: #f3f4f6;
+    color: #333;
+    font-family: 'Arial', sans-serif;
+    text-align: center;
+    /* padding: 50px; */
+    display: flex;
+    justify-content: center;   /* Horizontal center */
+    align-items: center;        /* Vertical center */
+    height: 100vh;              /* Full height layar */
+    margin: 0;
+}
+.container {
+    max-width: 700px;
+    margin: auto;
+    padding: 30px;
+    background: #fff;
+    border-radius: 12px;
+    box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
+}
+.h1 {
+    font-size: 2.5em;
+    color: #1a202c;
+    padding: 20px;
+}
+.p {
+    font-size: 16px;
+    line-height: 1.6;
+    color: #4a5568;
+    padding: 20px;
+}
+.logo {
+    width: 200px;
+    display: inline-block;
+    margin-bottom: 10px;
+}
+.footer {
+    margin-top: 20px;
+    font-size: 14px;
+    color: #718096;
+}
+.footer a {
+    color: #3182ce;
+    text-decoration: none;
+}

package/src/overwrites/peregrine/lib/talons/Adapter/useAdapter.js CHANGED Viewed

@@ -11,6 +11,7 @@ import { CACHE_PERSIST_PREFIX } from '@magento/peregrine/lib/Apollo/constants';
 import getLinks from '@magento/peregrine/lib/Apollo/links';
 import typePolicies from '@magento/peregrine/lib/Apollo/policies';
 import { BrowserPersistence } from '@magento/peregrine/lib/util';
+import axios from 'axios';
 const isServer = !globalThis.document;
 const storage = new BrowserPersistence();
@@ -47,6 +48,7 @@ export const useAdapter = props => {
     }
     const [initialized, setInitialized] = useState(false);
+    const [isMaintenance, setIsMaintenance] = useState(false);
     const apiBase = useMemo(
         () => apiUrl || new URL('/graphql', origin).toString(),
@@ -186,13 +188,33 @@ export const useAdapter = props => {
         })();
     }, [apolloClient, initialized]);
+    useEffect(() => {
+        if (initialized) return;
+        // immediately invoke this async function
+        (async () => {
+            axios.get(apiBase).then((response) => {
+                setIsMaintenance(false)
+            }).catch((error) => {
+                const status = error.response.status;
+                if (status != 200) {
+                    setIsMaintenance(true)
+                } else {
+                    setIsMaintenance(false)
+                }
+            });
+        })();
+    }, [apiBase,initialized]);
     return {
         apolloProps,
+        isMaintenance,
         initialized,
         reduxProps,
         routerProps,
         styleProps,
-        urlHasStoreCode
+        urlHasStoreCode,
+        apiBase
     };
 };

package/src/overwrites/peregrine/lib/talons/CreateAccount/useCreateAccount.js CHANGED Viewed

@@ -134,8 +134,6 @@ export const useCreateAccount = props => {
                 storage.setItem('confirm_email', formValues.customer.email);
-                console.log(formValues.customer.email)
                 history.push('/verify-email');
                 // Get reCaptchaV3 Data for signIn mutation

package/src/overwrites/peregrine/lib/talons/FilterSidebar/useFilterSidebar.js CHANGED Viewed

@@ -32,24 +32,11 @@ export const useFilterSidebar = props => {
     const history = useHistory();
     const { pathname, search } = useLocation();
-    const allActiveFilters = getFiltersFromSearch(search);
     const { data: introspectionData } = useQuery(getFilterInputsQuery, {
         fetchPolicy: 'cache-and-network',
         nextFetchPolicy: 'cache-first'
     });
-    // const {
-    //     called: subFilterItemsCalled,
-    //     data: subFilterItems,
-    //     loading: subFilterItemsLoading,
-    //     error: subFilterItemsError
-    // } = useQuery(getSubFiltersQuery,
-    // {
-    //     fetchPolicy: 'cache-and-network',
-    //     nextFetchPolicy: 'cache-first'
-    // });
     const subFilterItems = [];
     const attributeCodes = useMemo(
@@ -90,7 +77,7 @@ export const useFilterSidebar = props => {
         return nextFilters;
     }, [DISABLED_FILTERS, attributeCodes, introspectionData]);
     const isBooleanFilter = options => {
         const optionsString = JSON.stringify(options);
         return (
@@ -257,30 +244,6 @@ export const useFilterSidebar = props => {
     }, [closeDrawer]);
     const handleApply = useCallback((...args) => {
-        const group = args[0];
-        const item = args[1];
-        // REMOVE ACTIVE FILTER
-        // if (group.includes('card_release')) {
-        //     const subFilter = group.replace("card_release", "card_set");
-        //     filterApi.removeGroup({ group: subFilter });
-        // }
-        // if (group.includes('sc_release')) {
-        //     const subFilter = group.replace("sc_release", "sc_set_name");
-        //     filterApi.removeGroup({ group: subFilter });
-        // }
-        // if (group.includes('sc_set_name')) {
-        //     const subFilter = group.replace("sc_set_name", "sc_release");
-        //     filterApi.removeGroup({ group: subFilter });
-        // }
-        // if (group.includes('card_set')) {
-        //     const subFilter = group.replace("card_set", "card_release");
-        //     filterApi.removeGroup({ group: subFilter });
-        // }
         setIsApplying(true);
         handleClose();
     }, [handleClose]);

package/src/overwrites/peregrine/lib/talons/Header/useAccountTrigger.js ADDED Viewed

@@ -0,0 +1,47 @@
+import { useCallback } from 'react';
+import { useDropdown } from '@magento/peregrine/lib/hooks/useDropdown';
+import { useUserContext } from '@magento/peregrine/lib/context/user';
+import { useHistory } from 'react-router-dom';
+/**
+ * The useAccountTrigger talon complements the AccountTrigger component.
+ *
+ * @returns {Object}    talonProps
+ * @returns {Boolean}   talonProps.accountMenuIsOpen - Whether the menu that this trigger toggles is open or not.
+ * @returns {Function}  talonProps.setAccountMenuIsOpen  - Set the value of accoutMenuIsOpen.
+ * @returns {Ref}       talonProps.accountMenuRef - A React ref to the menu that this trigger toggles.
+ * @returns {Ref}       talonProps.accountMenuTriggerRef - A React ref to the trigger element itself.
+ * @returns {Function}  talonProps.handleTriggerClick - A function for handling when the trigger is clicked.
+ */
+export const useAccountTrigger = () => {
+    const {
+        elementRef: accountMenuRef,
+        expanded: accountMenuIsOpen,
+        setExpanded: setAccountMenuIsOpen,
+        triggerRef: accountMenuTriggerRef
+    } = useDropdown();
+    const [{ isSignedIn: isUserSignedIn }] = useUserContext();
+    const history = useHistory();
+    const handleTriggerClick = useCallback(() => {
+        if (isUserSignedIn) {
+            // Toggle the Account Menu.
+            setAccountMenuIsOpen(isOpen => !isOpen);
+        } else {
+            history.push('/sign-in')
+        }
+    }, [setAccountMenuIsOpen,isUserSignedIn,history]);
+    return {
+        accountMenuIsOpen,
+        accountMenuRef,
+        accountMenuTriggerRef,
+        setAccountMenuIsOpen,
+        handleTriggerClick,
+        isUserSignedIn
+    };
+};

package/src/overwrites/venia-ui/lib/RootComponents/Category/categoryContent.js CHANGED Viewed

@@ -128,7 +128,7 @@ const CategoryContent = props => {
     ) : null;
     const sidebar = shouldShowFilterButtons ? (
-        <FilterSidebar children={children} filters={filters} prefixes={category ? category.prefixes : []} />
+        <FilterSidebar category={category} children={children} filters={filters} prefixes={category ? category.prefixes : []} />
     ) : shouldShowFilterShimmer ? (
         <FilterSidebarShimmer />
     ) : null;

package/src/overwrites/venia-ui/lib/components/Adapter/adapter.js CHANGED Viewed

@@ -7,6 +7,8 @@ import App, { AppContextProvider } from '@magento/venia-ui/lib/components/App';
 import StoreCodeRoute from '@magento/venia-ui/lib/components/StoreCodeRoute';
 import { useWebsiteByIp } from '@riosst100/pwa-marketplace/src/talons/WebsiteByIp/useWebsiteByIp';
 import { BrowserPersistence } from '@magento/peregrine/lib/util';
+import MaintenancePage from '@riosst100/pwa-marketplace/src/components/MaintenancePage';
+import axios from 'axios';
 const storage = new BrowserPersistence();
@@ -19,9 +21,34 @@ const Adapter = props => {
         apolloProps,
         initialized,
         reduxProps,
-        routerProps
+        routerProps,
+        isMaintenance,
+        apiBase
     } = talonProps;
+    // console.log('isMaintenance',isMaintenance)
+    // useEffect(() => {
+    //     const fetchData = async () => {
+    //         axios.get(apiBase).then((response) => {
+    //             // setIsMaintenance(false)
+    //         }).catch((error) => {
+    //             const status = error.response.status;
+    //             if (status != 200) {
+    //                 console.log('status',status)
+    //                 return <MaintenancePage />;
+    //                 // setIsMaintenance(true)
+    //             }
+    //         });
+    //     };
+    //     fetchData();
+    // if (isMaintenance) {
+    //     return <MaintenancePage />;
+    // }
     const websiteCodes = [];
     const websiteStores = useMemo(() => ({}), []);
     const storeCurrencies = useMemo(() => ({}), []);
@@ -58,7 +85,48 @@ const Adapter = props => {
         }
     }, [websiteCodeInUrl])
+    const currentWebsiteCode = storage && storage.getItem('website_code') || process.env.WEBSITE_CODE;
     useEffect(() => {
+        if (!websiteCodeInUrl) {
+            // history.replace(location.pathname + location.search)
+        } else if (websiteCodeInUrl && websiteCodeInUrl !== currentWebsiteCode) {
+            const storeCodeInUrl = websiteStores[websiteCodeInUrl];
+            // await removeCart();
+            // alert(storeCodeInUrl)
+            // update store/website saat url berubah, misal /id ke /sg
+            // issue store view code gk berubah, klo di graphql aman
+            // ini update di graphql dan di cookie, tapi di cookie beda klo ga di hardcode
+            // ini oke, store di graphql dari sini
+            // storeCodeInUrl = 'id_id_store_view';
+            // console.log('storeCodeInUrl',storeCodeInUrl)
+            // await apolloClient.clearCacheData(apolloClient, 'cart');
+            // await removeCart();
+            storage.removeItem('cartId');
+            storage.setItem('store_view_code', storeCodeInUrl);
+            storage.setItem('website_code', websiteCodeInUrl);
+            storage.setItem(
+                'store_view_currency',
+                storeCurrencies[storeCodeInUrl]
+            );
+            storage.setItem(
+                'store_view_secure_base_media_url',
+                storeSecureBaseMediaUrl[storeCodeInUrl]
+            );
+            // We're required to reload the page as the basename doesn't
+            // change entirely without a full page reload.
+            // history.go(0);
+        }
         if (!websiteCodeInUrl && getWebsiteByUserIp) {
             setVerifyUserIp(false);
@@ -82,6 +150,8 @@ const Adapter = props => {
                 let storeCodeInUrl = websiteStores[websiteCode];
+                storage.removeItem('cartId');
                 storage.setItem('store_view_code', storeCodeInUrl);
                 storage.setItem('website_code', websiteCode);
                 storage.setItem(
@@ -101,6 +171,10 @@ const Adapter = props => {
         return null;
     }
+    if (isMaintenance) {
+        return <MaintenancePage />;
+    }
     const children = props.children || <App />;
     return !verifyUserIp && (

package/src/overwrites/venia-ui/lib/components/CreateAccountPage/createAccountPage.js CHANGED Viewed

@@ -31,7 +31,7 @@ const CreateAccountPage = props => {
 };
 CreateAccountPage.defaultProps = {
-    signedInRedirectUrl: '/order-history',
+    signedInRedirectUrl: '/',
     signInPageUrl: '/sign-in'
 };

package/src/overwrites/venia-ui/lib/components/FilterModal/CurrentFilters/currentFilters.js CHANGED Viewed

@@ -7,11 +7,13 @@ import CurrentFilter from './currentFilter';
 import defaultClasses from './currentFilters.module.css';
 const CurrentFilters = props => {
-    const { filterApi, filterState, onRemove, filterNames } = props;
+    const { category, filterApi, filterState, onRemove, filterNames } = props;
     const { removeItem } = filterApi;
     const classes = useStyle(defaultClasses, props.classes);
     const { formatMessage } = useIntl();
+    const defaultTopFilterAttrCode = category.default_top_filter.attribute_code;
     // create elements and params at the same time for efficiency
     const filterElements = useMemo(() => {
         const elements = [];
@@ -20,9 +22,7 @@ const CurrentFilters = props => {
                 const { title, value } = item || {};
                 const key = `${group}::${title}_${value}`;
-                const customAttributeLandingPage = ['bricks_categories','sc_sports_categories','card_game', 'sc_baseball_release','auction','special_price','lof_preorder','card_pre_orders','sc_baseball_inserts','sc_baseball_parallel','sc_set_type'];
-                if (!customAttributeLandingPage.includes(group)) {
+                if (group != defaultTopFilterAttrCode) {
                     elements.push(
                         <li key={key} className={classes.item}>
                             <CurrentFilter

package/src/overwrites/venia-ui/lib/components/FilterSidebar/filterSidebar.js CHANGED Viewed

@@ -21,7 +21,7 @@ const SCROLL_OFFSET = 150;
  * @param {Object} props.filters - filters to display
  */
 const FilterSidebar = props => {
-    const { filters, filterCountToOpen, prefixes } = props;
+    const { filters, category, filterCountToOpen, prefixes } = props;
     const talonProps = useFilterSidebar({ filters });
     const {
         filterApi,
@@ -61,17 +61,6 @@ const FilterSidebar = props => {
     const handleCategoryApplyFilter = useCallback(
         (...args) => {
-            // const filterElement = filterRef.current;
-            // if (
-            //     filterElement &&
-            //     typeof filterElement.getBoundingClientRect === 'function'
-            // ) {
-            // const filterTop = filterElement.getBoundingClientRect().top;
-            // const windowScrollY =
-            //     window.scrollY + filterTop - SCROLL_OFFSET;
-            // window.scrollTo(0, windowScrollY);
-            // }
             history.push('/' + args[1].path + '.html');
             if (args[0] != "category_uid") {
@@ -98,6 +87,7 @@ const FilterSidebar = props => {
                 const groupName = filterNames.get(group);
                 const frontendInput = filterFrontendInput.get(group);
                 let subFilter = null;
                 return (
@@ -167,6 +157,7 @@ const FilterSidebar = props => {
                 </div>
                 <CurrentFilters
                     filterApi={filterApi}
+                    category={category}
                     filterNames={filterNames}
                     filterState={filterState}
                     onRemove={handleApplyFilter}
@@ -191,7 +182,6 @@ FilterSidebar.propTypes = {
         root: string,
         root_open: string
     }),
-    prefixes: [],
     filters: arrayOf(
         shape({
             attribute_code: string,

package/src/overwrites/venia-ui/lib/components/SignInPage/signInPage.js CHANGED Viewed

@@ -33,7 +33,7 @@ const SignInPage = props => {
 SignInPage.defaultProps = {
     createAccountPageUrl: '/create-account',
     forgotPasswordPageUrl: '/forgot-password',
-    signedInRedirectUrl: '/order-history'
+    signedInRedirectUrl: '/'
 };
 SignInPage.propTypes = {

package/src/overwrites/venia-ui/lib/components/StoreCodeRoute/storeCodeRoute.js CHANGED Viewed

@@ -1,8 +1,10 @@
-import { useEffect, useMemo } from 'react';
-import { useHistory } from 'react-router-dom';
-import { BrowserPersistence } from '@magento/peregrine/lib/util';
+// import { useEffect, useMemo } from 'react';
+// import { useHistory } from 'react-router-dom';
+// import { BrowserPersistence } from '@magento/peregrine/lib/util';
+// import { useCartContext } from '@magento/peregrine/lib/context/cart';
+// import { useApolloClient, useQuery } from '@apollo/client';
-const storage = new BrowserPersistence();
+// const storage = new BrowserPersistence();
 /**
  * This component checks for use of a store code in the url that is not the
@@ -10,64 +12,82 @@ const storage = new BrowserPersistence();
  * and reloads the page so that they are used in the graphQL headers.
  */
 const StoreCodeRoute = () => {
-    const history = useHistory();
+    // const history = useHistory();
-    const websiteCodes = [];
-    const websiteStores = useMemo(() => ({}), []);
-    const storeCurrencies = useMemo(() => ({}), []);
-    const storeSecureBaseMediaUrl = useMemo(() => ({}), []);
+    // const websiteCodes = [];
+    // const websiteStores = useMemo(() => ({}), []);
+    // const storeCurrencies = useMemo(() => ({}), []);
+    // const storeSecureBaseMediaUrl = useMemo(() => ({}), []);
-    AVAILABLE_WEBSITES.forEach(store => {
-        websiteCodes.push(store.website_code);
-        websiteStores[store.website_code] = store.store_code;
-        storeCurrencies[store.store_code] = store.default_display_currency_code;
-        storeSecureBaseMediaUrl[store.store_code] = store.secure_base_media_url;
-    });
+    // AVAILABLE_WEBSITES.forEach(store => {
+    //     websiteCodes.push(store.website_code);
+    //     websiteStores[store.website_code] = store.store_code;
+    //     storeCurrencies[store.store_code] = store.default_display_currency_code;
+    //     storeSecureBaseMediaUrl[store.store_code] = store.secure_base_media_url;
+    // });
-    // Sort by length (longest first) to avoid false hits ie "en" matching just
-    // the "/en" in "/en-us/home.html" when "en-us" is also in storeCodes.
-    websiteCodes.sort((a, b) => b.length - a.length);
+    // // Sort by length (longest first) to avoid false hits ie "en" matching just
+    // // the "/en" in "/en-us/home.html" when "en-us" is also in storeCodes.
+    // websiteCodes.sort((a, b) => b.length - a.length);
-    // Find the store code in the url. This will always be the first path.
-    // ie `https://example.com/fr/foo/baz.html` => `fr`.
-    const { location } = globalThis;
-    const match = location && location.pathname.split("/")[1];
-    let websiteCodeInUrl = websiteCodes.find((str) => str === match);
+    // // Find the store code in the url. This will always be the first path.
+    // // ie `https://example.com/fr/foo/baz.html` => `fr`.
+    // const { location } = globalThis;
+    // const match = location && location.pathname.split("/")[1];
+    // let websiteCodeInUrl = websiteCodes.find((str) => str === match);
-    // Determine what the current store code is using the configured basename.
-    const currentWebsiteCode = storage && storage.getItem('website_code') || process.env.WEBSITE_CODE;
+    // // Determine what the current store code is using the configured basename.
+    // const currentWebsiteCode = storage && storage.getItem('website_code') || process.env.WEBSITE_CODE;
     // If we find a store code in the url that is not the current one, update
     // the storage value and refresh so that we start using the new code.
-    useEffect(() => {
-        if (!websiteCodeInUrl) {
-            history.replace(location.pathname + location.search)
-        } else if (websiteCodeInUrl && websiteCodeInUrl !== currentWebsiteCode) {
-            let storeCodeInUrl = websiteStores[websiteCodeInUrl];
-            storage.setItem('store_view_code', storeCodeInUrl);
-            storage.setItem('website_code', websiteCodeInUrl);
-            storage.setItem(
-                'store_view_currency',
-                storeCurrencies[storeCodeInUrl]
-            );
-            storage.setItem(
-                'store_view_secure_base_media_url',
-                storeSecureBaseMediaUrl[storeCodeInUrl]
-            );
+    // useEffect(() => {
+    //     if (!websiteCodeInUrl) {
+    //         history.replace(location.pathname + location.search)
+    //     } else if (websiteCodeInUrl && websiteCodeInUrl !== currentWebsiteCode) {
+    //         const storeCodeInUrl = websiteStores[websiteCodeInUrl];
+            // alert(storeCodeInUrl)
+            // update store/website saat url berubah, misal /id ke /sg
+            // issue store view code gk berubah, klo di graphql aman
+            // ini update di graphql dan di cookie, tapi di cookie beda klo ga di hardcode
+            // ini oke, store di graphql dari sini
+            // storeCodeInUrl = 'id_id_store_view';
+            // console.log('storeCodeInUrl',storeCodeInUrl)
+            // await apolloClient.clearCacheData(apolloClient, 'cart');
+            // await removeCart();
+            // storage.setItem('store_view_code', storeCodeInUrl);
+            // storage.setItem('website_code', websiteCodeInUrl);
+            // storage.setItem(
+            //     'store_view_currency',
+            //     storeCurrencies[storeCodeInUrl]
+            // );
+            // storage.setItem(
+            //     'store_view_secure_base_media_url',
+            //     storeSecureBaseMediaUrl[storeCodeInUrl]
+            // );
             // We're required to reload the page as the basename doesn't
             // change entirely without a full page reload.
-            history.go(0);
-        }
-    }, [
-        websiteCodeInUrl,
-        // currentWebsiteCode,
-        history
-        // storeCodeInUrl,
-        // storeCurrencies,
-        // storeSecureBaseMediaUrl
-    ]);
+            // history.go(0);
+    //     }
+    // }, [
+    //     websiteCodeInUrl,
+    //     // currentWebsiteCode,
+    //     history
+    //     // , apolloClient, removeCart
+    //     // storeCodeInUrl,
+    //     // storeCurrencies,
+    //     // storeSecureBaseMediaUrl
+    // ]);
     return null;
 };

package/src/talons/WebsiteSwitcher/useWebsiteSwitcher.js CHANGED Viewed

@@ -198,9 +198,6 @@ export const useWebsiteSwitcher = (props = {}) => {
             const newPath = pathName ? `/${pathName}${newSearchParams}` : (accessBaseWebsite ? `/${pathName}${accessBaseWebsite}` : '');
-            await apolloClient.clearCacheData(apolloClient, 'cart');
-            await removeCart();
             if (newWebsiteCode) {
                 globalThis.location.assign(`/${newWebsiteCode}${newPath || ''}`);
             } else {