Merge branch 'develop' into feature/CSR-1392

src/digital-components/button-question/button-question.vue

@@ -305,13 +305,15 @@ export default {
 
 <style lang="scss">
 .vehicle-damage {
-    @include media-breakpoint-up(md) {
+    .button-question {
-        .col-12 {
+        @include media-breakpoint-up(md) {
-            width: 66.66666667%;
+            .col-12 {
-        }
+                width: 66.66666667%;
-        .col {
+            }
-            width: 33.3333333%;
+            .col {
-            flex: 0 0 auto;
+                width: 33.3333333%;
+                flex: 0 0 auto;
+            }
         }
     }
 }

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"

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 {

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;