From 149cea422bb42b4e3d44084593b6cfabbf4868bd Mon Sep 17 00:00:00 2001
From: Bill Richardson <william.richardson@safelite.com>
Date: Wed, 13 Dec 2023 15:39:53 -0500
Subject: [PATCH 1/2] fix for modal button being actually disabled  and keep
 styling

---
 src/digital-components/modal/modal.vue | 1 -
 src/styles/client-customizations.scss  | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 1ea62829..bd7d5796 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -34,7 +34,6 @@
                         loaderColor="white"
                         :buttonText="footerButtonText"
                         :class="(isButtonDisabled || isFooterButtonDisabled) && 'form-test-invalid'"
-                        :isDisabled="(isButtonDisabled || isFooterButtonDisabled)"
                         @clickEvent="validateAndEmit" />
                 </div>
             </div>
diff --git a/src/styles/client-customizations.scss b/src/styles/client-customizations.scss
index e1955587..39bc12d2 100644
--- a/src/styles/client-customizations.scss
+++ b/src/styles/client-customizations.scss
@@ -27,17 +27,18 @@ $limu-button-color: #A9E3E9;
     }
 
     .btn {
-        &.btn-override[aria-disabled="false"]{
+        &.btn-override[aria-disabled="false"]:not(.form-test-invalid) {
             &.btn-primary {
                 background: $limu-button-color !important;
                 color: $limu-button-text-color !important;
             }
+
             &:focus-visible {
                 background: $limu-button-color !important;
                 color: $limu-button-text-color !important;
                 box-shadow: 0 0 0 3px $white, 0 0 0 5.5px $limu-button-color !important;
             }
-            
+
         }
     }
 

From 1df582b3aa1d4f29eaba1033605a3fedb337ac18 Mon Sep 17 00:00:00 2001
From: Bill Richardson <william.richardson@safelite.com>
Date: Wed, 13 Dec 2023 21:27:10 -0500
Subject: [PATCH 2/2] add ability to override

---
 src/helpers/cms-content-helper.js             |  2 +-
 .../site-header/site-header.vue               | 22 +++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/helpers/cms-content-helper.js b/src/helpers/cms-content-helper.js
index 67206666..75c669a5 100644
--- a/src/helpers/cms-content-helper.js
+++ b/src/helpers/cms-content-helper.js
@@ -199,7 +199,7 @@ function getCmsSiteHeader(cmsResponse) {
             const { parentAccountNumber } = useMainStore().issConfig;
             let headerAnswersToUse = siteHeader.Answers
                 .find((answer) => answer.AccountNumber === parentAccountNumber.toString());
-            if (headerAnswersToUse === null) {
+            if (headerAnswersToUse == null) {
                 headerAnswersToUse = siteHeader.Answers
                     .find((answer) => answer.AccountNumber === '0');
             }
diff --git a/src/iss-components/site-header/site-header.vue b/src/iss-components/site-header/site-header.vue
index d88e71dc..d1622a93 100644
--- a/src/iss-components/site-header/site-header.vue
+++ b/src/iss-components/site-header/site-header.vue
@@ -86,6 +86,28 @@ export default ({
     },
     methods: {
         setupHeader() {
+            const overrideCmsHeaderAnswers = this.getCmsContent(this.cmsWidgetName, 'Answers');
+            if (overrideCmsHeaderAnswers && Array.isArray(overrideCmsHeaderAnswers)) {
+                const { parentAccountNumber } = useMainStore().issConfig;
+                let headerOverrideToUse = overrideCmsHeaderAnswers
+                    .find((answer) => answer.AccountNumber === parentAccountNumber.toString());
+                if (headerOverrideToUse == null) {
+                    headerOverrideToUse = overrideCmsHeaderAnswers
+                        .find((answer) => answer.AccountNumber === '0');
+                }
+
+                if (headerOverrideToUse) {
+                    this.cmsClientHeader = {
+                        altText: headerOverrideToUse.AltText,
+                        clientName: headerOverrideToUse.ClientName,
+                        hexCode: headerOverrideToUse.HexCode,
+                        imageId: headerOverrideToUse.ImageId,
+                        imageUrl: headerOverrideToUse.AnswerImageUrl
+                    };
+
+                    return;
+                }
+            }
             const { clientHeader } = useMainStore().issConfig;
             if (clientHeader) {
                 this.cmsClientHeader = clientHeader;