Merge pull request #2122 from magento-chaika/Chaika_2.2.4_PR5

Fixed issues:
- MAGETWO-86670: New user created from admin for non default store view receives Welcome Email from default store view

Author: dvoskoboinikov

app/code/Magento/Customer/Model/EmailNotification.php

@@ -3,9 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Customer\Model;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Mail\Template\SenderResolverInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\Mail\Template\TransportBuilder;
 use Magento\Customer\Helper\View as CustomerViewHelper;
@@ -90,28 +93,36 @@ class EmailNotification implements EmailNotificationInterface
      */
     private $scopeConfig;
 
+    /**
+     * @var SenderResolverInterface
+     */
+    private $senderResolver;
+
     /**
      * @param CustomerRegistry $customerRegistry
      * @param StoreManagerInterface $storeManager
      * @param TransportBuilder $transportBuilder
      * @param CustomerViewHelper $customerViewHelper
      * @param DataObjectProcessor $dataProcessor
      * @param ScopeConfigInterface $scopeConfig
+     * @param SenderResolverInterface|null $senderResolver
      */
     public function __construct(
         CustomerRegistry $customerRegistry,
         StoreManagerInterface $storeManager,
         TransportBuilder $transportBuilder,
         CustomerViewHelper $customerViewHelper,
         DataObjectProcessor $dataProcessor,
-        ScopeConfigInterface $scopeConfig
+        ScopeConfigInterface $scopeConfig,
+        SenderResolverInterface $senderResolver = null
     ) {
         $this->customerRegistry = $customerRegistry;
         $this->storeManager = $storeManager;
         $this->transportBuilder = $transportBuilder;
         $this->customerViewHelper = $customerViewHelper;
         $this->dataProcessor = $dataProcessor;
         $this->scopeConfig = $scopeConfig;
+        $this->senderResolver = $senderResolver ?: ObjectManager::getInstance()->get(SenderResolverInterface::class);
     }
 
     /**
@@ -230,6 +241,7 @@ private function passwordReset(CustomerInterface $customer)
      * @param int|null $storeId
      * @param string $email
      * @return void
+     * @throws \Magento\Framework\Exception\MailException
      */
     private function sendEmailTemplate(
         $customer,
@@ -243,10 +255,17 @@ private function sendEmailTemplate(
         if ($email === null) {
             $email = $customer->getEmail();
         }
+
+        /** @var array $from */
+        $from = $this->senderResolver->resolve(
+            $this->scopeConfig->getValue($sender, 'store', $storeId),
+            $storeId
+        );
+
         $transport = $this->transportBuilder->setTemplateIdentifier($templateId)
             ->setTemplateOptions(['area' => 'frontend', 'store' => $storeId])
             ->setTemplateVars($templateParams)
-            ->setFrom($this->scopeConfig->getValue($sender, 'store', $storeId))
+            ->setFrom($from)
             ->addTo($email, $this->customerViewHelper->getCustomerName($customer))
             ->getTransport();