update code

Author: rogerdz

app/code/Magento/Catalog/Controller/Product/Compare/Index.php

@@ -78,14 +78,11 @@ public function execute()
     {
         $beforeUrl = $this->getRequest()->getParam(self::PARAM_NAME_URL_ENCODED);
         if ($beforeUrl) {
-            $beforeUrl = $this->urlDecoder->decode($beforeUrl);
-            if(strpos((string)$beforeUrl, "customer/section/load") == 0){
-                $this->_catalogSession->setBeforeCompareUrl(
-                    $beforeUrl
-                );
-            } else {
-                $this->_catalogSession->unsBeforeCompareUrl();
-            }
+            $this->_catalogSession->setBeforeCompareUrl(
+                $this->urlDecoder->decode($beforeUrl)
+            );
+        } else {
+            $this->_catalogSession->unsBeforeCompareUrl();
         }
         return $this->resultPageFactory->create();
     }

app/code/Magento/Catalog/CustomerData/CompareProducts.php

@@ -9,6 +9,7 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\UrlInterface;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
@@ -43,25 +44,33 @@ class CompareProducts implements SectionSourceInterface
      */
     private $storeManager;
 
+    /**
+     * @var UrlInterface
+     */
+    private $urlBuilder;
+
     /**
      * @param \Magento\Catalog\Helper\Product\Compare $helper
      * @param \Magento\Catalog\Model\Product\Url $productUrl
      * @param \Magento\Catalog\Helper\Output $outputHelper
      * @param ScopeConfigInterface|null $scopeConfig
      * @param StoreManagerInterface|null $storeManager
+     * @param UrlInterface|null $urlBuilder
      */
     public function __construct(
         \Magento\Catalog\Helper\Product\Compare $helper,
         \Magento\Catalog\Model\Product\Url $productUrl,
         \Magento\Catalog\Helper\Output $outputHelper,
         ?ScopeConfigInterface $scopeConfig = null,
-        ?StoreManagerInterface $storeManager = null
+        ?StoreManagerInterface $storeManager = null,
+        ?UrlInterface $urlBuilder = null
     ) {
         $this->helper = $helper;
         $this->productUrl = $productUrl;
         $this->outputHelper = $outputHelper;
         $this->scopeConfig = $scopeConfig ?? ObjectManager::getInstance()->get(ScopeConfigInterface::class);
         $this->storeManager = $storeManager ?? ObjectManager::getInstance()->get(StoreManagerInterface::class);
+        $this->urlBuilder = $urlBuilder ?? ObjectManager::getInstance()->get(UrlInterface::class);
     }
 
     /**
@@ -73,7 +82,7 @@ public function getSectionData()
         return [
             'count' => $count,
             'countCaption' => $count == 1 ? __('1 item') : __('%1 items', $count),
-            'listUrl' => $this->helper->getListUrl(),
+            'listUrl' => $this->urlBuilder->getUrl('catalog/product_compare'),
             'items' => $count ? $this->getItems() : [],
             'websiteId' => $this->storeManager->getWebsite()->getId()
         ];