diff --git a/jest.config.js b/jest.config.js
index 7b59ea2c1..6c0addf5f 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -32,11 +32,7 @@ module.exports = {
     "!src/layouts/payment-pia-return/*.vue", // Temp test exclusion while in development
     "!src/layouts/insurance/*.vue", // Temp test exclusion while in development
     "!src/layouts/insurance-company/*.vue", // Temp test exclusion while in development
-    "!src/layouts/schedule/**/*.vue", // Temp test exclusion while in development
     "!src/digital-components/date-picker/**/*.vue", // Temp test exclusion while in development
-
-    "!src/**/*-june-2025.vue", // Exclude these temporary files for CASH-845 project
-
     "!src/layouts/insurance-company/insurance-company-question/*.vue", // Temp test exclusion while in development
     "!src/experiment-components/*.vue",
     // END
@@ -44,7 +40,7 @@ module.exports = {
   testMatch: ["**/*.spec.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx)"],
   coverageThreshold: {
     global: {
-      statements: 64,
+      statements: 68,
     },
   },
   // Uncomment this to avoid the massive amount of warnings we are getting for onSubmit and onInvalidSubmit
diff --git a/src/digital-components/salesforce-webchat/salesforce-webchat.vue b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
index da11702e3..85d9d891d 100644
--- a/src/digital-components/salesforce-webchat/salesforce-webchat.vue
+++ b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
@@ -41,9 +41,6 @@ export default {
     beforeUnmount() {
         // Clean up event listeners and observers
         window.removeEventListener("sierra-chat-transfer", this._handleSierraToSalesforceTransfer);
-        if (this._salesforceChatOpenObserver) {
-            this._salesforceChatOpenObserver.disconnect();
-        }
     },
     methods: {
         initializeSalesforceWebchat() {
@@ -133,6 +130,9 @@ export default {
 </script>
 
 <style lang="scss">
+.embedded-messaging > .embeddedMessagingFrame[class~="isMaximized"] {
+    z-index: 9999 !important;
+}
 .dockableContainer {
     &.showDockableContainer {
         color: $gray-600;
diff --git a/src/digital-components/sierra-webchat/sierra-webchat.spec.js b/src/digital-components/sierra-webchat/sierra-webchat.spec.js
index 964a4f52e..2fd3bd3a3 100644
--- a/src/digital-components/sierra-webchat/sierra-webchat.spec.js
+++ b/src/digital-components/sierra-webchat/sierra-webchat.spec.js
@@ -59,14 +59,6 @@ describe("sierraWebchat.vue", () => {
         expect(window.sierraChat.closeChatModal).toHaveBeenCalled();
     });
 
-    it("dispatches sierra-chat-closed on handleSierraOnClose", () => {
-        const eventSpy = jest.spyOn(window, "dispatchEvent");
-        wrapper.vm.createSierraConfig().onClose();
-        expect(eventSpy).toHaveBeenCalledWith(
-            expect.objectContaining({ type: "sierra-chat-closed" })
-        );
-    });
-
     it("dispatches sierra-chat-transfer on handleSierraOnTransfer", () => {
         const eventSpy = jest.spyOn(window, "dispatchEvent");
         const transfer = {
diff --git a/src/digital-components/sierra-webchat/sierra-webchat.vue b/src/digital-components/sierra-webchat/sierra-webchat.vue
index 2ba74b33a..0b4381411 100644
--- a/src/digital-components/sierra-webchat/sierra-webchat.vue
+++ b/src/digital-components/sierra-webchat/sierra-webchat.vue
@@ -7,10 +7,20 @@ import analyticsMixin from "@/mixins/analytics-mixin";
 import store from "@/store";
 import { routeData } from "@/router/constants/routes";
 import { deepClone } from "@/helpers/object-helper";
+import { webchatHelper } from "@/helpers/webchat-helper";
 
 export default {
     name: "sierraWebchat",
     mixins: [analyticsMixin],
+    data() {
+        return {
+            transferInProgress: false,
+        };
+    },
+    setup() {
+        const { webchatGlobalNonpersistedState, launchWebchat } = webchatHelper();
+        return { webchatGlobalNonpersistedState, launchWebchat };
+    },
     methods: {
         openSierraChatModal() {
             const sierra = window.sierraChat || window.sierra || window.SierraChat;
@@ -35,11 +45,18 @@ export default {
                 display: "corner",
                 onLoad: () => this.openSierraChatModal(),
                 onOpen: () => {},
-                onClose: () => window.dispatchEvent(new CustomEvent("sierra-chat-closed")),
-                onTransfer: (transfer) =>
+                onClose: () => {
+                    if (!this.transferInProgress) {
+                        this.webchatGlobalNonpersistedState.showWebchatButton = true;
+                        this.transferInProgress = false;
+                    }
+                },
+                onTransfer: (transfer) => {
+                    this.transferInProgress = true;
                     window.dispatchEvent(
                         new CustomEvent("sierra-chat-transfer", { detail: transfer })
-                    ),
+                    );
+                },
             };
         },
         getSierraContext() {
@@ -152,37 +169,16 @@ export default {
                         LastName: transfer.data.last_name,
                         Email: transfer.data.email,
                     });
-                    if (
-                        window.embeddedservice_bootstrap.utilAPI &&
-                        typeof window.embeddedservice_bootstrap.utilAPI.launchChat === "function"
-                    ) {
-                        window.embeddedservice_bootstrap.utilAPI.launchChat();
-                        return;
-                    }
                 }
-                window.embeddedservice_bootstrap.utilAPI.launchChat();
+                this.webchatGlobalNonpersistedState.shouldLaunchSierra = false;
+                this.launchWebchat();
             }
         };
         window.addEventListener("sierra-chat-transfer", this._handleSierraTransfer);
-
-        // Notify funnel-header about Sierra chat open/close state
-        this._sierraChatContainerObserver = new MutationObserver(() => {
-            const isOpen = !!document.querySelector("[data-sierra-chat-container]");
-            window.dispatchEvent(
-                new CustomEvent("sierra-chat-visibility", { detail: { open: isOpen } })
-            );
-        });
-        this._sierraChatContainerObserver.observe(document.body, {
-            childList: true,
-            subtree: true,
-        });
     },
     beforeUnmount() {
         window.removeEventListener("launch-sierra-webchat", this.triggerSierraChat);
         window.removeEventListener("sierra-chat-transfer", this._handleSierraTransfer);
-        if (this._sierraChatContainerObserver) {
-            this._sierraChatContainerObserver.disconnect();
-        }
     },
 };
 </script>
diff --git a/src/fmg-components/funnel-header/funnel-header.vue b/src/fmg-components/funnel-header/funnel-header.vue
index 00df5db87..7bfa3eef6 100644
--- a/src/fmg-components/funnel-header/funnel-header.vue
+++ b/src/fmg-components/funnel-header/funnel-header.vue
@@ -79,16 +79,7 @@ export default {
             return this.getCmsContent(this.cmsWidgetName, "LogoImage");
         },
         shouldShowWebchatButton() {
-            // Hide the chat icon if Sierra chat is open
-            if (this.sierraChatOpen) {
-                return false;
-            }
-            // Show if either Sierra is enabled or Salesforce button is available and not hidden by page
-            return (
-                (this.webchatGlobalNonpersistedState.shouldLaunchSierra ||
-                    this.webchatGlobalNonpersistedState.showWebchatButton) &&
-                !this.shouldHideWebchatButtonOnPage
-            );
+            return this.webchatGlobalNonpersistedState.showWebchatButton;
         },
     },
     methods: {
@@ -116,10 +107,6 @@ export default {
         webchatClicked(event) {
             event.preventDefault();
             this.launchWebchat();
-            // Only set sierraChatOpen if Sierra experiment is active
-            if (this.webchatGlobalNonpersistedState.shouldLaunchSierra) {
-                this.sierraChatOpen = true;
-            }
         },
         syncSierraExperimentFlag() {
             const experiments = store.getters.applicationUser.experiments;
@@ -159,11 +146,6 @@ export default {
             unknownAlertEvent.displayAlert = true;
             this.globalAlertMessages.push(unknownAlertEvent);
         }
-        // Listen for Sierra chat open/close events from sierra-webchat
-        this._handleSierraChatVisibility = (event) => {
-            this.sierraChatOpen = !!(event.detail && event.detail.open);
-        };
-        window.addEventListener("sierra-chat-visibility", this._handleSierraChatVisibility);
 
         // Add scroll listener for header shadow effect
         this._handleScroll = () => {
@@ -172,8 +154,6 @@ export default {
         window.addEventListener("scroll", this._handleScroll);
     },
     beforeUnmount() {
-        window.removeEventListener("sierra-chat-closed", this._handleSierraChatClosed);
-        window.removeEventListener("sierra-chat-visibility", this._handleSierraChatVisibility);
         window.removeEventListener("sierra-chat-transfer", this._handleSierraToSalesforceTransfer);
         window.removeEventListener("scroll", this._handleScroll);
     },
diff --git a/src/helpers/webchat-helper.js b/src/helpers/webchat-helper.js
index e5254d08d..1317f3341 100644
--- a/src/helpers/webchat-helper.js
+++ b/src/helpers/webchat-helper.js
@@ -8,6 +8,7 @@ const webchatGlobalNonpersistedState = reactive({
 
 export const webchatHelper = () => {
     function launchWebchat() {
+        webchatGlobalNonpersistedState.showWebchatButton = false;
         if (webchatGlobalNonpersistedState.shouldLaunchSierra) {
             window.dispatchEvent(new CustomEvent("launch-sierra-webchat")); // launches the sierra chat
         } else {
diff --git a/src/layouts/schedule/schedule.spec.js b/src/layouts/schedule/schedule.spec.js
new file mode 100644
index 000000000..7d5cdcec1
--- /dev/null
+++ b/src/layouts/schedule/schedule.spec.js
@@ -0,0 +1,183 @@
+// Components
+import schedule from "@/layouts/schedule/schedule.vue";
+
+// Supporting Files
+import { shallowMount } from "@vue/test-utils";
+import { getMountOptions } from "@/helpers/unit-test-helper.js";
+import { routeData } from "@/router/constants/routes";
+import store from "@/store";
+import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
+
+const storeMocked = {
+    getters: {
+        payment: { isInsurance: false },
+        order: {
+            payment: { isInsurance: false, insuranceCoverage: { isVerified: false } },
+            referralNumber: "",
+            serviceLocation: {
+                address: "",
+                address2: "",
+                city: "",
+                state: "",
+                zipCode: "00000",
+                zipCodeCtu: "000",
+                appointmentType: null,
+                provider: {},
+                isVehicleProtected: false,
+            },
+            schedule: {
+                date: "",
+                routeCode: "",
+                startTime: "",
+                endTime: "",
+                jobMinMinutes: null,
+                jobMaxMinutes: null,
+            },
+            policy: {
+                isItac: false,
+                isNoComp: false,
+            },
+            damage: { isRepair: false },
+            lineItems: { glassParts: [] },
+        },
+        vehicle: {
+            cardId: "",
+        },
+        lineItems: {
+            supportingItems: [],
+        },
+        applicationUser: {
+            experiments: [],
+        },
+        isMobileAppointment: false,
+    },
+};
+
+jest.mock("@/helpers/heritage-integration/navigation-helper", () => ({
+    navigateToHeritageFunnel: jest.fn(),
+}));
+
+describe("schedule.vue", () => {
+    describe("navigation", () => {
+        test("backButtonAction => non-insurance: navigateWithoutSaving called", () => {
+            // Arrange
+            const { wrapper, mocks } = setupMocks();
+
+            // Act
+            wrapper.vm.backButtonAction();
+
+            // Assert
+            expect(wrapper.vm.$router.navigateWithoutSaving).toHaveBeenCalledWith(
+                mocks.navigationScenarios.CLICKED_BACK,
+                routeData.SCHEDULE.name
+            );
+        });
+
+        test("backButtonAction => insurance verified: navigateToHeritageFunnel called", () => {
+            // Arrange
+            store.getters.order.payment.isInsurance = true;
+            store.getters.order.payment.insuranceCoverage = { isVerified: true };
+            store.getters.order.referralNumber = "";
+            const { wrapper } = setupMocks();
+
+            // Act
+            wrapper.vm.backButtonAction();
+
+            // Assert
+            expect(navigateToHeritageFunnel).toHaveBeenCalledWith({
+                shouldSaveSession: false,
+                pageNameToLog: "schedule",
+                navType: "back",
+            });
+        });
+    });
+
+    describe("computed: isForwardActionDisabled", () => {
+        test("should be true when routeCode missing or appointmentType not set", async () => {
+            const { wrapper } = setupMocks();
+            await wrapper.setData({
+                selectedTimeSlotInfo: { timeSlot: { routeCode: null } },
+                appointmentType: null,
+            });
+            expect(wrapper.vm.isForwardActionDisabled).toBe(true);
+        });
+
+        test("should be false when routeCode present and appointmentType set", async () => {
+            const { wrapper } = setupMocks();
+            await wrapper.setData({
+                selectedTimeSlotInfo: { timeSlot: { routeCode: "RC123" } },
+                appointmentType: "SomeType",
+            });
+            expect(wrapper.vm.isForwardActionDisabled).toBe(false);
+        });
+    });
+
+    describe("computed: selectedRouteCodeData", () => {
+        test("should return null when routeCode not set", async () => {
+            const { wrapper } = setupMocks();
+            await wrapper.setData({
+                selectedTimeSlotInfo: { timeSlot: { routeCode: null } },
+            });
+            expect(wrapper.vm.selectedRouteCodeData).toBeNull();
+        });
+
+        test("should return routeCode and premium flag when set", async () => {
+            const { wrapper } = setupMocks();
+            await wrapper.setData({
+                selectedTimeSlotInfo: {
+                    timeSlot: { routeCode: "RC999" },
+                    isPremiumAppointment: true,
+                },
+            });
+            expect(wrapper.vm.selectedRouteCodeData).toEqual({
+                routeCode: "RC999",
+                isPremiumAppointment: true,
+            });
+        });
+    });
+
+    describe("forwardButtonAction (early exit path)", () => {
+        test("shows recal acknowledgement popup and does not navigate when required", async () => {
+            const { wrapper } = setupMocks();
+            // Force the recal-ack modal path
+            wrapper.vm.showRecalAcknowledgementModal = jest.fn(() => true);
+            await wrapper.setData({ isRecalAcknowledgedForScheduling: null });
+
+            await wrapper.vm.forwardButtonAction();
+
+            expect(wrapper.vm.showRecalAcknowledgementPopup).toBe(true);
+            expect(wrapper.vm.$router.navigateWithSaving).not.toHaveBeenCalled();
+        });
+    });
+});
+
+function setupMocks(mountOptionsMockData = {}) {
+    const route = { name: "schedule" };
+    const defaultMountOptions = {
+        route: route,
+        router: {
+            navigate: jest.fn(),
+            navigateWithSaving: jest.fn(),
+            navigateWithoutSaving: jest.fn(),
+        },
+        store: { ...storeMocked },
+    };
+    const mockBaseMixin = {
+        methods: {
+            getTierOnePackagePrice: jest.fn(),
+            filterOutFees: jest.fn(),
+            getCmsContent: jest.fn(),
+        },
+    };
+    const baseMountOptions = getMountOptions({
+        ...defaultMountOptions,
+        ...mountOptionsMockData,
+    });
+
+    baseMountOptions.global.mixins = [mockBaseMixin];
+    baseMountOptions.global.mocks.pageName = route.name;
+    const wrapper = shallowMount(schedule, baseMountOptions);
+    wrapper.getCmsContent = jest.fn();
+
+    return { wrapper, mocks: baseMountOptions.global?.mocks || {} };
+}
diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index c4d566ae7..e20c025fb 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -98,11 +98,11 @@
                     linkWidgetName="ServiceZipLinkWidget"
                     modalWidgetName="ServiceZipModalWidget" />
             </div>
-            <div class="row your-shop-location" v-if="showInshopComponent">
+            <div class="row your-shop-location" v-if="showShopLocationComponent">
                 <div class="col-12 col-md-10 col-lg-8 col-xl-7">
                     <div>
                         <shopLocation
-                            v-if="showInshopComponent"
+                            v-if="showShopLocationComponent"
                             :selectedShop="selectedShopAnswer"
                             :selectedProviderNumberFromParent="selectedProvider?.providerNumber"
                             :shopProviderDataFromParent="shopProviderData"
@@ -633,19 +633,18 @@ export default {
                 this.handleZipCodeChange(newValue);
             },
         },
-        showInshopComponent() {
+        showShopLocationComponent() {
             // If we get no inshop or mobile data, then show the shoplocation component so the user is not
             // looking at a half blank screen with no way to try another zip/location.
             if (
-                (this.inshopTimeSlotsData === undefined &&
-                    this.mobileTimeSlotsData === undefined) ||
-                (this.inshopTimeSlotsData.days.length === 0 &&
-                    this.mobileTimeSlotsData.days.length === 0) ||
+                (this.selectableDatesInshop === undefined &&
+                    this.selectableDatesMobile === undefined) ||
+                (this.selectableDatesInshop?.days?.length === 0 &&
+                    this.selectableDatesMobile?.days?.length === 0) ||
                 (this.appointmentType && this.appointmentType !== AppointmentTypeStrings.MOBILE)
             ) {
                 return true;
             }
-
             return false;
         },
         isMobileSelected() {
@@ -1327,8 +1326,8 @@ export default {
             if (isMobileSelected === undefined) {
                 isMobileSelected = this.appointmentType === AppointmentTypeStrings.MOBILE;
             }
-            let storedDate = store.getters.order.schedule.date;
-            if (isMobileSelected) storedDate += "-mobile";
+            let storedDate = store.getters.order.schedule?.date;
+            if (isMobileSelected && storedDate) storedDate += "-mobile";
             return storedDate;
         },
         getSelectedTimeSlotInfo() {
@@ -1844,7 +1843,6 @@ export default {
                 this.appointmentType = null;
             }
             this.setSelectedDateToFirstAvailable(); // v-if on appointmentTypeQuestion ensures dates have been loaded by now
-            this.setDisplayWaitList(); // v-if on appointmentTypeQuestion ensures dates have been loaded by now
         },
         setSelectedDateToFirstAvailable() {
             this.selectedDate = this.getFirstAvailableDate();