From 7ee12b065765bd814c5c089da7ba9032569f6cf7 Mon Sep 17 00:00:00 2001
From: priti <priti@twojay.in>
Date: Thu, 4 Apr 2019 14:18:33 +0530
Subject: [PATCH 1/4] fixes-for-customer-name-twice-desktop

---
 .../Customer/view/frontend/templates/account/customer.phtml   | 1 -
 .../Magento/luma/Magento_Theme/web/css/source/_module.less    | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Customer/view/frontend/templates/account/customer.phtml b/app/code/Magento/Customer/view/frontend/templates/account/customer.phtml
index 2bdb6ac044a92..b7b8796142de8 100644
--- a/app/code/Magento/Customer/view/frontend/templates/account/customer.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/account/customer.phtml
@@ -16,7 +16,6 @@
               data-toggle="dropdown"
               data-trigger-keypress-button="true"
               data-bind="scope: 'customer'">
-            <span data-bind="text: customer().fullname"></span>
             <button type="button"
                     class="action switch"
                     tabindex="-1"
diff --git a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
index cadf575b95fc7..1e942a84d9a16 100644
--- a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
@@ -104,6 +104,10 @@
                 font-size: @font-size__base;
                 margin: 0 0 0 15px;
 
+                &.customer-welcome{
+                   margin: 0 0 0 5px;
+                }
+
                 > a {
                     .lib-link(
                     @_link-color: @header-panel__text-color,

From 921f7b90bbc32e2759bffdb93529b864b479f41b Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Wed, 10 Apr 2019 16:43:51 +0300
Subject: [PATCH 2/4] magento/magento2#20832: MFTF test fix.

---
 .../Test/Mftf/Section/StorefrontPanelHeaderSection.xml      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml
index 1955c6a417ba9..a06b099220b56 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml
@@ -12,8 +12,8 @@
         <element name="WelcomeMessage" type="text" selector=".greet.welcome span"/>
         <element name="createAnAccountLink" type="select" selector=".panel.header li:nth-child(3)" timeout="30"/>
         <element name="notYouLink" type="button" selector=".greet.welcome span a"/>
-        <element name="customerWelcome" type="text" selector=".panel.header .customer-welcome"/>
-        <element name="customerWelcomeMenu" type="text" selector=".panel.header .customer-welcome .customer-menu"/>
-        <element name="customerLogoutLink" type="text" selector=".panel.header .customer-welcome .customer-menu .authorization-link a" timeout="30"/>
+        <element name="customerWelcome" type="text" selector=".panel.header .greet.welcome"/>
+        <element name="customerWelcomeMenu" type="text" selector=".panel.header .greet.welcome .customer-menu"/>
+        <element name="customerLogoutLink" type="text" selector=".panel.header .greet.welcome .customer-menu .authorization-link a" timeout="30"/>
     </section>
 </sections>

From a2b2aa0e5db615843ba00bf332aca0b38fe3236b Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Thu, 11 Apr 2019 15:47:21 +0300
Subject: [PATCH 3/4] magento/magento2#20832: MFTF test fix.

---
 .../Test/Mftf/ActionGroup/StorefrontCustomerActionGroup.xml   | 4 ++--
 .../Test/Mftf/Section/StorefrontPanelHeaderSection.xml        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerActionGroup.xml
index fc5c1b881752e..c3b92b1af7f82 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerActionGroup.xml
@@ -9,8 +9,8 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="CustomerLogoutStorefrontByMenuItemsActionGroup">
-        <conditionalClick selector="{{StorefrontPanelHeaderSection.customerWelcome}}"
-                          dependentSelector="{{StorefrontPanelHeaderSection.customerWelcomeMenu}}"
+        <conditionalClick selector="{{StorefrontPanelHeaderSection.customerWelcomeMenu}}"
+                          dependentSelector="{{StorefrontPanelHeaderSection.customerLogoutLink}}"
                           visible="false"
                           stepKey="clickHeaderCustomerMenuButton" />
         <click selector="{{StorefrontPanelHeaderSection.customerLogoutLink}}" stepKey="clickSignOutButton" />
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml
index 0505aa908f2a0..3610532c5356b 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml
@@ -16,8 +16,8 @@
         <element name="createAnAccountLink" type="select" selector="//div[@class='panel wrapper']//li/a[contains(.,'Create an Account')]" timeout="30"/>
         <element name="notYouLink" type="button" selector=".greet.welcome span a"/>
         <element name="customerWelcome" type="text" selector=".panel.header .greet.welcome"/>
-        <element name="customerWelcomeMenu" type="text" selector=".panel.header .greet.welcome .customer-menu"/>
+        <element name="customerWelcomeMenu" type="text" selector=".panel.header .customer-welcome .customer-name"/>
         <element name="customerLoginLink" type="button" selector=".panel.header .header.links .authorization-link a" timeout="30"/>
-        <element name="customerLogoutLink" type="text" selector=".panel.header .greet.welcome .customer-menu .authorization-link a" timeout="30"/>
+        <element name="customerLogoutLink" type="text" selector=".panel.header .customer-welcome .customer-menu .authorization-link a" timeout="30"/>
     </section>
 </sections>

From 6c14bd8f4fb4e78044906b483d7e53074b648227 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Fri, 12 Apr 2019 12:28:08 +0300
Subject: [PATCH 4/4] magento/magento2#20832: Static test fix.

---
 .../Magento/luma/Magento_Theme/web/css/source/_module.less    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
index f45a6ee945c0f..dfcc51e0a0a26 100644
--- a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
@@ -112,8 +112,8 @@
                 font-size: @font-size__base;
                 margin: 0 0 0 15px;
 
-                &.customer-welcome{
-                   margin: 0 0 0 5px;
+                &.customer-welcome {
+                    margin: 0 0 0 5px;
                 }
 
                 > a {