From 913de733cacf7b6be577832e8a5cb89e623e26a9 Mon Sep 17 00:00:00 2001
From: AdamCaouetteSafelite <adam.caouette@safelite.com>
Date: Fri, 18 Jul 2025 15:24:19 -0400
Subject: [PATCH 1/3] CASH-845: fix for seeing duration as undefined

---
 src/digital-components/date-picker/date-picker.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue
index 9fe6bb7a9..79c7d4dd2 100644
--- a/src/digital-components/date-picker/date-picker.vue
+++ b/src/digital-components/date-picker/date-picker.vue
@@ -335,7 +335,11 @@ export default {
                 this.estimatedServiceMinutesMaximum
             );
 
-            return `${inshopDurationTextWithoutTime} ${inshopDurationTime}`;
+            if (this.estimatedServiceMinutesMinimum && this.estimatedServiceMinutesMaximum) {
+                return `${inshopDurationTextWithoutTime} ${inshopDurationTime}`;
+            }
+
+            return null;
         },
         durationTextBlockCopy() {
             if (this.appointmentType === AppointmentTypeStrings.MOBILE) {

From b7bf5c969047acf8164b74ceb1781b7a85ac424e Mon Sep 17 00:00:00 2001
From: AdamCaouetteSafelite <adam.caouette@safelite.com>
Date: Fri, 18 Jul 2025 15:39:52 -0400
Subject: [PATCH 2/3] CASH-845: add another nextTick and await to ensure date
 picker is ready for an auto select of first date

---
 src/layouts/schedule/schedule.vue | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 70a4dbc01..0330afafd 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -1151,7 +1151,7 @@ export default {
             });
             datePickerInitialData.pricingByDayBasePrice = this.pricingByDayBasePrice;
             datePickerInitialData.pricingByDayUpcharge = this.pricingByDayUpcharge;
-            this.$refs.datePicker.initializeComponent(datePickerInitialData);
+            await this.$refs.datePicker.initializeComponent(datePickerInitialData);
             this.selectableDatesInshop =
                 datePickerInitialData.initialShopTimeSlotsResponse.inshopTimeSlotsData;
             this.selectableDatesMobile =
@@ -1182,11 +1182,13 @@ export default {
                         });
                     });
                 }
-                if (this.isMobileSelected) {
-                    this.selectedDate = selectedDateMobile;
-                } else {
-                    this.selectedDate = selectedDateInshop;
-                }
+                this.$nextTick(() => {
+                    if (this.isMobileSelected) {
+                        this.selectedDate = selectedDateMobile;
+                    } else {
+                        this.selectedDate = selectedDateInshop;
+                    }
+                });
             }
         },
         getScheduleApiResponse,

From 4b5de2fe6df839f641134581e2b4d98cbf2de0d8 Mon Sep 17 00:00:00 2001
From: AdamCaouetteSafelite <adam.caouette@safelite.com>
Date: Fri, 18 Jul 2025 15:58:58 -0400
Subject: [PATCH 3/3] CASH-845 add duration text back to Mobile

---
 .../date-picker/date-picker.vue               | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue
index 79c7d4dd2..7945744ec 100644
--- a/src/digital-components/date-picker/date-picker.vue
+++ b/src/digital-components/date-picker/date-picker.vue
@@ -341,9 +341,26 @@ export default {
 
             return null;
         },
+        mobileDurationText() {
+            const mobileDurationTextWithoutTime = this.getCmsContent(
+                "TimeSlotModalQuestion",
+                cmsWidgetFieldMappings.DURATION
+            );
+
+            const mobileDurationTime = getDisplayTextForDurationLength(
+                this.estimatedServiceMinutesMinimum,
+                this.estimatedServiceMinutesMaximum
+            );
+
+            if (this.estimatedServiceMinutesMinimum && this.estimatedServiceMinutesMaximum) {
+                return `${mobileDurationTextWithoutTime} ${mobileDurationTime}`;
+            }
+
+            return null;
+        },
         durationTextBlockCopy() {
             if (this.appointmentType === AppointmentTypeStrings.MOBILE) {
-                return null;
+                return this.mobileDurationText;
             } else if (this.appointmentType === AppointmentTypeStrings.IN_SHOP) {
                 return this.inshopDurationText;
             } else if (