From 5b80824f1765c1fbdb0c171f96467a65cb3fbd8d Mon Sep 17 00:00:00 2001
From: Matt Sykes <Matthew.Sykes@safelite.com>
Date: Mon, 22 Jun 2026 17:00:03 -0400
Subject: [PATCH 01/18] Avoid logging unhandledRejection with browser
 extensions in stack trace

---
 src/App.vue | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/App.vue b/src/App.vue
index 36c4b58a3..d8600aa87 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -87,9 +87,18 @@ window.onerror = (msg, url, line, col, error) => {
     return suppressErrorAlert;
 };
 
+function isBrowserExtensionUnhandledRejection(reason) {
+    const stack = reason instanceof Error ? reason.stack : "";
+    return typeof stack === "string" && stack.includes("chrome-extension://");
+}
+
 // Log Promise rejections that are never handled (.catch / await try/catch), e.g. fire-and-forget async.
 window.addEventListener("unhandledrejection", (event) => {
     const reason = event.reason;
+    if (isBrowserExtensionUnhandledRejection(reason)) {
+        return;
+    }
+
     const message = reason instanceof Error ? reason.message : String(reason);
     global.$logger.logError(`unhandledrejection: ${message}`, {
         stack: reason instanceof Error ? reason.stack : undefined,

From 45c669b30fa1f13b2f8b440ad5a60043c4206fb1 Mon Sep 17 00:00:00 2001
From: credelinghuys <Chris.Redelinghuys@safelite.com>
Date: Tue, 23 Jun 2026 11:14:19 -0400
Subject: [PATCH 02/18] CASH-2942: Always bailout for VIN required vehicles

---
 .../heritage-integration/navigation-helper.js |  3 +++
 .../navigation-helper.spec.js                 | 15 ++++++++++++
 src/mixins/vin-pages-mixin.js                 |  2 +-
 src/mixins/vin-pages-mixin.spec.js            | 23 +++++++++++++++++++
 4 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/src/helpers/heritage-integration/navigation-helper.js b/src/helpers/heritage-integration/navigation-helper.js
index a2b4452d5..029fb1f08 100644
--- a/src/helpers/heritage-integration/navigation-helper.js
+++ b/src/helpers/heritage-integration/navigation-helper.js
@@ -65,6 +65,9 @@ export async function skipVinLookup() {
     if (store.getters.damage.isRepair) {
         return true;
     }
+    if (store.getters.vehicle.vinRequired) {
+        return false;
+    }
     const isVinOptionalVehicle = store.getters.order.vehicle.make
         ? await store.dispatch(storeActions.IS_VIN_OPTIONAL_VEHICLE)
         : false;
diff --git a/src/helpers/heritage-integration/navigation-helper.spec.js b/src/helpers/heritage-integration/navigation-helper.spec.js
index 752c98fdc..ab1b9d6d7 100644
--- a/src/helpers/heritage-integration/navigation-helper.spec.js
+++ b/src/helpers/heritage-integration/navigation-helper.spec.js
@@ -11,6 +11,7 @@ import { damageLocationsSelected as glassLocations } from "@/constants/damage-lo
 
 import store from "@/store";
 import router from "@/router";
+import { skipVinLookup } from "@/helpers/heritage-integration/navigation-helper";
 
 const getPageToRouteExistingOrderTo = navigationHelper.getPageToRouteExistingOrderTo;
 const navigateToHeritageFunnel = navigationHelper.navigateToHeritageFunnel;
@@ -147,6 +148,20 @@ describe("navigateToHeritageFunnel", () => {
     });
 });
 
+describe("skipVinLookup", () => {
+    afterEach(() => {
+        store.commit(storeMutations.UPDATE_VIN_REQUIRED, false);
+        store.commit(storeMutations.UPDATE_IS_REPAIR, false);
+    });
+
+    test("returns false when vehicle vin is required", async () => {
+        store.commit(storeMutations.UPDATE_VIN_REQUIRED, true);
+        store.commit(storeMutations.UPDATE_IS_REPAIR, false);
+
+        await expect(skipVinLookup()).resolves.toBe(false);
+    });
+});
+
 /**
  * `arePagePrerequisitesValidObject` is an object where the keys are fmgPageValue names and the values are booleans that indicate
  * whether arePagePrerequisitesValid is true or false
diff --git a/src/mixins/vin-pages-mixin.js b/src/mixins/vin-pages-mixin.js
index 78cb134cf..c15529d4f 100644
--- a/src/mixins/vin-pages-mixin.js
+++ b/src/mixins/vin-pages-mixin.js
@@ -37,7 +37,7 @@ export default {
                 pageNameToLog: pageName,
             });
 
-            if (result.PartNotFound) {
+            if (result.PartNotFound || store.getters.vehicle.vinRequired) {
                 return bailoutMixin.methods.navigateToBailoutPage(
                     this,
                     bailoutCodes.PART_NOT_FOUND
diff --git a/src/mixins/vin-pages-mixin.spec.js b/src/mixins/vin-pages-mixin.spec.js
index d9ff6f874..46d755c3c 100644
--- a/src/mixins/vin-pages-mixin.spec.js
+++ b/src/mixins/vin-pages-mixin.spec.js
@@ -3,6 +3,10 @@ import { shallowMount } from "@vue/test-utils";
 import { setupMocksForJsFiles, getMountOptions } from "@/helpers/unit-test-helper.js";
 import { storeActions } from "@/constants/store-actions";
 import vehicleQuestionsMixin from "@/mixins/vehicle-questions-mixin";
+import bailoutMixin from "@/mixins/bailout-mixin";
+import { bailoutCodes } from "@/constants/bailout-codes";
+import store from "@/store";
+import { storeMutations } from "@/constants/store-mutations";
 
 jest.mock("@/helpers/heritage-integration/navigation-helper", () => ({
     navigateForward: jest.fn(),
@@ -15,6 +19,7 @@ jest.mock("@/helpers/heritage-integration/order-helper.js", () => ({
 describe("vin-pages-mixin", () => {
     afterEach(() => {
         jest.clearAllMocks();
+        store.commit(storeMutations.UPDATE_VIN_REQUIRED, false);
     });
 
     describe("navigateForwardWithSingleCarMatch", () => {
@@ -29,6 +34,24 @@ describe("vin-pages-mixin", () => {
             // Assert
             expect(vehicleQuestionsMixin.methods.navigateForward).toHaveBeenCalled();
         });
+
+        test("vinRequired vehicles navigate to bailout after VIN is saved", async () => {
+            // Arrange
+            store.commit(storeMutations.UPDATE_VIN_REQUIRED, true);
+            const { wrapper } = setupMocks({});
+            bailoutMixin.methods.navigateToBailoutPage = jest.fn();
+            vehicleQuestionsMixin.methods.navigateForward = jest.fn();
+
+            // Act
+            await wrapper.vm.navigateForwardWithSingleCarMatch();
+
+            // Assert
+            expect(bailoutMixin.methods.navigateToBailoutPage).toHaveBeenCalledWith(
+                wrapper.vm,
+                bailoutCodes.PART_NOT_FOUND
+            );
+            expect(vehicleQuestionsMixin.methods.navigateForward).not.toHaveBeenCalled();
+        });
     });
 });
 

From 5d8c5b44f51e4376163bb7b66b57bc50b29a9774 Mon Sep 17 00:00:00 2001
From: scottkiener-at-safelite <scott.kiener@safelite.com>
Date: Wed, 24 Jun 2026 10:42:36 -0400
Subject: [PATCH 03/18] CASH-2880 | Add loader to date-picker for scheduling

---
 .../scheduling/date-picker/date-picker.vue    | 37 +++++++++++++++++--
 1 file changed, 34 insertions(+), 3 deletions(-)

diff --git a/src/layouts/scheduling/date-picker/date-picker.vue b/src/layouts/scheduling/date-picker/date-picker.vue
index 3ade2058e..a7f78cc2c 100644
--- a/src/layouts/scheduling/date-picker/date-picker.vue
+++ b/src/layouts/scheduling/date-picker/date-picker.vue
@@ -10,16 +10,21 @@
                 class="date-picker__nav-icon date-picker__nav-icon--flipped"
                 alt="" />
         </button>
-        <div class="date-picker__track d-flex flex-grow-1">
+        <div
+            class="date-picker__track d-flex flex-grow-1"
+            :class="{ 'date-picker__track--loading': isLoadingDates }"
+            :style="isLoadingDates ? { '--card-count': windowSize } : null">
             <button
-                v-for="date in visibleDates"
+                v-for="(date, index) in visibleDates"
                 :key="date.value"
                 class="date-picker__day-card d-flex flex-column align-items-center justify-content-center"
                 :class="{
                     'date-picker__day-card--selected': isSelected(date.value),
                     'date-picker__day-card--disabled': !date.isAvailable,
+                    'date-picker__day-card--loading': isLoadingDates,
                 }"
-                :disabled="!date.isAvailable"
+                :style="isLoadingDates ? { '--card-index': index } : null"
+                :disabled="!date.isAvailable || isLoadingDates"
                 :aria-pressed="isSelected(date.value)"
                 :aria-label="`${date.dayAbbr} ${date.monthAbbr} ${date.day}`"
                 @click="selectDate(date)">
@@ -308,6 +313,23 @@ export default {
                 color: $gray-300;
             }
         }
+
+        &--loading,
+        &--loading.date-picker__day-card--selected,
+        &--loading.date-picker__day-card--disabled {
+            border-color: $gray-200;
+            cursor: default;
+            background-color: $gray-200;
+            background-image: linear-gradient(90deg, $gray-200 25%, $gray-100 50%, $gray-200 75%);
+            background-repeat: no-repeat;
+            background-size: calc(var(--card-count) * 200%) 100%;
+            animation: date-picker-shimmer 1.5s ease-in-out infinite;
+
+            .date-picker__day-abbr,
+            .date-picker__day-date {
+                visibility: hidden;
+            }
+        }
     }
 
     &__day-abbr,
@@ -336,4 +358,13 @@ export default {
         }
     }
 }
+
+@keyframes date-picker-shimmer {
+    0% {
+        background-position-x: calc(var(--card-index) / (var(--card-count) - 1) * 100% + 100%);
+    }
+    100% {
+        background-position-x: calc(var(--card-index) / (var(--card-count) - 1) * 100% - 100%);
+    }
+}
 </style>

From 8a678a6a4168a4512b4cba85bb9dbb99ad4bd57c Mon Sep 17 00:00:00 2001
From: credelinghuys <Chris.Redelinghuys@safelite.com>
Date: Wed, 24 Jun 2026 12:41:11 -0400
Subject: [PATCH 04/18] CASH-2942: Update vinRequired property on vehicle
 update

---
 src/store/index.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/store/index.js b/src/store/index.js
index 73ea13114..c359444e5 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -498,6 +498,9 @@ export const mutations = {
         state.order.vehicle.carId = vehicleInfo.carId;
         state.order.vehicle.category = vehicleInfo.category;
         state.order.vehicle.vin = vehicleInfo.vin;
+        if (vehicleInfo.vinRequired !== undefined) {
+            state.order.vehicle.vinRequired = vehicleInfo.vinRequired;
+        }
 
         state.order.vehicle.imageUrl = vehicleInfo.imageUrl;
         state.order.vehicle.imageVifNumber = vehicleInfo.imageVifNumber;

From d9b8c0906eae40c1800917a98c97c55d4e3299f3 Mon Sep 17 00:00:00 2001
From: scottkiener-at-safelite <scott.kiener@safelite.com>
Date: Wed, 24 Jun 2026 15:52:11 -0400
Subject: [PATCH 05/18] CASH-2880 | Make the loader show upon page load & Add
 loader to datepick

Reduce time that the spinner shows upon page load
Add a loading animation to date-picker
---
 .../scheduling/date-picker/date-picker.vue    | 53 ++++++----
 src/layouts/scheduling/scheduling.vue         | 97 +++++++++++--------
 2 files changed, 91 insertions(+), 59 deletions(-)

diff --git a/src/layouts/scheduling/date-picker/date-picker.vue b/src/layouts/scheduling/date-picker/date-picker.vue
index a7f78cc2c..39ecbded1 100644
--- a/src/layouts/scheduling/date-picker/date-picker.vue
+++ b/src/layouts/scheduling/date-picker/date-picker.vue
@@ -14,23 +14,39 @@
             class="date-picker__track d-flex flex-grow-1"
             :class="{ 'date-picker__track--loading': isLoadingDates }"
             :style="isLoadingDates ? { '--card-count': windowSize } : null">
-            <button
-                v-for="(date, index) in visibleDates"
-                :key="date.value"
-                class="date-picker__day-card d-flex flex-column align-items-center justify-content-center"
-                :class="{
-                    'date-picker__day-card--selected': isSelected(date.value),
-                    'date-picker__day-card--disabled': !date.isAvailable,
-                    'date-picker__day-card--loading': isLoadingDates,
-                }"
-                :style="isLoadingDates ? { '--card-index': index } : null"
-                :disabled="!date.isAvailable || isLoadingDates"
-                :aria-pressed="isSelected(date.value)"
-                :aria-label="`${date.dayAbbr} ${date.monthAbbr} ${date.day}`"
-                @click="selectDate(date)">
-                <span class="date-picker__day-abbr">{{ date.dayAbbr }}</span>
-                <span class="date-picker__day-date">{{ date.monthAbbr }} {{ date.day }}</span>
-            </button>
+            <template v-if="showLoadingPlaceholders">
+                <div
+                    v-for="index in windowSize"
+                    :key="index"
+                    class="date-picker__day-card date-picker__day-card--loading d-flex flex-column align-items-center justify-content-center"
+                    :style="{ '--card-index': index - 1 }"
+                    aria-hidden="true">
+                    <!-- Placeholder text is intentionally non-empty so the spans occupy the
+                         same height as real content. The --loading CSS hides them via
+                         visibility:hidden, so they are never visible to users. -->
+                    <span class="date-picker__day-abbr">MON</span>
+                    <span class="date-picker__day-date">Jan 00</span>
+                </div>
+            </template>
+            <template v-else>
+                <button
+                    v-for="(date, index) in visibleDates"
+                    :key="date.value"
+                    class="date-picker__day-card d-flex flex-column align-items-center justify-content-center"
+                    :class="{
+                        'date-picker__day-card--selected': isSelected(date.value),
+                        'date-picker__day-card--disabled': !date.isAvailable,
+                        'date-picker__day-card--loading': isLoadingDates,
+                    }"
+                    :style="isLoadingDates ? { '--card-index': index } : null"
+                    :disabled="!date.isAvailable || isLoadingDates"
+                    :aria-pressed="isSelected(date.value)"
+                    :aria-label="`${date.dayAbbr} ${date.monthAbbr} ${date.day}`"
+                    @click="selectDate(date)">
+                    <span class="date-picker__day-abbr">{{ date.dayAbbr }}</span>
+                    <span class="date-picker__day-date">{{ date.monthAbbr }} {{ date.day }}</span>
+                </button>
+            </template>
         </div>
         <button
             class="date-picker__nav-btn"
@@ -115,6 +131,9 @@ export default {
         };
     },
     computed: {
+        showLoadingPlaceholders() {
+            return this.isLoadingDates && !this.allDates.length;
+        },
         allDates() {
             if (this.availableDates === null) return [];
 
diff --git a/src/layouts/scheduling/scheduling.vue b/src/layouts/scheduling/scheduling.vue
index 9b63dd88e..41512f411 100644
--- a/src/layouts/scheduling/scheduling.vue
+++ b/src/layouts/scheduling/scheduling.vue
@@ -34,7 +34,7 @@
                         @zip-code-clicked="onMobileZipCodeClicked" />
                     <inshopSchedulingCard
                         v-for="{ provider } in inShopProvidersAndTimeslots"
-                        v-show="selectedDate"
+                        v-show="showInshopSchedulingCards"
                         :key="provider.providerNumber"
                         class="mt-4"
                         v-model="selectedScheduling"
@@ -138,17 +138,6 @@ export default {
     async beforeRouteEnter(to, from, next) {
         const serviceZipCode = store.getters.order.serviceLocation.zipCode;
 
-        const shopProviderData = await store.dispatch("getProviders", {
-            payload: { serviceZipCode },
-            pageNameToLog: to.name,
-        });
-        // Get the first 3 providers from the shopProviderData
-        const providers = shopProviderData?.data?.shopProviders?.slice(0, 3) ?? [];
-        const mobileProviderNumber = shopProviderData?.data?.mobileProviderNumber ?? null;
-
-        const startDate = toDateString(0);
-        const endDate = toDateString(SCHEDULE_FETCH_DAYS - 1);
-
         const promiseResultMap = [
             {
                 resultKey: "cmsContent",
@@ -160,45 +149,64 @@ export default {
                     pageNameToLog: to.name,
                 }),
             },
-            ...providers.map((provider, i) => ({
-                resultKey: `inshopTimeSlots_${i}`,
-                promise: fetchInshopTimeSlots({
-                    startDate,
-                    endDate,
-                    providerNumber: provider.providerNumber,
+            {
+                resultKey: "providers",
+                promise: store.dispatch("getProviders", {
+                    payload: { serviceZipCode },
                     pageNameToLog: to.name,
                 }),
-            })),
-            // Get the mobile time slots if a mobile provider number is available
-            ...(mobileProviderNumber
-                ? [
-                      {
-                          resultKey: "mobileTimeSlots",
-                          promise: fetchMobileTimeSlots({
-                              startDate,
-                              endDate,
-                              zipCode: serviceZipCode,
-                              pageNameToLog: to.name,
-                          }),
-                      },
-                  ]
-                : []),
+            },
         ];
         const resultMap = await settleAllPromises(promiseResultMap);
-        next((vm) => {
+        // Get the first 3 providers from the shopProviderData
+        const providers = resultMap.providers?.shopProviders?.slice(0, 3) ?? [];
+        const mobileProviderNumber = resultMap.providers?.mobileProviderNumber ?? null;
+        next(async (vm) => {
             vm.setCmsContent(resultMap.cmsContent);
-            vm.inShopProvidersAndTimeslots = providers.map((provider, i) => ({
+            vm.inShopProvidersAndTimeslots = providers.map((provider) => ({
                 provider,
-                timeSlots: resultMap[`inshopTimeSlots_${i}`] ?? null,
+                timeSlots: null,
             }));
             vm.mobileProviderAndTimeSlot = mobileProviderNumber
-                ? {
-                      providerNumber: mobileProviderNumber,
-                      timeSlots: resultMap.mobileTimeSlots ?? null,
-                  }
+                ? { providerNumber: mobileProviderNumber, timeSlots: null }
                 : null;
+            const startDate = toDateString(0);
+            const endDate = toDateString(SCHEDULE_FETCH_DAYS - 1);
+            const timeSlotsPromiseResultMap = [
+                ...providers.map((provider, i) => ({
+                    resultKey: `inshopTimeSlots_${i}`,
+                    promise: fetchInshopTimeSlots({
+                        startDate,
+                        endDate,
+                        providerNumber: provider.providerNumber,
+                        pageNameToLog: to.name,
+                    }),
+                })),
+                // Get the mobile time slots if a mobile provider number is available
+                ...(mobileProviderNumber
+                    ? [
+                          {
+                              resultKey: "mobileTimeSlots",
+                              promise: fetchMobileTimeSlots({
+                                  startDate,
+                                  endDate,
+                                  zipCode: serviceZipCode,
+                                  pageNameToLog: to.name,
+                              }),
+                          },
+                      ]
+                    : []),
+            ];
+            const timeSlotsResultMap = await settleAllPromises(timeSlotsPromiseResultMap);
+            vm.inShopProvidersAndTimeslots.forEach((entry, i) => {
+                entry.timeSlots = timeSlotsResultMap[`inshopTimeSlots_${i}`] ?? null;
+            });
+            if (vm.mobileProviderAndTimeSlot) {
+                vm.mobileProviderAndTimeSlot.timeSlots = timeSlotsResultMap.mobileTimeSlots ?? null;
+            }
             vm.datesLoaded = true;
             vm.mobilePremiumAppointmentFee = resultMap.mobilePremiumFee ?? null;
+            vm.isLoadingDates = false;
         });
     },
     watch: {
@@ -217,7 +225,12 @@ export default {
             return store.getters.order.serviceLocation.zipCode;
         },
         showMobileSchedulingCard() {
-            return Boolean(this.mobileProviderAndTimeSlot && this.selectedDate);
+            return Boolean(
+                this.mobileProviderAndTimeSlot && (this.selectedDate || this.isLoadingDates)
+            );
+        },
+        showInshopSchedulingCards() {
+            return this.selectedDate || this.isLoadingDates;
         },
         mobileTimeSlotsForSelectedDate() {
             if (!this.selectedDate) {
@@ -251,7 +264,7 @@ export default {
     data() {
         return {
             selectedDate: null,
-            isLoadingDates: false,
+            isLoadingDates: true,
             datesLoaded: false,
             datePickerStartDate: toDateString(0),
             datePickerEndDate: toDateString(SCHEDULE_FETCH_DAYS - 1),

From 0adec758dd474f6922d954df0a1c954f03237419 Mon Sep 17 00:00:00 2001
From: scottkiener-at-safelite <scott.kiener@safelite.com>
Date: Thu, 25 Jun 2026 10:14:44 -0400
Subject: [PATCH 06/18] CASH-2880 | Add in selected date change animation

---
 src/layouts/scheduling/scheduling.vue | 68 ++++++++++++++++++---------
 1 file changed, 45 insertions(+), 23 deletions(-)

diff --git a/src/layouts/scheduling/scheduling.vue b/src/layouts/scheduling/scheduling.vue
index 41512f411..b23312331 100644
--- a/src/layouts/scheduling/scheduling.vue
+++ b/src/layouts/scheduling/scheduling.vue
@@ -20,29 +20,35 @@
                         :availableDates="availableDates"
                         :isLoadingDates="isLoadingDates"
                         @requestMoreDates="handleRequestMoreDates" />
-                    <mobileSchedulingCard
-                        v-if="showMobileSchedulingCard"
-                        class="mt-4"
-                        v-model="selectedScheduling"
-                        :providerNumber="mobileProviderAndTimeSlot.providerNumber"
-                        :timeSlots="mobileTimeSlotsForSelectedDate"
-                        :premiumTimeSlotPrice="premiumTimeSlotPrice"
-                        :zipCode="serviceZipCode"
-                        :showFreeFlag="showMobileFreeFlag"
-                        :radioGroupName="schedulingRadioGroupName"
-                        :isLoading="isLoadingDates"
-                        @zip-code-clicked="onMobileZipCodeClicked" />
-                    <inshopSchedulingCard
-                        v-for="{ provider } in inShopProvidersAndTimeslots"
-                        v-show="showInshopSchedulingCards"
-                        :key="provider.providerNumber"
-                        class="mt-4"
-                        v-model="selectedScheduling"
-                        :provider="provider"
-                        :timeSlots="getInshopTimeSlotsForSelectedDate(provider.providerNumber)"
-                        :radioGroupName="schedulingRadioGroupName"
-                        :isLoading="isLoadingDates"
-                        @address-clicked="onInshopAddressClicked(provider)" />
+                    <Transition name="card-slide" mode="out-in">
+                        <div :key="selectedDate">
+                            <mobileSchedulingCard
+                                v-if="showMobileSchedulingCard"
+                                class="mt-4"
+                                v-model="selectedScheduling"
+                                :providerNumber="mobileProviderAndTimeSlot.providerNumber"
+                                :timeSlots="mobileTimeSlotsForSelectedDate"
+                                :premiumTimeSlotPrice="premiumTimeSlotPrice"
+                                :zipCode="serviceZipCode"
+                                :showFreeFlag="showMobileFreeFlag"
+                                :radioGroupName="schedulingRadioGroupName"
+                                :isLoading="isLoadingDates"
+                                @zip-code-clicked="onMobileZipCodeClicked" />
+                            <inshopSchedulingCard
+                                v-for="{ provider } in inShopProvidersAndTimeslots"
+                                v-show="showInshopSchedulingCards"
+                                :key="provider.providerNumber"
+                                class="mt-4"
+                                v-model="selectedScheduling"
+                                :provider="provider"
+                                :timeSlots="
+                                    getInshopTimeSlotsForSelectedDate(provider.providerNumber)
+                                "
+                                :radioGroupName="schedulingRadioGroupName"
+                                :isLoading="isLoadingDates"
+                                @address-clicked="onInshopAddressClicked(provider)" />
+                        </div>
+                    </Transition>
                     <navbar
                         cmsWidgetName="FunnelFooterWidget"
                         ref="navbar"
@@ -404,4 +410,20 @@ h5 {
     line-height: 32px;
     font-size: 1.25rem;
 }
+
+.card-slide-enter-active {
+    transition:
+        opacity 0.3s ease-out,
+        transform 0.3s ease-out;
+}
+.card-slide-leave-active {
+    transition: opacity 0.32s ease-in;
+}
+.card-slide-enter-from {
+    opacity: 0;
+    transform: translateX(24px);
+}
+.card-slide-leave-to {
+    opacity: 0;
+}
 </style>

From edff5b752842d84b7bca87ef50644ee7146d773c Mon Sep 17 00:00:00 2001
From: scottkiener-at-safelite <scott.kiener@safelite.com>
Date: Thu, 25 Jun 2026 11:07:18 -0400
Subject: [PATCH 07/18] Remove unused class

---
 src/layouts/scheduling/date-picker/date-picker.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/layouts/scheduling/date-picker/date-picker.vue b/src/layouts/scheduling/date-picker/date-picker.vue
index 39ecbded1..5e7caf089 100644
--- a/src/layouts/scheduling/date-picker/date-picker.vue
+++ b/src/layouts/scheduling/date-picker/date-picker.vue
@@ -12,7 +12,6 @@
         </button>
         <div
             class="date-picker__track d-flex flex-grow-1"
-            :class="{ 'date-picker__track--loading': isLoadingDates }"
             :style="isLoadingDates ? { '--card-count': windowSize } : null">
             <template v-if="showLoadingPlaceholders">
                 <div

From 81a02d7fb932105131a77f460e4efa8581a12040 Mon Sep 17 00:00:00 2001
From: Carl Nation <Carl.Nation@safelite.com>
Date: Thu, 25 Jun 2026 12:11:35 -0400
Subject: [PATCH 08/18] CASH-632 remove horizontal row with page gradient

CASH-632 remove horizontal row with page gradient per Devyn
---
 src/layouts/coverage-statement/coverage-statement.vue       | 1 -
 src/layouts/duplicate-check/duplicate-check.vue             | 1 -
 src/layouts/endorsements/endorsements.vue                   | 1 -
 src/layouts/policy-driver/policy-driver.vue                 | 1 -
 src/layouts/policy-info-submitted/policy-info-submitted.vue | 1 -
 src/layouts/policy-info/policy-info.vue                     | 1 -
 src/layouts/policy-vehicle/policy-vehicle.vue               | 1 -
 src/layouts/recalibration-info/recalibration-info.vue       | 1 -
 src/layouts/verify-details/verify-details.vue               | 1 -
 src/styles/common-styles.scss                               | 5 -----
 10 files changed, 14 deletions(-)

diff --git a/src/layouts/coverage-statement/coverage-statement.vue b/src/layouts/coverage-statement/coverage-statement.vue
index 6dda6fdd2..f98f64ad3 100644
--- a/src/layouts/coverage-statement/coverage-statement.vue
+++ b/src/layouts/coverage-statement/coverage-statement.vue
@@ -4,7 +4,6 @@
             cmsWidgetName="FunnelHeaderWidget"
             ref="funnelHeader"
             :overrideImageSrc="clientLogoImageSrc" />
-        <div class="page-gradient"></div>
         <div class="container">
             <div class="row">
                 <div class="col-12 col-md-10 col-lg-8 col-xl-7">
diff --git a/src/layouts/duplicate-check/duplicate-check.vue b/src/layouts/duplicate-check/duplicate-check.vue
index 40f0a8c0d..a5d624de8 100644
--- a/src/layouts/duplicate-check/duplicate-check.vue
+++ b/src/layouts/duplicate-check/duplicate-check.vue
@@ -4,7 +4,6 @@
             cmsWidgetName="FunnelHeaderWidget"
             ref="funnelHeader"
             :overrideImageSrc="clientLogoImageSrc" />
-        <div class="page-gradient"></div>
         <div class="container">
             <div class="row">
                 <div class="col-12 col-md-10 col-lg-8 col-xl-7">
diff --git a/src/layouts/endorsements/endorsements.vue b/src/layouts/endorsements/endorsements.vue
index 7aa027dec..4e16fb05b 100644
--- a/src/layouts/endorsements/endorsements.vue
+++ b/src/layouts/endorsements/endorsements.vue
@@ -4,7 +4,6 @@
             cmsWidgetName="FunnelHeaderWidget"
             ref="funnelHeader"
             :overrideImageSrc="clientLogoImageSrc" />
-        <div class="page-gradient"></div>
         <div class="container">
             <div class="row">
                 <div class="col-12 col-md-10 col-lg-8 col-xl-7">
diff --git a/src/layouts/policy-driver/policy-driver.vue b/src/layouts/policy-driver/policy-driver.vue
index ae2d9fb6c..9f96e7a4d 100644
--- a/src/layouts/policy-driver/policy-driver.vue
+++ b/src/layouts/policy-driver/policy-driver.vue
@@ -4,7 +4,6 @@
             cmsWidgetName="FunnelHeaderWidget"
             ref="funnelHeader"
             :overrideImageSrc="clientLogoImageSrc" />
-        <div class="page-gradient"></div>
         <div class="container">
             <div class="row">
                 <div class="col-12 col-md-10 col-lg-8 col-xl-7">
diff --git a/src/layouts/policy-info-submitted/policy-info-submitted.vue b/src/layouts/policy-info-submitted/policy-info-submitted.vue
index 5afec595d..d3b4d22c0 100644
--- a/src/layouts/policy-info-submitted/policy-info-submitted.vue
+++ b/src/layouts/policy-info-submitted/policy-info-submitted.vue
@@ -4,7 +4,6 @@
             cmsWidgetName="FunnelHeaderWidget"
             ref="funnelHeader"
             :overrideImageSrc="clientLogoImageSrc" />
-        <div class="page-gradient"></div>
         <div class="container">
             <div class="row">
                 <div class="col-12 col-md-10 col-lg-8 col-xl-7">
diff --git a/src/layouts/policy-info/policy-info.vue b/src/layouts/policy-info/policy-info.vue
index ac03c43bd..3ea2b8477 100644
--- a/src/layouts/policy-info/policy-info.vue
+++ b/src/layouts/policy-info/policy-info.vue
@@ -4,7 +4,6 @@
             cmsWidgetName="FunnelHeaderWidget"
             ref="funnelHeader"
             :overrideImageSrc="clientLogoImageSrc" />
-        <div class="page-gradient"></div>
         <div class="container">
             <div class="row">
                 <div class="col-12 col-md-10 col-lg-8 col-xl-7">
diff --git a/src/layouts/policy-vehicle/policy-vehicle.vue b/src/layouts/policy-vehicle/policy-vehicle.vue
index 768169127..e03a9e766 100644
--- a/src/layouts/policy-vehicle/policy-vehicle.vue
+++ b/src/layouts/policy-vehicle/policy-vehicle.vue
@@ -4,7 +4,6 @@
             cmsWidgetName="FunnelHeaderWidget"
             ref="funnelHeader"
             :overrideImageSrc="clientLogoImageSrc" />
-        <div class="page-gradient"></div>
         <div class="container">
             <div class="row">
                 <div class="col-12 col-md-10 col-lg-8 col-xl-7">
diff --git a/src/layouts/recalibration-info/recalibration-info.vue b/src/layouts/recalibration-info/recalibration-info.vue
index 032348457..a592d70ae 100644
--- a/src/layouts/recalibration-info/recalibration-info.vue
+++ b/src/layouts/recalibration-info/recalibration-info.vue
@@ -4,7 +4,6 @@
             cmsWidgetName="FunnelHeaderWidget"
             ref="funnelHeader"
             :overrideImageSrc="clientLogoImageSrc" />
-        <div class="page-gradient"></div>
         <div class="container">
             <div class="row">
                 <div class="col-12 col-md-10 col-lg-8 col-xl-7">
diff --git a/src/layouts/verify-details/verify-details.vue b/src/layouts/verify-details/verify-details.vue
index a7e5daa23..f446776fc 100644
--- a/src/layouts/verify-details/verify-details.vue
+++ b/src/layouts/verify-details/verify-details.vue
@@ -4,7 +4,6 @@
             cmsWidgetName="FunnelHeaderWidget"
             ref="funnelHeader"
             :overrideImageSrc="clientLogoImageSrc" />
-        <div class="page-gradient"></div>
         <div class="container">
             <div class="row">
                 <div class="col-12 col-md-10 col-lg-8 col-xl-7">
diff --git a/src/styles/common-styles.scss b/src/styles/common-styles.scss
index ce1354f16..c619196fa 100644
--- a/src/styles/common-styles.scss
+++ b/src/styles/common-styles.scss
@@ -102,8 +102,3 @@ option,
 .btn {
     letter-spacing: 0.03rem;
 }
-
-.page-gradient {
-    height: 12px;
-    background: linear-gradient(to bottom, rgba(0, 0, 0, 0.08), rgba(0, 0, 0, 0));
-}

From 84d31fa55ccb0eed3aa37303ed1484a9e43b0990 Mon Sep 17 00:00:00 2001
From: Matt Sykes <Matthew.Sykes@safelite.com>
Date: Thu, 25 Jun 2026 12:47:02 -0400
Subject: [PATCH 09/18] Fix textbox-question render failures on mobile-details
 and schedule

Harden the shared textbox-question component and its mobile flow parents
to prevent runtime-1 "undefined is not a function" errors seen in
CloudWatch (chunk 5615 / textbox-question.vue).

- Coerce modelValue to a string in textbox-question setup and value getter
- Ensure v-maska always receives a string mask
- Guard the value watcher when handleChange is unavailable
- Fix mobile-details v-model bindings (remove invalid this. prefix)
- Coerce address fields from store to strings before binding
- Correct malformed modelValue prop definitions on vehicle-protected-question
  and service-zip-question
- Add unit test for null modelValue coercion
---
 .../textbox-question/textbox-question.spec.js | 16 ++++++++
 .../textbox-question/textbox-question.vue     | 40 ++++++++++++-------
 src/layouts/mobile-details/mobile-details.vue | 14 +++----
 .../vehicle-protected-question.vue            |  3 +-
 .../service-zip-question.vue                  |  3 +-
 5 files changed, 53 insertions(+), 23 deletions(-)

diff --git a/src/digital-components/textbox-question/textbox-question.spec.js b/src/digital-components/textbox-question/textbox-question.spec.js
index be33230c2..d83eb6509 100644
--- a/src/digital-components/textbox-question/textbox-question.spec.js
+++ b/src/digital-components/textbox-question/textbox-question.spec.js
@@ -13,6 +13,22 @@ const mockMixin = {
 const maska = jest.fn();
 
 describe("textboxQuestion.vue", () => {
+    it("Should coerce non-string modelValue to empty string for v-model.trim", async () => {
+        const wrapper = shallowMount(textboxQuestion, {
+            global: {
+                directives: {
+                    maska: maska,
+                },
+            },
+            propsData: {
+                modelValue: null,
+            },
+            mixins: [mockMixin],
+        });
+
+        expect(wrapper.vm.value).toBe("");
+    });
+
     it("Should render a text input", async () => {
         // Arrange
         const wrapper = shallowMount(textboxQuestion, {
diff --git a/src/digital-components/textbox-question/textbox-question.vue b/src/digital-components/textbox-question/textbox-question.vue
index 9e0810513..fd8f850ef 100644
--- a/src/digital-components/textbox-question/textbox-question.vue
+++ b/src/digital-components/textbox-question/textbox-question.vue
@@ -25,7 +25,7 @@
             <input
                 class="form-control"
                 v-model.trim="value"
-                v-maska="mask"
+                v-maska="effectiveMask"
                 :type="type"
                 :ref="inputId"
                 :id="inputId"
@@ -90,6 +90,19 @@ import loader from "@/ux-components/loader/loader.vue";
 import { ref } from "vue";
 import { v4 as uuidv4 } from "uuid";
 
+function coerceTextboxValue(modelValue) {
+    if (modelValue == null) {
+        return "";
+    }
+    if (typeof modelValue === "number") {
+        return String(modelValue);
+    }
+    if (typeof modelValue === "string") {
+        return modelValue;
+    }
+    return "";
+}
+
 export default {
     name: "textbox-question",
     props: {
@@ -145,18 +158,8 @@ export default {
         const inputId = !props.customInputId ? `input-${uuid}` : props.customInputId;
 
         const propsClone = Object.assign({}, props);
-        const modelValue = propsClone.modelValue;
-        let initialValue;
-        let isImageProcessing = ref(false);
-
-        switch (typeof modelValue) {
-            case "number":
-                initialValue = modelValue;
-                break;
-            default:
-                initialValue = modelValue && modelValue.length > 0 ? modelValue : "";
-                break;
-        }
+        const modelValue = coerceTextboxValue(propsClone.modelValue);
+        const initialValue = modelValue;
 
         const fieldOptions = {
             type: "text",
@@ -164,6 +167,8 @@ export default {
             initialValue: initialValue,
         };
 
+        let isImageProcessing = ref(false);
+
         const { errorMessage, handleBlur, handleChange, meta, validate, errors } = useField(
             inputId,
             props.validationRules,
@@ -223,18 +228,25 @@ export default {
         },
         value: {
             get: function () {
-                return this.modelValue;
+                return coerceTextboxValue(this.modelValue);
             },
             set: function (newValue) {
                 this.$emit("update:modelValue", newValue);
             },
         },
+        effectiveMask() {
+            return this.mask ?? "";
+        },
     },
     mounted() {
         this.$emit("textboxQuestionEvent.inputIdAssigned", this.inputId);
     },
     watch: {
         async value(newValue) {
+            if (typeof this.handleChange !== "function") {
+                return;
+            }
+
             const result = await validate(newValue, this.validationRules); // do a test validation check, without triggering full validation
             if (result.valid) {
                 this.handleChange(newValue); // trigger full validation on this field only
diff --git a/src/layouts/mobile-details/mobile-details.vue b/src/layouts/mobile-details/mobile-details.vue
index cb98386e6..1dcd75a36 100644
--- a/src/layouts/mobile-details/mobile-details.vue
+++ b/src/layouts/mobile-details/mobile-details.vue
@@ -34,7 +34,7 @@
                                 class="keys-message" />
                             <mobileAddressQuestions
                                 ref="addressQuestions"
-                                v-model="this.addressQuestions"
+                                v-model="addressQuestions"
                                 captureApartmentNumberOrBusinessName="true"
                                 preserveCityAndStateOnReset="true"
                                 labelBold="true"
@@ -42,7 +42,7 @@
                                 isZipCodeDisabled="true" />
                             <vehicleProtectedQuestion
                                 ref="vehicleProtectedQuestion"
-                                v-model="this.isVehicleProtected"
+                                v-model="isVehicleProtected"
                                 cmsWidgetName="VehicleProtectedQuestionWidget"
                                 labelBold="true" />
                             <textBlock
@@ -84,11 +84,11 @@ export default {
     data() {
         return {
             addressQuestions: {
-                streetAddress: this.getServiceAddressFromStore(),
-                apartmentNumberOrBusinessName: this.getServiceAddress2FromStore(),
-                city: this.getServiceCityFromStore(),
-                state: this.getServiceStateFromStore(),
-                zipCode: this.getServiceZipCodeFromStore(),
+                streetAddress: String(this.getServiceAddressFromStore() ?? ""),
+                apartmentNumberOrBusinessName: String(this.getServiceAddress2FromStore() ?? ""),
+                city: String(this.getServiceCityFromStore() ?? ""),
+                state: String(this.getServiceStateFromStore() ?? ""),
+                zipCode: String(this.getServiceZipCodeFromStore() ?? ""),
             },
             isVehicleProtected: this.getIsVehicleProtectedFromStore(),
         };
diff --git a/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue b/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue
index b13f72ca9..cbec63dcf 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue
@@ -25,7 +25,8 @@ export default {
     name: "vehicle-protected-question",
     props: {
         modelValue: {
-            isVehicleProtected: Boolean,
+            type: Boolean,
+            default: null,
         },
         cmsWidgetName: String,
         labelBold: {
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-question/service-zip-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-question/service-zip-question.vue
index 0bc88799b..71bef4d02 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-question/service-zip-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-question/service-zip-question.vue
@@ -29,7 +29,8 @@ export default {
     name: "service-zip-question",
     props: {
         modelValue: {
-            serviceZipCode: String,
+            type: String,
+            default: "",
         },
         cmsWidgetName: String,
         isRequired: {

From dbdf06869b08148f9c33c82e03456670a43b1457 Mon Sep 17 00:00:00 2001
From: Matt Sykes <Matthew.Sykes@safelite.com>
Date: Thu, 25 Jun 2026 12:57:29 -0400
Subject: [PATCH 10/18] Exclude quantummetric caused errors from logging
 unhandled rejection

Add quantummetric.com to the exclusion of unhandled rejection logging similar to browser extensions
---
 src/App.vue | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index d8600aa87..e0bce4693 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -87,15 +87,19 @@ window.onerror = (msg, url, line, col, error) => {
     return suppressErrorAlert;
 };
 
-function isBrowserExtensionUnhandledRejection(reason) {
+function isThirdPartyUnhandledRejection(reason) {
     const stack = reason instanceof Error ? reason.stack : "";
-    return typeof stack === "string" && stack.includes("chrome-extension://");
+    if (typeof stack !== "string") {
+        return false;
+    }
+
+    return stack.includes("chrome-extension://") || stack.includes("quantummetric.com");
 }
 
 // Log Promise rejections that are never handled (.catch / await try/catch), e.g. fire-and-forget async.
 window.addEventListener("unhandledrejection", (event) => {
     const reason = event.reason;
-    if (isBrowserExtensionUnhandledRejection(reason)) {
+    if (isThirdPartyUnhandledRejection(reason)) {
         return;
     }
 

From 1a16dc5fa0b7ea53249e4588bce0bfb6dcd5c21f Mon Sep 17 00:00:00 2001
From: credelinghuys <Chris.Redelinghuys@safelite.com>
Date: Thu, 25 Jun 2026 14:11:14 -0400
Subject: [PATCH 11/18] CASH-2947: Add bailoutCode to FmgSessionData. Remove
 duplicate bailoutcode in vuex.

---
 src/constants/store-actions.js            |  2 -
 src/constants/store-mutations.js          |  3 --
 src/layouts/bailout/bailout.vue           |  5 +-
 src/layouts/vin-lookup/vin-lookup.spec.js |  3 +-
 src/layouts/vin-lookup/vin-lookup.vue     |  2 +-
 src/mixins/analytics-mixin.js             | 15 ++++++
 src/mixins/analytics-mixin.spec.js        | 66 +++++++++++++++++++++++
 src/mixins/bailout-mixin.js               |  9 +++-
 src/mixins/bailout-mixin.spec.js          | 53 +++++++-----------
 src/router/methods/before-each.js         |  2 +-
 src/router/methods/navigate.js            | 11 ++--
 src/store/index.js                        | 11 ++--
 12 files changed, 123 insertions(+), 59 deletions(-)

diff --git a/src/constants/store-actions.js b/src/constants/store-actions.js
index a50ff4bb9..ad31474c3 100644
--- a/src/constants/store-actions.js
+++ b/src/constants/store-actions.js
@@ -132,8 +132,6 @@ const storeActions = {
     UPDATE_HAS_TRIGGERED_ERROR: "updateHasTriggeredError",
     GET_VALID_IDEMPOTENCY_KEY: "getValidIdempotencyKey",
     CORRECT_IDEMPOTENCY_KEY_EXPIRY: "correctIdempotencyKeyExpiry",
-
-    SAVE_BAILOUT_CODE: "saveBailoutCode",
 };
 
 export { storeActions };
diff --git a/src/constants/store-mutations.js b/src/constants/store-mutations.js
index f95a397a0..61755214b 100644
--- a/src/constants/store-mutations.js
+++ b/src/constants/store-mutations.js
@@ -116,9 +116,6 @@ const storeMutations = {
     UPDATE_EXPERIMENTS: "updateExperiments",
     UPDATE_TRIGGERED_SITE_ENTRY: "updateTriggeredSiteEntry",
 
-    // BAILOUT MUTATIONS
-    UPDATE_BAILOUT_CODE: "updateBailoutCode",
-
     // EXTERNAL_PARAMETER MUTATIONS
     UPDATE_IS_EXTERNAL_PARAMETER: "updateIsExternalParameter",
     UPDATE_EXTERNAL_PARAMETER_YEAR: "updateExternalParameterYear",
diff --git a/src/layouts/bailout/bailout.vue b/src/layouts/bailout/bailout.vue
index 12cca1b92..b1f9722db 100644
--- a/src/layouts/bailout/bailout.vue
+++ b/src/layouts/bailout/bailout.vue
@@ -159,7 +159,7 @@ export default {
 
     methods: {
         getBailoutCodeFromStore() {
-            return store.getters.applicationUser.bailoutCode;
+            return store.getters.bailoutCode;
         },
         getFirstNameFromStore() {
             return store.getters.order.customer.firstName;
@@ -233,7 +233,6 @@ export default {
                         this.navigationScenarios.CLICKED_FORWARD,
                         this.pageName,
                         {
-                            bailoutCode: this.bailoutCode,
                             submit: true,
                         }
                     );
@@ -244,7 +243,7 @@ export default {
             }
         },
         arePagePrerequisitesValid() {
-            return this.getBailoutCodeFromStore() !== null;
+            return this.getBailoutCodeFromStore() != null;
         },
     },
 
diff --git a/src/layouts/vin-lookup/vin-lookup.spec.js b/src/layouts/vin-lookup/vin-lookup.spec.js
index 5fe09edb2..39b1108f2 100644
--- a/src/layouts/vin-lookup/vin-lookup.spec.js
+++ b/src/layouts/vin-lookup/vin-lookup.spec.js
@@ -11,8 +11,9 @@ jest.mock("@/store", () => ({
     commit: jest.fn(),
     dispatch: jest.fn(),
     getters: {
+        bailoutCode: null,
         applicationUser: {
-            bailoutCode: null,
+            pageData: {},
         },
         externalParameterState: {
             isExternalParameter: false,
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 5d89c40c7..35e2a626e 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -525,7 +525,7 @@ export default {
         },
         getRequiredVinNotFound() {
             // Prevents success alert from showing
-            var bailoutCode = this.$store.getters.applicationUser.bailoutCode;
+            var bailoutCode = this.$store.getters.bailoutCode;
             var vinRequired = this.$store.getters.vehicle.vinRequired;
             if (vinRequired && this.vin && bailoutCode == bailoutCodes.PART_NOT_FOUND) {
                 return true;
diff --git a/src/mixins/analytics-mixin.js b/src/mixins/analytics-mixin.js
index 7ff1fcd51..32f01ddba 100644
--- a/src/mixins/analytics-mixin.js
+++ b/src/mixins/analytics-mixin.js
@@ -34,6 +34,7 @@ import { getQuerystringParameter } from "@/helpers/querystring-helper";
 import { containsRecalParts, getRecalPartNumbers } from "@/helpers/recal-helper";
 import { getAmountDue, getSubTotal, getSalesTax } from "@/helpers/pricing-helper.js";
 import { partTypeStrings } from "@/constants/part-type-strings";
+import { bailoutCodes } from "@/constants/bailout-codes";
 import router from "@/router";
 
 export default {
@@ -271,6 +272,9 @@ export default {
             sessionData.totalPrice = getAmountDue(order?.lineItems, true);
             sessionData.userAgent = navigator.userAgent;
             sessionData.cashPriceSubTotal = order?.cashPriceSubTotal;
+            sessionData.bailoutCode = this.getBailoutCodeEnum(
+                applicationUser?.pageData?.bailout?.bailoutCode
+            );
 
             await baseMixin.methods.dispatchStoreAction(
                 storeActions.LOG_FMG_SESSION_DATA,
@@ -279,6 +283,17 @@ export default {
             );
         },
 
+        getBailoutCodeEnum(bailoutCode) {
+            if (bailoutCode) {
+                const bailoutCodeEnum = Object.keys(bailoutCodes).find(
+                    (key) => bailoutCodes[key] === bailoutCode
+                );
+                return bailoutCodeEnum ? bailoutCode + "_" + bailoutCodeEnum : bailoutCode;
+            } else {
+                return null;
+            }
+        },
+
         pushOrderToDataLayer() {
             // helper check for if an object is defined (but maybe falsey)
             const isDefined = (x) => x !== null && x !== undefined;
diff --git a/src/mixins/analytics-mixin.spec.js b/src/mixins/analytics-mixin.spec.js
index ee7c39e3c..4699a3449 100644
--- a/src/mixins/analytics-mixin.spec.js
+++ b/src/mixins/analytics-mixin.spec.js
@@ -22,6 +22,7 @@ import {
     getUserIdValue,
 } from "@/helpers/heritage-integration/cookie-helper";
 import baseMixin from "./base-mixin";
+import { bailoutCodes } from "@/constants/bailout-codes";
 
 const parts = {
     windshield: {
@@ -746,6 +747,71 @@ describe("analyticsMixin.js", () => {
         //Assert
         expect(gaLabels).toEqual(GaLabels);
     });
+
+    describe("getBailoutCodeEnum", () => {
+        test("returns null when bailout code is not provided", () => {
+            expect(analyticsMixin.methods.getBailoutCodeEnum(null)).toBeNull();
+            expect(analyticsMixin.methods.getBailoutCodeEnum(undefined)).toBeNull();
+        });
+
+        test("returns formatted value when bailout code matches a known enum", () => {
+            const result = analyticsMixin.methods.getBailoutCodeEnum(bailoutCodes.PART_NOT_FOUND);
+
+            expect(result).toBe(`${bailoutCodes.PART_NOT_FOUND}_PART_NOT_FOUND`);
+        });
+
+        test("returns original value when bailout code does not match a known enum", () => {
+            expect(analyticsMixin.methods.getBailoutCodeEnum(999)).toBe(999);
+        });
+    });
+
+    describe("pushFmgSessionData", () => {
+        beforeEach(() => {
+            baseMixin.methods.hasSubmittedOrder = jest.fn().mockReturnValue(false);
+            baseMixin.methods.getSubmittedOrder = jest.fn();
+            baseMixin.methods.hasSubmittedApplicationUser = jest.fn().mockReturnValue(false);
+            baseMixin.methods.getSubmittedApplicationUser = jest.fn();
+            store.getters.order = {
+                vehicle: { vinRequired: false },
+                payment: {
+                    isInsurance: false,
+                    isClaimAndCoverage: false,
+                    isPia: false,
+                },
+                damage: { isRepair: false },
+                lineItems: {},
+                serviceLocation: {},
+                customer: {},
+                policy: {},
+            };
+            store.getters.applicationUser = {
+                experiments: [],
+                pageData: {
+                    bailout: {
+                        bailoutCode: bailoutCodes.PART_NOT_FOUND,
+                    },
+                },
+            };
+        });
+
+        test("dispatches session data with formatted bailout code", async () => {
+            const mocks = setupMocksForJsFiles({
+                actionList: [{ actionName: storeActions.LOG_FMG_SESSION_DATA }],
+            });
+
+            await analyticsMixin.methods.pushFmgSessionData();
+
+            expect(mocks.baseMixin.methods.dispatchStoreAction).toHaveBeenCalledWith(
+                storeActions.LOG_FMG_SESSION_DATA,
+                expect.objectContaining({
+                    currentPage: "mockedPageName",
+                    bailoutCode: `${bailoutCodes.PART_NOT_FOUND}_PART_NOT_FOUND`,
+                }),
+                false
+            );
+        });
+    });
+
     describe("initSession", () => {
         test("Generates random values for userId and deviceId if not present", async () => {
             // Arrange
diff --git a/src/mixins/bailout-mixin.js b/src/mixins/bailout-mixin.js
index f8c724da2..2640f670c 100644
--- a/src/mixins/bailout-mixin.js
+++ b/src/mixins/bailout-mixin.js
@@ -1,12 +1,17 @@
 import { navigationScenarios } from "@/router/constants/navigation-scenarios";
+import { routeData } from "@/router/constants/routes";
+import { savePageData } from "@/router/methods/helpers/save-page-data";
 
 export default {
     methods: {
         navigateToBailoutPage(vm, bailoutCode) {
             const self = vm ?? this;
 
-            self.dispatchStoreAction(self.storeActions.SAVE_BAILOUT_CODE, bailoutCode).then(() => {
-                self.$router.navigateWithoutSaving(navigationScenarios.BAILOUT, self.pageName);
+            return savePageData(routeData.BAILOUT.name, { bailoutCode }).then(() => {
+                return self.$router.navigateWithoutSaving(
+                    navigationScenarios.BAILOUT,
+                    self.pageName
+                );
             });
         },
     },
diff --git a/src/mixins/bailout-mixin.spec.js b/src/mixins/bailout-mixin.spec.js
index 9571c6f26..4b7dfee0f 100644
--- a/src/mixins/bailout-mixin.spec.js
+++ b/src/mixins/bailout-mixin.spec.js
@@ -1,33 +1,34 @@
 import bailoutMixin from "@/mixins/bailout-mixin";
-import { storeActions } from "@/constants/store-actions.js";
 import { navigationScenarios } from "@/router/constants/navigation-scenarios";
 import { bailoutCodes } from "@/constants/bailout-codes.js";
+import { routeData } from "@/router/constants/routes";
+
+jest.mock("@/router/methods/helpers/save-page-data", () => ({
+    savePageData: jest.fn().mockResolvedValue(undefined),
+}));
+
+import { savePageData } from "@/router/methods/helpers/save-page-data";
 
 describe("bailout-mixin.js", () => {
-    test("navigateToBailoutPage: dispatches SAVE_BAILOUT_CODE action with bailout code", async () => {
-        // Arrange
+    beforeEach(() => {
+        savePageData.mockClear();
+    });
+
+    test("navigateToBailoutPage: saves bailout code to pageData", async () => {
         const mockVm = createMockVm();
         const bailoutCode = bailoutCodes.PART_NOT_FOUND;
 
-        // Act
         await bailoutMixin.methods.navigateToBailoutPage(mockVm, bailoutCode);
 
-        // Assert
-        expect(mockVm.dispatchStoreAction).toHaveBeenCalledWith(
-            storeActions.SAVE_BAILOUT_CODE,
-            bailoutCode
-        );
+        expect(savePageData).toHaveBeenCalledWith(routeData.BAILOUT.name, { bailoutCode });
     });
 
     test("navigateToBailoutPage: navigates to bailout page after saving bailout code", async () => {
-        // Arrange
         const mockVm = createMockVm();
         const bailoutCode = bailoutCodes.PART_NOT_FOUND;
 
-        // Act
         await bailoutMixin.methods.navigateToBailoutPage(mockVm, bailoutCode);
 
-        // Assert
         expect(mockVm.$router.navigateWithoutSaving).toHaveBeenCalledWith(
             navigationScenarios.BAILOUT,
             mockVm.pageName
@@ -35,55 +36,39 @@ describe("bailout-mixin.js", () => {
     });
 
     test("navigateToBailoutPage: uses current context (this) when vm is not provided", async () => {
-        // Arrange
         const mockRouter = {
             navigateWithoutSaving: jest.fn().mockResolvedValue(undefined),
         };
         const mockThis = {
-            dispatchStoreAction: jest.fn().mockResolvedValue(undefined),
             $router: mockRouter,
-            storeActions: storeActions,
             pageName: "test-page",
         };
-
         const bailoutCode = bailoutCodes.PART_NOT_FOUND;
 
-        // Act
         await bailoutMixin.methods.navigateToBailoutPage.call(mockThis, undefined, bailoutCode);
 
-        // Assert
-        expect(mockThis.dispatchStoreAction).toHaveBeenCalledWith(
-            storeActions.SAVE_BAILOUT_CODE,
-            bailoutCode
-        );
+        expect(savePageData).toHaveBeenCalledWith(routeData.BAILOUT.name, { bailoutCode });
     });
 
-    test("navigateToBailoutPage: passes correct bailout code to store", async () => {
-        // Arrange
+    test("navigateToBailoutPage: passes correct bailout code to pageData", async () => {
         const mockVm = createMockVm();
         const customBailoutCode = 999;
 
-        // Act
         await bailoutMixin.methods.navigateToBailoutPage(mockVm, customBailoutCode);
 
-        // Assert
-        expect(mockVm.dispatchStoreAction).toHaveBeenCalledWith(
-            storeActions.SAVE_BAILOUT_CODE,
-            customBailoutCode
-        );
+        expect(savePageData).toHaveBeenCalledWith(routeData.BAILOUT.name, {
+            bailoutCode: customBailoutCode,
+        });
     });
 
     test("navigateToBailoutPage: calls navigateWithoutSaving with correct parameters", async () => {
-        // Arrange
         const mockVm = createMockVm();
         const mockPageName = "vehicle-damage";
         mockVm.pageName = mockPageName;
         const bailoutCode = bailoutCodes.PART_NOT_FOUND;
 
-        // Act
         await bailoutMixin.methods.navigateToBailoutPage(mockVm, bailoutCode);
 
-        // Assert
         expect(mockVm.$router.navigateWithoutSaving).toHaveBeenCalledWith(
             navigationScenarios.BAILOUT,
             mockPageName
@@ -93,11 +78,9 @@ describe("bailout-mixin.js", () => {
 
 function createMockVm() {
     return {
-        dispatchStoreAction: jest.fn().mockResolvedValue(undefined),
         $router: {
             navigateWithoutSaving: jest.fn().mockResolvedValue(undefined),
         },
-        storeActions,
         pageName: "test-page",
     };
 }
diff --git a/src/router/methods/before-each.js b/src/router/methods/before-each.js
index 84e653551..3e1dd540d 100644
--- a/src/router/methods/before-each.js
+++ b/src/router/methods/before-each.js
@@ -193,5 +193,5 @@ export async function beforeEach(to, from) {
 
 function getIsBailout(submittedState) {
     const submittedStateObj = JSON.parse(submittedState);
-    return !!submittedStateObj?.applicationUser?.bailoutCode;
+    return !!submittedStateObj?.applicationUser?.pageData?.bailout?.bailoutCode;
 }
diff --git a/src/router/methods/navigate.js b/src/router/methods/navigate.js
index 63e20d96c..288278137 100644
--- a/src/router/methods/navigate.js
+++ b/src/router/methods/navigate.js
@@ -3,6 +3,7 @@ import { buildManualUrl } from "@/router/methods/helpers/build-manual-url";
 import { getDestination } from "@/router/methods/helpers/get-destination";
 import { savePageData } from "@/router/methods/helpers/save-page-data";
 import { navigationScenarios } from "@/router/constants/navigation-scenarios";
+import { routeData } from "@/router/constants/routes";
 import router from "@/router";
 import store from "@/store";
 
@@ -79,9 +80,13 @@ export async function navigateWithSaving(scenario, currentPageName) {
 export async function navigateWithPageData(scenario, currentPageName, pageData = {}) {
     const nextPage = getDestination(currentPageName, scenario);
 
-    if (pageData && pageData.bailoutCode) {
-        pageData.AppName = "FixMyGlass";
-        await savePageData(currentPageName, pageData);
+    if (currentPageName === routeData.BAILOUT.name) {
+        const existingPageData = store.getters.pageData(routeData.BAILOUT.name) ?? {};
+        await savePageData(routeData.BAILOUT.name, {
+            ...existingPageData,
+            ...pageData,
+            AppName: "FixMyGlass",
+        });
     } else {
         await savePageData(nextPage.name, pageData);
     }
diff --git a/src/store/index.js b/src/store/index.js
index c359444e5..b75ff652d 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -227,7 +227,6 @@ const getDefaultState = () => {
             affiliateCookies: [],
             loggingOption: false,
             hasAlreadyTriggeredError: false,
-            bailoutCode: null,
         },
         idempotencyKeyFields: {
             referralCorrelationId: null,
@@ -1030,9 +1029,6 @@ export const mutations = {
         state.idempotencyKeyFields.totalInCents = totalInCents;
         state.idempotencyKeyFields.expiryTime = expiryTime;
     },
-    updateBailoutCode(state, bailoutCode) {
-        state.applicationUser.bailoutCode = bailoutCode;
-    },
 };
 
 // Export Getters
@@ -1155,6 +1151,7 @@ export const getters = {
     pageData: (state) => (page) => {
         return state.applicationUser.pageData[page];
     },
+    bailoutCode: (state) => state.applicationUser.pageData.bailout?.bailoutCode,
     applicationUser: (state) => state.applicationUser,
     order: (state) => state.order,
     payment: (state) => state.order.payment,
@@ -1844,6 +1841,7 @@ export const actions = {
             totalPrice,
             userAgent,
             cashPriceSubTotal,
+            bailoutCode,
         }
     ) {
         var payload = {
@@ -1898,6 +1896,7 @@ export const actions = {
             userAgent: userAgent,
             cashPriceSubTotal: cashPriceSubTotal,
             billToAccountNumber: billToAccountNumber,
+            bailoutCode: bailoutCode,
         };
 
         return globalMethods.callHttpClient({
@@ -3959,10 +3958,6 @@ export const actions = {
             context.commit(storeMutations.UPDATE_IDEMPOTENCY_KEY, newKey);
         }
     },
-
-    saveBailoutCode(context, bailoutCode) {
-        context.commit(storeMutations.UPDATE_BAILOUT_CODE, bailoutCode);
-    },
 };
 
 export default createStore({

From 209d1db92a65505e98200cab4b3df39158aacad4 Mon Sep 17 00:00:00 2001
From: credelinghuys <Chris.Redelinghuys@safelite.com>
Date: Fri, 26 Jun 2026 11:44:25 -0400
Subject: [PATCH 12/18] CASH-2872: Add promo codes to order subtotal

---
 src/mixins/analytics-mixin.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/mixins/analytics-mixin.js b/src/mixins/analytics-mixin.js
index 32f01ddba..58c8e3399 100644
--- a/src/mixins/analytics-mixin.js
+++ b/src/mixins/analytics-mixin.js
@@ -637,7 +637,7 @@ export default {
                         }
 
                         discount += productPrice * -1;
-                        subTotal += isQuotePageDiscount ? productPrice : 0;
+                        subTotal += productPrice;
                     } else {
                         products.push({
                             productType: productType,
@@ -737,6 +737,9 @@ export default {
                 if (quotePageDiscount) {
                     combinedLineItems = combinedLineItems.concat(quotePageDiscount);
                 }
+                if (lineItems.promos) {
+                    combinedLineItems = combinedLineItems.concat(lineItems.promos);
+                }
 
                 //Remove child Parts if any
                 combinedLineItems.forEach((lineItem) => {

From 07a5659971e108d55bba8ceb8d6e21117ef40415 Mon Sep 17 00:00:00 2001
From: credelinghuys <Chris.Redelinghuys@safelite.com>
Date: Fri, 26 Jun 2026 14:06:23 -0400
Subject: [PATCH 13/18] CASH-2544: Recal modal text update

---
 .../content-group-modal/content-group-modal.vue               | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/fmg-components/content-group-modal/content-group-modal.vue b/src/fmg-components/content-group-modal/content-group-modal.vue
index e4a5241c4..12b4acf32 100644
--- a/src/fmg-components/content-group-modal/content-group-modal.vue
+++ b/src/fmg-components/content-group-modal/content-group-modal.vue
@@ -14,6 +14,7 @@
                 class="my-4 caption modal-sub-body"
                 v-if="ModalSubBodyText"
                 v-html="ModalSubBodyText"></p>
+            <p class="my-4 caption" v-if="ModalFooter2Text" v-html="ModalFooter2Text"></p>
             <slot></slot>
         </div>
     </modal>
@@ -58,6 +59,9 @@ export default {
         ModalCloseButtonText() {
             return this.getCmsContent(this.cmsWidgetName, "FooterText");
         },
+        ModalFooter2Text() {
+            return this.getCmsContent(this.cmsWidgetName, "FooterText2");
+        },
     },
     methods: {
         openModal() {

From 54fbc245f575a0e20eb691b56eec5fd61465ad01 Mon Sep 17 00:00:00 2001
From: credelinghuys <Chris.Redelinghuys@safelite.com>
Date: Fri, 26 Jun 2026 14:42:58 -0400
Subject: [PATCH 14/18] CASH-2954: Use V2 for parts-or-questions if VINRequired

---
 src/constants/endpoints.js | 4 ++--
 src/store/index.js         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/constants/endpoints.js b/src/constants/endpoints.js
index 76077db76..d6b3e3431 100644
--- a/src/constants/endpoints.js
+++ b/src/constants/endpoints.js
@@ -56,8 +56,8 @@ const endpoints = {
         url: "/parts/api/v1/parts/parts-or-questions",
         method: "POST",
     },
-    GetPartsOrQuestionsV3: {
-        url: "/parts/api/v3/parts/parts-or-questions",
+    GetPartsOrQuestionsV2: {
+        url: "/parts/api/v2/parts/parts-or-questions",
         method: "POST",
     },
     GetParts: {
diff --git a/src/store/index.js b/src/store/index.js
index b75ff652d..6efa57754 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1995,7 +1995,7 @@ export const actions = {
         const glassArrayForPayload = convertGlassPieceNamingForApi(glassArray);
 
         const partsOrQuestionsEndpoint = vehicle.vinRequired
-            ? endpoints.GetPartsOrQuestionsV3
+            ? endpoints.GetPartsOrQuestionsV2
             : endpoints.GetPartsOrQuestions;
 
         const response = await globalMethods

From 2a22e8f5b33c2be31d10e4e67a742fb31e8f3c64 Mon Sep 17 00:00:00 2001
From: scottkiener-at-safelite <scott.kiener@safelite.com>
Date: Mon, 29 Jun 2026 08:22:14 -0400
Subject: [PATCH 15/18] CASH-2880 | Remove unused loader

---
 .../mobile-scheduling-card/mobile-scheduling-card.vue          | 1 +
 src/layouts/scheduling/scheduling.vue                          | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/layouts/scheduling/mobile-scheduling-card/mobile-scheduling-card.vue b/src/layouts/scheduling/mobile-scheduling-card/mobile-scheduling-card.vue
index 51ac7a8c5..b1e2586c1 100644
--- a/src/layouts/scheduling/mobile-scheduling-card/mobile-scheduling-card.vue
+++ b/src/layouts/scheduling/mobile-scheduling-card/mobile-scheduling-card.vue
@@ -91,6 +91,7 @@
 import { PREMIUM_TIME_SLOT_ID_FLAG, AppointmentTypeStrings } from "@/constants/schedule-constants";
 import { militaryToTwelveHourTime } from "@/layouts/schedule/helpers/schedule-helper";
 import schedulingCardLoader from "@/layouts/scheduling/scheduling-card-loader/scheduling-card-loader.vue";
+
 export default {
     name: "mobile-scheduling-card",
     emits: ["update:modelValue", "zip-code-clicked"],
diff --git a/src/layouts/scheduling/scheduling.vue b/src/layouts/scheduling/scheduling.vue
index b23312331..7fa45f056 100644
--- a/src/layouts/scheduling/scheduling.vue
+++ b/src/layouts/scheduling/scheduling.vue
@@ -1,7 +1,6 @@
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm">
         <interceptOverlay v-if="isLoadingDates" />
-        <loadingModal notFullScreen ref="loadingModal" />
         <funnelHeader cmsWidgetName="FunnelHeaderWidget" ref="funnelHeader" />
         <div class="container page-container-grouped-styles">
             <div class="row">
@@ -68,7 +67,6 @@ import { Form } from "vee-validate";
 import datePicker from "@/layouts/scheduling/date-picker/date-picker";
 import mobileSchedulingCard from "@/layouts/scheduling/mobile-scheduling-card/mobile-scheduling-card";
 import inshopSchedulingCard from "@/layouts/scheduling/inshop-scheduling-card/inshop-scheduling-card";
-import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
 import interceptOverlay from "@/ux-components/intercept-overlay/intercept-overlay";
 import store from "@/store";
 import { AppointmentTypeStrings, PREMIUM_FEE_PART_TYPE } from "@/constants/schedule-constants";
@@ -397,7 +395,6 @@ export default {
         datePicker,
         mobileSchedulingCard,
         inshopSchedulingCard,
-        loadingModal,
         interceptOverlay,
     },
 };

From 8e6e717a84c16878ed4c33baa2ce1161a29d9cdf Mon Sep 17 00:00:00 2001
From: scottkiener-at-safelite <scott.kiener@safelite.com>
Date: Mon, 29 Jun 2026 09:25:57 -0400
Subject: [PATCH 16/18] Fix unit test now that loading status is true on page
 load

---
 src/layouts/scheduling/scheduling.spec.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/layouts/scheduling/scheduling.spec.js b/src/layouts/scheduling/scheduling.spec.js
index a7a97a3a2..788c93281 100644
--- a/src/layouts/scheduling/scheduling.spec.js
+++ b/src/layouts/scheduling/scheduling.spec.js
@@ -63,8 +63,9 @@ function setupMocks() {
 
 describe("scheduling.vue", () => {
     describe("intercept overlay", () => {
-        test("does not render interceptOverlay when isLoadingDates is false", () => {
+        test("does not render interceptOverlay when isLoadingDates is false", async () => {
             const { wrapper } = setupMocks();
+            await wrapper.setData({ isLoadingDates: false });
             expect(wrapper.find("intercept-overlay-stub").exists()).toBe(false);
             wrapper.unmount();
         });

From 480b3ab1488bf69f3397f3f094a6b6d8b9585482 Mon Sep 17 00:00:00 2001
From: scottkiener-at-safelite <scott.kiener@safelite.com>
Date: Mon, 29 Jun 2026 09:32:03 -0400
Subject: [PATCH 17/18] Intercept keystrokes via overlay

---
 .../intercept-overlay.spec.js                 | 29 +++++++++++++++++++
 .../intercept-overlay/intercept-overlay.vue   | 14 ++++++++-
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/src/ux-components/intercept-overlay/intercept-overlay.spec.js b/src/ux-components/intercept-overlay/intercept-overlay.spec.js
index f3854a47a..0a282b93d 100644
--- a/src/ux-components/intercept-overlay/intercept-overlay.spec.js
+++ b/src/ux-components/intercept-overlay/intercept-overlay.spec.js
@@ -14,4 +14,33 @@ describe("intercept-overlay.vue", () => {
         expect(wrapper.text()).toBe("");
         wrapper.unmount();
     });
+
+    describe("keyboard interception", () => {
+        test("adds a capturing keydown listener on mount and removes it on unmount", () => {
+            const addSpy = jest.spyOn(document, "addEventListener");
+            const removeSpy = jest.spyOn(document, "removeEventListener");
+
+            const wrapper = shallowMount(interceptOverlay);
+            expect(addSpy).toHaveBeenCalledWith("keydown", expect.any(Function), true);
+
+            const [, handler] = addSpy.mock.calls.find(
+                ([type, , capture]) => type === "keydown" && capture === true
+            );
+
+            wrapper.unmount();
+            expect(removeSpy).toHaveBeenCalledWith("keydown", handler, true);
+
+            addSpy.mockRestore();
+            removeSpy.mockRestore();
+        });
+
+        test("blockKey prevents default and stops immediate propagation", () => {
+            const wrapper = shallowMount(interceptOverlay);
+            const event = { preventDefault: jest.fn(), stopImmediatePropagation: jest.fn() };
+            wrapper.vm.blockKey(event);
+            expect(event.preventDefault).toHaveBeenCalled();
+            expect(event.stopImmediatePropagation).toHaveBeenCalled();
+            wrapper.unmount();
+        });
+    });
 });
diff --git a/src/ux-components/intercept-overlay/intercept-overlay.vue b/src/ux-components/intercept-overlay/intercept-overlay.vue
index 1a101589a..1269ccb9d 100644
--- a/src/ux-components/intercept-overlay/intercept-overlay.vue
+++ b/src/ux-components/intercept-overlay/intercept-overlay.vue
@@ -1,10 +1,22 @@
 <template>
-    <div class="intercept-overlay" aria-hidden="true"></div>
+    <div class="intercept-overlay" aria-hidden="true" @keydown.capture="blockKey"></div>
 </template>
 
 <script>
 export default {
     name: "intercept-overlay",
+    mounted() {
+        document.addEventListener("keydown", this.blockKey, true);
+    },
+    beforeUnmount() {
+        document.removeEventListener("keydown", this.blockKey, true);
+    },
+    methods: {
+        blockKey(event) {
+            event.preventDefault();
+            event.stopImmediatePropagation();
+        },
+    },
 };
 </script>
 

From d57a066faaeac7b8cf6c5ea671677d0014b9abba Mon Sep 17 00:00:00 2001
From: credelinghuys <Chris.Redelinghuys@safelite.com>
Date: Mon, 29 Jun 2026 14:32:32 -0400
Subject: [PATCH 18/18] CASH-2943: Remove bailout for all VinRequired vehicles

---
 src/mixins/vin-pages-mixin.js      |  2 +-
 src/mixins/vin-pages-mixin.spec.js | 34 ++++++++++++++++++++++++++----
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/src/mixins/vin-pages-mixin.js b/src/mixins/vin-pages-mixin.js
index c15529d4f..78cb134cf 100644
--- a/src/mixins/vin-pages-mixin.js
+++ b/src/mixins/vin-pages-mixin.js
@@ -37,7 +37,7 @@ export default {
                 pageNameToLog: pageName,
             });
 
-            if (result.PartNotFound || store.getters.vehicle.vinRequired) {
+            if (result.PartNotFound) {
                 return bailoutMixin.methods.navigateToBailoutPage(
                     this,
                     bailoutCodes.PART_NOT_FOUND
diff --git a/src/mixins/vin-pages-mixin.spec.js b/src/mixins/vin-pages-mixin.spec.js
index 46d755c3c..55f0d02fc 100644
--- a/src/mixins/vin-pages-mixin.spec.js
+++ b/src/mixins/vin-pages-mixin.spec.js
@@ -35,10 +35,9 @@ describe("vin-pages-mixin", () => {
             expect(vehicleQuestionsMixin.methods.navigateForward).toHaveBeenCalled();
         });
 
-        test("vinRequired vehicles navigate to bailout after VIN is saved", async () => {
+        test("navigate to bailout when parts are not found", async () => {
             // Arrange
-            store.commit(storeMutations.UPDATE_VIN_REQUIRED, true);
-            const { wrapper } = setupMocks({});
+            const { wrapper } = setupMocks({ partNotFound: true });
             bailoutMixin.methods.navigateToBailoutPage = jest.fn();
             vehicleQuestionsMixin.methods.navigateForward = jest.fn();
 
@@ -52,10 +51,29 @@ describe("vin-pages-mixin", () => {
             );
             expect(vehicleQuestionsMixin.methods.navigateForward).not.toHaveBeenCalled();
         });
+
+        test("vinRequired vehicles navigate forward when parts are found", async () => {
+            // Arrange
+            store.commit(storeMutations.UPDATE_VIN_REQUIRED, true);
+            const partsOrQuestions = [{ partNumber: "123" }];
+            const { wrapper } = setupMocks({ partsOrQuestions });
+            bailoutMixin.methods.navigateToBailoutPage = jest.fn();
+            vehicleQuestionsMixin.methods.navigateForward = jest.fn();
+
+            // Act
+            await wrapper.vm.navigateForwardWithSingleCarMatch();
+
+            // Assert
+            expect(bailoutMixin.methods.navigateToBailoutPage).not.toHaveBeenCalled();
+            expect(vehicleQuestionsMixin.methods.navigateForward).toHaveBeenCalledWith(
+                partsOrQuestions,
+                wrapper.vm
+            );
+        });
     });
 });
 
-function setupMocks({ partsOrQuestions = [] }) {
+function setupMocks({ partsOrQuestions = [], partNotFound = false } = {}) {
     const baseMixin = setupMocksForJsFiles({
         actionList: [
             {
@@ -67,6 +85,14 @@ function setupMocks({ partsOrQuestions = [] }) {
         ],
     });
 
+    if (partNotFound) {
+        baseMixin.baseMixin.methods.dispatchStoreAction.mockImplementation((actionName) => {
+            if (actionName === storeActions.GET_PARTS_OR_QUESTIONS) {
+                return Promise.resolve({ PartNotFound: true });
+            }
+        });
+    }
+
     const mocks = getMountOptions({
         router: {
             navigate: jest.fn(),