From f549516ef6515837a11a8d571ceb06eaeefaa9a3 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Wed, 21 May 2025 16:00:38 -0400
Subject: [PATCH 1/2] CASH-313 fix webchat button.

---
 src/fmg-components/funnel-header/funnel-header.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/fmg-components/funnel-header/funnel-header.vue b/src/fmg-components/funnel-header/funnel-header.vue
index f204cacc0..d740cbc8b 100644
--- a/src/fmg-components/funnel-header/funnel-header.vue
+++ b/src/fmg-components/funnel-header/funnel-header.vue
@@ -6,7 +6,6 @@
                     <button
                         v-show="shouldShowWebchatButton"
                         v-on:click="webchatClicked"
-                        v-on:keydown.enter.prevent.stop
                         type="button"
                         class="chat-button"></button>
                 </span>

From 5496b0ac30e642614cab3df69ad8627b219169b3 Mon Sep 17 00:00:00 2001
From: Chris Redelinghuys <chris.redelinghuys@safelite.com>
Date: Thu, 22 May 2025 08:39:04 -0400
Subject: [PATCH 2/2] CASH-580: Defect fixes and improvements

---
 src/layouts/payment/payment.vue | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/layouts/payment/payment.vue b/src/layouts/payment/payment.vue
index 91e3c04c5..bb617ec58 100644
--- a/src/layouts/payment/payment.vue
+++ b/src/layouts/payment/payment.vue
@@ -64,7 +64,7 @@
 
                     <div class="payment-method-question">
                         <buttonQuestion
-                            v-if="!isAfterpay"
+                            v-if="showSwitchPaymentMethod"
                             groupName="payment-method"
                             buttonTypeString="payment-method-list-button"
                             :buttonTypeObject="paymentMethodListButton"
@@ -292,6 +292,7 @@ export default {
             availableVaps: [],
             shouldBlockInteraction: false,
             paymentMethodListButton: paymentMethodListButton,
+            showSwitchPaymentMethod: !this.isAfterpay(),
         };
     },
     props: {
@@ -514,12 +515,6 @@ export default {
             }
             return false;
         },
-        isAfterpay() {
-            if (this.paymentType == "ap") {
-                return true;
-            }
-            return false;
-        },
         shouldDisplayPiaCCAlert() {
             return this.shouldDisplayPiaAlert(paymentMethods.CREDIT_CARD);
         },
@@ -828,6 +823,12 @@ export default {
                     this.backButtonAction();
                 }
 
+                if (event.data.indexOf("afterpayOpened") > -1) {
+                    console.log(new Date() + ": Payment method afterpay selected");
+                    this.updatePaymentMethod(paymentMethods.AFTERPAY);
+                    this.showSwitchPaymentMethod = false;
+                }
+
                 if (event.data.indexOf("creditCardSubmit") > -1) {
                     console.log(new Date() + ": Payment method credit card selected");
                     this.updatePaymentMethod(paymentMethods.CREDIT_CARD);
@@ -865,11 +866,6 @@ export default {
             }
         },
         switchToAfterpay() {
-            this.dispatchStoreAction(
-                storeActions.SAVE_PAYMENT_METHOD_CHOICE,
-                paymentMethods.AFTERPAY,
-                false
-            );
             const iframe = this.$refs.paymentFrame;
             if (iframe) {
                 iframe.contentWindow.postMessage("afterpay", "*");
@@ -892,6 +888,12 @@ export default {
         shouldDisplayPiaAlert(payMethod) {
             return this.$route?.query?.piaErrorType === payMethod;
         },
+        isAfterpay() {
+            if (this.paymentType == "ap") {
+                return true;
+            }
+            return false;
+        },
     },
     components: {
         funnelHeader,
@@ -915,6 +917,10 @@ export default {
     background-color: red;
 }
 
+.payment-method-question {
+    padding: 0 1.5rem;
+}
+
 .ui-block {
     position: fixed;
     top: 0;