From 4a598e785441304bef5c7e2817ef6d99a963aca2 Mon Sep 17 00:00:00 2001
From: Jitheesh <jitheeshvo@gmail.com>
Date: Wed, 20 Feb 2019 16:14:06 +0530
Subject: [PATCH 1/3] Checkout Page Cancel button is not working #21327 - hide
 cancel button if billing address is not available on current quote

---
 .../Checkout/view/frontend/web/js/view/billing-address.js   | 6 ++++++
 .../view/frontend/web/template/billing-address.html         | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js b/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js
index 6f9a1a46826da..121a94a14852f 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js
@@ -201,6 +201,12 @@ function (
                 this.isAddressDetailsVisible(true);
             }
         },
+        /**
+         * Manage cancel button visibility
+         */
+        canUseCancelBillingAddress: ko.computed(function () {
+            return quote.billingAddress() || lastSelectedBillingAddress;
+        }),
 
         /**
          * Restore billing address
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/billing-address.html b/app/code/Magento/Checkout/view/frontend/web/template/billing-address.html
index 5f735fbb4daa9..63edb5057b933 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/billing-address.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/billing-address.html
@@ -22,7 +22,7 @@
                 <button class="action action-update" type="button" data-bind="click: updateAddress">
                     <span data-bind="i18n: 'Update'"></span>
                 </button>
-                <button class="action action-cancel" type="button" data-bind="click: cancelAddressEdit">
+                <button class="action action-cancel" type="button" data-bind="click: cancelAddressEdit, visible: canUseCancelBillingAddress()">
                     <span data-bind="i18n: 'Cancel'"></span>
                 </button>
             </div>

From 5372fdc88a4aa1e00d9983b7f538760d2f210fe1 Mon Sep 17 00:00:00 2001
From: Jitheesh <jitheeshvo@gmail.com>
Date: Thu, 21 Feb 2019 10:28:32 +0530
Subject: [PATCH 2/3] Checkout Page Cancel button is not working #21327 - CR
 fix

---
 .../Checkout/view/frontend/web/js/view/billing-address.js        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js b/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js
index 121a94a14852f..4ea6fb5e5df75 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js
@@ -201,6 +201,7 @@ function (
                 this.isAddressDetailsVisible(true);
             }
         },
+        
         /**
          * Manage cancel button visibility
          */

From 642a4ebee39ffef3ac4ae6e848bf5659fdcd1459 Mon Sep 17 00:00:00 2001
From: Jitheesh <jitheeshvo@gmail.com>
Date: Fri, 22 Feb 2019 11:21:44 +0530
Subject: [PATCH 3/3] Checkout Page Cancel button is not working - Code style
 issues fixed

---
 .../Checkout/view/frontend/web/js/view/billing-address.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js b/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js
index 4ea6fb5e5df75..d68b0682eb511 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js
@@ -201,7 +201,7 @@ function (
                 this.isAddressDetailsVisible(true);
             }
         },
-        
+
         /**
          * Manage cancel button visibility
          */