From 887001d4b731f9cd1f326cfed056657df7e475ca Mon Sep 17 00:00:00 2001
From: Shikha Mishra <shikhamishra@cedcoss.com>
Date: Thu, 4 Apr 2019 00:15:57 +0530
Subject: [PATCH 1/3] Added Confirmation field in customer form

---
 .../Customer/Model/Customer/DataProviderWithDefaultAddresses.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/Customer/Model/Customer/DataProviderWithDefaultAddresses.php b/app/code/Magento/Customer/Model/Customer/DataProviderWithDefaultAddresses.php
index 4d1bb2e6b9e99..07b8681df91ac 100644
--- a/app/code/Magento/Customer/Model/Customer/DataProviderWithDefaultAddresses.php
+++ b/app/code/Magento/Customer/Model/Customer/DataProviderWithDefaultAddresses.php
@@ -39,7 +39,6 @@ class DataProviderWithDefaultAddresses extends \Magento\Ui\DataProvider\Abstract
     private static $forbiddenCustomerFields = [
         'password_hash',
         'rp_token',
-        'confirmation',
     ];
 
     /**

From 4c04f5513ce93072c4fca53ebd99d2dac94b28fd Mon Sep 17 00:00:00 2001
From: Shikha Mishra <shikhamishra@cedcoss.com>
Date: Thu, 4 Apr 2019 00:18:19 +0530
Subject: [PATCH 2/3] Fixed #22052 Customer account confirmation is overwritten
 by backend customer save

---
 .../Customer/view/base/ui_component/customer_form.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/app/code/Magento/Customer/view/base/ui_component/customer_form.xml b/app/code/Magento/Customer/view/base/ui_component/customer_form.xml
index 7e6b7bbe9cd09..e87997dbdb5e9 100644
--- a/app/code/Magento/Customer/view/base/ui_component/customer_form.xml
+++ b/app/code/Magento/Customer/view/base/ui_component/customer_form.xml
@@ -74,6 +74,17 @@
                 <visible>false</visible>
             </settings>
         </field>
+        <field name="confirmation" formElement="input">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="source" xsi:type="string">customer</item>
+                </item>
+            </argument>
+            <settings>
+                <dataType>text</dataType>
+                <visible>false</visible>
+            </settings>
+        </field>
         <field name="created_in" formElement="input">
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">

From e5c1b94d1b254af46d06c162466b7137cb120a06 Mon Sep 17 00:00:00 2001
From: Shikha Mishra <shikhamishra@cedcoss.com>
Date: Thu, 4 Apr 2019 20:54:04 +0530
Subject: [PATCH 3/3] Fixed Unit test failure

---
 .../Unit/Model/Customer/DataProviderWithDefaultAddressesTest.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderWithDefaultAddressesTest.php b/app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderWithDefaultAddressesTest.php
index 2fc3cdb927723..d5eaecb3ef35f 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderWithDefaultAddressesTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderWithDefaultAddressesTest.php
@@ -339,7 +339,6 @@ public function testGetData(): void
             'default_shipping' => 2,
             'password_hash' => 'password_hash',
             'rp_token' => 'rp_token',
-            'confirmation' => 'confirmation',
         ];
 
         $address = $this->getMockBuilder(\Magento\Customer\Model\Address::class)