Revert "#35881: Final Price for grouped products does not include tax in the Recently Viewed Widget and Meta price"

This reverts commit e751432.

Author: engcom-Echo

app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/Price.php

@@ -82,42 +82,40 @@ public function collect(ProductInterface $product, ProductRenderInterface $produ
                 ->getMinProduct();
         }
 
-        if ($product !== null) {
-            $priceInfo->setFinalPrice(
-                $product
-                    ->getPriceInfo()
-                    ->getPrice(FinalPrice::PRICE_CODE)
-                    ->getAmount()
-                    ->getValue()
-            );
-            $priceInfo->setMinimalPrice(
-                $product
-                    ->getPriceInfo()
-                    ->getPrice(FinalPrice::PRICE_CODE)
-                    ->getMinimalPrice()
-                    ->getValue()
-            );
-            $priceInfo->setRegularPrice(
-                $product
-                    ->getPriceInfo()
-                    ->getPrice(RegularPrice::PRICE_CODE)
-                    ->getAmount()
-                    ->getValue()
-            );
-            $priceInfo->setMaxPrice(
-                $product
-                    ->getPriceInfo()
-                    ->getPrice(FinalPrice::PRICE_CODE)
-                    ->getMaximalPrice()
-                    ->getValue()
-            );
+        $priceInfo->setFinalPrice(
+            $product
+                ->getPriceInfo()
+                ->getPrice(FinalPrice::PRICE_CODE)
+                ->getAmount()
+                ->getValue()
+        );
+        $priceInfo->setMinimalPrice(
+            $product
+                ->getPriceInfo()
+                ->getPrice(FinalPrice::PRICE_CODE)
+                ->getMinimalPrice()
+                ->getValue()
+        );
+        $priceInfo->setRegularPrice(
+            $product
+                ->getPriceInfo()
+                ->getPrice(RegularPrice::PRICE_CODE)
+                ->getAmount()
+                ->getValue()
+        );
+        $priceInfo->setMaxPrice(
+            $product
+                ->getPriceInfo()
+                ->getPrice(FinalPrice::PRICE_CODE)
+                ->getMaximalPrice()
+                ->getValue()
+        );
 
-            $this->formattedPriceInfoBuilder->build(
-                $priceInfo,
-                $productRender->getStoreId(),
-                $productRender->getCurrencyCode()
-            );
-        }
+        $this->formattedPriceInfoBuilder->build(
+            $priceInfo,
+            $productRender->getStoreId(),
+            $productRender->getCurrencyCode()
+        );
 
         $productRender->setPriceInfo($priceInfo);
     }

app/code/Magento/Catalog/view/frontend/templates/product/view/opengraph/general.phtml

@@ -33,9 +33,9 @@ if ($block->getProduct()->getTypeId() === Grouped::TYPE_CODE):
         ->getPrice(FinalPrice::PRICE_CODE)
         ->getMinProduct();
 
-    $priceAmount = ($minProduct !== null) ? $minProduct->getPriceInfo()
+    $priceAmount = $minProduct->getPriceInfo()
         ->getPrice(FinalPrice::PRICE_CODE)
-        ->getAmount() : $minProduct;
+        ->getAmount();
 else:
     $priceAmount = $block->getProduct()
         ->getPriceInfo()