From c21d50c3baf9d678aec68bb08330a25f8f3a1dff Mon Sep 17 00:00:00 2001
From: Scott Kiener <scott.kiener@safelite.com>
Date: Tue, 31 Oct 2023 15:42:40 -0400
Subject: [PATCH] CSR-1452 | Multiple bug fixes

additionalButtonData was used incorrectly
404's from validatePromo were handled incorrectly
---
 src/digital-components/button-question/button-question.vue    | 3 +--
 .../add-vaps-modal-buttons/add-vaps-modal-buttons.vue         | 3 +--
 src/layouts/service-location/shop-question/shop-question.vue  | 4 ++--
 src/store/index.js                                            | 3 +++
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/digital-components/button-question/button-question.vue b/src/digital-components/button-question/button-question.vue
index 0ac7e2863..24a8b8f41 100644
--- a/src/digital-components/button-question/button-question.vue
+++ b/src/digital-components/button-question/button-question.vue
@@ -133,7 +133,6 @@ export default {
         suppressError: Boolean,
         useTextForValue: Boolean,
         valueToLogType: String,
-        additionalButtonData: Object,
         isSmallQuestionText: Boolean,
         customButtonQuestionId: String,
         logDisplayedValuesEvent: {
@@ -256,7 +255,7 @@ export default {
                 buttonFooterCopy: answer.buttonFooterCopy ?? answer.buttonFooterCopy,
                 buttonImage: answer.buttonImage ?? answer.AnswerImageUrl,
                 buttonImageId: answer.buttonImageId ?? answer.ImageId,
-                additionalButtonData: answer.additionalButtonData ?? answer.additionalButtonData,
+                additionalButtonData: answer.additionalButtonData,
                 groupName: this.formatString(this.groupName),
                 value:
                     answer.value ??
diff --git a/src/layouts/payment-method/add-vaps-modal-buttons/add-vaps-modal-buttons.vue b/src/layouts/payment-method/add-vaps-modal-buttons/add-vaps-modal-buttons.vue
index c502fb165..abf9fc8ee 100644
--- a/src/layouts/payment-method/add-vaps-modal-buttons/add-vaps-modal-buttons.vue
+++ b/src/layouts/payment-method/add-vaps-modal-buttons/add-vaps-modal-buttons.vue
@@ -37,8 +37,7 @@
                         v-model="selectedWipers"
                         isMultiSelect
                         isRequired
-                        validationRules="checkbox-required"
-                        :additionalButtonData="additionalButtonData" />
+                        validationRules="checkbox-required" />
                 </div>
                 <div v-else-if="wipersOffered === wipersOfferedStrings.FRONT" class="wiper-options">
                     <p class="price">+${{ wipersModal.totalFrontPrice }}</p>
diff --git a/src/layouts/service-location/shop-question/shop-question.vue b/src/layouts/service-location/shop-question/shop-question.vue
index 57702f841..1b4d7dea8 100644
--- a/src/layouts/service-location/shop-question/shop-question.vue
+++ b/src/layouts/service-location/shop-question/shop-question.vue
@@ -19,8 +19,7 @@
                 textPosition="text-start"
                 v-model="selectedProviderNumber"
                 isRequired
-                validationRules="option-required"
-                :additionalButtonData="additionalButtonData" />
+                validationRules="option-required" />
             <textLink
                 v-if="displaySeeMoreLocationsLink"
                 ref="showMoreShopsLink"
@@ -156,6 +155,7 @@ export default {
                     buttonLabel: city,
                     buttonLabelSubCopy: `${distanceInMiles} mi`,
                     buttonBodyCopy: `${streetAddress}, ${city}, ${state} ${zipCode}`,
+                    additionalButtonData: this.additionalButtonData,
                     value: shopProvider.providerNumber,
                 };
             });
diff --git a/src/store/index.js b/src/store/index.js
index 62caaa1d1..e678df6ab 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -2273,6 +2273,9 @@ export const actions = {
             payload: requestObject,
             logApiCall: true,
             pageNameToLog: pageNameToLog,
+        }).catch((error) => {
+            // Validate promo will return 4xx errors when an invalid promo
+            return error;
         });
 
         if (validateResponse?.data?.serverData) {