MAGETWO-42486: [GITHUB] Adding product configurations shows wrong currency #1737

Author: Michail Slabko

app/code/Magento/Catalog/Ui/Component/Listing/Columns/Price.php

@@ -53,14 +53,12 @@ public function prepareDataSource(array $dataSource)
             $store = $this->storeManager->getStore(
                 $this->context->getFilterParam('store_id', \Magento\Store\Model\Store::DEFAULT_STORE_ID)
             );
-            $currencyCode = $store->getCurrentCurrencyCode();
-            $currencyRate = $store->getCurrentCurrencyRate();
-            $currency = $this->localeCurrency->getCurrency($currencyCode);
+            $currency = $this->localeCurrency->getCurrency($store->getBaseCurrencyCode());
 
             $fieldName = $this->getData('name');
             foreach ($dataSource['data']['items'] as & $item) {
                 if (isset($item[$fieldName])) {
-                    $item[$fieldName] = $currency->toCurrency(sprintf("%f", $item[$fieldName] * $currencyRate));
+                    $item[$fieldName] = $currency->toCurrency(sprintf("%f", $item[$fieldName]));
                 }
             }
         }

app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Super/Config/Matrix.php

@@ -54,6 +54,12 @@ class Matrix extends \Magento\Backend\Block\Template
     /** @var null|array */
     private $productAttributes;
 
+
+    /**
+     * @var \Magento\Framework\Locale\CurrencyInterface
+     */
+    protected $localeCurrency;
+
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\ConfigurableProduct\Model\Product\Type\Configurable $configurableType
@@ -72,6 +78,7 @@ public function __construct(
         \Magento\ConfigurableProduct\Model\Product\Type\VariationMatrix $variationMatrix,
         ProductRepositoryInterface $productRepository,
         \Magento\Catalog\Helper\Image $image,
+        \Magento\Framework\Locale\CurrencyInterface $localeCurrency,
         array $data = []
     ) {
         parent::__construct($context, $data);
@@ -80,6 +87,7 @@ public function __construct(
         $this->stockRegistry = $stockRegistry;
         $this->variationMatrix = $variationMatrix;
         $this->productRepository = $productRepository;
+        $this->localeCurrency = $localeCurrency;
         $this->image = $image;
     }
 
@@ -88,7 +96,7 @@ public function __construct(
      */
     public function getCurrencySymbol()
     {
-        return $this->_storeManager->getStore()->getCurrentCurrency()->getCurrencySymbol();
+        return $this->localeCurrency->getCurrency($this->_storeManager->getStore()->getBaseCurrencyCode())->getSymbol();
     }
 
     /**