From 68563732fc22bf0ab842290223f788a8d9aa0288 Mon Sep 17 00:00:00 2001
From: Mate Sitchinava <mate.sitchinava@scandiweb.com>
Date: Mon, 26 Sep 2022 14:30:47 +0400
Subject: [PATCH 01/17] fixed infinite scroll on PLP

---
 .../src/component/ProductList/ProductList.container.js          | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/scandipwa/src/component/ProductList/ProductList.container.js b/packages/scandipwa/src/component/ProductList/ProductList.container.js
index 3d0e818f7b..53cdb480a8 100644
--- a/packages/scandipwa/src/component/ProductList/ProductList.container.js
+++ b/packages/scandipwa/src/component/ProductList/ProductList.container.js
@@ -331,6 +331,8 @@ export class ProductListContainer extends PureComponent {
         setQueryParams({
             page: pageNumber === 1 ? '' : pageNumber
         }, location, history);
+
+        scrollToTop();
     }
 
     render() {

From 51f5a124eaa4d4cc0d3e2e306a6fd42c4b54d835 Mon Sep 17 00:00:00 2001
From: Mate Sitchinava <mate.sitchinava@scandiweb.com>
Date: Mon, 26 Sep 2022 14:38:38 +0400
Subject: [PATCH 02/17] fixed issues related to history changes

---
 .../CategoryFilterOverlay.container.js          |  7 +++----
 .../src/component/Popup/Popup.container.js      |  2 +-
 .../CategoryPage/CategoryPage.component.js      | 17 ++++-------------
 .../CategoryPage/CategoryPage.container.js      | 12 +++++++++---
 .../ProductComparePage.container.js             |  2 +-
 .../route/ProductPage/ProductPage.container.js  |  2 +-
 6 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/packages/scandipwa/src/component/CategoryFilterOverlay/CategoryFilterOverlay.container.js b/packages/scandipwa/src/component/CategoryFilterOverlay/CategoryFilterOverlay.container.js
index a37194c5cf..27096625eb 100644
--- a/packages/scandipwa/src/component/CategoryFilterOverlay/CategoryFilterOverlay.container.js
+++ b/packages/scandipwa/src/component/CategoryFilterOverlay/CategoryFilterOverlay.container.js
@@ -188,10 +188,9 @@ export class CategoryFilterOverlayContainer extends PureComponent {
 
         window.addEventListener('popstate', this.historyBackHook);
 
-        history.pushState(
-            { overlayOpen: true },
-            '',
-            pathname + search
+        history.push(
+            pathname + search,
+            { overlayOpen: true }
         );
     }
 
diff --git a/packages/scandipwa/src/component/Popup/Popup.container.js b/packages/scandipwa/src/component/Popup/Popup.container.js
index cc8fd3ee17..b509c08142 100644
--- a/packages/scandipwa/src/component/Popup/Popup.container.js
+++ b/packages/scandipwa/src/component/Popup/Popup.container.js
@@ -86,7 +86,7 @@ export class PopupContainer extends PureComponent {
             name: POPUP,
             title: this._getPopupTitle(),
             onCloseClick: () => {
-                history.back();
+                history.goBack();
             }
         });
 
diff --git a/packages/scandipwa/src/route/CategoryPage/CategoryPage.component.js b/packages/scandipwa/src/route/CategoryPage/CategoryPage.component.js
index 2c02711ba6..c48cdbdff9 100644
--- a/packages/scandipwa/src/route/CategoryPage/CategoryPage.component.js
+++ b/packages/scandipwa/src/route/CategoryPage/CategoryPage.component.js
@@ -14,7 +14,6 @@ import PropTypes from 'prop-types';
 import { lazy, PureComponent, Suspense } from 'react';
 
 import CategoryDetails from 'Component/CategoryDetails';
-import { CATEGORY_FILTER_OVERLAY_ID } from 'Component/CategoryFilterOverlay/CategoryFilterOverlay.config';
 import CategoryItemsCount from 'Component/CategoryItemsCount';
 import CategoryProductList from 'Component/CategoryProductList';
 import CategorySort from 'Component/CategorySort';
@@ -59,7 +58,7 @@ export class CategoryPage extends PureComponent {
             sortKey: PropTypes.string
         }).isRequired,
         onSortChange: PropTypes.func.isRequired,
-        toggleOverlayByKey: PropTypes.func.isRequired,
+        onFilterButtonClick: PropTypes.func.isRequired,
         selectedFilters: FilterType.isRequired,
         filter: FilterInputType.isRequired,
         search: PropTypes.string,
