Merge pull request #523 from Safelite/feature/richardson/SSR-1052

fix for modal button being actually disabled  and keep styling

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>

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');
             }

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;

src/styles/client-customizations.scss

@@ -27,11 +27,12 @@ $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;