From a7b5bb2f47af4d71a2b143c009f9d486310c5c64 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Fri, 6 Oct 2023 11:16:19 -0400
Subject: [PATCH 1/5] CSR-1594 modal height and button position fix.

---
 src/digital-components/modal/modal.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 1db38afb9..e0353829c 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -180,12 +180,16 @@ export default {
                     }
                     @include media-breakpoint-up(md) {
                         overflow: scroll;
+                        flex: none;
                     }
                 }
             }
             &.modal-dialog-centered {
                 align-items: flex-end;
                 min-height: 100%;
+                @include media-breakpoint-up(md) {
+                    align-items: inherit;
+                }
             }
         }
         .modal-footer {

From fb876c9d4ba5398f109791b019655750d6f58fdc Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Fri, 6 Oct 2023 12:04:15 -0400
Subject: [PATCH 2/5] Fix modal spinner deformity.

---
 src/digital-components/button-question/button-question.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/digital-components/button-question/button-question.vue b/src/digital-components/button-question/button-question.vue
index 304d90e0e..f6b0851a8 100644
--- a/src/digital-components/button-question/button-question.vue
+++ b/src/digital-components/button-question/button-question.vue
@@ -304,7 +304,7 @@ export default {
 </script>
 
 <style lang="scss">
-.vehicle-damage {
+.vehicle-damage .button-question {
     @include media-breakpoint-up(md) {
         .col-12 {
             width: 66.66666667%;

From 3b18ef96095ea4a55b5dbf5c83c2801d086e0063 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Fri, 6 Oct 2023 12:05:31 -0400
Subject: [PATCH 3/5] Update css with scss format.

---
 .../button-question/button-question.vue        | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/digital-components/button-question/button-question.vue b/src/digital-components/button-question/button-question.vue
index f6b0851a8..441ed6e0b 100644
--- a/src/digital-components/button-question/button-question.vue
+++ b/src/digital-components/button-question/button-question.vue
@@ -304,14 +304,16 @@ export default {
 </script>
 
 <style lang="scss">
-.vehicle-damage .button-question {
-    @include media-breakpoint-up(md) {
-        .col-12 {
-            width: 66.66666667%;
-        }
-        .col {
-            width: 33.3333333%;
-            flex: 0 0 auto;
+.vehicle-damage {
+    .button-question {
+        @include media-breakpoint-up(md) {
+            .col-12 {
+                width: 66.66666667%;
+            }
+            .col {
+                width: 33.3333333%;
+                flex: 0 0 auto;
+            }
         }
     }
 }

From 4a783a994de2f00bc4771414f108997e130ad62d Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Fri, 6 Oct 2023 14:37:43 -0400
Subject: [PATCH 4/5] Set ErrorMessage name to use customComponentId prop

---
 src/digital-components/date-picker/date-picker.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue
index 0683a9180..29f7522a3 100644
--- a/src/digital-components/date-picker/date-picker.vue
+++ b/src/digital-components/date-picker/date-picker.vue
@@ -58,7 +58,7 @@
                 loaderColor="blue"
                 loaderPosition="center" />
             <div class="row form-test-error" id="date-of-month-error">
-                <ErrorMessage name="date-of-month" class="small mt-1"></ErrorMessage>
+                <ErrorMessage :name="customComponentId" class="small mt-1"></ErrorMessage>
             </div>
             <button
                 v-if="calendarViewDirection === 'future' && !disableViewMoreDatesButton"

From 9e849026a721b1e6a2f19d5dd6cd31fa4342fedc Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Fri, 6 Oct 2023 16:03:27 -0400
Subject: [PATCH 5/5] Fix scrollToTop for menu-modal.

---
 src/fmg-components/funnel-header/menu-modal/menu-modal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fmg-components/funnel-header/menu-modal/menu-modal.vue b/src/fmg-components/funnel-header/menu-modal/menu-modal.vue
index f9660966f..278dfb7c0 100644
--- a/src/fmg-components/funnel-header/menu-modal/menu-modal.vue
+++ b/src/fmg-components/funnel-header/menu-modal/menu-modal.vue
@@ -102,7 +102,7 @@ export default {
         },
         show() {
             this.isActive = true;
-            this.scrollToPageTop();
+            window.scrollTo({ top: 0, left: 0, behavior: "smooth" });
         },
         hide() {
             var self = this;