@@ -94,8 +93,6 @@ export class CategoryPage extends PureComponent {
 
     state = {};
 
-    onFilterButtonClick = this.onFilterButtonClick.bind(this);
-
     static getDerivedStateFromProps(props) {
         const {
             isMobile,
@@ -124,12 +121,6 @@ export class CategoryPage extends PureComponent {
         return { activeLayoutType };
     }
 
-    onFilterButtonClick() {
-        const { toggleOverlayByKey } = this.props;
-
-        toggleOverlayByKey(CATEGORY_FILTER_OVERLAY_ID);
-    }
-
     displayProducts() {
         const {
             category: {
@@ -184,8 +175,8 @@ export class CategoryPage extends PureComponent {
             category: { is_anchor },
             isSearchPage,
             isCurrentCategoryLoaded,
-            isMatchingInfoFilter
-
+            isMatchingInfoFilter,
+            onFilterButtonClick
         } = this.props;
 
         if (!isMatchingInfoFilter) {
@@ -200,7 +191,7 @@ export class CategoryPage extends PureComponent {
             <button
               block="CategoryPage"
               elem="Filter"
-              onClick={ this.onFilterButtonClick }
+              onClick={ onFilterButtonClick }
             >
                 <FilterIcon />
                 <span>{ __('Filters') }</span>
diff --git a/packages/scandipwa/src/route/CategoryPage/CategoryPage.container.js b/packages/scandipwa/src/route/CategoryPage/CategoryPage.container.js
index 301ba4b23f..f68bc81637 100644
--- a/packages/scandipwa/src/route/CategoryPage/CategoryPage.container.js
+++ b/packages/scandipwa/src/route/CategoryPage/CategoryPage.container.js
@@ -13,6 +13,7 @@ import PropTypes from 'prop-types';
 import { PureComponent } from 'react';
 import { connect } from 'react-redux';
 
+import { CATEGORY_FILTER_OVERLAY_ID } from 'Component/CategoryFilterOverlay/CategoryFilterOverlay.config';
 import { CATEGORY } from 'Component/Header/Header.config';
 import { MENU_TAB } from 'Component/NavigationTabs/NavigationTabs.config';
 import {
@@ -175,7 +176,8 @@ export class CategoryPageContainer extends PureComponent {
     containerFunctions = {
         onSortChange: this.onSortChange.bind(this),
         onGridButtonClick: this.onGridButtonClick.bind(this),
-        onListButtonClick: this.onListButtonClick.bind(this)
+        onListButtonClick: this.onListButtonClick.bind(this),
+        onFilterButtonClick: this.onFilterButtonClick.bind(this)
     };
 
     setOfflineNoticeSize = this.setOfflineNoticeSize.bind(this);
@@ -353,6 +355,12 @@ export class CategoryPageContainer extends PureComponent {
         this.updateMeta();
     }
 
+    onFilterButtonClick() {
+        const { toggleOverlayByKey } = this.props;
+
+        toggleOverlayByKey(CATEGORY_FILTER_OVERLAY_ID);
+    }
+
     setOfflineNoticeSize() {
         const { setBigOfflineNotice, isInfoLoading } = this.props;
 
@@ -422,7 +430,6 @@ export class CategoryPageContainer extends PureComponent {
             filters,
             isMobile,
             sortFields,
-            toggleOverlayByKey,
             totalPages,
             totalItems,
             isSearchPage
@@ -444,7 +451,6 @@ export class CategoryPageContainer extends PureComponent {
             selectedFilters: this.getSelectedFiltersFromUrl(),
             selectedSort: this.getSelectedSortFromUrl(),
             sortFields,
-            toggleOverlayByKey,
             totalPages,
             totalItems
         };
diff --git a/packages/scandipwa/src/route/ProductComparePage/ProductComparePage.container.js b/packages/scandipwa/src/route/ProductComparePage/ProductComparePage.container.js
index 4ad7b4f3ab..f28f60d415 100644
--- a/packages/scandipwa/src/route/ProductComparePage/ProductComparePage.container.js
+++ b/packages/scandipwa/src/route/ProductComparePage/ProductComparePage.container.js
@@ -98,7 +98,7 @@ export class ProductComparePageContainer extends DataContainer {
         setHeaderState({
             name: PRODUCT_COMPARE,
             title: __('Compare'),
-            onBackClick: () => history.back()
+            onBackClick: () => history.goBack()
         });
     }
 
diff --git a/packages/scandipwa/src/route/ProductPage/ProductPage.container.js b/packages/scandipwa/src/route/ProductPage/ProductPage.container.js
index 8d852887cb..667cedd2b5 100644
--- a/packages/scandipwa/src/route/ProductPage/ProductPage.container.js
+++ b/packages/scandipwa/src/route/ProductPage/ProductPage.container.js
@@ -534,7 +534,7 @@ export class ProductPageContainer extends PureComponent {
         changeHeaderState({
             name: PDP,
             title: name,
-            onBackClick: () => history.back()
+            onBackClick: () => history.goBack()
         });
     }
 

From 5719ffc8d7d66cc855d884c4497f3c9831739327 Mon Sep 17 00:00:00 2001
From: Mate Sitchinava <mate.sitchinava@scandiweb.com>
Date: Mon, 26 Sep 2022 15:07:44 +0400
Subject: [PATCH 03/17] added missing prop for popup

---
 packages/scandipwa/src/component/Popup/Popup.component.js | 3 +--
 packages/scandipwa/src/component/Popup/Popup.container.js | 6 +++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/scandipwa/src/component/Popup/Popup.component.js b/packages/scandipwa/src/component/Popup/Popup.component.js
index f4f39011a8..d81b19168e 100644
--- a/packages/scandipwa/src/component/Popup/Popup.component.js
+++ b/packages/scandipwa/src/component/Popup/Popup.component.js
@@ -26,13 +26,12 @@ import './Popup.style';
 export class Popup extends Overlay {
     static propTypes = {
         ...Overlay.propTypes,
-        clickOutside: PropTypes.bool,
+        clickOutside: PropTypes.bool.isRequired,
         title: PropTypes.string
     };
 
     static defaultProps = {
         ...Overlay.defaultProps,
-        clickOutside: true,
         title: ''
     };
 
diff --git a/packages/scandipwa/src/component/Popup/Popup.container.js b/packages/scandipwa/src/component/Popup/Popup.container.js
index cc8fd3ee17..a5dd823b2b 100644
--- a/packages/scandipwa/src/component/Popup/Popup.container.js
+++ b/packages/scandipwa/src/component/Popup/Popup.container.js
@@ -49,6 +49,7 @@ export class PopupContainer extends PureComponent {
                 title: PropTypes.string
             })
         ).isRequired,
+        clickOutside: PropTypes.bool,
         activeOverlay: PropTypes.string.isRequired,
         goToPreviousNavigationState: PropTypes.func.isRequired,
         areOtherOverlaysOpen: PropTypes.bool.isRequired,
@@ -72,7 +73,8 @@ export class PopupContainer extends PureComponent {
         mix: {},
         contentMix: {},
         children: [],
-        isStatic: false
+        isStatic: false,
+        clickOutside: true
     };
 
     containerFunctions = {
@@ -95,6 +97,7 @@ export class PopupContainer extends PureComponent {
 
     containerProps() {
         const {
+            clickOutside,
             activeOverlay,
             areOtherOverlaysOpen,
             changeHeaderState,
@@ -114,6 +117,7 @@ export class PopupContainer extends PureComponent {
         } = this.props;
 
         return {
+            clickOutside,
             activeOverlay,
             areOtherOverlaysOpen,
             changeHeaderState,

From aae9d92a20852c7bb16f4d9de3759df04cc3638c Mon Sep 17 00:00:00 2001
From: Mate Sitchinava <mate.sitchinava@scandiweb.com>
Date: Mon, 26 Sep 2022 16:30:17 +0400
Subject: [PATCH 04/17] renamed clickOutside prop

---
 .../CheckoutTermsAndConditionsPopup.component.js          | 2 +-
 .../component/ImageZoomPopup/ImageZoomPopup.container.js  | 2 +-
 .../MyAccountAddressPopup.component.js                    | 2 +-
 .../MyAccountCustomerPopup.component.js                   | 2 +-
 .../NewVersionPopup/NewVersionPopup.component.js          | 2 +-
 packages/scandipwa/src/component/Popup/Popup.component.js | 6 +++---
 packages/scandipwa/src/component/Popup/Popup.container.js | 8 ++++----
 .../ShareWishlistPopup/ShareWishlistPopup.component.js    | 2 +-
 .../StoreInPickUpPopup/StoreInPickUpPopup.component.js    | 2 +-
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/packages/scandipwa/src/component/CheckoutTermsAndConditionsPopup/CheckoutTermsAndConditionsPopup.component.js b/packages/scandipwa/src/component/CheckoutTermsAndConditionsPopup/CheckoutTermsAndConditionsPopup.component.js
index 31917c8dfe..2136188fd3 100644
--- a/packages/scandipwa/src/component/CheckoutTermsAndConditionsPopup/CheckoutTermsAndConditionsPopup.component.js
+++ b/packages/scandipwa/src/component/CheckoutTermsAndConditionsPopup/CheckoutTermsAndConditionsPopup.component.js
@@ -39,7 +39,7 @@ export class CheckoutTermsAndConditionsPopup extends PureComponent {
         return (
             <Popup
               id={ TERMS_AND_CONDITIONS_POPUP_ID }
-              clickOutside={ false }
+              isCloseOnOutsideClick={ false }
               mix={ { block: 'CheckoutTermsAndConditionsPopup' } }
             >
                 { this.renderContent() }
diff --git a/packages/scandipwa/src/component/ImageZoomPopup/ImageZoomPopup.container.js b/packages/scandipwa/src/component/ImageZoomPopup/ImageZoomPopup.container.js
index 3c1a60a52b..01ff1a849c 100644
--- a/packages/scandipwa/src/component/ImageZoomPopup/ImageZoomPopup.container.js
+++ b/packages/scandipwa/src/component/ImageZoomPopup/ImageZoomPopup.container.js
@@ -89,7 +89,7 @@ export class ImageZoomPopupContainer extends PureComponent {
         return (
             <Popup
               id={ popupId }
-              clickOutside={ false }
+              isCloseOnOutsideClick={ false }
               mix={ { block: 'ImageZoomPopup', mix } }
               contentMix={ { block: 'ImageZoomPopup', elem: 'PopupContent' } }
               onClose={ onClose }
diff --git a/packages/scandipwa/src/component/MyAccountAddressPopup/MyAccountAddressPopup.component.js b/packages/scandipwa/src/component/MyAccountAddressPopup/MyAccountAddressPopup.component.js
index d86b1cd7de..e2e237d996 100644
--- a/packages/scandipwa/src/component/MyAccountAddressPopup/MyAccountAddressPopup.component.js
+++ b/packages/scandipwa/src/component/MyAccountAddressPopup/MyAccountAddressPopup.component.js
@@ -87,7 +87,7 @@ export class MyAccountAddressPopup extends PureComponent {
         return (
             <Popup
               id={ ADDRESS_POPUP_ID }
-              clickOutside={ false }
+              isCloseOnOutsideClick={ false }
               mix={ { block: 'MyAccountAddressPopup' } }
             >
                 <div>
diff --git a/packages/scandipwa/src/component/MyAccountCustomerPopup/MyAccountCustomerPopup.component.js b/packages/scandipwa/src/component/MyAccountCustomerPopup/MyAccountCustomerPopup.component.js
index e573f8d9ea..7594c45573 100644
--- a/packages/scandipwa/src/component/MyAccountCustomerPopup/MyAccountCustomerPopup.component.js
+++ b/packages/scandipwa/src/component/MyAccountCustomerPopup/MyAccountCustomerPopup.component.js
@@ -77,7 +77,7 @@ export class MyAccountCustomerPopup extends PureComponent {
         return (
             <Popup
               id={ CUSTOMER_POPUP_ID }
-              clickOutside={ false }
+              isCloseOnOutsideClick={ false }
               mix={ { block: 'MyAccountCustomerPopup' } }
             >
                 <Loader isLoading={ isLoading } />
diff --git a/packages/scandipwa/src/component/NewVersionPopup/NewVersionPopup.component.js b/packages/scandipwa/src/component/NewVersionPopup/NewVersionPopup.component.js
index 3af754ff07..071e4251df 100644
--- a/packages/scandipwa/src/component/NewVersionPopup/NewVersionPopup.component.js
+++ b/packages/scandipwa/src/component/NewVersionPopup/NewVersionPopup.component.js
@@ -97,7 +97,7 @@ export class NewVersionPopup extends PureComponent {
         return (
             <Popup
               id={ NEW_VERSION_POPUP_ID }
-              clickOutside={ false }
+              isCloseOnOutsideClick={ false }
               mix={ { block: 'NewVersionPopup' } }
             >
                 { this.renderContent() }
diff --git a/packages/scandipwa/src/component/Popup/Popup.component.js b/packages/scandipwa/src/component/Popup/Popup.component.js
index d81b19168e..928ca821b7 100644
--- a/packages/scandipwa/src/component/Popup/Popup.component.js
+++ b/packages/scandipwa/src/component/Popup/Popup.component.js
@@ -26,7 +26,7 @@ import './Popup.style';
 export class Popup extends Overlay {
     static propTypes = {
         ...Overlay.propTypes,
-        clickOutside: PropTypes.bool.isRequired,
+        isCloseOnOutsideClick: PropTypes.bool.isRequired,
         title: PropTypes.string
     };
 
@@ -109,9 +109,9 @@ export class Popup extends Overlay {
 
     // Same with click outside
     handleClickOutside() {
-        const { clickOutside, isMobile } = this.props;
+        const { isCloseOnOutsideClick, isMobile } = this.props;
 
-        if (!clickOutside) {
+        if (!isCloseOnOutsideClick) {
             return;
         }
 
diff --git a/packages/scandipwa/src/component/Popup/Popup.container.js b/packages/scandipwa/src/component/Popup/Popup.container.js
index a5dd823b2b..505407fbf4 100644
--- a/packages/scandipwa/src/component/Popup/Popup.container.js
+++ b/packages/scandipwa/src/component/Popup/Popup.container.js
@@ -49,7 +49,7 @@ export class PopupContainer extends PureComponent {
                 title: PropTypes.string
             })
         ).isRequired,
-        clickOutside: PropTypes.bool,
+        isCloseOnOutsideClick: PropTypes.bool,
         activeOverlay: PropTypes.string.isRequired,
         goToPreviousNavigationState: PropTypes.func.isRequired,
         areOtherOverlaysOpen: PropTypes.bool.isRequired,
@@ -74,7 +74,7 @@ export class PopupContainer extends PureComponent {
         contentMix: {},
         children: [],
         isStatic: false,
-        clickOutside: true
+        isCloseOnOutsideClick: true
     };
 
     containerFunctions = {
@@ -97,7 +97,7 @@ export class PopupContainer extends PureComponent {
 
     containerProps() {
         const {
-            clickOutside,
+            isCloseOnOutsideClick,
             activeOverlay,
             areOtherOverlaysOpen,
             changeHeaderState,
@@ -117,7 +117,7 @@ export class PopupContainer extends PureComponent {
         } = this.props;
 
         return {
-            clickOutside,
+            isCloseOnOutsideClick,
             activeOverlay,
             areOtherOverlaysOpen,
             changeHeaderState,
diff --git a/packages/scandipwa/src/component/ShareWishlistPopup/ShareWishlistPopup.component.js b/packages/scandipwa/src/component/ShareWishlistPopup/ShareWishlistPopup.component.js
index 904fb9c65f..503d800bb8 100644
--- a/packages/scandipwa/src/component/ShareWishlistPopup/ShareWishlistPopup.component.js
+++ b/packages/scandipwa/src/component/ShareWishlistPopup/ShareWishlistPopup.component.js
@@ -43,7 +43,7 @@ export class ShareWishlistPopup extends PureComponent {
         return (
             <Popup
               id={ SHARE_WISHLIST_POPUP_ID }
-              clickOutside={ false }
+              isCloseOnOutsideClick={ false }
               mix={ { block: 'ShareWishlistPopup' } }
             >
                 { this.renderContent() }
diff --git a/packages/scandipwa/src/component/StoreInPickUpPopup/StoreInPickUpPopup.component.js b/packages/scandipwa/src/component/StoreInPickUpPopup/StoreInPickUpPopup.component.js
index b46be6ecc9..4b5f7a02f5 100644
--- a/packages/scandipwa/src/component/StoreInPickUpPopup/StoreInPickUpPopup.component.js
+++ b/packages/scandipwa/src/component/StoreInPickUpPopup/StoreInPickUpPopup.component.js
@@ -153,7 +153,7 @@ export class StoreInPickUpPopupComponent extends PureComponent {
         return (
             <Popup
               id={ STORE_IN_PICK_UP_POPUP_ID }
-              clickOutside={ false }
+              isCloseOnOutsideClick={ false }
               mix={ { block: 'StoreInPickUpPopup' } }
             >
                 { this.renderContent() }

From d2e388be59877a4f30ee4cdaf300d6a484b0d1f2 Mon Sep 17 00:00:00 2001
From: ScandiWEB <scandiweb@ScandiWEBs-MacBook-Pro.local>
Date: Mon, 26 Sep 2022 15:52:25 +0300
Subject: [PATCH 05/17] Publish

 - @scandipwa/scandipwa@5.3.5
---
 packages/scandipwa/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/scandipwa/package.json b/packages/scandipwa/package.json
index ffd01c9271..6603830640 100644
--- a/packages/scandipwa/package.json
+++ b/packages/scandipwa/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@scandipwa/scandipwa",
     "description": "ScandiPWA source code used by CSA.",
-    "version": "5.3.4",
+    "version": "5.3.5",
     "scripts": {
         "start": "scandipwa-scripts start",
         "start:magento": "BUILD_MODE=magento scandipwa-scripts start",

From 74c49093891b7087cbfeb54731681578256a10a6 Mon Sep 17 00:00:00 2001
From: Mate Sitchinava <mate.sitchinava@scandiweb.com>
Date: Mon, 26 Sep 2022 18:03:50 +0400
Subject: [PATCH 06/17] revert history changes

---
 .../CategoryFilterOverlay.container.js                     | 7 ++++---
 packages/scandipwa/src/component/Popup/Popup.container.js  | 2 +-
 .../ProductComparePage/ProductComparePage.container.js     | 2 +-
 .../src/route/ProductPage/ProductPage.container.js         | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages/scandipwa/src/component/CategoryFilterOverlay/CategoryFilterOverlay.container.js b/packages/scandipwa/src/component/CategoryFilterOverlay/CategoryFilterOverlay.container.js
index 27096625eb..a37194c5cf 100644
--- a/packages/scandipwa/src/component/CategoryFilterOverlay/CategoryFilterOverlay.container.js
+++ b/packages/scandipwa/src/component/CategoryFilterOverlay/CategoryFilterOverlay.container.js
@@ -188,9 +188,10 @@ export class CategoryFilterOverlayContainer extends PureComponent {
 
         window.addEventListener('popstate', this.historyBackHook);
 
-        history.push(
-            pathname + search,
-            { overlayOpen: true }
+        history.pushState(
+            { overlayOpen: true },
+            '',
+            pathname + search
         );
     }
 
diff --git a/packages/scandipwa/src/component/Popup/Popup.container.js b/packages/scandipwa/src/component/Popup/Popup.container.js
index 701dc39c93..505407fbf4 100644
--- a/packages/scandipwa/src/component/Popup/Popup.container.js
+++ b/packages/scandipwa/src/component/Popup/Popup.container.js
@@ -88,7 +88,7 @@ export class PopupContainer extends PureComponent {
             name: POPUP,
             title: this._getPopupTitle(),
             onCloseClick: () => {
-                history.goBack();
+                history.back();
             }
         });
 
diff --git a/packages/scandipwa/src/route/ProductComparePage/ProductComparePage.container.js b/packages/scandipwa/src/route/ProductComparePage/ProductComparePage.container.js
index f28f60d415..4ad7b4f3ab 100644
--- a/packages/scandipwa/src/route/ProductComparePage/ProductComparePage.container.js
+++ b/packages/scandipwa/src/route/ProductComparePage/ProductComparePage.container.js
@@ -98,7 +98,7 @@ export class ProductComparePageContainer extends DataContainer {
         setHeaderState({
             name: PRODUCT_COMPARE,
             title: __('Compare'),
-            onBackClick: () => history.goBack()
+            onBackClick: () => history.back()
         });
     }
 
diff --git a/packages/scandipwa/src/route/ProductPage/ProductPage.container.js b/packages/scandipwa/src/route/ProductPage/ProductPage.container.js
index 667cedd2b5..8d852887cb 100644
--- a/packages/scandipwa/src/route/ProductPage/ProductPage.container.js
+++ b/packages/scandipwa/src/route/ProductPage/ProductPage.container.js
@@ -534,7 +534,7 @@ export class ProductPageContainer extends PureComponent {
         changeHeaderState({
             name: PDP,
             title: name,
-            onBackClick: () => history.goBack()
+            onBackClick: () => history.back()
         });
     }
 

From f52bad0030cc51a0b6f263f3a3ba106af44872b4 Mon Sep 17 00:00:00 2001
From: Mate Sitchinava <mate.sitchinava@scandiweb.com>
Date: Tue, 27 Sep 2022 16:09:43 +0400
Subject: [PATCH 07/17] added timeout for redis

---
 .../scandipwa/src/util/Request/Request.js     | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/packages/scandipwa/src/util/Request/Request.js b/packages/scandipwa/src/util/Request/Request.js
index ffe9593050..987c1cbd19 100644
--- a/packages/scandipwa/src/util/Request/Request.js
+++ b/packages/scandipwa/src/util/Request/Request.js
@@ -201,29 +201,31 @@ export const executeGet = async (queryObject, name, cacheTTL, signal) => {
         refreshUid();
     }
 
-    // circumvention of the eslint rule that prohibits usage of let
-    const res = [];
-
+    // Fetch only throws on network error, http errors have to be handled manually.
     try {
-        res[0] = await getFetch(uri, name, signal);
-    } catch (err) {
-        if (res.status === HTTP_410_GONE) {
+        const result = await getFetch(uri, name, signal);
+
+        if (result.status === HTTP_410_GONE) {
             const putResponse = await putPersistedQuery(getGraphqlEndpoint(), query, cacheTTL);
 
             if (putResponse.status === HTTP_201_CREATED) {
-                res[0] = await getFetch(uri, name, signal);
+                // eslint-disable-next-line no-magic-numbers
+                setTimeout(async () => parseResponse(await getFetch(uri, name, signal)), 200);
             }
-        } else if (res.status === HTTP_503_SERVICE_UNAVAILABLE) {
-            handleConnectionError(err, 'Service unavailable!...');
+        }
 
-            throw new Error(err);
+        if (result.status === HTTP_503_SERVICE_UNAVAILABLE) {
+            handleConnectionError(result.status, result.statusText);
+            throw new Error(result.statusText);
         }
 
-        handleConnectionError(err, 'executeGet failed');
-        throw new Error(err);
+        // Successful and all other http responses go here:
+        return parseResponse(result);
+    } catch (error) {
+        // Network error
+        handleConnectionError(error, 'executeGet failed');
+        throw new Error(error);
     }
-
-    return parseResponse(res[0]);
 };
 
 /**

From 233b79ed99de890ee135997bb9c86724d2ce14fe Mon Sep 17 00:00:00 2001
From: Mate Sitchinava <mate.sitchinava@scandiweb.com>
Date: Tue, 27 Sep 2022 17:05:45 +0400
Subject: [PATCH 08/17] added delay for redis

---
 packages/scandipwa/src/util/Request/Request.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/scandipwa/src/util/Request/Request.js b/packages/scandipwa/src/util/Request/Request.js
index 987c1cbd19..10981b4710 100644
--- a/packages/scandipwa/src/util/Request/Request.js
+++ b/packages/scandipwa/src/util/Request/Request.js
@@ -20,6 +20,9 @@ import { hash } from './Hash';
 export const GRAPHQL_URI = '/graphql';
 export const WINDOW_ID = 'WINDOW_ID';
 
+/** @namespace Util/Request/delay */
+export const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+
 /** @namespace Util/Request/getWindowId */
 export const getWindowId = () => {
     const result = sessionStorage.getItem(WINDOW_ID);
@@ -210,7 +213,9 @@ export const executeGet = async (queryObject, name, cacheTTL, signal) => {
 
             if (putResponse.status === HTTP_201_CREATED) {
                 // eslint-disable-next-line no-magic-numbers
-                setTimeout(async () => parseResponse(await getFetch(uri, name, signal)), 200);
+                await delay(300);
+
+                return parseResponse(await getFetch(uri, name, signal));
             }
         }
 

From bc7a1e81a020c460b4f775297e286ea94a8f2af1 Mon Sep 17 00:00:00 2001
From: Mate Sitchinava <mate.sitchinava@scandiweb.com>
Date: Tue, 27 Sep 2022 17:48:38 +0400
Subject: [PATCH 09/17] reverted Request.js changes

---
 .../src/util/Request/QueryDispatcher.js       |   4 +-
 .../scandipwa/src/util/Request/Request.js     | 235 +++++++++---------
 2 files changed, 119 insertions(+), 120 deletions(-)

diff --git a/packages/scandipwa/src/util/Request/QueryDispatcher.js b/packages/scandipwa/src/util/Request/QueryDispatcher.js
index 44ba2827e2..d4efa05df8 100644
--- a/packages/scandipwa/src/util/Request/QueryDispatcher.js
+++ b/packages/scandipwa/src/util/Request/QueryDispatcher.js
@@ -57,9 +57,7 @@ export class QueryDispatcher {
             this.promise = await executeGet(prepareQuery(queries), name, cacheTTL, this.controller.signal);
             this.onSuccess(this.promise, dispatch, options);
         } catch (err) {
-            if (!err.message.includes('abort')) {
-                this.onError(err, dispatch, options);
-            }
+            this.onError(err, dispatch, options);
         }
         const broadcast = await listenForBroadCast(name);
 
diff --git a/packages/scandipwa/src/util/Request/Request.js b/packages/scandipwa/src/util/Request/Request.js
index 10981b4710..2946094401 100644
--- a/packages/scandipwa/src/util/Request/Request.js
+++ b/packages/scandipwa/src/util/Request/Request.js
@@ -20,9 +20,6 @@ import { hash } from './Hash';
 export const GRAPHQL_URI = '/graphql';
 export const WINDOW_ID = 'WINDOW_ID';
 
-/** @namespace Util/Request/delay */
-export const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-
 /** @namespace Util/Request/getWindowId */
 export const getWindowId = () => {
     const result = sessionStorage.getItem(WINDOW_ID);
@@ -55,11 +52,11 @@ export const getStoreCodePath = () => {
 export const getGraphqlEndpoint = () => getStoreCodePath().concat(GRAPHQL_URI);
 
 /**
- * Append authorization token to header object
- * @param {Object} headers
- * @returns {Object} Headers with appended authorization
- * @namespace Util/Request/appendTokenToHeaders
- */
+   * Append authorization token to header object
+   * @param {Object} headers
+   * @returns {Object} Headers with appended authorization
+   * @namespace Util/Request/appendTokenToHeaders
+   */
 export const appendTokenToHeaders = (headers) => {
     const token = getAuthorizationToken();
 
@@ -70,13 +67,13 @@ export const appendTokenToHeaders = (headers) => {
 };
 
 /**
- *
- * @param {String} query Request body
- * @param {Object} variables Request variables
- * @param {String} url GraphQL url
- * @returns {*}
- * @namespace Util/Request/formatURI
- */
+   *
+   * @param {String} query Request body
+   * @param {Object} variables Request variables
+   * @param {String} url GraphQL url
+   * @returns {*}
+   * @namespace Util/Request/formatURI
+   */
 export const formatURI = (query, variables, url) => {
     // eslint-disable-next-line no-param-reassign
     variables._currency = getCurrency();
@@ -90,12 +87,12 @@ export const formatURI = (query, variables, url) => {
 };
 
 /**
- *
- * @param {String} uri
- * @param {String} name
- * @returns {Promise<Response>}
- * @namespace Util/Request/getFetch
- */
+   *
+   * @param {String} uri
+   * @param {String} name
+   * @returns {Promise<Response>}
+   * @namespace Util/Request/getFetch
+   */
 export const getFetch = (uri, name, signal) => fetch(uri,
     {
         method: 'GET',
@@ -108,12 +105,12 @@ export const getFetch = (uri, name, signal) => fetch(uri,
     });
 
 /**
- *
- * @param {String} graphQlURI
- * @param {{}} query Request body
- * @param {Int} cacheTTL
- * @namespace Util/Request/putPersistedQuery
- */
+   *
+   * @param {String} graphQlURI
+   * @param {{}} query Request body
+   * @param {Int} cacheTTL
+   * @namespace Util/Request/putPersistedQuery
+   */
 export const putPersistedQuery = (graphQlURI, query, cacheTTL) => fetch(`${ graphQlURI }?hash=${ hash(query) }`,
     {
         method: 'PUT',
@@ -125,13 +122,13 @@ export const putPersistedQuery = (graphQlURI, query, cacheTTL) => fetch(`${ grap
     });
 
 /**
- *
- * @param {String} graphQlURI
- * @param {String} queryObject
- * @param {String} name
- * @returns {Promise<Response>}
- * @namespace Util/Request/postFetch
- */
+   *
+   * @param {String} graphQlURI
+   * @param {String} queryObject
+   * @param {String} name
+   * @returns {Promise<Response>}
+   * @namespace Util/Request/postFetch
+   */
 export const postFetch = (graphQlURI, query, variables) => fetch(graphQlURI,
     {
         method: 'POST',
@@ -143,11 +140,11 @@ export const postFetch = (graphQlURI, query, variables) => fetch(graphQlURI,
     });
 
 /**
- * Checks for errors in response, if they exist, rejects promise
- * @param  {Object} res Response from GraphQL endpoint
- * @return {Promise<Object>} Handled GraphqlQL results promise
- * @namespace Util/Request/checkForErrors
- */
+   * Checks for errors in response, if they exist, rejects promise
+   * @param  {Object} res Response from GraphQL endpoint
+   * @return {Promise<Object>} Handled GraphqlQL results promise
+   * @namespace Util/Request/checkForErrors
+   */
 export const checkForErrors = (res) => new Promise((resolve, reject) => {
     const { errors, data } = res;
 
@@ -155,47 +152,55 @@ export const checkForErrors = (res) => new Promise((resolve, reject) => {
 });
 
 /**
- * Handle connection errors
- * @param  {any} err Error from fetch
- * @return {void} Simply console error
- * @namespace Util/Request/handleConnectionError
- */
-export const handleConnectionError = (err, msg) => {
-    // eslint-disable-next-line no-console
-    console.error(msg, err);
-}; // TODO: Add to logs pool
+   * Handle connection errors
+   * @param  {any} err Error from fetch
+   * @return {void} Simply console error
+   * @namespace Util/Request/handleConnectionError
+   */
+// eslint-disable-next-line no-console
+export const handleConnectionError = (err) => console.error(err); // TODO: Add to logs pool
 
 /**
- * Parse response and check wether it contains errors
- * @param  {{}} queryObject prepared with `prepareDocument()` from `Util/Query` request body object
- * @return {Promise<Request>} Fetch promise to GraphQL endpoint
- * @namespace Util/Request/parseResponse
- */
-export const parseResponse = async (response) => {
-    try {
-        const data = await response.json();
-
-        return checkForErrors(data);
-    } catch (err) {
-        handleConnectionError(err, 'Can not parse JSON!');
+   * Parse response and check wether it contains errors
+   * @param  {{}} queryObject prepared with `prepareDocument()` from `Util/Query` request body object
+   * @return {Promise<Request>} Fetch promise to GraphQL endpoint
+   * @namespace Util/Request/parseResponse
+   */
+export const parseResponse = (promise) => new Promise((resolve, reject) => {
+    promise.then(
+        /** @namespace Util/Request/parseResponse/Promise/promise/then */
+        (res) => res.json().then(
+            /** @namespace Util/Request/parseResponse/Promise/promise/then/json/then/resolve */
+            (res) => resolve(checkForErrors(res)),
+            /** @namespace Util/Request/parseResponse/Promise/promise/then/json/then/catch */
+            () => {
+                handleConnectionError('Can not transform JSON!');
+
+                return reject();
+            }
+        ),
+        /** @namespace Util/Request/parseResponse/Promise/promise/then/catch */
+        (err) => {
+            handleConnectionError('Can not establish connection!');
 
-        throw err;
-    }
-};
+            return reject(err);
+        }
+    );
+});
 
 export const HTTP_503_SERVICE_UNAVAILABLE = 503;
 export const HTTP_410_GONE = 410;
 export const HTTP_201_CREATED = 201;
 
 /**
- * Make GET request to endpoint (via ServiceWorker)
- * @param  {{}} queryObject prepared with `prepareDocument()` from `Util/Query` request body object
- * @param  {String} name Name of model for ServiceWorker to send BroadCasts updates to
- * @param  {Number} cacheTTL Cache TTL (in seconds) for ServiceWorker to cache responses
- * @return {Promise<Request>} Fetch promise to GraphQL endpoint
- * @namespace Util/Request/executeGet
- */
-export const executeGet = async (queryObject, name, cacheTTL, signal) => {
+   * Make GET request to endpoint (via ServiceWorker)
+   * @param  {{}} queryObject prepared with `prepareDocument()` from `Util/Query` request body object
+   * @param  {String} name Name of model for ServiceWorker to send BroadCasts updates to
+   * @param  {Number} cacheTTL Cache TTL (in seconds) for ServiceWorker to cache responses
+   * @return {Promise<Request>} Fetch promise to GraphQL endpoint
+   * @namespace Util/Request/executeGet
+   */
+export const executeGet = (queryObject, name, cacheTTL, signal) => {
     const { query, variables } = queryObject;
     const uri = formatURI(query, variables, getGraphqlEndpoint());
 
@@ -204,42 +209,46 @@ export const executeGet = async (queryObject, name, cacheTTL, signal) => {
         refreshUid();
     }
 
-    // Fetch only throws on network error, http errors have to be handled manually.
-    try {
-        const result = await getFetch(uri, name, signal);
-
-        if (result.status === HTTP_410_GONE) {
-            const putResponse = await putPersistedQuery(getGraphqlEndpoint(), query, cacheTTL);
-
-            if (putResponse.status === HTTP_201_CREATED) {
-                // eslint-disable-next-line no-magic-numbers
-                await delay(300);
-
-                return parseResponse(await getFetch(uri, name, signal));
+    return parseResponse(new Promise((resolve, reject) => {
+        getFetch(uri, name, signal).then(
+            /** @namespace Util/Request/executeGet/parseResponse/getFetch/then */
+            (res) => {
+                if (res.status === HTTP_410_GONE) {
+                    putPersistedQuery(getGraphqlEndpoint(), query, cacheTTL).then(
+                        /** @namespace Util/Request/executeGet/parseResponse/getFetch/then/putPersistedQuery/then */
+                        (putResponse) => {
+                            if (putResponse.status === HTTP_201_CREATED) {
+                                getFetch(uri, name, signal).then(
+                                    /** @namespace Util/Request/executeGet/parseResponse/getFetch/then/putPersistedQuery/then/getFetch/then/resolve */
+                                    (res) => resolve(res)
+                                );
+                            }
+                        }
+                    );
+                } else if (res.status === HTTP_503_SERVICE_UNAVAILABLE) {
+                    reject(res);
+                } else {
+                    resolve(res);
+                }
+            }, /** @namespace Util/Request/executeGet/parseResponse/getFetch/then/catch */
+            (err) => {
+                if (!signal.aborted) {
+                    return err;
+                }
+
+                return '';
             }
-        }
-
-        if (result.status === HTTP_503_SERVICE_UNAVAILABLE) {
-            handleConnectionError(result.status, result.statusText);
-            throw new Error(result.statusText);
-        }
-
-        // Successful and all other http responses go here:
-        return parseResponse(result);
-    } catch (error) {
-        // Network error
-        handleConnectionError(error, 'executeGet failed');
-        throw new Error(error);
-    }
+        );
+    }));
 };
 
 /**
- * Make POST request to endpoint
- * @param  {{}} queryObject prepared with `prepareDocument()` from `Util/Query` request body object
- * @return {Promise<Request>} Fetch promise to GraphQL endpoint
- * @namespace Util/Request/executePost
- */
-export const executePost = async (queryObject) => {
+   * Make POST request to endpoint
+   * @param  {{}} queryObject prepared with `prepareDocument()` from `Util/Query` request body object
+   * @return {Promise<Request>} Fetch promise to GraphQL endpoint
+   * @namespace Util/Request/executePost
+   */
+export const executePost = (queryObject) => {
     const { query, variables } = queryObject;
 
     if (isSignedIn()) {
@@ -247,23 +256,15 @@ export const executePost = async (queryObject) => {
         refreshUid();
     }
 
-    try {
-        const response = await postFetch(getGraphqlEndpoint(), query, variables);
-
-        return parseResponse(response);
-    } catch (err) {
-        handleConnectionError(err, 'executePost failed');
-
-        throw new Error(err);
-    }
+    return parseResponse(postFetch(getGraphqlEndpoint(), query, variables));
 };
 
 /**
- * Listen to the BroadCast connection
- * @param  {String} name Name of model for ServiceWorker to send BroadCasts updates to
- * @return {Promise<any>} Broadcast message promise
- * @namespace Util/Request/listenForBroadCast
- */
+   * Listen to the BroadCast connection
+   * @param  {String} name Name of model for ServiceWorker to send BroadCasts updates to
+   * @return {Promise<any>} Broadcast message promise
+   * @namespace Util/Request/listenForBroadCast
+   */
 export const listenForBroadCast = (name) => new Promise((resolve) => {
     const { BroadcastChannel } = window;
     const windowId = getWindowId();

From 83fa7339455c04470b14adaf9d972b46f96c5345 Mon Sep 17 00:00:00 2001
From: Mate Sitchinava <mate.sitchinava@scandiweb.com>
Date: Tue, 27 Sep 2022 18:10:44 +0400
Subject: [PATCH 10/17] reverted signal controller

---
 .../src/util/Request/QueryDispatcher.js       |  45 ++++--
 .../scandipwa/src/util/Request/Request.js     | 142 +++++++++---------
 2 files changed, 99 insertions(+), 88 deletions(-)

diff --git a/packages/scandipwa/src/util/Request/QueryDispatcher.js b/packages/scandipwa/src/util/Request/QueryDispatcher.js
index d4efa05df8..78f08f7767 100644
--- a/packages/scandipwa/src/util/Request/QueryDispatcher.js
+++ b/packages/scandipwa/src/util/Request/QueryDispatcher.js
@@ -35,10 +35,15 @@ export class QueryDispatcher {
         this.name = name;
         this.cacheTTL = cacheTTL;
         this.promise = null;
-        this.controller = null;
     }
 
-    async handleData(dispatch, options) {
+    /**
+     * Is responsible for request routing and manages `onError`, `onSuccess`, `onUpdate` functions triggers.
+     * @param  {Function} dispatch Store changing function from Redux (dispatches actions)
+     * @param  {any} options Any options received from Container
+     * @return {void}@memberof QueryDispatcher
+     */
+    handleData(dispatch, options) {
         const { name, cacheTTL } = this;
 
         const rawQueries = this.prepareRequest(options, dispatch);
@@ -49,19 +54,33 @@ export class QueryDispatcher {
 
         const queries = rawQueries instanceof Field ? [rawQueries] : rawQueries;
 
-        const abort = this.promise && this.controller.abort();
-
-        this.controller = new AbortController();
-
-        try {
-            this.promise = await executeGet(prepareQuery(queries), name, cacheTTL, this.controller.signal);
-            this.onSuccess(this.promise, dispatch, options);
-        } catch (err) {
-            this.onError(err, dispatch, options);
+        if (this.promise) {
+            this.promise.cancel();
         }
-        const broadcast = await listenForBroadCast(name);
 
-        this.onUpdate(broadcast, dispatch, options);
+        this.promise = makeCancelable(
+            new Promise((resolve, reject) => {
+                executeGet(prepareQuery(queries), name, cacheTTL)
+                    .then(
+                        /** @namespace Util/Request/QueryDispatcher/QueryDispatcher/handleData/makeCancelable/executeGet/then/resolve */
+                        (data) => resolve(data),
+                        /** @namespace Util/Request/QueryDispatcher/QueryDispatcher/handleData/makeCancelable/executeGet/then/reject/catch */
+                        (error) => reject(error)
+                    );
+            })
+        );
+
+        this.promise.promise.then(
+            /** @namespace Util/Request/QueryDispatcher/QueryDispatcher/handleData/then */
+            (data) => this.onSuccess(data, dispatch, options),
+            /** @namespace Util/Request/QueryDispatcher/QueryDispatcher/handleData/then/catch */
+            (error) => this.onError(error, dispatch, options),
+        );
+
+        listenForBroadCast(name).then(
+            /** @namespace Util/Request/QueryDispatcher/QueryDispatcher/handleData/listenForBroadCast/then */
+            (data) => this.onUpdate(data, dispatch, options),
+        );
     }
 
     /**
diff --git a/packages/scandipwa/src/util/Request/Request.js b/packages/scandipwa/src/util/Request/Request.js
index 2946094401..9204c31269 100644
--- a/packages/scandipwa/src/util/Request/Request.js
+++ b/packages/scandipwa/src/util/Request/Request.js
@@ -52,11 +52,11 @@ export const getStoreCodePath = () => {
 export const getGraphqlEndpoint = () => getStoreCodePath().concat(GRAPHQL_URI);
 
 /**
-   * Append authorization token to header object
-   * @param {Object} headers
-   * @returns {Object} Headers with appended authorization
-   * @namespace Util/Request/appendTokenToHeaders
-   */
+  * Append authorization token to header object
+  * @param {Object} headers
+  * @returns {Object} Headers with appended authorization
+  * @namespace Util/Request/appendTokenToHeaders
+  */
 export const appendTokenToHeaders = (headers) => {
     const token = getAuthorizationToken();
 
@@ -67,13 +67,13 @@ export const appendTokenToHeaders = (headers) => {
 };
 
 /**
-   *
-   * @param {String} query Request body
-   * @param {Object} variables Request variables
-   * @param {String} url GraphQL url
-   * @returns {*}
-   * @namespace Util/Request/formatURI
-   */
+  *
+  * @param {String} query Request body
+  * @param {Object} variables Request variables
+  * @param {String} url GraphQL url
+  * @returns {*}
+  * @namespace Util/Request/formatURI
+  */
 export const formatURI = (query, variables, url) => {
     // eslint-disable-next-line no-param-reassign
     variables._currency = getCurrency();
@@ -87,16 +87,15 @@ export const formatURI = (query, variables, url) => {
 };
 
 /**
-   *
-   * @param {String} uri
-   * @param {String} name
-   * @returns {Promise<Response>}
-   * @namespace Util/Request/getFetch
-   */
-export const getFetch = (uri, name, signal) => fetch(uri,
+  *
+  * @param {String} uri
+  * @param {String} name
+  * @returns {Promise<Response>}
+  * @namespace Util/Request/getFetch
+  */
+export const getFetch = (uri, name) => fetch(uri,
     {
         method: 'GET',
-        signal,
         headers: appendTokenToHeaders({
             'Content-Type': 'application/json',
             'Application-Model': `${ name }_${ getWindowId() }`,
@@ -105,12 +104,12 @@ export const getFetch = (uri, name, signal) => fetch(uri,
     });
 
 /**
-   *
-   * @param {String} graphQlURI
-   * @param {{}} query Request body
-   * @param {Int} cacheTTL
-   * @namespace Util/Request/putPersistedQuery
-   */
+  *
+  * @param {String} graphQlURI
+  * @param {{}} query Request body
+  * @param {Int} cacheTTL
+  * @namespace Util/Request/putPersistedQuery
+  */
 export const putPersistedQuery = (graphQlURI, query, cacheTTL) => fetch(`${ graphQlURI }?hash=${ hash(query) }`,
     {
         method: 'PUT',
@@ -122,13 +121,13 @@ export const putPersistedQuery = (graphQlURI, query, cacheTTL) => fetch(`${ grap
     });
 
 /**
-   *
-   * @param {String} graphQlURI
-   * @param {String} queryObject
-   * @param {String} name
-   * @returns {Promise<Response>}
-   * @namespace Util/Request/postFetch
-   */
+  *
+  * @param {String} graphQlURI
+  * @param {String} queryObject
+  * @param {String} name
+  * @returns {Promise<Response>}
+  * @namespace Util/Request/postFetch
+  */
 export const postFetch = (graphQlURI, query, variables) => fetch(graphQlURI,
     {
         method: 'POST',
@@ -140,11 +139,11 @@ export const postFetch = (graphQlURI, query, variables) => fetch(graphQlURI,
     });
 
 /**
-   * Checks for errors in response, if they exist, rejects promise
-   * @param  {Object} res Response from GraphQL endpoint
-   * @return {Promise<Object>} Handled GraphqlQL results promise
-   * @namespace Util/Request/checkForErrors
-   */
+  * Checks for errors in response, if they exist, rejects promise
+  * @param  {Object} res Response from GraphQL endpoint
+  * @return {Promise<Object>} Handled GraphqlQL results promise
+  * @namespace Util/Request/checkForErrors
+  */
 export const checkForErrors = (res) => new Promise((resolve, reject) => {
     const { errors, data } = res;
 
@@ -152,20 +151,20 @@ export const checkForErrors = (res) => new Promise((resolve, reject) => {
 });
 
 /**
-   * Handle connection errors
-   * @param  {any} err Error from fetch
-   * @return {void} Simply console error
-   * @namespace Util/Request/handleConnectionError
-   */
+  * Handle connection errors
+  * @param  {any} err Error from fetch
+  * @return {void} Simply console error
+  * @namespace Util/Request/handleConnectionError
+  */
 // eslint-disable-next-line no-console
 export const handleConnectionError = (err) => console.error(err); // TODO: Add to logs pool
 
 /**
-   * Parse response and check wether it contains errors
-   * @param  {{}} queryObject prepared with `prepareDocument()` from `Util/Query` request body object
-   * @return {Promise<Request>} Fetch promise to GraphQL endpoint
-   * @namespace Util/Request/parseResponse
-   */
+  * Parse response and check wether it contains errors
+  * @param  {{}} queryObject prepared with `prepareDocument()` from `Util/Query` request body object
+  * @return {Promise<Request>} Fetch promise to GraphQL endpoint
+  * @namespace Util/Request/parseResponse
+  */
 export const parseResponse = (promise) => new Promise((resolve, reject) => {
     promise.then(
         /** @namespace Util/Request/parseResponse/Promise/promise/then */
@@ -193,14 +192,14 @@ export const HTTP_410_GONE = 410;
 export const HTTP_201_CREATED = 201;
 
 /**
-   * Make GET request to endpoint (via ServiceWorker)
-   * @param  {{}} queryObject prepared with `prepareDocument()` from `Util/Query` request body object
-   * @param  {String} name Name of model for ServiceWorker to send BroadCasts updates to
-   * @param  {Number} cacheTTL Cache TTL (in seconds) for ServiceWorker to cache responses
-   * @return {Promise<Request>} Fetch promise to GraphQL endpoint
-   * @namespace Util/Request/executeGet
-   */
-export const executeGet = (queryObject, name, cacheTTL, signal) => {
+  * Make GET request to endpoint (via ServiceWorker)
+  * @param  {{}} queryObject prepared with `prepareDocument()` from `Util/Query` request body object
+  * @param  {String} name Name of model for ServiceWorker to send BroadCasts updates to
+  * @param  {Number} cacheTTL Cache TTL (in seconds) for ServiceWorker to cache responses
+  * @return {Promise<Request>} Fetch promise to GraphQL endpoint
+  * @namespace Util/Request/executeGet
+  */
+export const executeGet = (queryObject, name, cacheTTL) => {
     const { query, variables } = queryObject;
     const uri = formatURI(query, variables, getGraphqlEndpoint());
 
@@ -210,7 +209,7 @@ export const executeGet = (queryObject, name, cacheTTL, signal) => {
     }
 
     return parseResponse(new Promise((resolve, reject) => {
-        getFetch(uri, name, signal).then(
+        getFetch(uri, name).then(
             /** @namespace Util/Request/executeGet/parseResponse/getFetch/then */
             (res) => {
                 if (res.status === HTTP_410_GONE) {
@@ -218,7 +217,7 @@ export const executeGet = (queryObject, name, cacheTTL, signal) => {
                         /** @namespace Util/Request/executeGet/parseResponse/getFetch/then/putPersistedQuery/then */
                         (putResponse) => {
                             if (putResponse.status === HTTP_201_CREATED) {
-                                getFetch(uri, name, signal).then(
+                                getFetch(uri, name).then(
                                     /** @namespace Util/Request/executeGet/parseResponse/getFetch/then/putPersistedQuery/then/getFetch/then/resolve */
                                     (res) => resolve(res)
                                 );
@@ -230,24 +229,17 @@ export const executeGet = (queryObject, name, cacheTTL, signal) => {
                 } else {
                     resolve(res);
                 }
-            }, /** @namespace Util/Request/executeGet/parseResponse/getFetch/then/catch */
-            (err) => {
-                if (!signal.aborted) {
-                    return err;
-                }
-
-                return '';
             }
         );
     }));
 };
 
 /**
-   * Make POST request to endpoint
-   * @param  {{}} queryObject prepared with `prepareDocument()` from `Util/Query` request body object
-   * @return {Promise<Request>} Fetch promise to GraphQL endpoint
-   * @namespace Util/Request/executePost
-   */
+  * Make POST request to endpoint
+  * @param  {{}} queryObject prepared with `prepareDocument()` from `Util/Query` request body object
+  * @return {Promise<Request>} Fetch promise to GraphQL endpoint
+  * @namespace Util/Request/executePost
+  */
 export const executePost = (queryObject) => {
     const { query, variables } = queryObject;
 
@@ -260,11 +252,11 @@ export const executePost = (queryObject) => {
 };
 
 /**
-   * Listen to the BroadCast connection
-   * @param  {String} name Name of model for ServiceWorker to send BroadCasts updates to
-   * @return {Promise<any>} Broadcast message promise
-   * @namespace Util/Request/listenForBroadCast
-   */
+  * Listen to the BroadCast connection
+  * @param  {String} name Name of model for ServiceWorker to send BroadCasts updates to
+  * @return {Promise<any>} Broadcast message promise
+  * @namespace Util/Request/listenForBroadCast
+  */
 export const listenForBroadCast = (name) => new Promise((resolve) => {
     const { BroadcastChannel } = window;
     const windowId = getWindowId();

From 5aed0219e4e9f1daa4f192ef2cfd8cc7e0b4c73c Mon Sep 17 00:00:00 2001
From: Mate Sitchinava <mate.sitchinava@scandiweb.com>
Date: Wed, 28 Sep 2022 13:04:41 +0400
Subject: [PATCH 11/17] reverted back to original fix

---
 .../src/util/Request/QueryDispatcher.js       | 121 ++++++++----------
 .../scandipwa/src/util/Request/Request.js     |  99 +++++++-------
 2 files changed, 102 insertions(+), 118 deletions(-)

diff --git a/packages/scandipwa/src/util/Request/QueryDispatcher.js b/packages/scandipwa/src/util/Request/QueryDispatcher.js
index 78f08f7767..c0da2a3293 100644
--- a/packages/scandipwa/src/util/Request/QueryDispatcher.js
+++ b/packages/scandipwa/src/util/Request/QueryDispatcher.js
@@ -18,32 +18,27 @@ export const ONE_MONTH_IN_SECONDS = 2592000;
 export const FIVE_MINUTES_IN_SECONDS = 300;
 
 /**
- * Abstract request dispatcher.
- * IMPORTANT: it is required to implement `prepareRequest(options)` before using!
- * @class QueryDispatcher
- * @namespace Util/Request/QueryDispatcher
- */
+  * Abstract request dispatcher.
+  * IMPORTANT: it is required to implement `prepareRequest(options)` before using!
+  * @class QueryDispatcher
+  * @namespace Util/Request/QueryDispatcher
+  */
 export class QueryDispatcher {
     /**
-     * Creates an instance of QueryDispatcher.
-     * @param  {String} name Name of model for ServiceWorker to send BroadCasts updates to
-     * @param  {Number} cacheTTL Cache TTL (in seconds) for ServiceWorker to cache responses
-     * @memberof QueryDispatcher
-     */
+      * Creates an instance of QueryDispatcher.
+      * @param  {String} name Name of model for ServiceWorker to send BroadCasts updates to
+      * @param  {Number} cacheTTL Cache TTL (in seconds) for ServiceWorker to cache responses
+      * @memberof QueryDispatcher
+      */
     __construct(name, cacheTTL = ONE_MONTH_IN_SECONDS) {
         super.__construct();
         this.name = name;
         this.cacheTTL = cacheTTL;
         this.promise = null;
+        this.controller = null;
     }
 
-    /**
-     * Is responsible for request routing and manages `onError`, `onSuccess`, `onUpdate` functions triggers.
-     * @param  {Function} dispatch Store changing function from Redux (dispatches actions)
-     * @param  {any} options Any options received from Container
-     * @return {void}@memberof QueryDispatcher
-     */
-    handleData(dispatch, options) {
+    async handleData(dispatch, options) {
         const { name, cacheTTL } = this;
 
         const rawQueries = this.prepareRequest(options, dispatch);
@@ -54,74 +49,62 @@ export class QueryDispatcher {
 
         const queries = rawQueries instanceof Field ? [rawQueries] : rawQueries;
 
-        if (this.promise) {
-            this.promise.cancel();
+        const abort = this.promise && this.controller.abort();
+
+        this.controller = new AbortController();
+
+        try {
+            this.promise = await executeGet(prepareQuery(queries), name, cacheTTL, this.controller.signal);
+            this.onSuccess(this.promise, dispatch, options);
+        } catch (err) {
+            if (!err.message.includes('abort')) {
+                this.onError(err, dispatch, options);
+            }
         }
+        const broadcast = await listenForBroadCast(name);
 
-        this.promise = makeCancelable(
-            new Promise((resolve, reject) => {
-                executeGet(prepareQuery(queries), name, cacheTTL)
-                    .then(
-                        /** @namespace Util/Request/QueryDispatcher/QueryDispatcher/handleData/makeCancelable/executeGet/then/resolve */
-                        (data) => resolve(data),
-                        /** @namespace Util/Request/QueryDispatcher/QueryDispatcher/handleData/makeCancelable/executeGet/then/reject/catch */
-                        (error) => reject(error)
-                    );
-            })
-        );
-
-        this.promise.promise.then(
-            /** @namespace Util/Request/QueryDispatcher/QueryDispatcher/handleData/then */
-            (data) => this.onSuccess(data, dispatch, options),
-            /** @namespace Util/Request/QueryDispatcher/QueryDispatcher/handleData/then/catch */
-            (error) => this.onError(error, dispatch, options),
-        );
-
-        listenForBroadCast(name).then(
-            /** @namespace Util/Request/QueryDispatcher/QueryDispatcher/handleData/listenForBroadCast/then */
-            (data) => this.onUpdate(data, dispatch, options),
-        );
+        this.onUpdate(broadcast, dispatch, options);
     }
 
     /**
-     * Is triggered by BroadCast updated from ServiceWorker.
-     * Should dispatch some action.
-     * @param  {any} data Data received from fetch of GraphQL endpoint
-     * @param  {Function} dispatch Store changing function from Redux (dispatches actions)
-     * @return {void}
-     * @memberof QueryDispatcher
-     */
+      * Is triggered by BroadCast updated from ServiceWorker.
+      * Should dispatch some action.
+      * @param  {any} data Data received from fetch of GraphQL endpoint
+      * @param  {Function} dispatch Store changing function from Redux (dispatches actions)
+      * @return {void}
+      * @memberof QueryDispatcher
+      */
     onUpdate(data, dispatch, options) {
         this.onSuccess(data, dispatch, options);
     }
 
     /**
-     * Is responsible for request building (request & mutation preparation)
-     * @param  {any} options Any options received from Container
-     * @param {Function} dispatch
-     * @return {Array<Field>|Field} Array or single item of Field instances
-     * @memberof QueryDispatcher
-     */
+      * Is responsible for request building (request & mutation preparation)
+      * @param  {any} options Any options received from Container
+      * @param {Function} dispatch
+      * @return {Array<Field>|Field} Array or single item of Field instances
+      * @memberof QueryDispatcher
+      */
     prepareRequest(options, dispatch) {}
 
     /**
-     * Is triggered on successful fetch of GraphQL endpoint.
-     * IMPORTANT: If there are any errors in response (`errors` field in JSON response from GraphQL), this function won't trigger!
-     * Should dispatch some action.
-     * @param  {any} data
-     * @param  {any} dispatch
-     * @return {void}@memberof QueryDispatcher
-     */
+      * Is triggered on successful fetch of GraphQL endpoint.
+      * IMPORTANT: If there are any errors in response (`errors` field in JSON response from GraphQL), this function won't trigger!
+      * Should dispatch some action.
+      * @param  {any} data
+      * @param  {any} dispatch
+      * @return {void}@memberof QueryDispatcher
+      */
     onSuccess(data, dispatch) {}
 
     /**
-     * Is triggered on error in fetch of GraphQL endpoint.
-     * IMPORTANT: If there are any errors in response (`errors` field in JSON response from GraphQL), this function will trigger!
-     * Should dispatch some action.
-     * @param  {any} error
-     * @param  {any} dispatch
-     * @return {void}@memberof QueryDispatcher
-     */
+      * Is triggered on error in fetch of GraphQL endpoint.
+      * IMPORTANT: If there are any errors in response (`errors` field in JSON response from GraphQL), this function will trigger!
+      * Should dispatch some action.
+      * @param  {any} error
+      * @param  {any} dispatch
+      * @return {void}@memberof QueryDispatcher
+      */
     onError(error, dispatch) {}
 }
 
diff --git a/packages/scandipwa/src/util/Request/Request.js b/packages/scandipwa/src/util/Request/Request.js
index 9204c31269..5307d3561b 100644
--- a/packages/scandipwa/src/util/Request/Request.js
+++ b/packages/scandipwa/src/util/Request/Request.js
@@ -93,9 +93,10 @@ export const formatURI = (query, variables, url) => {
   * @returns {Promise<Response>}
   * @namespace Util/Request/getFetch
   */
-export const getFetch = (uri, name) => fetch(uri,
+export const getFetch = (uri, name, signal) => fetch(uri,
     {
         method: 'GET',
+        signal,
         headers: appendTokenToHeaders({
             'Content-Type': 'application/json',
             'Application-Model': `${ name }_${ getWindowId() }`,
@@ -156,8 +157,10 @@ export const checkForErrors = (res) => new Promise((resolve, reject) => {
   * @return {void} Simply console error
   * @namespace Util/Request/handleConnectionError
   */
-// eslint-disable-next-line no-console
-export const handleConnectionError = (err) => console.error(err); // TODO: Add to logs pool
+export const handleConnectionError = (err, msg) => {
+    // eslint-disable-next-line no-console
+    console.error(msg, err);
+}; // TODO: Add to logs pool
 
 /**
   * Parse response and check wether it contains errors
@@ -165,27 +168,17 @@ export const handleConnectionError = (err) => console.error(err); // TODO: Add t
   * @return {Promise<Request>} Fetch promise to GraphQL endpoint
   * @namespace Util/Request/parseResponse
   */
-export const parseResponse = (promise) => new Promise((resolve, reject) => {
-    promise.then(
-        /** @namespace Util/Request/parseResponse/Promise/promise/then */
-        (res) => res.json().then(
-            /** @namespace Util/Request/parseResponse/Promise/promise/then/json/then/resolve */
-            (res) => resolve(checkForErrors(res)),
-            /** @namespace Util/Request/parseResponse/Promise/promise/then/json/then/catch */
-            () => {
-                handleConnectionError('Can not transform JSON!');
-
-                return reject();
-            }
-        ),
-        /** @namespace Util/Request/parseResponse/Promise/promise/then/catch */
-        (err) => {
-            handleConnectionError('Can not establish connection!');
+export const parseResponse = async (response) => {
+    try {
+        const data = await response.json();
 
-            return reject(err);
-        }
-    );
-});
+        return checkForErrors(data);
+    } catch (err) {
+        handleConnectionError(err, 'Can not parse JSON!');
+
+        throw err;
+    }
+};
 
 export const HTTP_503_SERVICE_UNAVAILABLE = 503;
 export const HTTP_410_GONE = 410;
@@ -199,7 +192,7 @@ export const HTTP_201_CREATED = 201;
   * @return {Promise<Request>} Fetch promise to GraphQL endpoint
   * @namespace Util/Request/executeGet
   */
-export const executeGet = (queryObject, name, cacheTTL) => {
+export const executeGet = async (queryObject, name, cacheTTL, signal) => {
     const { query, variables } = queryObject;
     const uri = formatURI(query, variables, getGraphqlEndpoint());
 
@@ -208,30 +201,30 @@ export const executeGet = (queryObject, name, cacheTTL) => {
         refreshUid();
     }
 
-    return parseResponse(new Promise((resolve, reject) => {
-        getFetch(uri, name).then(
-            /** @namespace Util/Request/executeGet/parseResponse/getFetch/then */
-            (res) => {
-                if (res.status === HTTP_410_GONE) {
-                    putPersistedQuery(getGraphqlEndpoint(), query, cacheTTL).then(
-                        /** @namespace Util/Request/executeGet/parseResponse/getFetch/then/putPersistedQuery/then */
-                        (putResponse) => {
-                            if (putResponse.status === HTTP_201_CREATED) {
-                                getFetch(uri, name).then(
-                                    /** @namespace Util/Request/executeGet/parseResponse/getFetch/then/putPersistedQuery/then/getFetch/then/resolve */
-                                    (res) => resolve(res)
-                                );
-                            }
-                        }
-                    );
-                } else if (res.status === HTTP_503_SERVICE_UNAVAILABLE) {
-                    reject(res);
-                } else {
-                    resolve(res);
-                }
+    // Fetch only throws on network error, http errors have to be handled manually.
+    try {
+        const result = await getFetch(uri, name, signal);
+
+        if (result.status === HTTP_410_GONE) {
+            const putResponse = await putPersistedQuery(getGraphqlEndpoint(), query, cacheTTL);
+
+            if (putResponse.status === HTTP_201_CREATED) {
+                return parseResponse(await getFetch(uri, name, signal));
             }
-        );
-    }));
+        }
+
+        if (result.status === HTTP_503_SERVICE_UNAVAILABLE) {
+            handleConnectionError(result.status, result.statusText);
+            throw new Error(result.statusText);
+        }
+
+        // Successful and all other http responses go here:
+        return parseResponse(result);
+    } catch (error) {
+        // Network error
+        handleConnectionError(error, 'executeGet failed');
+        throw new Error(error);
+    }
 };
 
 /**
@@ -240,7 +233,7 @@ export const executeGet = (queryObject, name, cacheTTL) => {
   * @return {Promise<Request>} Fetch promise to GraphQL endpoint
   * @namespace Util/Request/executePost
   */
-export const executePost = (queryObject) => {
+export const executePost = async (queryObject) => {
     const { query, variables } = queryObject;
 
     if (isSignedIn()) {
@@ -248,7 +241,15 @@ export const executePost = (queryObject) => {
         refreshUid();
     }
 
-    return parseResponse(postFetch(getGraphqlEndpoint(), query, variables));
+    try {
+        const response = await postFetch(getGraphqlEndpoint(), query, variables);
+
+        return parseResponse(response);
+    } catch (err) {
+        handleConnectionError(err, 'executePost failed');
+
+        throw new Error(err);
+    }
 };
 
 /**

From 778b5c1a3b7120b4d4c1ee44398f0b5c565a51db Mon Sep 17 00:00:00 2001
From: Mate Sitchinava <mate.sitchinava@scandiweb.com>
Date: Wed, 28 Sep 2022 13:14:54 +0400
Subject: [PATCH 12/17] fixed comment formating

---
 .../scandipwa/src/util/Product/Product.js     |  2 +-
 .../src/util/Request/QueryDispatcher.js       | 64 +++++++++----------
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/packages/scandipwa/src/util/Product/Product.js b/packages/scandipwa/src/util/Product/Product.js
index aed3937f40..55d2bf75ce 100644
--- a/packages/scandipwa/src/util/Product/Product.js
+++ b/packages/scandipwa/src/util/Product/Product.js
@@ -318,7 +318,7 @@ export const getIndexedProduct = (product, itemSku) => {
 };
 
 /** @namespace Util/Product/getIndexedProducts */
-export const getIndexedProducts = (products) => products.map((product) => getIndexedProduct(product));
+export const getIndexedProducts = (products = []) => products.map((product) => getIndexedProduct(product));
 
 /** @namespace Util/Product/getIndexedParameteredProducts */
 export const getIndexedParameteredProducts = (products) => Object.entries(products)
diff --git a/packages/scandipwa/src/util/Request/QueryDispatcher.js b/packages/scandipwa/src/util/Request/QueryDispatcher.js
index c0da2a3293..97152ca6d8 100644
--- a/packages/scandipwa/src/util/Request/QueryDispatcher.js
+++ b/packages/scandipwa/src/util/Request/QueryDispatcher.js
@@ -18,11 +18,11 @@ export const ONE_MONTH_IN_SECONDS = 2592000;
 export const FIVE_MINUTES_IN_SECONDS = 300;
 
 /**
-  * Abstract request dispatcher.
-  * IMPORTANT: it is required to implement `prepareRequest(options)` before using!
-  * @class QueryDispatcher
-  * @namespace Util/Request/QueryDispatcher
-  */
+ * Abstract request dispatcher.
+ * IMPORTANT: it is required to implement `prepareRequest(options)` before using!
+ * @class QueryDispatcher
+ * @namespace Util/Request/QueryDispatcher
+ */
 export class QueryDispatcher {
     /**
       * Creates an instance of QueryDispatcher.
@@ -67,44 +67,44 @@ export class QueryDispatcher {
     }
 
     /**
-      * Is triggered by BroadCast updated from ServiceWorker.
-      * Should dispatch some action.
-      * @param  {any} data Data received from fetch of GraphQL endpoint
-      * @param  {Function} dispatch Store changing function from Redux (dispatches actions)
-      * @return {void}
-      * @memberof QueryDispatcher
-      */
+     * Is triggered by BroadCast updated from ServiceWorker.
+     * Should dispatch some action.
+     * @param  {any} data Data received from fetch of GraphQL endpoint
+     * @param  {Function} dispatch Store changing function from Redux (dispatches actions)
+     * @return {void}
+     * @memberof QueryDispatcher
+     */
     onUpdate(data, dispatch, options) {
         this.onSuccess(data, dispatch, options);
     }
 
     /**
-      * Is responsible for request building (request & mutation preparation)
-      * @param  {any} options Any options received from Container
-      * @param {Function} dispatch
-      * @return {Array<Field>|Field} Array or single item of Field instances
-      * @memberof QueryDispatcher
-      */
+     * Is responsible for request building (request & mutation preparation)
+     * @param  {any} options Any options received from Container
+     * @param {Function} dispatch
+     * @return {Array<Field>|Field} Array or single item of Field instances
+     * @memberof QueryDispatcher
+     */
     prepareRequest(options, dispatch) {}
 
     /**
-      * Is triggered on successful fetch of GraphQL endpoint.
-      * IMPORTANT: If there are any errors in response (`errors` field in JSON response from GraphQL), this function won't trigger!
-      * Should dispatch some action.
-      * @param  {any} data
-      * @param  {any} dispatch
-      * @return {void}@memberof QueryDispatcher
-      */
+     * Is triggered on successful fetch of GraphQL endpoint.
+     * IMPORTANT: If there are any errors in response (`errors` field in JSON response from GraphQL), this function won't trigger!
+     * Should dispatch some action.
+     * @param  {any} data
+     * @param  {any} dispatch
+     * @return {void}@memberof QueryDispatcher
+     */
     onSuccess(data, dispatch) {}
 
     /**
-      * Is triggered on error in fetch of GraphQL endpoint.
-      * IMPORTANT: If there are any errors in response (`errors` field in JSON response from GraphQL), this function will trigger!
-      * Should dispatch some action.
-      * @param  {any} error
-      * @param  {any} dispatch
-      * @return {void}@memberof QueryDispatcher
-      */
+     * Is triggered on error in fetch of GraphQL endpoint.
+     * IMPORTANT: If there are any errors in response (`errors` field in JSON response from GraphQL), this function will trigger!
+     * Should dispatch some action.
+     * @param  {any} error
+     * @param  {any} dispatch
+     * @return {void}@memberof QueryDispatcher
+     */
     onError(error, dispatch) {}
 }
 

From ce9b1cb1f2c4526c872fddec636cc1c0c9283a60 Mon Sep 17 00:00:00 2001
From: Mate Sitchinava <mate.sitchinava@scandiweb.com>
Date: Wed, 28 Sep 2022 13:17:40 +0400
Subject: [PATCH 13/17] fixed comment formating

---
 .../scandipwa/src/util/Product/Product.js     |   2 +-
 .../scandipwa/src/util/Request/Request.js     | 126 +++++++++---------
 2 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/packages/scandipwa/src/util/Product/Product.js b/packages/scandipwa/src/util/Product/Product.js
index 55d2bf75ce..aed3937f40 100644
--- a/packages/scandipwa/src/util/Product/Product.js
+++ b/packages/scandipwa/src/util/Product/Product.js
@@ -318,7 +318,7 @@ export const getIndexedProduct = (product, itemSku) => {
 };
 
 /** @namespace Util/Product/getIndexedProducts */
-export const getIndexedProducts = (products = []) => products.map((product) => getIndexedProduct(product));
+export const getIndexedProducts = (products) => products.map((product) => getIndexedProduct(product));
 
 /** @namespace Util/Product/getIndexedParameteredProducts */
 export const getIndexedParameteredProducts = (products) => Object.entries(products)
diff --git a/packages/scandipwa/src/util/Request/Request.js b/packages/scandipwa/src/util/Request/Request.js
index 5307d3561b..ea03d91470 100644
--- a/packages/scandipwa/src/util/Request/Request.js
+++ b/packages/scandipwa/src/util/Request/Request.js
@@ -52,11 +52,11 @@ export const getStoreCodePath = () => {
 export const getGraphqlEndpoint = () => getStoreCodePath().concat(GRAPHQL_URI);
 
 /**
-  * Append authorization token to header object
-  * @param {Object} headers
-  * @returns {Object} Headers with appended authorization
-  * @namespace Util/Request/appendTokenToHeaders
-  */
+ * Append authorization token to header object
+ * @param {Object} headers
+ * @returns {Object} Headers with appended authorization
+ * @namespace Util/Request/appendTokenToHeaders
+ */
 export const appendTokenToHeaders = (headers) => {
     const token = getAuthorizationToken();
 
@@ -67,13 +67,13 @@ export const appendTokenToHeaders = (headers) => {
 };
 
 /**
-  *
-  * @param {String} query Request body
-  * @param {Object} variables Request variables
-  * @param {String} url GraphQL url
-  * @returns {*}
-  * @namespace Util/Request/formatURI
-  */
+ *
+ * @param {String} query Request body
+ * @param {Object} variables Request variables
+ * @param {String} url GraphQL url
+ * @returns {*}
+ * @namespace Util/Request/formatURI
+ */
 export const formatURI = (query, variables, url) => {
     // eslint-disable-next-line no-param-reassign
     variables._currency = getCurrency();
@@ -87,12 +87,12 @@ export const formatURI = (query, variables, url) => {
 };
 
 /**
-  *
-  * @param {String} uri
-  * @param {String} name
-  * @returns {Promise<Response>}
-  * @namespace Util/Request/getFetch
-  */
+ *
+ * @param {String} uri
+ * @param {String} name
+ * @returns {Promise<Response>}
+ * @namespace Util/Request/getFetch
+ */
 export const getFetch = (uri, name, signal) => fetch(uri,
     {
         method: 'GET',
@@ -105,12 +105,12 @@ export const getFetch = (uri, name, signal) => fetch(uri,
     });
 
 /**
-  *
-  * @param {String} graphQlURI
-  * @param {{}} query Request body
-  * @param {Int} cacheTTL
-  * @namespace Util/Request/putPersistedQuery
-  */
+ *
+ * @param {String} graphQlURI
+ * @param {{}} query Request body
+ * @param {Int} cacheTTL
+ * @namespace Util/Request/putPersistedQuery
+ */
 export const putPersistedQuery = (graphQlURI, query, cacheTTL) => fetch(`${ graphQlURI }?hash=${ hash(query) }`,
     {
         method: 'PUT',
@@ -122,13 +122,13 @@ export const putPersistedQuery = (graphQlURI, query, cacheTTL) => fetch(`${ grap
     });
 
 /**
-  *
-  * @param {String} graphQlURI
-  * @param {String} queryObject
-  * @param {String} name
-  * @returns {Promise<Response>}
-  * @namespace Util/Request/postFetch
-  */
+ *
+ * @param {String} graphQlURI
+ * @param {String} queryObject
+ * @param {String} name
+ * @returns {Promise<Response>}
+ * @namespace Util/Request/postFetch
+ */
 export const postFetch = (graphQlURI, query, variables) => fetch(graphQlURI,
     {
         method: 'POST',
@@ -140,11 +140,11 @@ export const postFetch = (graphQlURI, query, variables) => fetch(graphQlURI,
     });
 
 /**
-  * Checks for errors in response, if they exist, rejects promise
-  * @param  {Object} res Response from GraphQL endpoint
-  * @return {Promise<Object>} Handled GraphqlQL results promise
-  * @namespace Util/Request/checkForErrors
-  */
+ * Checks for errors in response, if they exist, rejects promise
+ * @param  {Object} res Response from GraphQL endpoint
+ * @return {Promise<Object>} Handled GraphqlQL results promise
+ * @namespace Util/Request/checkForErrors
+ */
 export const checkForErrors = (res) => new Promise((resolve, reject) => {
     const { errors, data } = res;
 
@@ -152,22 +152,22 @@ export const checkForErrors = (res) => new Promise((resolve, reject) => {
 });
 
 /**
-  * Handle connection errors
-  * @param  {any} err Error from fetch
-  * @return {void} Simply console error
-  * @namespace Util/Request/handleConnectionError
-  */
+ * Handle connection errors
+ * @param  {any} err Error from fetch
+ * @return {void} Simply console error
+ * @namespace Util/Request/handleConnectionError
+ */
 export const handleConnectionError = (err, msg) => {
     // eslint-disable-next-line no-console
     console.error(msg, err);
 }; // TODO: Add to logs pool
 
 /**
-  * Parse response and check wether it contains errors
-  * @param  {{}} queryObject prepared with `prepareDocument()` from `Util/Query` request body object
-  * @return {Promise<Request>} Fetch promise to GraphQL endpoint
-  * @namespace Util/Request/parseResponse
-  */
+ * Parse response and check wether it contains errors
+ * @param  {{}} queryObject prepared with `prepareDocument()` from `Util/Query` request body object
+ * @return {Promise<Request>} Fetch promise to GraphQL endpoint
+ * @namespace Util/Request/parseResponse
+ */
 export const parseResponse = async (response) => {
     try {
         const data = await response.json();
@@ -185,13 +185,13 @@ export const HTTP_410_GONE = 410;
 export const HTTP_201_CREATED = 201;
 
 /**
-  * Make GET request to endpoint (via ServiceWorker)
-  * @param  {{}} queryObject prepared with `prepareDocument()` from `Util/Query` request body object
-  * @param  {String} name Name of model for ServiceWorker to send BroadCasts updates to
-  * @param  {Number} cacheTTL Cache TTL (in seconds) for ServiceWorker to cache responses
-  * @return {Promise<Request>} Fetch promise to GraphQL endpoint
-  * @namespace Util/Request/executeGet
-  */
+ * Make GET request to endpoint (via ServiceWorker)
+ * @param  {{}} queryObject prepared with `prepareDocument()` from `Util/Query` request body object
+ * @param  {String} name Name of model for ServiceWorker to send BroadCasts updates to
+ * @param  {Number} cacheTTL Cache TTL (in seconds) for ServiceWorker to cache responses
+ * @return {Promise<Request>} Fetch promise to GraphQL endpoint
+ * @namespace Util/Request/executeGet
+ */
 export const executeGet = async (queryObject, name, cacheTTL, signal) => {
     const { query, variables } = queryObject;
     const uri = formatURI(query, variables, getGraphqlEndpoint());
@@ -228,11 +228,11 @@ export const executeGet = async (queryObject, name, cacheTTL, signal) => {
 };
 
 /**
-  * Make POST request to endpoint
-  * @param  {{}} queryObject prepared with `prepareDocument()` from `Util/Query` request body object
-  * @return {Promise<Request>} Fetch promise to GraphQL endpoint
-  * @namespace Util/Request/executePost
-  */
+ * Make POST request to endpoint
+ * @param  {{}} queryObject prepared with `prepareDocument()` from `Util/Query` request body object
+ * @return {Promise<Request>} Fetch promise to GraphQL endpoint
+ * @namespace Util/Request/executePost
+ */
 export const executePost = async (queryObject) => {
     const { query, variables } = queryObject;
 
@@ -253,11 +253,11 @@ export const executePost = async (queryObject) => {
 };
 
 /**
-  * Listen to the BroadCast connection
-  * @param  {String} name Name of model for ServiceWorker to send BroadCasts updates to
-  * @return {Promise<any>} Broadcast message promise
-  * @namespace Util/Request/listenForBroadCast
-  */
+ * Listen to the BroadCast connection
+ * @param  {String} name Name of model for ServiceWorker to send BroadCasts updates to
+ * @return {Promise<any>} Broadcast message promise
+ * @namespace Util/Request/listenForBroadCast
+ */
 export const listenForBroadCast = (name) => new Promise((resolve) => {
     const { BroadcastChannel } = window;
     const windowId = getWindowId();

From 0cff0b116ea55970c55b06e75a421b700cd7172e Mon Sep 17 00:00:00 2001
From: Mate Sitchinava <mate.sitchinava@scandiweb.com>
Date: Wed, 28 Sep 2022 13:18:41 +0400
Subject: [PATCH 14/17] fixed comment formating

---
 packages/scandipwa/src/util/Request/QueryDispatcher.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/scandipwa/src/util/Request/QueryDispatcher.js b/packages/scandipwa/src/util/Request/QueryDispatcher.js
index 97152ca6d8..44ba2827e2 100644
--- a/packages/scandipwa/src/util/Request/QueryDispatcher.js
+++ b/packages/scandipwa/src/util/Request/QueryDispatcher.js
@@ -25,11 +25,11 @@ export const FIVE_MINUTES_IN_SECONDS = 300;
  */
 export class QueryDispatcher {
     /**
-      * Creates an instance of QueryDispatcher.
-      * @param  {String} name Name of model for ServiceWorker to send BroadCasts updates to
-      * @param  {Number} cacheTTL Cache TTL (in seconds) for ServiceWorker to cache responses
-      * @memberof QueryDispatcher
-      */
+     * Creates an instance of QueryDispatcher.
+     * @param  {String} name Name of model for ServiceWorker to send BroadCasts updates to
+     * @param  {Number} cacheTTL Cache TTL (in seconds) for ServiceWorker to cache responses
+     * @memberof QueryDispatcher
+     */
     __construct(name, cacheTTL = ONE_MONTH_IN_SECONDS) {
         super.__construct();
         this.name = name;

From 18aa232cb36bb47c053e9983ff983a88d89e1f50 Mon Sep 17 00:00:00 2001
From: aleksandrskondratjevs <aleksandrs.kondratjevs_1@outlook.com>
Date: Wed, 28 Sep 2022 12:33:09 +0300
Subject: [PATCH 15/17] Bump quote-graphql module version

---
 packages/scandipwa/composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/scandipwa/composer.json b/packages/scandipwa/composer.json
index 11712e66b3..572c7b3695 100644
--- a/packages/scandipwa/composer.json
+++ b/packages/scandipwa/composer.json
@@ -18,7 +18,7 @@
         "scandipwa/route717": "2.0.2",
         "scandipwa/performance": "1.5.6",
         "scandipwa/customer-graph-ql": "4.0.4",
-        "scandipwa/quote-graphql": "3.0.4",
+        "scandipwa/quote-graphql": "3.0.5",
         "scandipwa/wishlist-graphql": "2.0.16",
         "scandipwa/urlrewrite-graphql": "1.3.7",
         "scandipwa/store-graphql": "1.3.0",

From ace7c9475ff65d0d1b777b3684ce96c850bf1f3e Mon Sep 17 00:00:00 2001
From: aleksandrskondratjevs <aleksandrs.kondratjevs_1@outlook.com>
Date: Wed, 28 Sep 2022 12:34:01 +0300
Subject: [PATCH 16/17] Bump quote-graphql module version

---
 packages/scandipwa/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/scandipwa/package.json b/packages/scandipwa/package.json
index 6603830640..52269960f2 100644
--- a/packages/scandipwa/package.json
+++ b/packages/scandipwa/package.json
@@ -83,7 +83,7 @@
             "scandipwa/route717": "2.0.2",
             "scandipwa/performance": "1.5.6",
             "scandipwa/customer-graph-ql": "4.0.4",
-            "scandipwa/quote-graphql": "3.0.4",
+            "scandipwa/quote-graphql": "3.0.5",
             "scandipwa/wishlist-graphql": "2.0.16",
             "scandipwa/urlrewrite-graphql": "1.3.7",
             "scandipwa/store-graphql": "1.3.0",

From f46f652cc15335ad167f185fbc054772d4e365ae Mon Sep 17 00:00:00 2001
From: aleksandrskondratjevs <aleksandrs.kondratjevs_1@outlook.com>
Date: Thu, 29 Sep 2022 09:32:39 +0300
Subject: [PATCH 17/17] Publish

 - @scandipwa/scandipwa@5.3.6
---
 packages/scandipwa/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/scandipwa/package.json b/packages/scandipwa/package.json
index 52269960f2..a484c9f279 100644
--- a/packages/scandipwa/package.json
+++ b/packages/scandipwa/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@scandipwa/scandipwa",
     "description": "ScandiPWA source code used by CSA.",
-    "version": "5.3.5",
+    "version": "5.3.6",
     "scripts": {
         "start": "scandipwa-scripts start",
         "start:magento": "BUILD_MODE=magento scandipwa-scripts start",