From 035a91ea717c2d8b5484715f97fa6034df55d240 Mon Sep 17 00:00:00 2001
From: Bill Richardson <william.richardson@safelite.com>
Date: Tue, 3 Feb 2026 10:02:15 -0500
Subject: [PATCH] catch some edge cases

---
 src/layouts/schedule-page/schedule-page.vue       |  2 +-
 .../service-location/service-location.vue         | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/layouts/schedule-page/schedule-page.vue b/src/layouts/schedule-page/schedule-page.vue
index 909ba2a9..99139a0a 100644
--- a/src/layouts/schedule-page/schedule-page.vue
+++ b/src/layouts/schedule-page/schedule-page.vue
@@ -176,7 +176,7 @@ const getAvailableDates = async (
                     storeAction.payload.shopAppointmentType,
                     storeAction.payload.providerNumber
                 );
-            } else {
+            } else if (storeAction.payload?.zipCodeOverride) {
                 timeSlotsResponse = await useMainStore().getMobileTimeSlots(
                     storeAction.payload.startDate,
                     storeAction.payload.endDate,
diff --git a/src/layouts/schedule-page/service-location/service-location.vue b/src/layouts/schedule-page/service-location/service-location.vue
index 92312f35..b6e1d89e 100644
--- a/src/layouts/schedule-page/service-location/service-location.vue
+++ b/src/layouts/schedule-page/service-location/service-location.vue
@@ -314,7 +314,7 @@ export default {
             }
         },
         selectedProvider(newProvider, oldProvider) {
-            if (newProvider?.providerNumber !== oldProvider?.providerNumber) {
+            if (newProvider?.providerNumber !== oldProvider?.providerNumber || this.availabilityRating === null) {
                 const appointmentIsInshop = this.selectedAppointmentType === AppointmentTypeStrings.IN_SHOP;
                 const returnedProvider = {
                     provider: newProvider,
@@ -325,7 +325,9 @@ export default {
                     this.refreshAvailabilityRating();
                 }
 
-                this.$emit('provider-changed', returnedProvider);
+                if (newProvider?.providerNumber !== oldProvider?.providerNumber) {
+                    this.$emit('provider-changed', returnedProvider);
+                }
             }
         }
     },
@@ -577,5 +579,14 @@ $page-side-padding: 1.5rem;
             text-decoration: underline;
         }
     }
+    div.alert {
+        margin-top: 0.625rem;
+
+        :deep(.alert-header) {
+            button.btn-collapse {
+                align-self: center;
+            }
+        }
+    }
 }
 </style>