Merge remote-tracking branch '39321/set-correct-price-on-quote-item' into comprs_june

Author: engcom-Charlie

app/code/Magento/Checkout/CustomerData/DefaultItem.php

@@ -84,7 +84,7 @@ protected function doGetItemData()
     {
         $imageHelper = $this->imageHelper->init($this->getProductForThumbnail(), 'mini_cart_product_thumbnail');
         $productName = $this->escaper->escapeHtml($this->item->getProduct()->getName());
-
+        $this->item->setConvertedPrice($this->item->getPrice());
         return [
             'options' => $this->getOptionList(),
             'qty' => $this->item->getQty() * 1,

app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php

@@ -746,8 +746,7 @@ protected function processAppliedTaxes(
      */
     public function updateItemTaxInfo($quoteItem, $itemTaxDetails, $baseItemTaxDetails, $store)
     {
-        //The price should be base price
-        $quoteItem->setPrice($baseItemTaxDetails->getPrice());
+        $quoteItem->setPrice($itemTaxDetails->getPrice());
         if ($quoteItem->getCustomPrice() && $this->taxHelper->applyTaxOnCustomPrice()) {
             $quoteItem->setCustomPrice($itemTaxDetails->getPrice());
         }