From 52b5cf42f0f45859a376ac4c261acf801ff7adec Mon Sep 17 00:00:00 2001
From: Chris Redelinghuys <chris.redelinghuys@safelite.com>
Date: Tue, 22 Jul 2025 14:29:04 -0400
Subject: [PATCH] CASH-1212: Update selected date if it's null after getting
 dates for another month

---
 src/layouts/schedule/schedule.vue | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index c822a3ea3..ab9e08177 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -1176,8 +1176,8 @@ export default {
 
             if (!this.selectedDate) {
                 // if no date is preselected on load, then select the first available
-                const selectedDateMobile = this.getSelectedDateForMobile();
-                const selectedDateInshop = this.getSelectedDateForInshop();
+                let selectedDateMobile = this.getSelectedDateForMobile();
+                let selectedDateInshop = this.getSelectedDateForInshop();
 
                 // if there is still no selected date, then load more and try again
                 if (
@@ -1195,6 +1195,13 @@ export default {
                             // > Doing so will likely add or remove dates,
                             // > desyncing the schedule page and the date-picker.
 
+                            if (!selectedDateInshop) {
+                                selectedDateInshop = this.getSelectedDateForInshop();
+                            }
+                            if (!selectedDateMobile) {
+                                selectedDateMobile = this.getSelectedDateForMobile();
+                            }
+
                             this.setDisplayWaitList();
                         });
                     });