From d767d9084797567efb5f8b2d4949ae658476d817 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Tue, 13 Jan 2026 17:57:34 -0500
Subject: [PATCH] CASH-2034: fixes

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

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 948a7de19..ca541876c 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -621,7 +621,10 @@ export default {
             },
         },
         isMobileSelected() {
-            return this.appointmentType == AppointmentTypeStrings.MOBILE;
+            return (
+                this.appointmentType == AppointmentTypeStrings.MOBILE ||
+                (this.isServiceableMobile && !this.isServiceableInshop)
+            );
         },
         isServiceableMobile() {
             if (this.isRecalibrationServiceableMobile !== null) {
@@ -1140,7 +1143,7 @@ export default {
                 );
             }
         },
-        onShopSelected(shopQuestionPopUpData) {
+        async onShopSelected(shopQuestionPopUpData) {
             this.resetWaitlist();
             this.preSelectedDate = null;
             this.shopProviderData = shopQuestionPopUpData.shopProviderData;
@@ -1148,6 +1151,8 @@ export default {
             const selectedProvider = this.shopProviderData.shopProviders.find((shopProvider) => {
                 return shopProvider.providerNumber === shopQuestionPopUpData.selectedProviderNumber;
             });
+            const didProviderNumberChange =
+                oldProvider?.providerNumber !== selectedProvider.providerNumber;
 
             // No zipCodeData comes back if zip was not changed
             if (shopQuestionPopUpData.zipCodeData) {
@@ -1156,13 +1161,12 @@ export default {
                     selectedProvider
                 );
             } else {
-                const didProviderNumberChange =
-                    oldProvider?.providerNumber !== selectedProvider.providerNumber;
                 if (didProviderNumberChange) {
                     this.updateSelectedProvider(selectedProvider);
-                    this.initializeDatePicker();
                 }
             }
+            await this.initializeDatePicker();
+            this.setSelectedDateToFirstAvailable();
         },
         async getMoreScheduleData(startDate, endDate) {
             // called only when "View more dates" is clicked; not on initial page load
@@ -1710,7 +1714,6 @@ export default {
             this.zipContainsMilitaryBase = newZipCode.containsMilitaryBase;
             this.selectedDate = null;
             this.selectedProvider = newProvider;
-            this.initializeDatePicker();
         },
         handleAppointmentTypeChange(newAppointmentType) {
             this.updateFooterButtonText();