From cb7705271d934499b33f0f0e99e337bb49e72523 Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Sun, 10 May 2026 08:42:20 -0400
Subject: [PATCH 01/25] CASH-2468 - add policy info fields

CASH-2468 - add policy info fields
---
 src/constants/insurance.js                    |   4 +
 .../funnel-header/funnel-header.vue           |  26 +-
 .../more-policy-questions.vue                 |  76 ++++++
 src/layouts/policy-info/policy-info.vue       | 249 +++++++++++++++++-
 src/store/index.js                            |  11 +
 5 files changed, 357 insertions(+), 9 deletions(-)
 create mode 100644 src/layouts/policy-info/more-policy-questions/more-policy-questions.vue

diff --git a/src/constants/insurance.js b/src/constants/insurance.js
index b23e1fddd..075e899b9 100644
--- a/src/constants/insurance.js
+++ b/src/constants/insurance.js
@@ -82,3 +82,7 @@ export function coverageTypeEnum(strCoverageType) {
 export const NON_MANAGED_SHOW_CLAIM_NUMBER_PARENTS = [
     { name: "KentuckyFarmBureau", value: "223499" },
 ];
+
+export const PARENT_ACCOUNT_NUMBERS = {
+    STATE_FARM: "711310",
+};
\ No newline at end of file
diff --git a/src/fmg-components/funnel-header/funnel-header.vue b/src/fmg-components/funnel-header/funnel-header.vue
index 7bfa3eef6..ac6e73bde 100644
--- a/src/fmg-components/funnel-header/funnel-header.vue
+++ b/src/fmg-components/funnel-header/funnel-header.vue
@@ -5,8 +5,17 @@
         </div>
         <div class="container d-flex">
             <div class="site-logo">
-                <a href="https://safelite.com">
-                    <img class="logo-image img-fluid" :src="imageSrc" alt="Safelite logo" />
+                <a
+                    :href="overrideImageSrc ? null : 'https://safelite.com'"
+                    :class="{ 'pe-none': !!overrideImageSrc }"
+                    :tabindex="overrideImageSrc ? -1 : null"
+                    :aria-disabled="!!overrideImageSrc"
+                    @click="overrideImageSrc && $event.preventDefault()">
+                    <img
+                        class="logo-image img-fluid"
+                        :class="{ 'logo-image--override': !!overrideImageSrc }"
+                        :src="imageSrc"
+                        alt="Safelite logo" />
                 </a>
             </div>
             <div class="button-container webchat">
@@ -69,6 +78,10 @@ export default {
             type: Boolean,
             default: false,
         },
+        overrideImageSrc: {
+            type: String,
+            default: "",
+        },
     },
     setup() {
         const { webchatGlobalNonpersistedState, launchWebchat } = webchatHelper();
@@ -76,7 +89,7 @@ export default {
     },
     computed: {
         imageSrc() {
-            return this.getCmsContent(this.cmsWidgetName, "LogoImage");
+            return this.overrideImageSrc || this.getCmsContent(this.cmsWidgetName, "LogoImage");
         },
         shouldShowWebchatButton() {
             return this.webchatGlobalNonpersistedState.showWebchatButton;
@@ -199,6 +212,13 @@ export default {
         @include media-breakpoint-up(md) {
             width: 165px;
         }
+
+        &--override {
+            width: 200px;
+            @include media-breakpoint-up(md) {
+                width: 250px;
+            }
+        }
     }
 
     .webchat {
diff --git a/src/layouts/policy-info/more-policy-questions/more-policy-questions.vue b/src/layouts/policy-info/more-policy-questions/more-policy-questions.vue
new file mode 100644
index 000000000..89cf13286
--- /dev/null
+++ b/src/layouts/policy-info/more-policy-questions/more-policy-questions.vue
@@ -0,0 +1,76 @@
+<template>
+    <div class="more-policy-questions">
+        <buttonQuestion
+            :questionText="questionText"
+            isMultiSelect
+            :answers="answersToDisplay"
+            :groupName="groupName"
+            buttonTypeString="checkbox"
+            isRequired
+            v-model="selectedValues" />
+    </div>
+</template>
+
+<script>
+import buttonQuestion from "@/digital-components/button-question/button-question";
+import store from "@/store";
+import { PARENT_ACCOUNT_NUMBERS } from "@/constants/insurance";
+
+const STATE_FARM_ONLY_ANSWER_NAMES = new Set(["ThirdPartyVehicle", "Injuries"]);
+const HIDDEN_FOR_STATE_FARM_ANSWER_NAMES = new Set(["OtherResponsibleParty"]);
+
+export default {
+    name: "morePolicyQuestions",
+    props: {
+        modelValue: Array,
+        groupName: String,
+        cmsWidgetName: String,
+    },
+    computed: {
+        questionText() {
+            return this.getCmsContent(this.cmsWidgetName, "QuestionText");
+        },
+        answersFromCms() {
+            return this.getCmsContent(this.cmsWidgetName, "Answers");
+        },
+        isStateFarm() {
+            return (
+                store.getters.order?.payment?.parentAccountNumber?.toString() ===
+                PARENT_ACCOUNT_NUMBERS.STATE_FARM
+            );
+        },
+        answersToDisplay() {
+            if (!Array.isArray(this.answersFromCms)) return [];
+            return this.answersFromCms.filter((ans) => {
+                if (STATE_FARM_ONLY_ANSWER_NAMES.has(ans?.Name)) {
+                    return this.isStateFarm;
+                }
+                if (HIDDEN_FOR_STATE_FARM_ANSWER_NAMES.has(ans?.Name)) {
+                    return !this.isStateFarm;
+                }
+                return true;
+            });
+        },
+        selectedValues: {
+            get() {
+                return this.modelValue;
+            },
+            set(newValue) {
+                this.$emit("update:modelValue", newValue);
+            },
+        },
+    },
+    components: {
+        buttonQuestion,
+    },
+};
+</script>
+
+<style lang="scss">
+.more-policy-questions {
+    .ui-checkbox {
+        flex-direction: column;
+        gap: 0.5rem;
+    }
+}
+</style>
diff --git a/src/layouts/policy-info/policy-info.vue b/src/layouts/policy-info/policy-info.vue
index ceef462a0..bb860ee5e 100644
--- a/src/layouts/policy-info/policy-info.vue
+++ b/src/layouts/policy-info/policy-info.vue
@@ -1,13 +1,117 @@
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
-        <funnelHeader cmsWidgetName="FunnelHeaderWidget" ref="funnelHeader" />
+        <funnelHeader
+            cmsWidgetName="FunnelHeaderWidget"
+            ref="funnelHeader"
+            :overrideImageSrc="clientLogoImageSrc" />
         <div class="container">
             <div class="row">
                 <div class="col-12 col-md-10 col-lg-8 col-xl-7">
                     <funnelSubHeader class="pb-4" cmsWidgetName="FunnelSubHeaderWidget" />
-                    <!--
-                            ... Page code goes here.
-                    -->
+                    
+                    <textBlock
+                        cmsWidgetName="PageTitleWidget"
+                        typeStyle="h1"
+                        :customText="pageTitleText"
+                        class="mb-5 text-left text-md-left cc-page-title" />
+
+                    <textBlock
+                        cmsWidgetName="PageInstructionsWidget"
+                        typeStyle="body"
+                        class="mb-5 text-left text-md-left" />
+
+                    <textboxQuestion
+                        isRequired
+                        class="mb-4"
+                        cmsWidgetName="PolicyNumberWidget"
+                        v-model="policyNumber"
+                        inputId="policyNumber"
+                        validationRules="policy-number-required" />
+
+                    <textboxQuestion
+                        isRequired
+                        class="mb-4"
+                        cmsWidgetName="ZipWidget"
+                        v-model="policyZip"
+                        inputId="policyZip"
+                        maxLength="5"
+                        validationRules="zip-code-required|zip-code-format" />
+
+                    <div class="row">
+                        <div class="col-12 col-md-8">
+                            <textboxQuestion
+                                isRequired
+                                class="mb-4"
+                                cmsWidgetName="PhoneWidget"
+                                v-model="phoneNumber"
+                                inputId="phoneNumber"
+                                validationRules="phone-number-required" />
+                        </div>
+                        <div class="col-12 col-md-4">
+                            <textboxQuestion
+                                isRequired
+                                class="mb-4"
+                                cmsWidgetName="PhoneExtensionWidget"
+                                v-model="phoneExtension"
+                                inputId="phoneExtension" />
+                        </div>
+                    </div>
+
+                    <datePickerPopup
+                        isRequired
+                        class="mb-4"
+                        cmsWidgetName="DateOfLossWidget"
+                        v-model="dateOfLoss"
+                        customInputId="dateOfLoss"
+                        placeholderText="MM/DD/YYYY"
+                        validationRules="date-of-loss-required"
+                        format="MM/dd/yyyy"
+                        modelType="MM/dd/yyyy"
+                        :enableTimePicker="false"
+                        :textInput="true"
+                        :maxDate="today"
+                        :preventMinMaxNavigation="true" />
+
+                    <dropdownQuestion
+                        isRequired
+                        :questionText="damageTypesQuestionText"
+                        class="mb-4"
+                        v-model="damageCause"
+                        cmsWidgetName="DamageTypesWidget"
+                        customDropdownId="damageTypes"
+                        :options="damageTypesOptions"
+                        :valueAsKey="true"
+                        validationRules="damage-types-required"
+                        :labelBold="true" />
+
+                    <dropdownQuestion
+                        class="mb-4"
+                        customDropdownId="policyState"
+                        cmsWidgetName="StateQuestionWidget"
+                        v-model="policyState"
+                        ref="policyState"
+                        :options="stateOptions"
+                        validationRules="state-required"
+                        autocomplete="address-level1"
+                        placeHolderText="Select State"
+                        :labelBold="true" />
+
+                    <textboxQuestion
+                        isRequired
+                        class="mb-4"
+                        cmsWidgetName="CityWidget"
+                        v-model="city"
+                        inputId="city"
+                        validationRules="city-required" />
+
+                    <hr class="mt-4 mb-0" />
+
+                    <morePolicyQuestions
+                        ref="morePolicyQuestions"
+                        cmsWidgetName="MorePolicyQuestionsWidget"
+                        v-model="morePolicyQuestions"
+                        groupName="MorePolicyQuestionsQuestion" />                    
+
                     <navbar
                         cmsWidgetName="FunnelFooterWidget"
                         ref="navbar"
@@ -24,25 +128,90 @@
 import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
 import navbar from "@/fmg-components/nav-bar/nav-bar";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
-import { Form } from "vee-validate";
+import textBlock from "@/digital-components/text-block/text-block";
+import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
+import datePickerPopup from "@/digital-components/date-picker-popup/date-picker-popup";
+import dropdownQuestion from "@/digital-components/dropdown-question/dropdown-question";
+import morePolicyQuestions from "@/layouts/policy-info/more-policy-questions/more-policy-questions";
+import { stateOptions } from "@/constants/state-options";
+import { Form, defineRule } from "vee-validate";
+import { required } from "@/helpers/validation-rules";
+import { errorMessages } from "@/constants/error-messages";
+import { regex } from "@/helpers/validation-rules";
 
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
+import store from "@/store";
+
+defineRule("policy-number-required", required(errorMessages.POLICY_NUMBER_REQUIRED));
+defineRule("zip-code-required", required(errorMessages.ZIP_REQUIRED));
+defineRule("zip-code-format", regex(/(^\d{5}$)|(^\d{5}-\d{4}$)/, errorMessages.ZIP_FORMAT));
+defineRule("phone-number-required", required(errorMessages.PHONE_REQUIRED));
+defineRule("date-of-loss-required", required(errorMessages.DATE_OF_LOSS_REQUIRED));
+defineRule("damage-types-required", required(errorMessages.DAMAGE_TYPES_REQUIRED));
+defineRule("state-required", required(errorMessages.STATE_REQUIRED));
+defineRule("city-required", required(errorMessages.CITY_REQUIRED));
 
 export default {
     name: "policy-info",
     mixins: [],
     data() {
-        return {};
+        return {
+            clientConfig: {},
+            policyNumber: this.getPolicyNumberFromStore(),
+            policyZip: this.getPolicyZipFromStore(),
+            phoneNumber: this.getPhoneNumberFromStore(),
+            phoneExtension: this.getPhoneExtensionFromStore(),
+            dateOfLoss: this.getDateOfLossFromStore(),
+            damageCause: this.getDamageCauseFromStore(),
+            policyState: this.getPolicyStateFromStore(),
+            city: this.getCityFromStore(),
+            morePolicyQuestions: [],
+        };
     },
     components: {
         Form,
         funnelHeader,
         navbar,
         funnelSubHeader,
+        textBlock,
+        textboxQuestion,
+        datePickerPopup,
+        dropdownQuestion,
+        morePolicyQuestions,
+    },
+    computed: {
+        stateOptions() {
+            return stateOptions;
+        },
+        today() {
+            return new Date();
+        },
+        clientLogoImageSrc() {
+            return this.clientConfig?.ClientLogoWidget?.Image || "";
+        },
+        pageTitleText() {
+            return this.clientConfig?.PageTitleOverrideWidget?.Text || this.getCmsContent("PageTitleWidget", "Text");
+        },
+        damageTypesQuestionText() {
+            return this.getCmsContent("DamageTypesWidget", "QuestionText");
+        },
+        damageTypesOptions() {
+            const options = {};
+
+            const answers = this.getCmsContent("DamageTypesWidget", "Answers");
+            for (const answer of answers) {
+                options[answer.Name] = answer.Text;
+            }
+
+            return options;
+        },
     },
     // Ensure CMS content is fetched during route navigation without depending on `to`/`from`
     async beforeRouteEnter(to, from, next) {
+        const clientConfigPageName = `client_${store.getters.order.payment.parentAccountNumber}`;
+        const clientConfigPromise = fetchCmsContentForPage(clientConfigPageName);
+
         const pageName = to.name;
         const cmsContentPromise = fetchCmsContentForPage(pageName);
         const promiseResultMap = [
@@ -50,14 +219,43 @@ export default {
                 resultKey: "cmsContent",
                 promise: cmsContentPromise,
             },
+            {
+                resultKey: "clientConfig",
+                promise: clientConfigPromise,
+            },
         ];
         const resultMap = await settleAllPromises(promiseResultMap);
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
+            vm.clientConfig = resultMap.clientConfig;
         });
     },
 
     methods: {
+        getPolicyNumberFromStore() {
+            return store.getters.order.policy.policyNumber;
+        },
+        getPolicyZipFromStore() {
+            return store.getters.order.policy.zipCode;
+        },
+        getPhoneNumberFromStore() {
+            return store.getters.order.policy.phoneNumber;
+        },
+        getPhoneExtensionFromStore() {
+            return store.getters.order.policy.phoneExtension;
+        },
+        getDateOfLossFromStore() {
+            return store.getters.order.damage.dateOfLoss;
+        },
+        getDamageCauseFromStore() {
+            return store.getters.order.damage.damageCause;
+        },
+        getPolicyStateFromStore() {
+            return store.getters.order.policy.state;
+        },
+        getCityFromStore() {
+            return store.getters.order.policy.city;
+        },
         backButtonAction() {
             this.$router.navigateWithoutSaving(
                 this.navigationScenarios.CLICKED_BACK,
@@ -65,6 +263,29 @@ export default {
             );
         },
         async forwardButtonAction() {
+            this.dispatchStoreAction(
+                this.storeActions.SAVE_INSURANCE_DETAILS,
+                {
+                    policyNumber: this.policyNumber,
+                    zipCode: this.policyZip,
+                    phoneNumber: this.phoneNumber,
+                    phoneExtension: this.phoneExtension,
+                    state: this.policyState,
+                    city: this.city,
+                    morePolicyQuestions: this.morePolicyQuestions,
+                },
+                false
+            );
+
+            this.dispatchStoreAction(
+                this.storeActions.SAVE_DAMAGE_DETAILS,
+                {
+                    dateOfLoss: this.dateOfLoss,
+                    damageCause: this.damageCause,
+                },
+                false
+            );
+
             this.$router.navigateWithSaving(
                 this.navigationScenarios.CLICKED_FORWARD,
                 this.pageName
@@ -76,3 +297,19 @@ export default {
     },
 };
 </script>
+
+<style lang="scss">
+.cc-page-title {
+    font-size: 20px !important;
+    line-height: 1.325;
+    font-weight: 300;
+    color: $black;
+}
+
+.cc-page-instructions {
+    font-size: 16px !important;
+    font-weight: 400;
+    color: $gray-600;
+    line-height: 1.625;
+}
+</style>
\ No newline at end of file
diff --git a/src/store/index.js b/src/store/index.js
index 18b34f023..a794d702d 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -175,6 +175,8 @@ const getDefaultState = () => {
                 additionalAuthFlag: null,
                 isNoComp: false,
                 insuranceCompanyName: null,
+                phoneNumber: null,
+                phoneExtension: null,
                 streetAddress: null,
                 apartment: null,
                 city: null,
@@ -341,6 +343,12 @@ export const mutations = {
         state.order.payment.accountName = accountName;
         state.order.policy.insuranceCompanyName = accountName;
     },
+    updatePhoneNumber(state, phoneNumber) {
+        state.order.policy.phoneNumber = phoneNumber;
+    },
+    updatePhoneExtension(state, phoneExtension) {
+        state.order.policy.phoneExtension = phoneExtension;
+    },
     updateStreetAddress(state, streetAddress) {
         state.order.policy.streetAddress = streetAddress;
     },
@@ -548,6 +556,9 @@ export const mutations = {
             state.order.policy.state = insuranceDetails.state;
             state.order.policy.zipCode = insuranceDetails.zipCode;
             state.order.policy.claimNumber = insuranceDetails.claimNumber;
+            state.order.policy.phoneNumber = insuranceDetails.phoneNumber;
+            state.order.policy.phoneExtension = insuranceDetails.phoneExtension;
+            state.order.policy.morePolicyQuestions = insuranceDetails.morePolicyQuestions;
         }
     },
     updateDamageDetails(state, damageDetails) {

From df3cdebf2e528ead5dd46a0212d10fe3d861b50d Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Mon, 11 May 2026 09:08:47 -0400
Subject: [PATCH 02/25] CASH-2468 policy info fields saved to store

CASH-2468 policy info fields saved to store
---
 src/constants/error-messages.js               |   4 +
 .../date-picker-popup/date-picker-popup.vue   |  20 +-
 src/layouts/policy-info/policy-info.vue       | 182 +++++++++++++++++-
 src/store/index.js                            |  11 ++
 4 files changed, 214 insertions(+), 3 deletions(-)

diff --git a/src/constants/error-messages.js b/src/constants/error-messages.js
index 6899c2aec..b5cbde3fa 100644
--- a/src/constants/error-messages.js
+++ b/src/constants/error-messages.js
@@ -44,6 +44,10 @@ const errorMessages = {
     DAMAGE_TYPES_REQUIRED: "How damage occurred is required",
     ZIP_CODE_REQUIRED: "Please enter your ZIP code",
     ZIP_CODE_FORMAT: "Zip must be 5 digits",
+    DATE_OF_BIRTH_REQUIRED: "Please enter your date of birth",
+    LOSS_TIME_REQUIRED: "Please enter your loss time",
+    LOSS_LOCATION_REQUIRED: "Please select your loss location",
+    SUBROGATION_REQUIRED: "Please make a selection",
 };
 
 export { errorMessages };
diff --git a/src/digital-components/date-picker-popup/date-picker-popup.vue b/src/digital-components/date-picker-popup/date-picker-popup.vue
index 7f3e109ac..ea24197bc 100644
--- a/src/digital-components/date-picker-popup/date-picker-popup.vue
+++ b/src/digital-components/date-picker-popup/date-picker-popup.vue
@@ -26,7 +26,8 @@
                 :min-date="minDate"
                 :max-date="maxDate"
                 :auto-apply="autoApply"
-                :text-input="textInput"
+                :text-input="resolvedTextInput"
+                :hide-input-icon="textInputOnly"
                 :prevent-min-max-navigation="preventMinMaxNavigation"
                 :teleport="true"
                 :aria-labels="{ input: questionText }"
@@ -107,6 +108,12 @@ export default {
             type: Boolean,
             default: false,
         },
+        // Force manual entry: text input enabled, calendar popup never opens
+        // and the calendar icon is hidden.
+        textInputOnly: {
+            type: Boolean,
+            default: false,
+        },
         preventMinMaxNavigation: {
             type: Boolean,
             default: false,
@@ -155,7 +162,7 @@ export default {
         questionText() {
             if (!this.cmsWidgetName) return "";
             const text = this.getCmsContent
-                ? this.getCmsContent(this.cmsWidgetName, "BodyText")
+                ? this.getCmsContent(this.cmsWidgetName, "QuestionText")
                 : "";
             return this.addOptionalText ? `${text} (optional)` : text;
         },
@@ -193,6 +200,15 @@ export default {
                 clearable: this.clearable,
             };
         },
+        // Forwarded to VueDatePicker's `text-input` prop. When `textInputOnly`
+        // is set, force text input on AND tell the picker never to open its
+        // menu (so focus/click on the input is a no-op visually).
+        resolvedTextInput() {
+            if (this.textInputOnly) {
+                return { enabled: true, openMenu: false };
+            }
+            return this.textInput;
+        },
     },
     methods: {
         onDateChange(newValue) {
diff --git a/src/layouts/policy-info/policy-info.vue b/src/layouts/policy-info/policy-info.vue
index bb860ee5e..f89e5db09 100644
--- a/src/layouts/policy-info/policy-info.vue
+++ b/src/layouts/policy-info/policy-info.vue
@@ -28,6 +28,40 @@
                         inputId="policyNumber"
                         validationRules="policy-number-required" />
 
+                    <datePickerPopup
+                        v-if="displayDateOfBirth"
+                        isRequired
+                        class="mb-4"
+                        cmsWidgetName="DateOfBirthWidget"
+                        v-model="dateOfBirth"
+                        customInputId="dateOfBirth"
+                        placeholderText="MM/DD/YYYY"
+                        validationRules="date-of-birth-required"
+                        format="MM/dd/yyyy"
+                        modelType="MM/dd/yyyy"
+                        :enableTimePicker="false"
+                        :textInputOnly="true"
+                        :maxDate="today"
+                        :preventMinMaxNavigation="true" />
+
+                    <textboxQuestion
+                        v-if="displayLastName"
+                        isRequired
+                        class="mb-4"
+                        cmsWidgetName="LastNameWidget"
+                        v-model="lastName"
+                        inputId="lastName"
+                        validationRules="last-name-required" />
+
+                    <textboxQuestion
+                        v-if="displayStreetAddress"
+                        isRequired
+                        class="mb-4"
+                        cmsWidgetName="StreetAddressWidget"
+                        v-model="streetAddress"
+                        inputId="streetAddress"
+                        validationRules="street-address-required" />
+
                     <textboxQuestion
                         isRequired
                         class="mb-4"
@@ -72,6 +106,18 @@
                         :maxDate="today"
                         :preventMinMaxNavigation="true" />
 
+                    <dropdownQuestion
+                        isRequired
+                        :questionText="timeOfLossQuestionText"
+                        class="mb-4"
+                        v-model="lossTime"
+                        cmsWidgetName="TimeOfLossWidget"
+                        customDropdownId="lossTime"
+                        :options="lossTimeOptions"
+                        :valueAsKey="true"
+                        validationRules="loss-time-required"
+                        :labelBold="true" />
+
                     <dropdownQuestion
                         isRequired
                         :questionText="damageTypesQuestionText"
@@ -84,7 +130,19 @@
                         validationRules="damage-types-required"
                         :labelBold="true" />
 
+                    <buttonQuestion
+                        v-if="displaySubrogation"
+                        :questionText="subrogationQuestionText"
+                        :answers="subrogationAnswers"
+                        class="mb-4"
+                        groupName="SubrogationQuestion"
+                        buttonTypeString="listButton"
+                        isRequired
+                        validationRules="subrogation-required"
+                        v-model="subrogationSelectedValue" />
+                    
                     <dropdownQuestion
+                        v-if="displayLossState"
                         class="mb-4"
                         customDropdownId="policyState"
                         cmsWidgetName="StateQuestionWidget"
@@ -96,7 +154,20 @@
                         placeHolderText="Select State"
                         :labelBold="true" />
 
+                    <dropdownQuestion
+                        v-if="displayLossLocation"
+                        :questionText="lossLocationQuestionText"
+                        class="mb-4"
+                        v-model="lossLocation"
+                        cmsWidgetName="LossLocationQuestionWidget"
+                        customDropdownId="lossLocation"
+                        :options="lossLocationOptions"
+                        :valueAsKey="true"
+                        validationRules="loss-location-required"
+                        :labelBold="true" />
+
                     <textboxQuestion
+                        v-if="displayLossCity"
                         isRequired
                         class="mb-4"
                         cmsWidgetName="CityWidget"
@@ -133,6 +204,7 @@ import textboxQuestion from "@/digital-components/textbox-question/textbox-quest
 import datePickerPopup from "@/digital-components/date-picker-popup/date-picker-popup";
 import dropdownQuestion from "@/digital-components/dropdown-question/dropdown-question";
 import morePolicyQuestions from "@/layouts/policy-info/more-policy-questions/more-policy-questions";
+import buttonQuestion from "@/digital-components/button-question/button-question";
 import { stateOptions } from "@/constants/state-options";
 import { Form, defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";
@@ -142,6 +214,7 @@ import { regex } from "@/helpers/validation-rules";
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import store from "@/store";
+import { debugLog } from "@/helpers/debug-log-helper";
 
 defineRule("policy-number-required", required(errorMessages.POLICY_NUMBER_REQUIRED));
 defineRule("zip-code-required", required(errorMessages.ZIP_REQUIRED));
@@ -151,6 +224,12 @@ defineRule("date-of-loss-required", required(errorMessages.DATE_OF_LOSS_REQUIRED
 defineRule("damage-types-required", required(errorMessages.DAMAGE_TYPES_REQUIRED));
 defineRule("state-required", required(errorMessages.STATE_REQUIRED));
 defineRule("city-required", required(errorMessages.CITY_REQUIRED));
+defineRule("date-of-birth-required", required(errorMessages.DATE_OF_BIRTH_REQUIRED));
+defineRule("last-name-required", required(errorMessages.LAST_NAME_REQUIRED));
+defineRule("street-address-required", required(errorMessages.STREET_ADDRESS_REQUIRED));
+defineRule("loss-time-required", required(errorMessages.LOSS_TIME_REQUIRED));
+defineRule("loss-location-required", required(errorMessages.LOSS_LOCATION_REQUIRED));
+defineRule("subrogation-required", required(errorMessages.SUBROGATION_REQUIRED));
 
 export default {
     name: "policy-info",
@@ -163,10 +242,16 @@ export default {
             phoneNumber: this.getPhoneNumberFromStore(),
             phoneExtension: this.getPhoneExtensionFromStore(),
             dateOfLoss: this.getDateOfLossFromStore(),
+            lastName: this.getLastNameFromStore(),
+            streetAddress: this.getStreetAddressFromStore(),
             damageCause: this.getDamageCauseFromStore(),
             policyState: this.getPolicyStateFromStore(),
             city: this.getCityFromStore(),
-            morePolicyQuestions: [],
+            dateOfBirth: this.getDateOfBirthFromStore(),
+            lossTime: this.getLossTimeFromStore(),
+            morePolicyQuestions: this.getMorePolicyQuestionsFromStore(),
+            subrogationSelectedValue: this.getSubrogationSelectedValueFromStore(),
+            lossLocation: this.getLossLocationFromStore(),
         };
     },
     components: {
@@ -179,6 +264,7 @@ export default {
         datePickerPopup,
         dropdownQuestion,
         morePolicyQuestions,
+        buttonQuestion,
     },
     computed: {
         stateOptions() {
@@ -206,6 +292,72 @@ export default {
 
             return options;
         },
+        lossTimeOptions() {
+            const options = {};
+
+            const answers = this.getCmsContent("TimeOfLossWidget", "Answers");
+            for (const answer of answers) {
+                options[answer.Name] = answer.Text;
+            }
+
+            return options;
+        },
+        timeOfLossQuestionText() {
+            return this.getCmsContent("TimeOfLossWidget", "QuestionText");
+        },
+        lossLocationOptions() {
+            const options = {};
+
+            const answers = this.getCmsContent("LossLocationQuestionWidget", "Answers");
+            for (const answer of answers) {
+                options[answer.Name] = answer.Text;
+            }
+            
+            return options;
+        },
+        parsedClientConfig() {
+            const raw = this.clientConfig?.ConfigWidget?.Text;
+            if (!raw) return {};
+            try {
+                return JSON.parse(raw);
+            } catch (err) {
+                console.warn("Failed to parse clientConfig.ConfigWidget.Text", err);
+                return {};
+            }
+        },
+        displayLossState() {
+            return this.parsedClientConfig.displayLossState ?? false;
+        },
+        displayLossCity() {
+            return this.parsedClientConfig.displayLossCity ?? false;
+        },
+        displayLossLocation() {
+            return this.parsedClientConfig.displayLossLocation ?? false;
+        },
+        displaySubrogation() {
+            return this.parsedClientConfig.displaySubrogation ?? false;
+        },
+        displayStreetAddress() {
+            return this.parsedClientConfig.displayStreetAddress ?? false;
+        },
+        displayDateOfBirth() {
+            return this.parsedClientConfig.displayDateOfBirth ?? false;
+        },
+        displayLastName() {
+            return this.parsedClientConfig.displayLastName ?? false;
+        },
+        displayLossTime() {
+            return this.parsedClientConfig.displayLossTime ?? false;
+        },
+        subrogationQuestionText() {
+            return this.getCmsContent("SubrogationQuestionWidget", "QuestionText");
+        },
+        subrogationAnswers() {
+            return this.getCmsContent("SubrogationQuestionWidget", "Answers");
+        },
+        lossLocationQuestionText() {
+            return this.getCmsContent("LossLocationQuestionWidget", "QuestionText");
+        },
     },
     // Ensure CMS content is fetched during route navigation without depending on `to`/`from`
     async beforeRouteEnter(to, from, next) {
@@ -228,6 +380,7 @@ export default {
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
             vm.clientConfig = resultMap.clientConfig;
+            debugLog(`clientConfig::${clientConfigPageName}`, JSON.stringify(vm.clientConfig));
         });
     },
 
@@ -256,6 +409,27 @@ export default {
         getCityFromStore() {
             return store.getters.order.policy.city;
         },
+        getDateOfBirthFromStore() {
+            return store.getters.order.policy.dateOfBirth;
+        },
+        getLastNameFromStore() {
+            return store.getters.order.policy.lastName;
+        },
+        getStreetAddressFromStore() {
+            return store.getters.order.policy.streetAddress;
+        },
+        getLossTimeFromStore() {
+            return store.getters.order.policy.lossTime;
+        },
+        getSubrogationSelectedValueFromStore() {
+            return store.getters.order.policy.subrogation;
+        },
+        getMorePolicyQuestionsFromStore() {
+            return store.getters.order.policy.morePolicyQuestions ?? [];
+        },
+        getLossLocationFromStore() {
+            return store.getters.order.policy.lossLocation;
+        },
         backButtonAction() {
             this.$router.navigateWithoutSaving(
                 this.navigationScenarios.CLICKED_BACK,
@@ -273,6 +447,12 @@ export default {
                     state: this.policyState,
                     city: this.city,
                     morePolicyQuestions: this.morePolicyQuestions,
+                    lossLocation: this.lossLocation,
+                    lossTime: this.lossTime,
+                    lastName: this.lastName,
+                    dateOfBirth: this.dateOfBirth,
+                    subrogation: this.subrogationSelectedValue,
+                    streetAddress: this.streetAddress,
                 },
                 false
             );
diff --git a/src/store/index.js b/src/store/index.js
index a794d702d..9f06b76cc 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -182,6 +182,11 @@ const getDefaultState = () => {
                 city: null,
                 state: null,
                 zipCode: null,
+                dateOfBirth: null,
+                lossTime: null,
+                lossLocation: null,
+                lastName: null,
+                subrogation: null,
             },
             schedule: {
                 date: null,
@@ -559,6 +564,12 @@ export const mutations = {
             state.order.policy.phoneNumber = insuranceDetails.phoneNumber;
             state.order.policy.phoneExtension = insuranceDetails.phoneExtension;
             state.order.policy.morePolicyQuestions = insuranceDetails.morePolicyQuestions;
+            state.order.policy.dateOfBirth = insuranceDetails.dateOfBirth;
+            state.order.policy.lossTime = insuranceDetails.lossTime;
+            state.order.policy.lastName = insuranceDetails.lastName;
+            state.order.policy.lossLocation = insuranceDetails.lossLocation;
+            state.order.policy.subrogation = insuranceDetails.subrogation;
+            state.order.policy.streetAddress = insuranceDetails.streetAddress;
         }
     },
     updateDamageDetails(state, damageDetails) {

From 35c1b1d650539cf7d73045550b1053b662be0b1e Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Mon, 11 May 2026 13:56:22 -0400
Subject: [PATCH 03/25] CASH-2468 customizations

CASH-2468 customizations
---
 src/constants/insurance.js                    |  1 +
 .../insurance-company/insurance-company.vue   |  2 +-
 .../more-policy-questions.vue                 | 41 +++++++++++++++----
 src/layouts/policy-info/policy-info.vue       | 36 +++++++++++++++-
 4 files changed, 68 insertions(+), 12 deletions(-)

diff --git a/src/constants/insurance.js b/src/constants/insurance.js
index 075e899b9..fe4d2b8f9 100644
--- a/src/constants/insurance.js
+++ b/src/constants/insurance.js
@@ -85,4 +85,5 @@ export const NON_MANAGED_SHOW_CLAIM_NUMBER_PARENTS = [
 
 export const PARENT_ACCOUNT_NUMBERS = {
     STATE_FARM: "711310",
+    USAA: "900040",
 };
\ No newline at end of file
diff --git a/src/layouts/insurance-company/insurance-company.vue b/src/layouts/insurance-company/insurance-company.vue
index c97a8589a..480cf505f 100644
--- a/src/layouts/insurance-company/insurance-company.vue
+++ b/src/layouts/insurance-company/insurance-company.vue
@@ -182,7 +182,7 @@ export default {
 
             await this.dispatchStoreAction(
                 this.storeActions.SAVE_PARENT_ACCOUNT_NUMBER,
-                this.selectedAccount.parentAccountNumber.toString(),
+                Number(this.selectedAccount.parentAccountNumber).toString(),
                 false
             );
 
diff --git a/src/layouts/policy-info/more-policy-questions/more-policy-questions.vue b/src/layouts/policy-info/more-policy-questions/more-policy-questions.vue
index 89cf13286..0345efcda 100644
--- a/src/layouts/policy-info/more-policy-questions/more-policy-questions.vue
+++ b/src/layouts/policy-info/more-policy-questions/more-policy-questions.vue
@@ -18,6 +18,12 @@ import { PARENT_ACCOUNT_NUMBERS } from "@/constants/insurance";
 
 const STATE_FARM_ONLY_ANSWER_NAMES = new Set(["ThirdPartyVehicle", "Injuries"]);
 const HIDDEN_FOR_STATE_FARM_ANSWER_NAMES = new Set(["OtherResponsibleParty"]);
+// Maps an answer's Name to the CMS widget that supplies a State Farm-specific
+// label override. The widget's "Text" property replaces the answer's Text.
+const STATE_FARM_TEXT_OVERRIDES = {
+    AdditionalDamage: "AdditionalDamageStateFarmWidget",
+    Rental: "RentalStateFarmWidget",
+};
 
 export default {
     name: "morePolicyQuestions",
@@ -39,17 +45,34 @@ export default {
                 PARENT_ACCOUNT_NUMBERS.STATE_FARM
             );
         },
+        stateFarmTextOverrides() {
+            return Object.fromEntries(
+                Object.entries(STATE_FARM_TEXT_OVERRIDES).map(([name, widget]) => [
+                    name,
+                    this.getCmsContent(widget, "Text"),
+                ])
+            );
+        },
         answersToDisplay() {
             if (!Array.isArray(this.answersFromCms)) return [];
-            return this.answersFromCms.filter((ans) => {
-                if (STATE_FARM_ONLY_ANSWER_NAMES.has(ans?.Name)) {
-                    return this.isStateFarm;
-                }
-                if (HIDDEN_FOR_STATE_FARM_ANSWER_NAMES.has(ans?.Name)) {
-                    return !this.isStateFarm;
-                }
-                return true;
-            });
+            return this.answersFromCms
+                .filter((ans) => {
+                    if (STATE_FARM_ONLY_ANSWER_NAMES.has(ans?.Name)) {
+                        return this.isStateFarm;
+                    }
+                    if (HIDDEN_FOR_STATE_FARM_ANSWER_NAMES.has(ans?.Name)) {
+                        return !this.isStateFarm;
+                    }
+                    return true;
+                })
+                .map((ans) => {
+                    if (!this.isStateFarm) return ans;
+                    const overrideText = this.stateFarmTextOverrides[ans?.Name];
+                    if (overrideText) {
+                        return { ...ans, Text: overrideText };
+                    }
+                    return ans;
+                });
         },
         selectedValues: {
             get() {
diff --git a/src/layouts/policy-info/policy-info.vue b/src/layouts/policy-info/policy-info.vue
index f89e5db09..cee968882 100644
--- a/src/layouts/policy-info/policy-info.vue
+++ b/src/layouts/policy-info/policy-info.vue
@@ -18,15 +18,17 @@
                     <textBlock
                         cmsWidgetName="PageInstructionsWidget"
                         typeStyle="body"
+                        :customText="pageInstructionsText"
                         class="mb-5 text-left text-md-left" />
 
                     <textboxQuestion
                         isRequired
-                        class="mb-4"
-                        cmsWidgetName="PolicyNumberWidget"
+                        class="mb-1"
+                        :cmsWidgetName="policyNumberWidgetName"
                         v-model="policyNumber"
                         inputId="policyNumber"
                         validationRules="policy-number-required" />
+                    <span v-if="displayPolicyHelperText" class="d-block mb-5 helper-text" v-html="policyHelperText"></span>
 
                     <datePickerPopup
                         v-if="displayDateOfBirth"
@@ -79,6 +81,7 @@
                                 cmsWidgetName="PhoneWidget"
                                 v-model="phoneNumber"
                                 inputId="phoneNumber"
+                                mask="###-###-####"
                                 validationRules="phone-number-required" />
                         </div>
                         <div class="col-12 col-md-4">
@@ -107,6 +110,7 @@
                         :preventMinMaxNavigation="true" />
 
                     <dropdownQuestion
+                        v-if="displayLossTime"
                         isRequired
                         :questionText="timeOfLossQuestionText"
                         class="mb-4"
@@ -210,6 +214,7 @@ import { Form, defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
 import { regex } from "@/helpers/validation-rules";
+import { PARENT_ACCOUNT_NUMBERS } from "@/constants/insurance";
 
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
@@ -279,6 +284,22 @@ export default {
         pageTitleText() {
             return this.clientConfig?.PageTitleOverrideWidget?.Text || this.getCmsContent("PageTitleWidget", "Text");
         },
+        pageInstructionsText() {
+            return this.clientConfig?.PageInstructionsOverrideWidget?.Text || this.getCmsContent("PageInstructionsWidget", "Text");
+        },
+        isUSAA() {
+            return (
+                store.getters.order?.payment?.parentAccountNumber?.toString() ===
+                PARENT_ACCOUNT_NUMBERS.USAA
+            );
+        },
+        policyNumberWidgetName() {
+            console.log("isUSAA", this.isUSAA);
+            return this.isUSAA ? "PolicyNumberUSAAWidget" : "PolicyNumberWidget";
+        },
+        policyHelperText() {
+            return this.clientConfig?.PolicyHelperTextOverrideWidget?.Text;
+        },
         damageTypesQuestionText() {
             return this.getCmsContent("DamageTypesWidget", "QuestionText");
         },
@@ -349,6 +370,9 @@ export default {
         displayLossTime() {
             return this.parsedClientConfig.displayLossTime ?? false;
         },
+        displayPolicyHelperText() {
+            return this.policyHelperText !== null && this.policyHelperText !== "";
+        },
         subrogationQuestionText() {
             return this.getCmsContent("SubrogationQuestionWidget", "QuestionText");
         },
@@ -492,4 +516,12 @@ export default {
     color: $gray-600;
     line-height: 1.625;
 }
+
+.helper-text {
+    font-size: 14px !important;
+    font-weight: 400;
+    color: $gray-600;
+    line-height: 1.625;
+    font-style: italic;
+}
 </style>
\ No newline at end of file

From 54a0e1179fe23600ac174d498bd22055209a21e7 Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Mon, 11 May 2026 15:39:37 -0400
Subject: [PATCH 04/25] CASH-2468 add AmFam disclaimer

CASH-2468 add AmFam disclaimer
---
 src/layouts/policy-info/policy-info.vue | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/layouts/policy-info/policy-info.vue b/src/layouts/policy-info/policy-info.vue
index cee968882..952af03e4 100644
--- a/src/layouts/policy-info/policy-info.vue
+++ b/src/layouts/policy-info/policy-info.vue
@@ -193,6 +193,8 @@
                         :isForwardActionDisabled="!meta.valid"
                         @back-clicked="backButtonAction"
                         @ForwardClicked="forwardButtonAction" />
+
+                    <span v-if="displayDisclaimerText" class="d-block mb-5 disclaimer-text" v-html="disclaimerText"></span>
                 </div>
             </div>
         </div>
@@ -300,6 +302,12 @@ export default {
         policyHelperText() {
             return this.clientConfig?.PolicyHelperTextOverrideWidget?.Text;
         },
+        disclaimerText() {
+            return this.clientConfig?.DisclaimerWidget?.Text;
+        },
+        displayDisclaimerText() {
+            return this.disclaimerText !== null && this.disclaimerText !== "";
+        },
         damageTypesQuestionText() {
             return this.getCmsContent("DamageTypesWidget", "QuestionText");
         },
@@ -524,4 +532,11 @@ export default {
     line-height: 1.625;
     font-style: italic;
 }
+
+.disclaimer-text {
+    font-size: 12px !important;
+    font-weight: 400;
+    color: $gray-600;
+    line-height: 1.625;
+}
 </style>
\ No newline at end of file

From 5be4bb88cdabd2f7a5d5f81c44d4a5b76cf85db1 Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Tue, 12 May 2026 09:52:37 -0400
Subject: [PATCH 05/25] CASH-619 DupCheck page layout

CASH-619 DupCheck page layout
---
 .../duplicate-check/duplicate-check.vue       | 92 ++++++++++++++++++-
 src/ux-components/list-button/list-button.vue |  7 +-
 2 files changed, 93 insertions(+), 6 deletions(-)

diff --git a/src/layouts/duplicate-check/duplicate-check.vue b/src/layouts/duplicate-check/duplicate-check.vue
index aa1f80bb9..3d3318cac 100644
--- a/src/layouts/duplicate-check/duplicate-check.vue
+++ b/src/layouts/duplicate-check/duplicate-check.vue
@@ -5,9 +5,40 @@
             <div class="row">
                 <div class="col-12 col-md-10 col-lg-8 col-xl-7">
                     <funnelSubHeader class="pb-4" cmsWidgetName="FunnelSubHeaderWidget" />
-                    <!--
-                            ... Page code goes here.
-                    -->
+                    
+                    <textBlock
+                        cmsWidgetName="DupCheckPageTitleWidget"
+                        typeStyle="h1"
+                        :customText="pageTitleText"
+                        class="mb-5 text-left text-md-left cc-page-title" />
+
+                    <textBlock
+                        cmsWidgetName="DupCheckPageInstructionsWidget"
+                        typeStyle="body"
+                        :customText="pageInstructionsText"
+                        class="mb-5 text-left text-md-left cc-page-instructions" />
+
+                    <buttonQuestion
+                        :questionText="existingClaimsQuestionText"
+                        :answers="existingClaimsAnswers"
+                        class="mb-4"
+                        groupName="existingClaimsQuestion"
+                        buttonTypeString="listButton"
+                        isRequired
+                        v-model="existingClaimsSelectedValue" />
+
+                    <div class="or-divider mb-4" role="separator" aria-label="or">
+                        <span class="or-divider-text">or</span>
+                    </div>
+
+                    <buttonQuestion
+                        :answers="startNewClaimAnswers"
+                        class="mb-4"
+                        groupName="existingClaimsQuestion"
+                        buttonTypeString="listButton"
+                        isRequired
+                        v-model="startNewClaimSelectedValue" />
+
                     <navbar
                         cmsWidgetName="FunnelFooterWidget"
                         ref="navbar"
@@ -24,6 +55,8 @@
 import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
 import navbar from "@/fmg-components/nav-bar/nav-bar";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
+import textBlock from "@/digital-components/text-block/text-block";
+import buttonQuestion from "@/digital-components/button-question/button-question";
 import { Form } from "vee-validate";
 
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
@@ -40,6 +73,8 @@ export default {
         funnelHeader,
         navbar,
         funnelSubHeader,
+        textBlock,
+        buttonQuestion,
     },
     // Ensure CMS content is fetched during route navigation without depending on `to`/`from`
     async beforeRouteEnter(to, from, next) {
@@ -56,6 +91,30 @@ export default {
             vm.setCmsContent(resultMap.cmsContent);
         });
     },
+    computed: {
+        pageTitleText() {
+            return this.getCmsContent("DupCheckPageTitleWidget", "Text");
+        },
+        pageInstructionsText() {
+            return this.getCmsContent("DupCheckPageInstructionsWidget", "Text");
+        },
+        existingClaimsQuestionText() {
+            return this.getCmsContent("ExistingClaimsListWidget", "QuestionText");
+        },
+        existingClaimsAnswers() {
+            return this.getCmsContent("ExistingClaimsListWidget", "Answers");
+        },
+        startNewClaimQuestionText() {
+            return this.getCmsContent("StartNewClaimWidget", "QuestionText");
+        },
+        startNewClaimAnswers() {
+            const answers = this.getCmsContent("StartNewClaimWidget", "Answers");
+            return answers.map(answer => ({
+                buttonLabel: answer.Text,
+                value: answer.Name,
+            }));
+        },
+    },
 
     methods: {
         backButtonAction() {
@@ -76,3 +135,30 @@ export default {
     },
 };
 </script>
+<style lang="scss">
+.cc-page-title {
+    font-size: 20px !important;
+    line-height: 1.325;
+    font-weight: 300;
+    color: $black;
+}
+.or-divider {
+    display: flex;
+    align-items: center;
+    text-align: center;
+    color: $gray-600;
+
+    &::before,
+    &::after {
+        content: "";
+        flex: 1;
+        border-bottom: 1px solid $gray-500;
+    }
+
+    .or-divider-text {
+        padding: 0 0.75rem;
+        font-size: 0.875rem;
+        text-transform: lowercase;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/ux-components/list-button/list-button.vue b/src/ux-components/list-button/list-button.vue
index 293f29d73..df71f9800 100644
--- a/src/ux-components/list-button/list-button.vue
+++ b/src/ux-components/list-button/list-button.vue
@@ -6,9 +6,10 @@
         <div
             :aria-label="buttonLabel"
             class="button-content list-button-content d-flex flex-column justify-content-center py-3 px-4 p-md-4">
-            <span class="m-0" :class="[textPosition, labelBold ? 'span-bold' : '']">
-                {{ buttonLabel }}
-            </span>
+            <span
+                class="m-0"
+                :class="[textPosition, labelBold ? 'span-bold' : '']"
+                v-html="buttonLabel"></span>
             <span v-if="buttonLabelSubCopy" class="m-0 small" :class="textPosition">
                 {{ buttonLabelSubCopy }}
             </span>

From 87614ce1968c29dac83d0fd8a215940f54550c6f Mon Sep 17 00:00:00 2001
From: Carl Nation <Carl.Nation@safelite.com>
Date: Wed, 27 May 2026 08:36:36 -0400
Subject: [PATCH 06/25] prettier

---
 src/constants/insurance.js              |  2 +-
 src/layouts/policy-info/policy-info.vue | 30 +++++++++++++++++--------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/constants/insurance.js b/src/constants/insurance.js
index 13a0fa932..1439fafcb 100644
--- a/src/constants/insurance.js
+++ b/src/constants/insurance.js
@@ -89,4 +89,4 @@ export const NON_MANAGED_SHOW_CLAIM_NUMBER_PARENTS = [
 export const PARENT_ACCOUNT_NUMBERS = {
     STATE_FARM: "711310",
     USAA: "900040",
-};
\ No newline at end of file
+};
diff --git a/src/layouts/policy-info/policy-info.vue b/src/layouts/policy-info/policy-info.vue
index 952af03e4..0918a7536 100644
--- a/src/layouts/policy-info/policy-info.vue
+++ b/src/layouts/policy-info/policy-info.vue
@@ -8,7 +8,7 @@
             <div class="row">
                 <div class="col-12 col-md-10 col-lg-8 col-xl-7">
                     <funnelSubHeader class="pb-4" cmsWidgetName="FunnelSubHeaderWidget" />
-                    
+
                     <textBlock
                         cmsWidgetName="PageTitleWidget"
                         typeStyle="h1"
@@ -28,7 +28,10 @@
                         v-model="policyNumber"
                         inputId="policyNumber"
                         validationRules="policy-number-required" />
-                    <span v-if="displayPolicyHelperText" class="d-block mb-5 helper-text" v-html="policyHelperText"></span>
+                    <span
+                        v-if="displayPolicyHelperText"
+                        class="d-block mb-5 helper-text"
+                        v-html="policyHelperText"></span>
 
                     <datePickerPopup
                         v-if="displayDateOfBirth"
@@ -144,7 +147,7 @@
                         isRequired
                         validationRules="subrogation-required"
                         v-model="subrogationSelectedValue" />
-                    
+
                     <dropdownQuestion
                         v-if="displayLossState"
                         class="mb-4"
@@ -185,7 +188,7 @@
                         ref="morePolicyQuestions"
                         cmsWidgetName="MorePolicyQuestionsWidget"
                         v-model="morePolicyQuestions"
-                        groupName="MorePolicyQuestionsQuestion" />                    
+                        groupName="MorePolicyQuestionsQuestion" />
 
                     <navbar
                         cmsWidgetName="FunnelFooterWidget"
@@ -194,7 +197,10 @@
                         @back-clicked="backButtonAction"
                         @ForwardClicked="forwardButtonAction" />
 
-                    <span v-if="displayDisclaimerText" class="d-block mb-5 disclaimer-text" v-html="disclaimerText"></span>
+                    <span
+                        v-if="displayDisclaimerText"
+                        class="d-block mb-5 disclaimer-text"
+                        v-html="disclaimerText"></span>
                 </div>
             </div>
         </div>
@@ -284,10 +290,16 @@ export default {
             return this.clientConfig?.ClientLogoWidget?.Image || "";
         },
         pageTitleText() {
-            return this.clientConfig?.PageTitleOverrideWidget?.Text || this.getCmsContent("PageTitleWidget", "Text");
+            return (
+                this.clientConfig?.PageTitleOverrideWidget?.Text ||
+                this.getCmsContent("PageTitleWidget", "Text")
+            );
         },
         pageInstructionsText() {
-            return this.clientConfig?.PageInstructionsOverrideWidget?.Text || this.getCmsContent("PageInstructionsWidget", "Text");
+            return (
+                this.clientConfig?.PageInstructionsOverrideWidget?.Text ||
+                this.getCmsContent("PageInstructionsWidget", "Text")
+            );
         },
         isUSAA() {
             return (
@@ -341,7 +353,7 @@ export default {
             for (const answer of answers) {
                 options[answer.Name] = answer.Text;
             }
-            
+
             return options;
         },
         parsedClientConfig() {
@@ -539,4 +551,4 @@ export default {
     color: $gray-600;
     line-height: 1.625;
 }
-</style>
\ No newline at end of file
+</style>

From 2eac24f0c75b616e99ff46f1e0b6fe39e41bb2ff Mon Sep 17 00:00:00 2001
From: Matt Sykes <Matthew.Sykes@safelite.com>
Date: Wed, 27 May 2026 08:37:53 -0400
Subject: [PATCH 07/25] Invalidate cached getters using non-reactive properties

---
 src/constants/store-mutations.js |  3 ++
 src/store/index.js               | 15 ++++++
 src/store/store.spec.js          | 89 ++++++++++++++++++++++++++++++++
 3 files changed, 107 insertions(+)

diff --git a/src/constants/store-mutations.js b/src/constants/store-mutations.js
index d2fc2b0fc..a06a37bb0 100644
--- a/src/constants/store-mutations.js
+++ b/src/constants/store-mutations.js
@@ -147,6 +147,9 @@ const storeMutations = {
 
     //Affiliate Cookies
     UPDATE_AFFILIATE_COOKIES: "updateAffiliateCookies",
+
+    // Submitted state (invalidates getters that read sessionStorage submittedState)
+    INCREMENT_SUBMITTED_STATE_REVISION: "incrementSubmittedStateRevision",
 };
 
 export { storeMutations };
diff --git a/src/store/index.js b/src/store/index.js
index 63c759051..df5461cf7 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -225,6 +225,7 @@ const getDefaultState = () => {
             expiryTime: null,
             idempotencyKey: null,
         },
+        submittedStateRevision: 0,
     };
 };
 
@@ -745,6 +746,11 @@ export const mutations = {
     resetState(state) {
         Object.assign(state, getDefaultState());
     },
+    // Bumps when submittedState sessionStorage is created, updated, or cleared so getters
+    // that read sessionStorage (coverageIsVerified, etc.) invalidate their Vuex cache.
+    incrementSubmittedStateRevision(state) {
+        state.submittedStateRevision = (state.submittedStateRevision ?? 0) + 1;
+    },
     resetSaveSessionPromise(state) {
         state.applicationUser.saveSessionPromise = null;
     },
@@ -1004,6 +1010,7 @@ export const getters = {
         return !!nonWindshieldItems?.length;
     },
     coverageIsVerified: (state) => {
+        state.submittedStateRevision;
         let order;
         if (window.sessionStorage.getItem(sessionStorageKeyConstants.SUBMITTED_STATE) !== null) {
             order = JSON.parse(
@@ -1036,6 +1043,7 @@ export const getters = {
         return getHasRecalibrationPart(state);
     },
     isRecalibrationOnSubmittedState: (state) => {
+        state.submittedStateRevision;
         if (window.sessionStorage.getItem(sessionStorageKeyConstants.SUBMITTED_STATE) !== null) {
             return getHasRecalibrationPart({
                 order: JSON.parse(
@@ -1046,6 +1054,7 @@ export const getters = {
         return false;
     },
     shouldHideRecalibration: (state) => {
+        state.submittedStateRevision;
         if (window.sessionStorage.getItem(sessionStorageKeyConstants.SUBMITTED_STATE) !== null) {
             state = JSON.parse(
                 window.sessionStorage.getItem(sessionStorageKeyConstants.SUBMITTED_STATE)
@@ -3696,6 +3705,8 @@ export const actions = {
 
         //restore affiliate cookies
         context.commit(storeMutations.UPDATE_AFFILIATE_COOKIES, affiliateCookies);
+
+        context.commit(storeMutations.INCREMENT_SUBMITTED_STATE_REVISION);
     },
 
     addDonationToSubmittedState(context, donationAmount) {
@@ -3725,11 +3736,15 @@ export const actions = {
             sessionStorageKeyConstants.SUBMITTED_STATE,
             JSON.stringify(submittedState)
         );
+
+        context.commit(storeMutations.INCREMENT_SUBMITTED_STATE_REVISION);
     },
 
     resetSubmittedState(context) {
         // clear from local storage
         window.sessionStorage.removeItem(sessionStorageKeyConstants.SUBMITTED_STATE);
+
+        context.commit(storeMutations.INCREMENT_SUBMITTED_STATE_REVISION);
     },
     resetExternalParameterState(context) {
         if (context.getters.isExternalParameter) {
diff --git a/src/store/store.spec.js b/src/store/store.spec.js
index f8c41cbe4..ec2a757ca 100644
--- a/src/store/store.spec.js
+++ b/src/store/store.spec.js
@@ -1,7 +1,9 @@
 import globalMethods from "@/global-methods";
+import store from "@/store";
 import { mutations, state, actions, getters } from "@/store";
 import { storeMutations } from "@/constants/store-mutations";
 import { storeActions } from "@/constants/store-actions";
+import { sessionStorageKeyConstants } from "@/constants/session-storage";
 import { experimentTriggers } from "@/constants/experiments";
 import { routeData } from "@/router/constants/routes";
 import { AppointmentTypeStrings } from "@/constants/schedule-constants";
@@ -363,6 +365,14 @@ describe("Mutations", () => {
         expect(state.order.customer.phoneNumber).toEqual("555-555-5555");
         expect(state.order.customer.isSmsOptIn).toEqual(true);
     });
+
+    it("incrementSubmittedStateRevision, should increment submittedStateRevision", () => {
+        const storeState = { submittedStateRevision: 0 };
+
+        mutations.incrementSubmittedStateRevision(storeState);
+
+        expect(storeState.submittedStateRevision).toEqual(1);
+    });
 });
 
 describe("Actions", () => {
@@ -3610,6 +3620,85 @@ describe("Actions", () => {
     });
 });
 
+describe("submittedStateRevision", () => {
+    beforeEach(() => {
+        mutations.resetState(store.state);
+        window.sessionStorage.removeItem(sessionStorageKeyConstants.SUBMITTED_STATE);
+    });
+
+    it("resetSubmittedState action commits INCREMENT_SUBMITTED_STATE_REVISION", async () => {
+        const context = { commit: jest.fn() };
+
+        await actions.resetSubmittedState(context);
+
+        expect(context.commit).toHaveBeenCalledWith(
+            storeMutations.INCREMENT_SUBMITTED_STATE_REVISION
+        );
+    });
+
+    it("createSubmittedState action commits INCREMENT_SUBMITTED_STATE_REVISION at end", async () => {
+        const context = {
+            commit: jest.fn(),
+            state: {
+                order: {
+                    payment: { insuranceCoverage: { isVerified: false } },
+                    policy: { currentDeductible: 0 },
+                    lineItems: {},
+                },
+                applicationUser: {
+                    experiments: [],
+                    affiliateCookies: [],
+                },
+            },
+        };
+
+        await actions.createSubmittedState(context);
+
+        expect(context.commit).toHaveBeenCalledWith(
+            storeMutations.INCREMENT_SUBMITTED_STATE_REVISION
+        );
+    });
+
+    it("addDonationToSubmittedState action commits INCREMENT_SUBMITTED_STATE_REVISION", async () => {
+        window.sessionStorage.setItem(
+            sessionStorageKeyConstants.SUBMITTED_STATE,
+            JSON.stringify({
+                order: {
+                    lineItems: { supportingItems: [] },
+                },
+                applicationUser: {},
+            })
+        );
+
+        const context = { commit: jest.fn() };
+
+        await actions.addDonationToSubmittedState(context, 5);
+
+        expect(context.commit).toHaveBeenCalledWith(
+            storeMutations.INCREMENT_SUBMITTED_STATE_REVISION
+        );
+    });
+
+    it("coverageIsVerified re-evaluates after resetSubmittedState clears sessionStorage", () => {
+        window.sessionStorage.setItem(
+            sessionStorageKeyConstants.SUBMITTED_STATE,
+            JSON.stringify({
+                order: {
+                    payment: { insuranceCoverage: { isVerified: true } },
+                    policy: { currentDeductible: 500 },
+                },
+                applicationUser: {},
+            })
+        );
+
+        expect(store.getters.coverageIsVerified).toBe(true);
+
+        store.dispatch(storeActions.RESET_SUBMITTED_STATE);
+
+        expect(store.getters.coverageIsVerified).toBe(false);
+    });
+});
+
 describe("Getters", () => {
     it("Vehicle getter, should return vehicle data", () => {
         // Arrange

From 53091433d228eb3487fa672d242f8fec93748d6a Mon Sep 17 00:00:00 2001
From: Minojhini Valaiyapathi <minojhini.valaiyapathi@safelite.com>
Date: Wed, 27 May 2026 08:39:37 -0400
Subject: [PATCH 08/25] CASH-2755 - Add referralSequenceNumber to the datalayer

---
 src/mixins/analytics-mixin.js      | 7 +++++++
 src/mixins/analytics-mixin.spec.js | 9 +++++++++
 2 files changed, 16 insertions(+)

diff --git a/src/mixins/analytics-mixin.js b/src/mixins/analytics-mixin.js
index 1ea812c49..433288266 100644
--- a/src/mixins/analytics-mixin.js
+++ b/src/mixins/analytics-mixin.js
@@ -398,6 +398,13 @@ export default {
                 payload.orderNumber = "";
             }
 
+            // Referral Sequence Number
+            if (order.referralSequenceNumber) {
+                payload.referralSequenceNumber = order.referralSequenceNumber;
+            } else {
+                payload.referralSequenceNumber = "";
+            }
+
             // Pricing
             // Only fire for completed orders?
 
diff --git a/src/mixins/analytics-mixin.spec.js b/src/mixins/analytics-mixin.spec.js
index 650403935..ee7c39e3c 100644
--- a/src/mixins/analytics-mixin.spec.js
+++ b/src/mixins/analytics-mixin.spec.js
@@ -423,6 +423,7 @@ describe("analyticsMixin.js", () => {
                 },
                 workOrderNumber: "01820-111111",
                 workOrderId: "222222222222",
+                referralSequenceNumber: "1234567",
             };
             store.getters.isRecalibrationOnOrder = true;
             store.getters.isRecalibrationOnSubmittedState = false;
@@ -667,6 +668,14 @@ describe("analyticsMixin.js", () => {
             expect(glassString).toMatch(/(\w+\/\w+)?(,\w+\/\w+)*/);
             expect(promoString).toMatch(/(\w+)?(,\w+)*/);
         });
+
+        test("Pushes referralSequenceNumber when present on order", () => {
+            window.dataLayer = [];
+
+            analyticsMixin.methods.pushOrderToDataLayer();
+
+            expect(window.dataLayer[0].referralSequenceNumber).toBe("1234567");
+        });
     });
 
     test("Obj is not null after action prepended", () => {

From fa21469c32a4858ff8ef8f19455361444d4b8bc7 Mon Sep 17 00:00:00 2001
From: Carl Nation <Carl.Nation@safelite.com>
Date: Wed, 27 May 2026 09:09:23 -0400
Subject: [PATCH 09/25] CASH-2468 broken text fix

CASH-2468 broken text fix
---
 src/layouts/policy-info/policy-info.spec.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/layouts/policy-info/policy-info.spec.js b/src/layouts/policy-info/policy-info.spec.js
index b3251154a..74649d20b 100644
--- a/src/layouts/policy-info/policy-info.spec.js
+++ b/src/layouts/policy-info/policy-info.spec.js
@@ -55,6 +55,15 @@ function setupMocks() {
     fetchCmsContentForPage.mockResolvedValue(mockCmsContent);
     settleAllPromises.mockResolvedValue({ cmsContent: mockCmsContent });
 
+    const mockMixin = {
+        methods: {
+            getCmsContent: jest.fn((widgetName, fieldName) => {
+                return mockCmsContent?.[widgetName]?.[fieldName] ?? "";
+            }),
+            setCmsContent: jest.fn(),
+        },
+    };
+
     const mountOptions = getMountOptions({
         route: { name: "policy-info", query: {}, params: {} },
         router: {
@@ -62,6 +71,7 @@ function setupMocks() {
             navigateWithSaving: jest.fn(),
             navigateWithoutSaving: jest.fn(),
         },
+        mixins: [mockMixin],
     });
 
     const wrapper = shallowMount(policyInfo, mountOptions);

From 79732a079e10cbbb34a8c6c56dbc0f54834cef20 Mon Sep 17 00:00:00 2001
From: Carl Nation <Carl.Nation@safelite.com>
Date: Wed, 27 May 2026 09:35:38 -0400
Subject: [PATCH 10/25] CASH-619 test fixes

CASH-619 test fixes
---
 src/layouts/duplicate-check/duplicate-check.spec.js | 11 +++++++++++
 src/layouts/duplicate-check/duplicate-check.vue     |  3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/layouts/duplicate-check/duplicate-check.spec.js b/src/layouts/duplicate-check/duplicate-check.spec.js
index e28a749e6..c6ef54ff8 100644
--- a/src/layouts/duplicate-check/duplicate-check.spec.js
+++ b/src/layouts/duplicate-check/duplicate-check.spec.js
@@ -55,6 +55,16 @@ function setupMocks() {
     fetchCmsContentForPage.mockResolvedValue(mockCmsContent);
     settleAllPromises.mockResolvedValue({ cmsContent: mockCmsContent });
 
+
+    const mockMixin = {
+        methods: {
+            getCmsContent: jest.fn((widgetName, fieldName) => {
+                return mockCmsContent?.[widgetName]?.[fieldName] ?? "";
+            }),
+            setCmsContent: jest.fn(),
+        },
+    };
+
     const mountOptions = getMountOptions({
         route: { name: "duplicate-check", query: {}, params: {} },
         router: {
@@ -62,6 +72,7 @@ function setupMocks() {
             navigateWithSaving: jest.fn(),
             navigateWithoutSaving: jest.fn(),
         },
+        mixins: [mockMixin],
     });
 
     const wrapper = shallowMount(duplicateCheck, mountOptions);
diff --git a/src/layouts/duplicate-check/duplicate-check.vue b/src/layouts/duplicate-check/duplicate-check.vue
index 3d3318cac..ab3358ee6 100644
--- a/src/layouts/duplicate-check/duplicate-check.vue
+++ b/src/layouts/duplicate-check/duplicate-check.vue
@@ -109,7 +109,8 @@ export default {
         },
         startNewClaimAnswers() {
             const answers = this.getCmsContent("StartNewClaimWidget", "Answers");
-            return answers.map(answer => ({
+            if (!Array.isArray(answers)) return [];
+            return answers.map((answer) => ({
                 buttonLabel: answer.Text,
                 value: answer.Name,
             }));

From 581b236bc346d98f65a493c9beb5cd429b271882 Mon Sep 17 00:00:00 2001
From: Carl Nation <Carl.Nation@safelite.com>
Date: Wed, 27 May 2026 09:41:23 -0400
Subject: [PATCH 11/25] CASH-619 prettier

CASH-619 prettier
---
 src/layouts/duplicate-check/duplicate-check.spec.js | 1 -
 src/layouts/duplicate-check/duplicate-check.vue     | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/layouts/duplicate-check/duplicate-check.spec.js b/src/layouts/duplicate-check/duplicate-check.spec.js
index c6ef54ff8..3f5d6cca2 100644
--- a/src/layouts/duplicate-check/duplicate-check.spec.js
+++ b/src/layouts/duplicate-check/duplicate-check.spec.js
@@ -55,7 +55,6 @@ function setupMocks() {
     fetchCmsContentForPage.mockResolvedValue(mockCmsContent);
     settleAllPromises.mockResolvedValue({ cmsContent: mockCmsContent });
 
-
     const mockMixin = {
         methods: {
             getCmsContent: jest.fn((widgetName, fieldName) => {
diff --git a/src/layouts/duplicate-check/duplicate-check.vue b/src/layouts/duplicate-check/duplicate-check.vue
index ab3358ee6..6cbc56e5b 100644
--- a/src/layouts/duplicate-check/duplicate-check.vue
+++ b/src/layouts/duplicate-check/duplicate-check.vue
@@ -5,7 +5,7 @@
             <div class="row">
                 <div class="col-12 col-md-10 col-lg-8 col-xl-7">
                     <funnelSubHeader class="pb-4" cmsWidgetName="FunnelSubHeaderWidget" />
-                    
+
                     <textBlock
                         cmsWidgetName="DupCheckPageTitleWidget"
                         typeStyle="h1"
@@ -162,4 +162,4 @@ export default {
         text-transform: lowercase;
     }
 }
-</style>
\ No newline at end of file
+</style>

From 6c549e6dd603ea2c98ccf911afd7812d656bda9f Mon Sep 17 00:00:00 2001
From: Matt Sykes <Matthew.Sykes@safelite.com>
Date: Wed, 27 May 2026 09:45:02 -0400
Subject: [PATCH 12/25] Remove solarwinds RUM script from solution

---
 environment-variables.js | 1 -
 public/index.html        | 2 --
 2 files changed, 3 deletions(-)

diff --git a/environment-variables.js b/environment-variables.js
index 55ffdf54e..e3e7ba2cd 100644
--- a/environment-variables.js
+++ b/environment-variables.js
@@ -12,7 +12,6 @@ const environmentVariables = {
   ['__VUE_APP_MY_ACCOUNT__']: "https://myaccountdev.safelite.com/",
   ['__VUE_APP_SAFELITE_HOP__']: "https://sv2-safelitehop-dev.safelite.com/fmgCheckoutShared.aspx",
   ['__VUE_APP_SESSION_TIMEOUT_MINUTES__']: 30,
-  ['__VUE_APP_SOLARWINDS_MONITORING_SCRIPT__']: "",
   ['__VUE_APP_ADYEN_ENVIRONMENT__']: "test",
   ['__VUE_APP_ADYEN_CLIENT_KEY__']: "test_WYGT4F5ZT5BRRL5MPWHK6QLYOIXZXROD",
   ['__VUE_APP_SESSION_EXPIRATION_INTERVAL_CHECK_MILLISECONDS__']: 60000,
diff --git a/public/index.html b/public/index.html
index ab8f27144..0e0518fb6 100644
--- a/public/index.html
+++ b/public/index.html
@@ -27,7 +27,5 @@
     
     <div id="app"></div>
     <!-- built files will be auto injected -->
-
-    <%= process.env.__VUE_APP_SOLARWINDS_MONITORING_SCRIPT__ %>
   </body>
 </html>

From 3cf35f24211013aa2b98701f906dba4ec29ee800 Mon Sep 17 00:00:00 2001
From: Carl Nation <Carl.Nation@safelite.com>
Date: Fri, 29 May 2026 07:18:23 -0400
Subject: [PATCH 13/25] CASH-2804 show advanced MSR mobile fee for itac and
 nocomp

CASH-2804 show advanced MSR mobile fee for itac and nocomp
---
 src/fmg-components/cart/cart.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue
index faa28376d..fa58cb57f 100644
--- a/src/fmg-components/cart/cart.vue
+++ b/src/fmg-components/cart/cart.vue
@@ -907,7 +907,7 @@ export default {
             return cartItem;
         },
         isCashItacNoComp() {
-            return !this.isInsurance || this.isITAC || this.isNoComp;
+            return !this.isInsurance || this.isItac || this.isNoComp;
         },
         mobileFeeCartItemName() {
             return this.getCmsContent("MobileServiceTextWidget", "Text");
@@ -971,7 +971,7 @@ export default {
             const msrFeeLineItem = this.getMsrFeeLineItem;
             const shouldCreateMsrFeeCartItem =
                 this.isMSRFeeApplicable &&
-                (!this.isInsurance || !this.IsMSRFeeCoveredByInsurance) &&
+                (this.isCashItacNoComp || !this.IsMSRFeeCoveredByInsurance) &&
                 msrFeeLineItem &&
                 this.msrFeeAmount > 0;
 

From 5960930b236517440a85f41839c1d0bba3029911 Mon Sep 17 00:00:00 2001
From: Carl Nation <Carl.Nation@safelite.com>
Date: Fri, 29 May 2026 15:38:08 -0400
Subject: [PATCH 14/25] CASH-2753 itac nocomp should work like cash

CASH-2753 itac nocomp should work like cash
---
 src/fmg-components/cart/cart.vue  | 2 +-
 src/layouts/schedule/schedule.vue | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue
index fa58cb57f..e38faca3b 100644
--- a/src/fmg-components/cart/cart.vue
+++ b/src/fmg-components/cart/cart.vue
@@ -1007,7 +1007,7 @@ export default {
             return this.getCmsContent("RecycleTextBlock", "Text");
         },
         msrToolTipBodyText() {
-            let cmsContentText = this.isInsurance
+            let cmsContentText = this.isInsurance && !this.isItac && !this.isNoComp
                 ? this.getCmsContent("MSRModal", "BodyText")
                 : this.getCmsContent("MSRModal", "BodyText2");
             if (this.isInsurance && cmsContentText) {
diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 788b7c388..5e8e6abd9 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -736,6 +736,8 @@ export default {
                 this.isMobileStaticRecalibrationApplicable &&
                 this.mobileFeeHasPrice &&
                 this.isInsurance &&
+                !this.isITAC &&
+                !this.isNoComp &&
                 !this.mobileFeePart?.isInsurable
             );
         },

From 9a8dafa4906c30a54c4ae6e69fa4df84e4b8f5ba Mon Sep 17 00:00:00 2001
From: Carl Nation <Carl.Nation@safelite.com>
Date: Fri, 29 May 2026 15:43:52 -0400
Subject: [PATCH 15/25] prettier

---
 src/fmg-components/cart/cart.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue
index e38faca3b..5d48dc5ae 100644
--- a/src/fmg-components/cart/cart.vue
+++ b/src/fmg-components/cart/cart.vue
@@ -1007,9 +1007,10 @@ export default {
             return this.getCmsContent("RecycleTextBlock", "Text");
         },
         msrToolTipBodyText() {
-            let cmsContentText = this.isInsurance && !this.isItac && !this.isNoComp
-                ? this.getCmsContent("MSRModal", "BodyText")
-                : this.getCmsContent("MSRModal", "BodyText2");
+            let cmsContentText =
+                this.isInsurance && !this.isItac && !this.isNoComp
+                    ? this.getCmsContent("MSRModal", "BodyText")
+                    : this.getCmsContent("MSRModal", "BodyText2");
             if (this.isInsurance && cmsContentText) {
                 cmsContentText = cmsContentText.replaceAll(
                     "{custom:mobileFee}",

From 3ba56a13a0bf247d2c166e2caef133ef91761f1e Mon Sep 17 00:00:00 2001
From: credelinghuys <Chris.Redelinghuys@safelite.com>
Date: Mon, 1 Jun 2026 14:26:00 -0400
Subject: [PATCH 16/25] CASH-2420: Check mobile fee when changing shop
 locations

---
 src/layouts/schedule/schedule.vue                    | 12 +++++++++++-
 src/layouts/schedule/shop-location/shop-location.vue |  4 ++++
 .../shop-question/shop-question-popup.vue            |  9 +++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 5e8e6abd9..efe3a9404 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -125,7 +125,8 @@
                             :zipCodeFromParent="zipCode"
                             :isShopQuestionDisplayed="isShopQuestionDisplayed"
                             @shop-selected="onShopSelected"
-                            @updated-serviceability="setServiceabilityDetails" />
+                            @updated-serviceability="setServiceabilityDetails"
+                            @updated-mobile-fee-part="setMobileFeePart" />
                     </div>
                     <div>
                         <textBlock
@@ -1318,6 +1319,15 @@ export default {
                 moreShopTimeSlots.mobileTimeSlotsData.days
             );
 
+            if (!this.selectableDatesMobile.estimatedServiceMinutesMinimum) {
+                this.selectableDatesMobile.estimatedServiceMinutesMinimum =
+                    moreShopTimeSlots.mobileTimeSlotsData.estimatedServiceMinutesMinimum;
+            }
+            if (!this.selectableDatesMobile.estimatedServiceMinutesMaximum) {
+                this.selectableDatesMobile.estimatedServiceMinutesMaximum =
+                    moreShopTimeSlots.mobileTimeSlotsData.estimatedServiceMinutesMaximum;
+            }
+
             return moreShopTimeSlots;
         },
 
diff --git a/src/layouts/schedule/shop-location/shop-location.vue b/src/layouts/schedule/shop-location/shop-location.vue
index f22436eda..e137a0208 100644
--- a/src/layouts/schedule/shop-location/shop-location.vue
+++ b/src/layouts/schedule/shop-location/shop-location.vue
@@ -19,6 +19,7 @@
             :zipCodeFromParent="zipCodeFromParent"
             @shop-selected="onShopSelected"
             @updated-serviceability="setServiceabilityDetails"
+            @updated-mobile-fee-part="setMobileFeePart"
             cmsWidgetName="YourSafeliteShopWidget" />
     </div>
 </template>
@@ -76,6 +77,9 @@ export default {
         setServiceabilityDetails(serviceabilityDetails) {
             this.$emit("updated-serviceability", serviceabilityDetails);
         },
+        setMobileFeePart(mobileFeePart) {
+            this.$emit("updated-mobile-fee-part", mobileFeePart);
+        },
     },
 };
 </script>
diff --git a/src/layouts/service-location/shop-question/shop-question-popup.vue b/src/layouts/service-location/shop-question/shop-question-popup.vue
index 430c347e1..c66f4c79a 100644
--- a/src/layouts/service-location/shop-question/shop-question-popup.vue
+++ b/src/layouts/service-location/shop-question/shop-question-popup.vue
@@ -107,6 +107,7 @@ import {
     getServiceabilityDetails,
     getClosestApplicableShops,
     getShopProviderData,
+    getPricedMobileFeePart,
 } from "@/layouts/service-location/helpers/service-location-helper/service-location-helper";
 
 defineRule("option-required", required(errorMessages.OPTION_REQUIRED));
@@ -338,6 +339,14 @@ export default {
                 );
 
                 this.$emit("updated-serviceability", serviceabilityDetails.data);
+
+                // retrieve mobile fee part
+                const mobileFeePart = await getPricedMobileFeePart(
+                    this.zipCodeData.zipCode,
+                    this.pageName
+                );
+
+                this.$emit("updated-mobile-fee-part", mobileFeePart);
             }
 
             this.closeModal();

From 1708da551b7cde25e1d3f97fe8f2aa84c4731a33 Mon Sep 17 00:00:00 2001
From: Carl Nation <Carl.Nation@safelite.com>
Date: Tue, 2 Jun 2026 08:13:49 -0400
Subject: [PATCH 17/25] CASH-632 add endorsements copy to page

CASH-632 add endorsements copy to page.
added custom logo.
added page gradient to match heritage
---
 .../coverage-statement/coverage-statement.vue | 20 +++-
 .../duplicate-check/duplicate-check.vue       | 24 ++++-
 src/layouts/endorsements/endorsements.vue     | 97 ++++++++++++++++++-
 src/layouts/policy-driver/policy-driver.vue   | 26 ++++-
 .../policy-info-submitted.vue                 | 26 ++++-
 src/layouts/policy-info/policy-info.vue       |  3 +-
 src/layouts/policy-vehicle/policy-vehicle.vue | 21 +++-
 .../recalibration-info/recalibration-info.vue | 27 +++++-
 src/layouts/verify-details/verify-details.vue | 11 ++-
 src/styles/common-styles.scss                 |  5 +
 10 files changed, 240 insertions(+), 20 deletions(-)

diff --git a/src/layouts/coverage-statement/coverage-statement.vue b/src/layouts/coverage-statement/coverage-statement.vue
index 81e2657bc..2c82166e3 100644
--- a/src/layouts/coverage-statement/coverage-statement.vue
+++ b/src/layouts/coverage-statement/coverage-statement.vue
@@ -1,6 +1,10 @@
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
-        <funnelHeader cmsWidgetName="FunnelHeaderWidget" ref="funnelHeader" />
+        <funnelHeader
+            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">
@@ -81,7 +85,7 @@ import afterpayBreakout from "../payment-method/afterpay-breakout/afterpay-break
 import modal from "@/digital-components/modal/modal";
 import contentGroupModal from "@/fmg-components/content-group-modal/content-group-modal.vue";
 import textBlock from "@/digital-components/text-block/text-block.vue";
-
+import { debugLog } from "@/helpers/debug-log-helper";
 export default {
     name: "coverage-statement",
     mixins: [],
@@ -89,6 +93,7 @@ export default {
         return {
             isClaimAndCoverage: this.isClaimAndCoverageFromStore(),
             isRecalibrationOnOrder: this.isRecalibrationOnOrderFromStore(),
+            clientConfig: {},
         };
     },
     components: {
@@ -107,15 +112,23 @@ export default {
     async beforeRouteEnter(to, from, next) {
         const pageName = to.name;
         const cmsContentPromise = fetchCmsContentForPage(pageName);
+        const clientConfigPageName = `client_${store.getters.order.payment.parentAccountNumber}`;
+        const clientConfigPromise = fetchCmsContentForPage(clientConfigPageName);
         const promiseResultMap = [
             {
                 resultKey: "cmsContent",
                 promise: cmsContentPromise,
             },
+            {
+                resultKey: "clientConfig",
+                promise: clientConfigPromise,
+            },
         ];
         const resultMap = await settleAllPromises(promiseResultMap);
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
+            vm.clientConfig = resultMap.clientConfig;
+            debugLog(`coverage-statement clientConfig::${clientConfigPageName}`, JSON.stringify(vm.clientConfig));
         });
     },
 
@@ -162,6 +175,9 @@ export default {
         },
     },
     computed: {
+        clientLogoImageSrc() {
+            return this.clientConfig?.ClientLogoWidget?.Image || "";
+        },
         deductibleAmount() {
             return this.$store.getters.order.policy.currentDeductible;
         },
diff --git a/src/layouts/duplicate-check/duplicate-check.vue b/src/layouts/duplicate-check/duplicate-check.vue
index 6cbc56e5b..f8ef02751 100644
--- a/src/layouts/duplicate-check/duplicate-check.vue
+++ b/src/layouts/duplicate-check/duplicate-check.vue
@@ -1,6 +1,10 @@
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
-        <funnelHeader cmsWidgetName="FunnelHeaderWidget" ref="funnelHeader" />
+        <funnelHeader
+            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">
@@ -61,12 +65,16 @@ import { Form } from "vee-validate";
 
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
+import store from "@/store";
+import { debugLog } from "@/helpers/debug-log-helper";
 
 export default {
     name: "duplicate-check",
     mixins: [],
     data() {
-        return {};
+        return {
+            clientConfig: {},
+        };
     },
     components: {
         Form,
@@ -78,6 +86,9 @@ export default {
     },
     // Ensure CMS content is fetched during route navigation without depending on `to`/`from`
     async beforeRouteEnter(to, from, next) {
+        const clientConfigPageName = `client_${store.getters.order.payment.parentAccountNumber}`;
+        const clientConfigPromise = fetchCmsContentForPage(clientConfigPageName);
+
         const pageName = to.name;
         const cmsContentPromise = fetchCmsContentForPage(pageName);
         const promiseResultMap = [
@@ -85,13 +96,22 @@ export default {
                 resultKey: "cmsContent",
                 promise: cmsContentPromise,
             },
+            {
+                resultKey: "clientConfig",
+                promise: clientConfigPromise,
+            },
         ];
         const resultMap = await settleAllPromises(promiseResultMap);
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
+            vm.clientConfig = resultMap.clientConfig;
+            debugLog(`duplicate-check clientConfig::${clientConfigPageName}`, JSON.stringify(vm.clientConfig));
         });
     },
     computed: {
+        clientLogoImageSrc() {
+            return this.clientConfig?.ClientLogoWidget?.Image || "";
+        },
         pageTitleText() {
             return this.getCmsContent("DupCheckPageTitleWidget", "Text");
         },
diff --git a/src/layouts/endorsements/endorsements.vue b/src/layouts/endorsements/endorsements.vue
index d43251901..1a505f8f4 100644
--- a/src/layouts/endorsements/endorsements.vue
+++ b/src/layouts/endorsements/endorsements.vue
@@ -1,13 +1,45 @@
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
-        <funnelHeader cmsWidgetName="FunnelHeaderWidget" ref="funnelHeader" />
+        <funnelHeader
+            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">
                     <funnelSubHeader class="pb-4" cmsWidgetName="FunnelSubHeaderWidget" />
-                    <!--
-                            ... Page code goes here.
-                    -->
+
+                    <textBlock
+                        cmsWidgetName="EndorsementsPageAdditionalInfoWidget"
+                        typeStyle="h1"
+                        :customText="endorsementHeading"
+                        class="mb-5 text-left text-md-left page-title" />
+
+                    <textBlock
+                        cmsWidgetName="MoreDetailsWidget"
+                        typeStyle="body"
+                        :customText="moreDetailsText"
+                        class="mb-5 text-left text-md-left page-instructions" />
+
+                    <buttonQuestion
+                        :questionText="schoolEndorsementQuestionText"
+                        :answers="schoolEndorsementAnswers"
+                        class="mb-4"
+                        groupName="schoolEndorsementQuestion"
+                        buttonTypeString="listButton"
+                        isRequired
+                        v-model="schoolEndorsementSelectedValue" />
+
+                    <buttonQuestion
+                        :questionText="parkingLotEndorsementQuestionText"
+                        :answers="parkingLotEndorsementAnswers"
+                        class="mb-4"
+                        groupName="parkingLotEndorsementQuestion"
+                        buttonTypeString="listButton"
+                        isRequired
+                        v-model="parkingLotEndorsementSelectedValue" />
+
                     <navbar
                         cmsWidgetName="FunnelFooterWidget"
                         ref="navbar"
@@ -28,35 +60,75 @@ import { Form } from "vee-validate";
 
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
+import store from "@/store";
+import { debugLog } from "@/helpers/debug-log-helper";
+import buttonQuestion from "@/digital-components/button-question/button-question";
+import textBlock from "@/digital-components/text-block/text-block";
 
 export default {
     name: "endorsements",
     mixins: [],
     data() {
-        return {};
+        return {
+            clientConfig: {},
+        };
     },
     components: {
         Form,
         funnelHeader,
         navbar,
         funnelSubHeader,
+        buttonQuestion,
+        textBlock,
     },
     // Ensure CMS content is fetched during route navigation without depending on `to`/`from`
     async beforeRouteEnter(to, from, next) {
         const pageName = to.name;
         const cmsContentPromise = fetchCmsContentForPage(pageName);
+        const clientConfigPageName = `client_${store.getters.order.payment.parentAccountNumber}`;
+        const clientConfigPromise = fetchCmsContentForPage(clientConfigPageName);
         const promiseResultMap = [
             {
                 resultKey: "cmsContent",
                 promise: cmsContentPromise,
             },
+            {
+                resultKey: "clientConfig",
+                promise: clientConfigPromise,
+            },
         ];
         const resultMap = await settleAllPromises(promiseResultMap);
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
+            vm.clientConfig = resultMap.clientConfig;
+            debugLog(`endorsements clientConfig::${clientConfigPageName}`, JSON.stringify(vm.clientConfig));
         });
     },
 
+    computed: {
+        clientLogoImageSrc() {
+            return this.clientConfig?.ClientLogoWidget?.Image || "";
+        },
+        endorsementHeading() {
+            return this.getCmsContent("EndorsementsPageAdditionalInfoWidget", "Text");
+        },
+        moreDetailsText() {
+            return this.getCmsContent("MoreDetailsWidget", "Text");
+        },
+        schoolEndorsementQuestionText() {
+            return this.getCmsContent("SchoolEndorsmentQuestionWidget", "QuestionText");
+        },
+        schoolEndorsementAnswers() {
+            return this.getCmsContent("SchoolEndorsmentQuestionWidget", "Answers");
+        },
+        parkingLotEndorsementQuestionText() {
+            return this.getCmsContent("ParkingLotQuestionWidget", "QuestionText");
+        },
+        parkingLotEndorsementAnswers() {
+            return this.getCmsContent("ParkingLotQuestionWidget", "Answers");
+        },
+    },
+
     methods: {
         backButtonAction() {
             this.$router.navigateWithoutSaving(
@@ -76,3 +148,18 @@ export default {
     },
 };
 </script>
+<style lang="scss">
+.page-title {
+    font-size: 20px !important;
+    line-height: 1.325;
+    font-weight: 300;
+    color: $black;
+}
+
+.page-instructions {
+    font-size: 16px !important;
+    font-weight: 400;
+    color: $gray-600;
+    line-height: 1.625;
+}
+</style>
\ No newline at end of file
diff --git a/src/layouts/policy-driver/policy-driver.vue b/src/layouts/policy-driver/policy-driver.vue
index 4b3b5f171..bcf5bf189 100644
--- a/src/layouts/policy-driver/policy-driver.vue
+++ b/src/layouts/policy-driver/policy-driver.vue
@@ -1,6 +1,10 @@
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
-        <funnelHeader cmsWidgetName="FunnelHeaderWidget" ref="funnelHeader" />
+        <funnelHeader
+            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">
@@ -28,12 +32,16 @@ import { Form } from "vee-validate";
 
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
+import store from "@/store";
+import { debugLog } from "@/helpers/debug-log-helper";
 
 export default {
     name: "policy-driver",
     mixins: [],
     data() {
-        return {};
+        return {
+            clientConfig: {},
+        };
     },
     components: {
         Form,
@@ -45,18 +53,32 @@ export default {
     async beforeRouteEnter(to, from, next) {
         const pageName = to.name;
         const cmsContentPromise = fetchCmsContentForPage(pageName);
+        const clientConfigPageName = `client_${store.getters.order.payment.parentAccountNumber}`;
+        const clientConfigPromise = fetchCmsContentForPage(clientConfigPageName);
         const promiseResultMap = [
             {
                 resultKey: "cmsContent",
                 promise: cmsContentPromise,
             },
+            {
+                resultKey: "clientConfig",
+                promise: clientConfigPromise,
+            },
         ];
         const resultMap = await settleAllPromises(promiseResultMap);
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
+            vm.clientConfig = resultMap.clientConfig;
+            debugLog(`policy-driver clientConfig::${clientConfigPageName}`, JSON.stringify(vm.clientConfig));
         });
     },
 
+    computed: {
+        clientLogoImageSrc() {
+            return this.clientConfig?.ClientLogoWidget?.Image || "";
+        },
+    },
+
     methods: {
         backButtonAction() {
             this.$router.navigateWithoutSaving(
diff --git a/src/layouts/policy-info-submitted/policy-info-submitted.vue b/src/layouts/policy-info-submitted/policy-info-submitted.vue
index fa7a623c0..f1bf68cdf 100644
--- a/src/layouts/policy-info-submitted/policy-info-submitted.vue
+++ b/src/layouts/policy-info-submitted/policy-info-submitted.vue
@@ -1,6 +1,10 @@
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
-        <funnelHeader cmsWidgetName="FunnelHeaderWidget" ref="funnelHeader" />
+        <funnelHeader
+            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">
@@ -28,12 +32,16 @@ import { Form } from "vee-validate";
 
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
+import store from "@/store";
+import { debugLog } from "@/helpers/debug-log-helper";
 
 export default {
     name: "policy-info-submitted",
     mixins: [],
     data() {
-        return {};
+        return {
+            clientConfig: {},
+        };
     },
     components: {
         Form,
@@ -45,18 +53,32 @@ export default {
     async beforeRouteEnter(to, from, next) {
         const pageName = to.name;
         const cmsContentPromise = fetchCmsContentForPage(pageName);
+        const clientConfigPageName = `client_${store.getters.order.payment.parentAccountNumber}`;
+        const clientConfigPromise = fetchCmsContentForPage(clientConfigPageName);
         const promiseResultMap = [
             {
                 resultKey: "cmsContent",
                 promise: cmsContentPromise,
             },
+            {
+                resultKey: "clientConfig",
+                promise: clientConfigPromise,
+            },
         ];
         const resultMap = await settleAllPromises(promiseResultMap);
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
+            vm.clientConfig = resultMap.clientConfig;
+            debugLog(`policy-info-submitted clientConfig::${clientConfigPageName}`, JSON.stringify(vm.clientConfig));
         });
     },
 
+    computed: {
+        clientLogoImageSrc() {
+            return this.clientConfig?.ClientLogoWidget?.Image || "";
+        },
+    },
+
     methods: {
         backButtonAction() {
             this.$router.navigateWithoutSaving(
diff --git a/src/layouts/policy-info/policy-info.vue b/src/layouts/policy-info/policy-info.vue
index 0918a7536..d3bcad8cb 100644
--- a/src/layouts/policy-info/policy-info.vue
+++ b/src/layouts/policy-info/policy-info.vue
@@ -4,6 +4,7 @@
             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">
@@ -424,7 +425,7 @@ export default {
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
             vm.clientConfig = resultMap.clientConfig;
-            debugLog(`clientConfig::${clientConfigPageName}`, JSON.stringify(vm.clientConfig));
+            debugLog(`policy-infoclientConfig::${clientConfigPageName}`, JSON.stringify(vm.clientConfig));
         });
     },
 
diff --git a/src/layouts/policy-vehicle/policy-vehicle.vue b/src/layouts/policy-vehicle/policy-vehicle.vue
index 2b87e6692..5c40ce257 100644
--- a/src/layouts/policy-vehicle/policy-vehicle.vue
+++ b/src/layouts/policy-vehicle/policy-vehicle.vue
@@ -1,6 +1,10 @@
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
-        <funnelHeader cmsWidgetName="FunnelHeaderWidget" ref="funnelHeader" />
+        <funnelHeader
+            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">
@@ -43,6 +47,7 @@ import store from "@/store";
 import buttonMain from "@/ux-components/button-main/button-main";
 import textLink from "@/ux-components/text-link/text-link.vue";
 import { parentAccountNumbers } from "@/constants/insurance";
+import { debugLog } from "@/helpers/debug-log-helper";
 
 import { Form } from "vee-validate";
 
@@ -53,7 +58,9 @@ export default {
     name: "policy-vehicle",
     mixins: [],
     data() {
-        return {};
+        return {
+            clientConfig: {},
+        };
     },
     components: {
         Form,
@@ -67,19 +74,29 @@ export default {
     async beforeRouteEnter(to, from, next) {
         const pageName = to.name;
         const cmsContentPromise = fetchCmsContentForPage(pageName);
+        const clientConfigPageName = `client_${store.getters.order.payment.parentAccountNumber}`;
+        const clientConfigPromise = fetchCmsContentForPage(clientConfigPageName);
         const promiseResultMap = [
             {
                 resultKey: "cmsContent",
                 promise: cmsContentPromise,
+            },{
+                resultKey: "clientConfig",
+                promise: clientConfigPromise,
             },
         ];
         const resultMap = await settleAllPromises(promiseResultMap);
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
+            vm.clientConfig = resultMap.clientConfig;
+            debugLog(`policy-vehicle clientConfig::${clientConfigPageName}`, JSON.stringify(vm.clientConfig));
         });
     },
 
     computed: {
+        clientLogoImageSrc() {
+            return this.clientConfig?.ClientLogoWidget?.Image || "";
+        },
         vehicleNotListedQuestionText() {
             return this.getCmsContent("VehicleNotListedWidget", "Text");
         },
diff --git a/src/layouts/recalibration-info/recalibration-info.vue b/src/layouts/recalibration-info/recalibration-info.vue
index 828ba080a..0c839558d 100644
--- a/src/layouts/recalibration-info/recalibration-info.vue
+++ b/src/layouts/recalibration-info/recalibration-info.vue
@@ -1,6 +1,10 @@
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
-        <funnelHeader cmsWidgetName="FunnelHeaderWidget" ref="funnelHeader" />
+        <funnelHeader
+            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">
@@ -28,12 +32,15 @@ import { Form } from "vee-validate";
 
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
-
+import store from "@/store";
+import { debugLog } from "@/helpers/debug-log-helper";
 export default {
     name: "recalibration-info",
     mixins: [],
     data() {
-        return {};
+        return {
+            clientConfig: {},
+        };
     },
     components: {
         Form,
@@ -45,18 +52,32 @@ export default {
     async beforeRouteEnter(to, from, next) {
         const pageName = to.name;
         const cmsContentPromise = fetchCmsContentForPage(pageName);
+        const clientConfigPageName = `client_${store.getters.order.payment.parentAccountNumber}`;
+        const clientConfigPromise = fetchCmsContentForPage(clientConfigPageName);
         const promiseResultMap = [
             {
                 resultKey: "cmsContent",
                 promise: cmsContentPromise,
             },
+            {
+                resultKey: "clientConfig",
+                promise: clientConfigPromise,
+            },
         ];
         const resultMap = await settleAllPromises(promiseResultMap);
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
+            vm.clientConfig = resultMap.clientConfig;
+            debugLog(`recalibration-info clientConfig::${clientConfigPageName}`, JSON.stringify(vm.clientConfig));
         });
     },
 
+    computed: {
+        clientLogoImageSrc() {
+            return this.clientConfig?.ClientLogoWidget?.Image || "";
+        },
+    },
+
     methods: {
         backButtonAction() {
             this.$router.navigateWithoutSaving(
diff --git a/src/layouts/verify-details/verify-details.vue b/src/layouts/verify-details/verify-details.vue
index e0b889cb2..a5717ba05 100644
--- a/src/layouts/verify-details/verify-details.vue
+++ b/src/layouts/verify-details/verify-details.vue
@@ -1,6 +1,9 @@
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
-        <funnelHeader cmsWidgetName="FunnelHeaderWidget" ref="funnelHeader" />
+        <funnelHeader
+            cmsWidgetName="FunnelHeaderWidget"
+            ref="funnelHeader"
+            :overrideImageSrc="clientLogoImageSrc" />
         <div class="container">
             <div class="row">
                 <div class="col-12 col-md-10 col-lg-8 col-xl-7">
@@ -57,6 +60,12 @@ export default {
         });
     },
 
+    computed: {
+        clientLogoImageSrc() {
+            return this.clientConfig?.ClientLogoWidget?.Image || "";
+        },
+    },
+
     methods: {
         backButtonAction() {
             this.$router.navigateWithoutSaving(
diff --git a/src/styles/common-styles.scss b/src/styles/common-styles.scss
index c619196fa..ce1354f16 100644
--- a/src/styles/common-styles.scss
+++ b/src/styles/common-styles.scss
@@ -102,3 +102,8 @@ 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 010a9c7c6060438d8340489e2422e1c79f68c64f Mon Sep 17 00:00:00 2001
From: Carl Nation <Carl.Nation@safelite.com>
Date: Tue, 2 Jun 2026 08:17:06 -0400
Subject: [PATCH 18/25] prettier

---
 src/layouts/coverage-statement/coverage-statement.vue     | 5 ++++-
 src/layouts/duplicate-check/duplicate-check.vue           | 5 ++++-
 src/layouts/endorsements/endorsements.vue                 | 7 +++++--
 src/layouts/policy-driver/policy-driver.vue               | 5 ++++-
 .../policy-info-submitted/policy-info-submitted.vue       | 5 ++++-
 src/layouts/policy-info/policy-info.vue                   | 5 ++++-
 src/layouts/policy-vehicle/policy-vehicle.vue             | 8 ++++++--
 src/layouts/recalibration-info/recalibration-info.vue     | 5 ++++-
 8 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/src/layouts/coverage-statement/coverage-statement.vue b/src/layouts/coverage-statement/coverage-statement.vue
index 2c82166e3..acdab2f17 100644
--- a/src/layouts/coverage-statement/coverage-statement.vue
+++ b/src/layouts/coverage-statement/coverage-statement.vue
@@ -128,7 +128,10 @@ export default {
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
             vm.clientConfig = resultMap.clientConfig;
-            debugLog(`coverage-statement clientConfig::${clientConfigPageName}`, JSON.stringify(vm.clientConfig));
+            debugLog(
+                `coverage-statement clientConfig::${clientConfigPageName}`,
+                JSON.stringify(vm.clientConfig)
+            );
         });
     },
 
diff --git a/src/layouts/duplicate-check/duplicate-check.vue b/src/layouts/duplicate-check/duplicate-check.vue
index f8ef02751..43f5a4bf5 100644
--- a/src/layouts/duplicate-check/duplicate-check.vue
+++ b/src/layouts/duplicate-check/duplicate-check.vue
@@ -105,7 +105,10 @@ export default {
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
             vm.clientConfig = resultMap.clientConfig;
-            debugLog(`duplicate-check clientConfig::${clientConfigPageName}`, JSON.stringify(vm.clientConfig));
+            debugLog(
+                `duplicate-check clientConfig::${clientConfigPageName}`,
+                JSON.stringify(vm.clientConfig)
+            );
         });
     },
     computed: {
diff --git a/src/layouts/endorsements/endorsements.vue b/src/layouts/endorsements/endorsements.vue
index 1a505f8f4..3668e221d 100644
--- a/src/layouts/endorsements/endorsements.vue
+++ b/src/layouts/endorsements/endorsements.vue
@@ -101,7 +101,10 @@ export default {
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
             vm.clientConfig = resultMap.clientConfig;
-            debugLog(`endorsements clientConfig::${clientConfigPageName}`, JSON.stringify(vm.clientConfig));
+            debugLog(
+                `endorsements clientConfig::${clientConfigPageName}`,
+                JSON.stringify(vm.clientConfig)
+            );
         });
     },
 
@@ -162,4 +165,4 @@ export default {
     color: $gray-600;
     line-height: 1.625;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/layouts/policy-driver/policy-driver.vue b/src/layouts/policy-driver/policy-driver.vue
index bcf5bf189..8a4dd0ee1 100644
--- a/src/layouts/policy-driver/policy-driver.vue
+++ b/src/layouts/policy-driver/policy-driver.vue
@@ -69,7 +69,10 @@ export default {
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
             vm.clientConfig = resultMap.clientConfig;
-            debugLog(`policy-driver clientConfig::${clientConfigPageName}`, JSON.stringify(vm.clientConfig));
+            debugLog(
+                `policy-driver clientConfig::${clientConfigPageName}`,
+                JSON.stringify(vm.clientConfig)
+            );
         });
     },
 
diff --git a/src/layouts/policy-info-submitted/policy-info-submitted.vue b/src/layouts/policy-info-submitted/policy-info-submitted.vue
index f1bf68cdf..d16f40322 100644
--- a/src/layouts/policy-info-submitted/policy-info-submitted.vue
+++ b/src/layouts/policy-info-submitted/policy-info-submitted.vue
@@ -69,7 +69,10 @@ export default {
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
             vm.clientConfig = resultMap.clientConfig;
-            debugLog(`policy-info-submitted clientConfig::${clientConfigPageName}`, JSON.stringify(vm.clientConfig));
+            debugLog(
+                `policy-info-submitted clientConfig::${clientConfigPageName}`,
+                JSON.stringify(vm.clientConfig)
+            );
         });
     },
 
diff --git a/src/layouts/policy-info/policy-info.vue b/src/layouts/policy-info/policy-info.vue
index d3bcad8cb..f5dcb5d96 100644
--- a/src/layouts/policy-info/policy-info.vue
+++ b/src/layouts/policy-info/policy-info.vue
@@ -425,7 +425,10 @@ export default {
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
             vm.clientConfig = resultMap.clientConfig;
-            debugLog(`policy-infoclientConfig::${clientConfigPageName}`, JSON.stringify(vm.clientConfig));
+            debugLog(
+                `policy-infoclientConfig::${clientConfigPageName}`,
+                JSON.stringify(vm.clientConfig)
+            );
         });
     },
 
diff --git a/src/layouts/policy-vehicle/policy-vehicle.vue b/src/layouts/policy-vehicle/policy-vehicle.vue
index 5c40ce257..1d787533d 100644
--- a/src/layouts/policy-vehicle/policy-vehicle.vue
+++ b/src/layouts/policy-vehicle/policy-vehicle.vue
@@ -80,7 +80,8 @@ export default {
             {
                 resultKey: "cmsContent",
                 promise: cmsContentPromise,
-            },{
+            },
+            {
                 resultKey: "clientConfig",
                 promise: clientConfigPromise,
             },
@@ -89,7 +90,10 @@ export default {
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
             vm.clientConfig = resultMap.clientConfig;
-            debugLog(`policy-vehicle clientConfig::${clientConfigPageName}`, JSON.stringify(vm.clientConfig));
+            debugLog(
+                `policy-vehicle clientConfig::${clientConfigPageName}`,
+                JSON.stringify(vm.clientConfig)
+            );
         });
     },
 
diff --git a/src/layouts/recalibration-info/recalibration-info.vue b/src/layouts/recalibration-info/recalibration-info.vue
index 0c839558d..4200b4c2a 100644
--- a/src/layouts/recalibration-info/recalibration-info.vue
+++ b/src/layouts/recalibration-info/recalibration-info.vue
@@ -68,7 +68,10 @@ export default {
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
             vm.clientConfig = resultMap.clientConfig;
-            debugLog(`recalibration-info clientConfig::${clientConfigPageName}`, JSON.stringify(vm.clientConfig));
+            debugLog(
+                `recalibration-info clientConfig::${clientConfigPageName}`,
+                JSON.stringify(vm.clientConfig)
+            );
         });
     },
 

From 25992a42c57104e5779f7862d2f1a9744eeca484 Mon Sep 17 00:00:00 2001
From: Carl Nation <Carl.Nation@safelite.com>
Date: Tue, 2 Jun 2026 08:28:43 -0400
Subject: [PATCH 19/25] fix test

fix test
---
 src/layouts/endorsements/endorsements.spec.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/layouts/endorsements/endorsements.spec.js b/src/layouts/endorsements/endorsements.spec.js
index a44302072..0917c44f4 100644
--- a/src/layouts/endorsements/endorsements.spec.js
+++ b/src/layouts/endorsements/endorsements.spec.js
@@ -55,13 +55,23 @@ function setupMocks() {
     fetchCmsContentForPage.mockResolvedValue(mockCmsContent);
     settleAllPromises.mockResolvedValue({ cmsContent: mockCmsContent });
 
+    const mockMixin = {
+        methods: {
+            getCmsContent: jest.fn((widgetName, fieldName) => {
+                return mockCmsContent?.[widgetName]?.[fieldName] ?? "";
+            }),
+            setCmsContent: jest.fn(),
+        },
+    };
+
     const mountOptions = getMountOptions({
-        route: { name: "duplicate-check", query: {}, params: {} },
+        route: { name: "endorsements", query: {}, params: {} },
         router: {
             navigate: jest.fn(),
             navigateWithSaving: jest.fn(),
             navigateWithoutSaving: jest.fn(),
         },
+        mixins: [mockMixin],
     });
 
     const wrapper = shallowMount(endorsements, mountOptions);

From d085ea900f2f8ffafb58e897722b46c5f7b1a08a Mon Sep 17 00:00:00 2001
From: Carl Nation <Carl.Nation@safelite.com>
Date: Tue, 2 Jun 2026 10:35:52 -0400
Subject: [PATCH 20/25] CASH-2468 use cancel link instead of back

CASH-2468 use cancel link instead of back
---
 src/fmg-components/nav-bar/nav-bar.vue  |  6 +++++-
 src/layouts/policy-info/policy-info.vue | 23 +++++++++++++++++------
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/fmg-components/nav-bar/nav-bar.vue b/src/fmg-components/nav-bar/nav-bar.vue
index 6b0397762..96b67f44e 100644
--- a/src/fmg-components/nav-bar/nav-bar.vue
+++ b/src/fmg-components/nav-bar/nav-bar.vue
@@ -57,6 +57,7 @@ export default {
         buttonSize: { type: Boolean, default: false },
         isSubmitHidden: { type: Boolean, default: false },
         overrideButtonText: String,
+        overrideBackButtonText: String,
     },
     components: {
         textLink,
@@ -73,7 +74,10 @@ export default {
     },
     computed: {
         backLink() {
-            return this.getCmsContent(this.cmsWidgetName, "BackButtonText");
+            return (
+                this.overrideBackButtonText ||
+                this.getCmsContent(this.cmsWidgetName, "BackButtonText")
+            );
         },
         buttonText() {
             return this.customButtontext
diff --git a/src/layouts/policy-info/policy-info.vue b/src/layouts/policy-info/policy-info.vue
index f5dcb5d96..10fb9d969 100644
--- a/src/layouts/policy-info/policy-info.vue
+++ b/src/layouts/policy-info/policy-info.vue
@@ -191,12 +191,15 @@
                         v-model="morePolicyQuestions"
                         groupName="MorePolicyQuestionsQuestion" />
 
-                    <navbar
-                        cmsWidgetName="FunnelFooterWidget"
-                        ref="navbar"
-                        :isForwardActionDisabled="!meta.valid"
-                        @back-clicked="backButtonAction"
-                        @ForwardClicked="forwardButtonAction" />
+                    <div class="policy-info-navbar">
+                        <navbar
+                            cmsWidgetName="FunnelFooterWidget"
+                            ref="navbar"
+                            :isForwardActionDisabled="!meta.valid"
+                            overrideBackButtonText="Cancel verification"
+                            @back-clicked="backButtonAction"
+                            @ForwardClicked="forwardButtonAction" />
+                    </div>
 
                     <span
                         v-if="displayDisclaimerText"
@@ -527,6 +530,14 @@ export default {
 </script>
 
 <style lang="scss">
+.policy-info-navbar {
+    .navigation-link {
+        font-family: inherit;
+        font-weight: 600;
+        text-decoration: none;
+    }
+}
+
 .cc-page-title {
     font-size: 20px !important;
     line-height: 1.325;

From d61fa1d82592067b0fb34dc81646c19811345fb6 Mon Sep 17 00:00:00 2001
From: Carl Nation <Carl.Nation@safelite.com>
Date: Tue, 2 Jun 2026 10:57:50 -0400
Subject: [PATCH 21/25] CASH-2468 make sure load session considers min date

CASH-2468 make sure load session considers min date from .net and saves it as null
---
 src/helpers/date-helper.js | 12 ++++++++++++
 src/store/index.js         |  6 ++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/helpers/date-helper.js b/src/helpers/date-helper.js
index 59ffa5745..f59ac7ba8 100644
--- a/src/helpers/date-helper.js
+++ b/src/helpers/date-helper.js
@@ -1,3 +1,15 @@
+// .NET serializes an unset DateTime as DateTime.MinValue ("0001-01-01T00:00:00").
+// Treat that as "no date" so it doesn't masquerade as a real, validation-passing value.
+const DOTNET_MIN_DATE_PREFIX = "0001-01-01";
+
+export function isDotNetMinDate(value) {
+    return typeof value === "string" && value.startsWith(DOTNET_MIN_DATE_PREFIX);
+}
+
+export function normalizeDotNetMinDate(value) {
+    return isDotNetMinDate(value) ? null : value;
+}
+
 export function getDateDifferenceInDays(startDate, endDate) {
     // Create date objects from the input strings
     var date1 = new Date(endDate);
diff --git a/src/store/index.js b/src/store/index.js
index 509c34093..fc786d3b9 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -40,7 +40,7 @@ import {
     getPromoCodeWithoutBundleIdentifier,
     removeCurrentlyActivePromoCodesFromInactivePromos,
 } from "@/helpers/promotions-helper";
-import { getDateDifferenceInDays } from "@/helpers/date-helper";
+import { getDateDifferenceInDays, normalizeDotNetMinDate } from "@/helpers/date-helper";
 import sharedMutations from "./vuex-shared-mutations/vuexSharedMutations";
 import {
     coverageStatus,
@@ -848,7 +848,9 @@ export const mutations = {
         state.order.damage.glassToReplace = sessionInformation.order.damage.glassToReplace;
         state.order.damage.isRepair = sessionInformation.order.damage.isRepair;
         state.order.damage.numberOfChips = sessionInformation.order.damage.numberOfChips;
-        state.order.damage.dateOfLoss = sessionInformation.order.damage?.dateOfLoss;
+        state.order.damage.dateOfLoss = normalizeDotNetMinDate(
+            sessionInformation.order.damage?.dateOfLoss
+        );
         state.order.damage.damageCause = sessionInformation.order.damage?.damageCause;
 
         state.order.damage.partQuestionAnswers =

From 2e41499caf7b209a2e7dc78afb74c1e293b8bc11 Mon Sep 17 00:00:00 2001
From: Carl Nation <Carl.Nation@safelite.com>
Date: Tue, 2 Jun 2026 14:26:20 -0400
Subject: [PATCH 22/25] CASH-632 added cancel link button for insurance pages

CASH-632 added cancel link button for insurance pages
---
 .../insurance-nav-bar/insurance-nav-bar.vue   | 160 ++++++++++++++++++
 .../duplicate-check/duplicate-check.vue       |  13 +-
 src/layouts/endorsements/endorsements.vue     |  13 +-
 src/layouts/policy-driver/policy-driver.vue   |  13 +-
 .../policy-info-submitted.vue                 |  13 +-
 src/layouts/policy-info/policy-info.vue       |  24 +--
 src/layouts/policy-vehicle/policy-vehicle.vue |  22 +--
 .../recalibration-info/recalibration-info.vue |  13 +-
 src/router/constants/routing-table.js         |  34 +++-
 9 files changed, 249 insertions(+), 56 deletions(-)
 create mode 100644 src/fmg-components/insurance-nav-bar/insurance-nav-bar.vue

diff --git a/src/fmg-components/insurance-nav-bar/insurance-nav-bar.vue b/src/fmg-components/insurance-nav-bar/insurance-nav-bar.vue
new file mode 100644
index 000000000..653087c43
--- /dev/null
+++ b/src/fmg-components/insurance-nav-bar/insurance-nav-bar.vue
@@ -0,0 +1,160 @@
+<template>
+    <div class="row"></div>
+    <div class="insurance-nav-bar nav-bar container-fluid g-5 my-5 px-0" id="infoBox">
+        <div class="row d-flex justify-content-between align-items-center vw-100">
+            <div v-if="!isCancelButtonHidden" class="col-auto cancel-col py-1 text-break">
+                <textLink
+                    linkType="navigation"
+                    text="Cancel verification"
+                    useLoadingModal
+                    @click-event="cancelClick"
+                    href="javascript:void(0)"
+                    data-bs-target="#footerModal"
+                    data-bs-dismiss="modal" />
+            </div>
+            <div class="col d-flex justify-content-end align-items-center forward-group">
+                <div v-if="!isBackButtonHidden" class="link-col py-1 text-break">
+                    <textLink
+                        linkType="navigation"
+                        :text="backLink"
+                        useLoadingModal
+                        @click-event="linkClick"
+                        href="javascript:void(0)"
+                        data-bs-target="#footerModal"
+                        data-bs-dismiss="modal" />
+                </div>
+                <buttonMain
+                    ref="buttonMain"
+                    isPrimary
+                    :buttonText="overrideButtonText || buttonText"
+                    loaderColor="white"
+                    :class="isForwardActionDisabled && 'form-test-invalid'"
+                    :aria-disabled="isForwardActionDisabled"
+                    :isDisabled="isForwardActionDisabled"
+                    @click-event="buttonClick"
+                    data-bs-target="#footerModal"
+                    data-test-id="insurance-nav-bar-main-button"
+                    data-bs-dismiss="modal"
+                    v-if="!isSubmitHidden" />
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import textLink from "@/ux-components/text-link/text-link";
+import buttonMain from "@/ux-components/button-main/button-main";
+import analyticsMixin from "@/mixins/analytics-mixin";
+
+export default {
+    name: "insurance-nav-bar",
+    emits: ["CancelClicked", "BackClicked", "ForwardClicked"],
+    props: {
+        isForwardActionDisabled: Boolean,
+        isBackButtonHidden: { type: Boolean, default: false },
+        isCancelButtonHidden: { type: Boolean, default: false },
+        cmsWidgetName: String,
+        buttonSize: { type: Boolean, default: false },
+        isSubmitHidden: { type: Boolean, default: false },
+        overrideButtonText: String,
+        overrideBackButtonText: String,
+    },
+    components: {
+        textLink,
+        buttonMain,
+    },
+    data() {
+        return {
+            customButtontext: "",
+        };
+    },
+
+    unmounted() {
+        document.onkeydown = null;
+    },
+    computed: {
+        backLink() {
+            return (
+                this.overrideBackButtonText ||
+                this.getCmsContent(this.cmsWidgetName, "BackButtonText")
+            );
+        },
+        buttonText() {
+            return this.customButtontext
+                ? this.customButtontext
+                : this.getCmsContent(this.cmsWidgetName, "ForwardButtonText");
+        },
+    },
+    methods: {
+        updateButtonText(newText) {
+            this.customButtontext = newText;
+        },
+        removeLoader() {
+            this.$refs.buttonMain.removeLoader();
+            document.onkeydown = function (e) {
+                return true;
+            };
+        },
+        buttonClick() {
+            //prevent keyboard input after button click
+            document.onkeydown = function (e) {
+                return false;
+            };
+            // check session expired and initSession to recreate cookies
+            if (analyticsMixin.methods.sessionExpired()) {
+                this.routeReturnUser();
+            } else {
+                this.$emit("ForwardClicked");
+            }
+        },
+        linkClick() {
+            // check session expired and initSession to recreate cookies
+            if (analyticsMixin.methods.sessionExpired()) {
+                this.routeReturnUser();
+            } else {
+                this.$emit("BackClicked");
+            }
+        },
+        cancelClick() {
+            // check session expired and initSession to recreate cookies
+            if (analyticsMixin.methods.sessionExpired()) {
+                this.routeReturnUser();
+            } else {
+                this.$emit("CancelClicked");
+            }
+        },
+        routeReturnUser() {
+            this.$router.sendToReturnUser();
+        },
+    },
+};
+</script>
+
+<style lang="scss" scoped>
+.nav-bar {
+    overflow: visible;
+    display: flex;
+    padding: 0;
+    position: relative;
+    z-index: 2;
+    a {
+        display: flex;
+        justify-content: center;
+    }
+    & > .container-fluid {
+        overflow-x: visible; // needed to fix hidden footer on some iphones
+    }
+    .forward-group {
+        gap: 1.5rem;
+    }
+    @media only screen and (min-width: 340px) {
+        .btn-primary {
+            width: auto;
+        }
+        a {
+            display: flex;
+            justify-content: flex-start;
+        }
+    }
+}
+</style>
diff --git a/src/layouts/duplicate-check/duplicate-check.vue b/src/layouts/duplicate-check/duplicate-check.vue
index 43f5a4bf5..13dd18c11 100644
--- a/src/layouts/duplicate-check/duplicate-check.vue
+++ b/src/layouts/duplicate-check/duplicate-check.vue
@@ -43,10 +43,11 @@
                         isRequired
                         v-model="startNewClaimSelectedValue" />
 
-                    <navbar
+                    <insuranceNavBar
                         cmsWidgetName="FunnelFooterWidget"
                         ref="navbar"
                         :isForwardActionDisabled="!meta.valid"
+                        @cancel-clicked="cancelButtonAction"
                         @back-clicked="backButtonAction"
                         @ForwardClicked="forwardButtonAction" />
                 </div>
@@ -57,7 +58,7 @@
 
 <script>
 import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
-import navbar from "@/fmg-components/nav-bar/nav-bar";
+import insuranceNavBar from "@/fmg-components/insurance-nav-bar/insurance-nav-bar";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
 import textBlock from "@/digital-components/text-block/text-block";
 import buttonQuestion from "@/digital-components/button-question/button-question";
@@ -79,7 +80,7 @@ export default {
     components: {
         Form,
         funnelHeader,
-        navbar,
+        insuranceNavBar,
         funnelSubHeader,
         textBlock,
         buttonQuestion,
@@ -141,6 +142,12 @@ export default {
     },
 
     methods: {
+        cancelButtonAction() {
+            this.$router.navigateWithoutSaving(
+                this.navigationScenarios.CLICKED_CANCEL_VERIFICATION,
+                this.pageName
+            );
+        },
         backButtonAction() {
             this.$router.navigateWithoutSaving(
                 this.navigationScenarios.CLICKED_BACK,
diff --git a/src/layouts/endorsements/endorsements.vue b/src/layouts/endorsements/endorsements.vue
index 3668e221d..6f113ed6c 100644
--- a/src/layouts/endorsements/endorsements.vue
+++ b/src/layouts/endorsements/endorsements.vue
@@ -40,10 +40,11 @@
                         isRequired
                         v-model="parkingLotEndorsementSelectedValue" />
 
-                    <navbar
+                    <insuranceNavBar
                         cmsWidgetName="FunnelFooterWidget"
                         ref="navbar"
                         :isForwardActionDisabled="!meta.valid"
+                        @cancel-clicked="cancelButtonAction"
                         @back-clicked="backButtonAction"
                         @ForwardClicked="forwardButtonAction" />
                 </div>
@@ -54,7 +55,7 @@
 
 <script>
 import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
-import navbar from "@/fmg-components/nav-bar/nav-bar";
+import insuranceNavBar from "@/fmg-components/insurance-nav-bar/insurance-nav-bar";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
 import { Form } from "vee-validate";
 
@@ -76,7 +77,7 @@ export default {
     components: {
         Form,
         funnelHeader,
-        navbar,
+        insuranceNavBar,
         funnelSubHeader,
         buttonQuestion,
         textBlock,
@@ -133,6 +134,12 @@ export default {
     },
 
     methods: {
+        cancelButtonAction() {
+            this.$router.navigateWithoutSaving(
+                this.navigationScenarios.CLICKED_CANCEL_VERIFICATION,
+                this.pageName
+            );
+        },
         backButtonAction() {
             this.$router.navigateWithoutSaving(
                 this.navigationScenarios.CLICKED_BACK,
diff --git a/src/layouts/policy-driver/policy-driver.vue b/src/layouts/policy-driver/policy-driver.vue
index 8a4dd0ee1..0659ff658 100644
--- a/src/layouts/policy-driver/policy-driver.vue
+++ b/src/layouts/policy-driver/policy-driver.vue
@@ -12,10 +12,11 @@
                     <!--
                             ... Page code goes here.
                     -->
-                    <navbar
+                    <insuranceNavBar
                         cmsWidgetName="FunnelFooterWidget"
                         ref="navbar"
                         :isForwardActionDisabled="!meta.valid"
+                        @cancel-clicked="cancelButtonAction"
                         @back-clicked="backButtonAction"
                         @ForwardClicked="forwardButtonAction" />
                 </div>
@@ -26,7 +27,7 @@
 
 <script>
 import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
-import navbar from "@/fmg-components/nav-bar/nav-bar";
+import insuranceNavBar from "@/fmg-components/insurance-nav-bar/insurance-nav-bar";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
 import { Form } from "vee-validate";
 
@@ -46,7 +47,7 @@ export default {
     components: {
         Form,
         funnelHeader,
-        navbar,
+        insuranceNavBar,
         funnelSubHeader,
     },
     // Ensure CMS content is fetched during route navigation without depending on `to`/`from`
@@ -83,6 +84,12 @@ export default {
     },
 
     methods: {
+        cancelButtonAction() {
+            this.$router.navigateWithoutSaving(
+                this.navigationScenarios.CLICKED_CANCEL_VERIFICATION,
+                this.pageName
+            );
+        },
         backButtonAction() {
             this.$router.navigateWithoutSaving(
                 this.navigationScenarios.CLICKED_BACK,
diff --git a/src/layouts/policy-info-submitted/policy-info-submitted.vue b/src/layouts/policy-info-submitted/policy-info-submitted.vue
index d16f40322..4b93def2e 100644
--- a/src/layouts/policy-info-submitted/policy-info-submitted.vue
+++ b/src/layouts/policy-info-submitted/policy-info-submitted.vue
@@ -12,10 +12,11 @@
                     <!--
                             ... Page code goes here.
                     -->
-                    <navbar
+                    <insuranceNavBar
                         cmsWidgetName="FunnelFooterWidget"
                         ref="navbar"
                         :isForwardActionDisabled="!meta.valid"
+                        @cancel-clicked="cancelButtonAction"
                         @back-clicked="backButtonAction"
                         @ForwardClicked="forwardButtonAction" />
                 </div>
@@ -26,7 +27,7 @@
 
 <script>
 import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
-import navbar from "@/fmg-components/nav-bar/nav-bar";
+import insuranceNavBar from "@/fmg-components/insurance-nav-bar/insurance-nav-bar";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
 import { Form } from "vee-validate";
 
@@ -46,7 +47,7 @@ export default {
     components: {
         Form,
         funnelHeader,
-        navbar,
+        insuranceNavBar,
         funnelSubHeader,
     },
     // Ensure CMS content is fetched during route navigation without depending on `to`/`from`
@@ -83,6 +84,12 @@ export default {
     },
 
     methods: {
+        cancelButtonAction() {
+            this.$router.navigateWithoutSaving(
+                this.navigationScenarios.CLICKED_CANCEL_VERIFICATION,
+                this.pageName
+            );
+        },
         backButtonAction() {
             this.$router.navigateWithoutSaving(
                 this.navigationScenarios.CLICKED_BACK,
diff --git a/src/layouts/policy-info/policy-info.vue b/src/layouts/policy-info/policy-info.vue
index 10fb9d969..ed8d4ce6a 100644
--- a/src/layouts/policy-info/policy-info.vue
+++ b/src/layouts/policy-info/policy-info.vue
@@ -191,15 +191,13 @@
                         v-model="morePolicyQuestions"
                         groupName="MorePolicyQuestionsQuestion" />
 
-                    <div class="policy-info-navbar">
-                        <navbar
+                        <insuranceNavBar
                             cmsWidgetName="FunnelFooterWidget"
                             ref="navbar"
                             :isForwardActionDisabled="!meta.valid"
-                            overrideBackButtonText="Cancel verification"
-                            @back-clicked="backButtonAction"
+                            isBackButtonHidden
+                            @cancel-clicked="cancelButtonAction"
                             @ForwardClicked="forwardButtonAction" />
-                    </div>
 
                     <span
                         v-if="displayDisclaimerText"
@@ -213,7 +211,7 @@
 
 <script>
 import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
-import navbar from "@/fmg-components/nav-bar/nav-bar";
+import insuranceNavBar from "@/fmg-components/insurance-nav-bar/insurance-nav-bar";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
 import textBlock from "@/digital-components/text-block/text-block";
 import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
@@ -274,7 +272,7 @@ export default {
     components: {
         Form,
         funnelHeader,
-        navbar,
+        insuranceNavBar,
         funnelSubHeader,
         textBlock,
         textboxQuestion,
@@ -481,9 +479,9 @@ export default {
         getLossLocationFromStore() {
             return store.getters.order.policy.lossLocation;
         },
-        backButtonAction() {
+        cancelButtonAction() {
             this.$router.navigateWithoutSaving(
-                this.navigationScenarios.CLICKED_BACK,
+                this.navigationScenarios.CLICKED_CANCEL_VERIFICATION,
                 this.pageName
             );
         },
@@ -530,14 +528,6 @@ export default {
 </script>
 
 <style lang="scss">
-.policy-info-navbar {
-    .navigation-link {
-        font-family: inherit;
-        font-weight: 600;
-        text-decoration: none;
-    }
-}
-
 .cc-page-title {
     font-size: 20px !important;
     line-height: 1.325;
diff --git a/src/layouts/policy-vehicle/policy-vehicle.vue b/src/layouts/policy-vehicle/policy-vehicle.vue
index 1d787533d..d92d45b50 100644
--- a/src/layouts/policy-vehicle/policy-vehicle.vue
+++ b/src/layouts/policy-vehicle/policy-vehicle.vue
@@ -17,18 +17,11 @@
                         class="mb-3"
                         @click-event="forwardButtonAction" />
 
-                    <textLink
-                        class="pt-3"
-                        useLoadingModal
-                        linkType="text"
-                        href="javascript:void(0)"
-                        :text="cancelVerificationCopy"
-                        @click-event="cancelVerificationAction" />
-
-                    <navbar
+                    <insuranceNavBar
                         cmsWidgetName="FunnelFooterWidget"
                         ref="navbar"
                         :isForwardActionDisabled="!meta.valid"
+                        @cancel-clicked="cancelButtonAction"
                         @back-clicked="backButtonAction"
                         @ForwardClicked="forwardButtonAction" />
 
@@ -41,11 +34,10 @@
 
 <script>
 import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
-import navbar from "@/fmg-components/nav-bar/nav-bar";
+import insuranceNavBar from "@/fmg-components/insurance-nav-bar/insurance-nav-bar";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
 import store from "@/store";
 import buttonMain from "@/ux-components/button-main/button-main";
-import textLink from "@/ux-components/text-link/text-link.vue";
 import { parentAccountNumbers } from "@/constants/insurance";
 import { debugLog } from "@/helpers/debug-log-helper";
 
@@ -65,9 +57,8 @@ export default {
     components: {
         Form,
         funnelHeader,
-        navbar,
+        insuranceNavBar,
         funnelSubHeader,
-        textLink,
         buttonMain,
     },
     // Ensure CMS content is fetched during route navigation without depending on `to`/`from`
@@ -104,9 +95,6 @@ export default {
         vehicleNotListedQuestionText() {
             return this.getCmsContent("VehicleNotListedWidget", "Text");
         },
-        cancelVerificationCopy() {
-            return this.getCmsContent("CancelVerificationWidget", "Text");
-        },
         amFamDisclaimerWidget() {
             return this.getCmsContent("AmFamDisclaimerWidget", "Text");
         },
@@ -122,7 +110,7 @@ export default {
         parentAccountNumberFromStore() {
             return store.getters.order?.payment?.parentAccountNumber;
         },
-        cancelVerificationAction() {
+        cancelButtonAction() {
             this.$router.navigateWithoutSaving(
                 this.navigationScenarios.CLICKED_CANCEL_VERIFICATION,
                 this.pageName
diff --git a/src/layouts/recalibration-info/recalibration-info.vue b/src/layouts/recalibration-info/recalibration-info.vue
index 4200b4c2a..e1fe2e0ed 100644
--- a/src/layouts/recalibration-info/recalibration-info.vue
+++ b/src/layouts/recalibration-info/recalibration-info.vue
@@ -12,10 +12,11 @@
                     <!--
                             ... Page code goes here.
                     -->
-                    <navbar
+                    <insuranceNavBar
                         cmsWidgetName="FunnelFooterWidget"
                         ref="navbar"
                         :isForwardActionDisabled="!meta.valid"
+                        @cancel-clicked="cancelButtonAction"
                         @back-clicked="backButtonAction"
                         @ForwardClicked="forwardButtonAction" />
                 </div>
@@ -26,7 +27,7 @@
 
 <script>
 import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
-import navbar from "@/fmg-components/nav-bar/nav-bar";
+import insuranceNavBar from "@/fmg-components/insurance-nav-bar/insurance-nav-bar";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
 import { Form } from "vee-validate";
 
@@ -45,7 +46,7 @@ export default {
     components: {
         Form,
         funnelHeader,
-        navbar,
+        insuranceNavBar,
         funnelSubHeader,
     },
     // Ensure CMS content is fetched during route navigation without depending on `to`/`from`
@@ -82,6 +83,12 @@ export default {
     },
 
     methods: {
+        cancelButtonAction() {
+            this.$router.navigateWithoutSaving(
+                this.navigationScenarios.CLICKED_CANCEL_VERIFICATION,
+                this.pageName
+            );
+        },
         backButtonAction() {
             this.$router.navigateWithoutSaving(
                 this.navigationScenarios.CLICKED_BACK,
diff --git a/src/router/constants/routing-table.js b/src/router/constants/routing-table.js
index ef597a06a..c84aaf712 100644
--- a/src/router/constants/routing-table.js
+++ b/src/router/constants/routing-table.js
@@ -446,7 +446,7 @@ const routingTable = function () {
             pageName: routeData.POLICY_INFO.name,
             maps: [
                 {
-                    scenario: navigationScenarios.CLICKED_BACK,
+                    scenario: navigationScenarios.CLICKED_CANCEL_VERIFICATION,
                     destinationPageData: routeData.INSURANCE_COMPANY,
                 },
                 {
@@ -471,6 +471,10 @@ const routingTable = function () {
         {
             pageName: routeData.DUPLICATE_CHECK.name,
             maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_CANCEL_VERIFICATION,
+                    destinationPageData: routeData.INSURANCE_COMPANY,
+                },
                 {
                     scenario: navigationScenarios.CLICKED_BACK,
                     destinationPageData: routeData.POLICY_INFO,
@@ -486,7 +490,7 @@ const routingTable = function () {
             maps: [
                 {
                     scenario: navigationScenarios.CLICKED_BACK,
-                    destinationPageData: routeData.DUPLICATE_CHECK,
+                    destinationPageData: routeData.POLICY_INFO,
                 },
                 {
                     scenario: navigationScenarios.CLICKED_FORWARD,
@@ -501,9 +505,13 @@ const routingTable = function () {
         {
             pageName: routeData.POLICY_DRIVER.name,
             maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_CANCEL_VERIFICATION,
+                    destinationPageData: routeData.POLICY_INFO,
+                },
                 {
                     scenario: navigationScenarios.CLICKED_BACK,
-                    destinationPageData: routeData.POLICY_VEHICLE,
+                    destinationPageData: routeData.POLICY_INFO,
                 },
                 {
                     scenario: navigationScenarios.CLICKED_FORWARD,
@@ -514,9 +522,13 @@ const routingTable = function () {
         {
             pageName: routeData.ENDORSEMENTS.name,
             maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_CANCEL_VERIFICATION,
+                    destinationPageData: routeData.POLICY_INFO,
+                },
                 {
                     scenario: navigationScenarios.CLICKED_BACK,
-                    destinationPageData: routeData.POLICY_DRIVER,
+                    destinationPageData: routeData.POLICY_INFO,
                 },
                 {
                     scenario: navigationScenarios.CLICKED_FORWARD,
@@ -527,9 +539,13 @@ const routingTable = function () {
         {
             pageName: routeData.POLICY_INFO_SUBMITTED.name,
             maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_CANCEL_VERIFICATION,
+                    destinationPageData: routeData.POLICY_INFO,
+                },
                 {
                     scenario: navigationScenarios.CLICKED_BACK,
-                    destinationPageData: routeData.ENDORSEMENTS,
+                    destinationPageData: routeData.POLICY_INFO,
                 },
                 {
                     scenario: navigationScenarios.CLICKED_FORWARD,
@@ -540,9 +556,13 @@ const routingTable = function () {
         {
             pageName: routeData.RECALIBRATION_INFO.name,
             maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_CANCEL_VERIFICATION,
+                    destinationPageData: routeData.POLICY_INFO,
+                },
                 {
                     scenario: navigationScenarios.CLICKED_BACK,
-                    destinationPageData: routeData.POLICY_INFO_SUBMITTED,
+                    destinationPageData: routeData.POLICY_INFO,
                 },
                 {
                     scenario: navigationScenarios.CLICKED_FORWARD,
@@ -559,7 +579,7 @@ const routingTable = function () {
                 },
                 {
                     scenario: navigationScenarios.CLICKED_BACK_RECALIBRATION_INFO,
-                    destinationPageData: routeData.RECALIBRATION_INFO,
+                    destinationPageData: routeData.POLICY_INFO,
                 },
                 {
                     scenario: navigationScenarios.CLICKED_BACK_NON_CLAIM_AND_COVERAGE,

From c8e5f68086ee53e886e205cbd553605ca2f51220 Mon Sep 17 00:00:00 2001
From: Carl Nation <Carl.Nation@safelite.com>
Date: Tue, 2 Jun 2026 14:35:02 -0400
Subject: [PATCH 23/25] prettier

---
 src/layouts/policy-info/policy-info.vue | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/layouts/policy-info/policy-info.vue b/src/layouts/policy-info/policy-info.vue
index ed8d4ce6a..4c47f1847 100644
--- a/src/layouts/policy-info/policy-info.vue
+++ b/src/layouts/policy-info/policy-info.vue
@@ -191,13 +191,13 @@
                         v-model="morePolicyQuestions"
                         groupName="MorePolicyQuestionsQuestion" />
 
-                        <insuranceNavBar
-                            cmsWidgetName="FunnelFooterWidget"
-                            ref="navbar"
-                            :isForwardActionDisabled="!meta.valid"
-                            isBackButtonHidden
-                            @cancel-clicked="cancelButtonAction"
-                            @ForwardClicked="forwardButtonAction" />
+                    <insuranceNavBar
+                        cmsWidgetName="FunnelFooterWidget"
+                        ref="navbar"
+                        :isForwardActionDisabled="!meta.valid"
+                        isBackButtonHidden
+                        @cancel-clicked="cancelButtonAction"
+                        @ForwardClicked="forwardButtonAction" />
 
                     <span
                         v-if="displayDisclaimerText"

From 03f1fdaa28ab4178e74f2baf3a93ee15826047c8 Mon Sep 17 00:00:00 2001
From: Carl Nation <Carl.Nation@safelite.com>
Date: Wed, 3 Jun 2026 06:28:27 -0400
Subject: [PATCH 24/25] CASH-632 fix tests for navbar

CASH-632 fix tests for navbar
---
 src/layouts/duplicate-check/duplicate-check.spec.js |  2 +-
 src/layouts/endorsements/endorsements.spec.js       |  2 +-
 src/layouts/policy-driver/policy-driver.spec.js     |  2 +-
 .../policy-info-submitted.spec.js                   |  2 +-
 src/layouts/policy-info/policy-info.spec.js         |  2 +-
 src/layouts/policy-vehicle/policy-vehicle.spec.js   |  2 +-
 .../recalibration-info/recalibration-info.spec.js   |  4 ++--
 src/layouts/verify-details/verify-details.spec.js   |  2 +-
 src/layouts/verify-details/verify-details.vue       | 13 ++++++++++---
 src/router/constants/routing-table.js               |  6 +++++-
 10 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/layouts/duplicate-check/duplicate-check.spec.js b/src/layouts/duplicate-check/duplicate-check.spec.js
index 3f5d6cca2..7dd9c3625 100644
--- a/src/layouts/duplicate-check/duplicate-check.spec.js
+++ b/src/layouts/duplicate-check/duplicate-check.spec.js
@@ -28,7 +28,7 @@ describe("duplicate-check.vue", () => {
 
         test("renders navbar component", () => {
             const { wrapper } = setupMocks();
-            expect(wrapper.findComponent({ name: "navbar" }).exists()).toBe(true);
+            expect(wrapper.findComponent({ name: "insuranceNavBar" }).exists()).toBe(true);
         });
 
         test("renders Form component", () => {
diff --git a/src/layouts/endorsements/endorsements.spec.js b/src/layouts/endorsements/endorsements.spec.js
index 0917c44f4..57a45d74b 100644
--- a/src/layouts/endorsements/endorsements.spec.js
+++ b/src/layouts/endorsements/endorsements.spec.js
@@ -28,7 +28,7 @@ describe("endorsements.vue", () => {
 
         test("renders navbar component", () => {
             const { wrapper } = setupMocks();
-            expect(wrapper.findComponent({ name: "navbar" }).exists()).toBe(true);
+            expect(wrapper.findComponent({ name: "insuranceNavBar" }).exists()).toBe(true);
         });
 
         test("renders Form component", () => {
diff --git a/src/layouts/policy-driver/policy-driver.spec.js b/src/layouts/policy-driver/policy-driver.spec.js
index 5680f6f2f..60ed331e6 100644
--- a/src/layouts/policy-driver/policy-driver.spec.js
+++ b/src/layouts/policy-driver/policy-driver.spec.js
@@ -28,7 +28,7 @@ describe("policy-driver.vue", () => {
 
         test("renders navbar component", () => {
             const { wrapper } = setupMocks();
-            expect(wrapper.findComponent({ name: "navbar" }).exists()).toBe(true);
+            expect(wrapper.findComponent({ name: "insuranceNavBar" }).exists()).toBe(true);
         });
 
         test("renders Form component", () => {
diff --git a/src/layouts/policy-info-submitted/policy-info-submitted.spec.js b/src/layouts/policy-info-submitted/policy-info-submitted.spec.js
index a647c2681..4d80621ee 100644
--- a/src/layouts/policy-info-submitted/policy-info-submitted.spec.js
+++ b/src/layouts/policy-info-submitted/policy-info-submitted.spec.js
@@ -28,7 +28,7 @@ describe("policy-info-submitted.vue", () => {
 
         test("renders navbar component", () => {
             const { wrapper } = setupMocks();
-            expect(wrapper.findComponent({ name: "navbar" }).exists()).toBe(true);
+            expect(wrapper.findComponent({ name: "insuranceNavBar" }).exists()).toBe(true);
         });
 
         test("renders Form component", () => {
diff --git a/src/layouts/policy-info/policy-info.spec.js b/src/layouts/policy-info/policy-info.spec.js
index 74649d20b..b86cce714 100644
--- a/src/layouts/policy-info/policy-info.spec.js
+++ b/src/layouts/policy-info/policy-info.spec.js
@@ -28,7 +28,7 @@ describe("policy-info.vue", () => {
 
         test("renders navbar component", () => {
             const { wrapper } = setupMocks();
-            expect(wrapper.findComponent({ name: "navbar" }).exists()).toBe(true);
+            expect(wrapper.findComponent({ name: "insuranceNavBar" }).exists()).toBe(true);
         });
 
         test("renders Form component", () => {
diff --git a/src/layouts/policy-vehicle/policy-vehicle.spec.js b/src/layouts/policy-vehicle/policy-vehicle.spec.js
index d11777667..f7f0b4806 100644
--- a/src/layouts/policy-vehicle/policy-vehicle.spec.js
+++ b/src/layouts/policy-vehicle/policy-vehicle.spec.js
@@ -28,7 +28,7 @@ describe("policy-vehicle.vue", () => {
 
         test("renders navbar component", () => {
             const { wrapper } = setupMocks();
-            expect(wrapper.findComponent({ name: "navbar" }).exists()).toBe(true);
+            expect(wrapper.findComponent({ name: "insuranceNavBar" }).exists()).toBe(true);
         });
 
         test("renders Form component", () => {
diff --git a/src/layouts/recalibration-info/recalibration-info.spec.js b/src/layouts/recalibration-info/recalibration-info.spec.js
index 50667e1fa..e564a2565 100644
--- a/src/layouts/recalibration-info/recalibration-info.spec.js
+++ b/src/layouts/recalibration-info/recalibration-info.spec.js
@@ -28,7 +28,7 @@ describe("recalibration-info.vue", () => {
 
         test("renders navbar component", () => {
             const { wrapper } = setupMocks();
-            expect(wrapper.findComponent({ name: "navbar" }).exists()).toBe(true);
+            expect(wrapper.findComponent({ name: "insuranceNavBar" }).exists()).toBe(true);
         });
 
         test("renders Form component", () => {
@@ -56,7 +56,7 @@ function setupMocks() {
     settleAllPromises.mockResolvedValue({ cmsContent: mockCmsContent });
 
     const mountOptions = getMountOptions({
-        route: { name: "policy-vehicle", query: {}, params: {} },
+        route: { name: "recalibration-info", query: {}, params: {} },
         router: {
             navigate: jest.fn(),
             navigateWithSaving: jest.fn(),
diff --git a/src/layouts/verify-details/verify-details.spec.js b/src/layouts/verify-details/verify-details.spec.js
index ec541ecf9..9aadda9cf 100644
--- a/src/layouts/verify-details/verify-details.spec.js
+++ b/src/layouts/verify-details/verify-details.spec.js
@@ -28,7 +28,7 @@ describe("verify-details.vue", () => {
 
         test("renders navbar component", () => {
             const { wrapper } = setupMocks();
-            expect(wrapper.findComponent({ name: "navbar" }).exists()).toBe(true);
+            expect(wrapper.findComponent({ name: "insuranceNavBar" }).exists()).toBe(true);
         });
 
         test("renders Form component", () => {
diff --git a/src/layouts/verify-details/verify-details.vue b/src/layouts/verify-details/verify-details.vue
index a5717ba05..a3e00eb7f 100644
--- a/src/layouts/verify-details/verify-details.vue
+++ b/src/layouts/verify-details/verify-details.vue
@@ -11,10 +11,11 @@
                     <!--
                             ... Page code goes here.
                     -->
-                    <navbar
+                    <insuranceNavBar
                         cmsWidgetName="FunnelFooterWidget"
                         ref="navbar"
                         :isForwardActionDisabled="!meta.valid"
+                        @cancel-clicked="cancelButtonAction"
                         @back-clicked="backButtonAction"
                         @ForwardClicked="forwardButtonAction" />
                 </div>
@@ -25,7 +26,7 @@
 
 <script>
 import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
-import navbar from "@/fmg-components/nav-bar/nav-bar";
+import insuranceNavBar from "@/fmg-components/insurance-nav-bar/insurance-nav-bar";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
 import { Form } from "vee-validate";
 
@@ -41,7 +42,7 @@ export default {
     components: {
         Form,
         funnelHeader,
-        navbar,
+        insuranceNavBar,
         funnelSubHeader,
     },
     // Ensure CMS content is fetched during route navigation without depending on `to`/`from`
@@ -67,6 +68,12 @@ export default {
     },
 
     methods: {
+        cancelButtonAction() {
+            this.$router.navigateWithoutSaving(
+                this.navigationScenarios.CLICKED_CANCEL_VERIFICATION,
+                this.pageName
+            );
+        },
         backButtonAction() {
             this.$router.navigateWithoutSaving(
                 this.navigationScenarios.CLICKED_BACK,
diff --git a/src/router/constants/routing-table.js b/src/router/constants/routing-table.js
index c84aaf712..ea2020a21 100644
--- a/src/router/constants/routing-table.js
+++ b/src/router/constants/routing-table.js
@@ -594,9 +594,13 @@ const routingTable = function () {
         {
             pageName: routeData.VERIFY_DETAILS.name,
             maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_CANCEL_VERIFICATION,
+                    destinationPageData: routeData.POLICY_INFO,
+                },
                 {
                     scenario: navigationScenarios.CLICKED_BACK,
-                    destinationPageData: routeData.DUPLICATE_CHECK,
+                    destinationPageData: routeData.POLICY_INFO,
                 },
                 {
                     scenario: navigationScenarios.CLICKED_FORWARD,

From 07bc9d2e7d252ba1838de9c2be2e5825b20ad1d6 Mon Sep 17 00:00:00 2001
From: credelinghuys <Chris.Redelinghuys@safelite.com>
Date: Wed, 3 Jun 2026 09:00:36 -0400
Subject: [PATCH 25/25] CASH-2541: Require VIN lookup if applicable

---
 src/constants/store-mutations.js  |  1 +
 src/layouts/estimate/estimate.vue | 15 ++++++++++++++-
 src/layouts/vehicle/vehicle.vue   |  6 ++++++
 src/store/index.js                |  8 ++++++++
 4 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/constants/store-mutations.js b/src/constants/store-mutations.js
index a06a37bb0..f95a397a0 100644
--- a/src/constants/store-mutations.js
+++ b/src/constants/store-mutations.js
@@ -22,6 +22,7 @@ const storeMutations = {
     UPDATE_VEHICLE_CAN_SAFELITE_SERVICE: "updateVehicleCanSafeliteService",
     UPDATE_SKIP_VIN_LOOKUP: "updateSkipVINLookup",
     UPDATE_SKIP_PART_QUESTIONS: "updateSkipPartQuestions",
+    UPDATE_VIN_REQUIRED: "updateVinRequired",
 
     UPDATE_IS_REPAIR: "updateIsRepair",
     UPDATE_NUMBER_OF_CHIPS: "updateNumberOfChips",
diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index 36e27127a..49ea778a9 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -100,6 +100,7 @@ export default {
         }
 
         const zip = store.getters.order.serviceLocation.zipCode;
+        const isVinLookupRequired = store.getters.vehicle.vinRequired;
 
         var vinByAddressPromise;
         if (zip) {
@@ -133,8 +134,9 @@ export default {
                 resultMap.cmsContent.FunnelFooterWidget.ForwardButtonText = forwardTextOption[0];
             }
 
+            var indexToRemove;
             if (!zip || resultMap.vinByAddress === false) {
-                var indexToRemove = resultMap.cmsContent.VinLookupMethod.Answers.findIndex(
+                indexToRemove = resultMap.cmsContent.VinLookupMethod.Answers.findIndex(
                     (answer) => answer.Name === "HomeAddress"
                 );
                 if (indexToRemove) {
@@ -142,6 +144,17 @@ export default {
                 }
             }
 
+            if (isVinLookupRequired) {
+                resultMap.cmsContent.FunnelSubHeaderWidget =
+                    resultMap.cmsContent.FunnelSubHeaderWidget_VinLookupRequired;
+                indexToRemove = resultMap.cmsContent.VinLookupMethod.Answers.findIndex(
+                    (answer) => answer.Name === "Decline"
+                );
+                if (indexToRemove) {
+                    resultMap.cmsContent.VinLookupMethod.Answers.splice(indexToRemove, 1);
+                }
+            }
+
             vm.setCmsContent(resultMap.cmsContent);
             if (store.getters.externalParameterState?.isExternalParameter) {
                 if (store.getters.externalParameterCustomer?.phoneNumber) {
diff --git a/src/layouts/vehicle/vehicle.vue b/src/layouts/vehicle/vehicle.vue
index 5c80694bf..dc2e758a1 100644
--- a/src/layouts/vehicle/vehicle.vue
+++ b/src/layouts/vehicle/vehicle.vue
@@ -143,6 +143,7 @@ export default {
             canSafeliteService: this.canSafeliteServiceFromStore(),
             skipVINLookup: this.getSkipVINLookupfromStore(),
             skipPartQuestions: this.getSkipPartQuestionsfromStore(),
+            vinRequired: this.getVinRequiredFromStore(),
         };
     },
 
@@ -490,6 +491,7 @@ export default {
             this.isBigTruck = result?.data.isBigTruck;
             this.skipVINLookup = result?.data.skipVINLookup;
             this.skipPartQuestions = result?.data.skipPartQuestions;
+            this.vinRequired = result?.data.vinRequired;
         },
         resetAlert() {
             this.displayNoServiceAlert = false;
@@ -548,6 +550,7 @@ export default {
                     imageVifColor: this.imageVifColor,
                     skipVINLookup: this.skipVINLookup,
                     skipPartQuestions: this.skipPartQuestions,
+                    vinRequired: this.vinRequired,
                 },
                 false
             );
@@ -639,6 +642,9 @@ export default {
         getSkipPartQuestionsfromStore() {
             return store.getters.vehicle.skipPartQuestions;
         },
+        getVinRequiredFromStore() {
+            return store.getters.vehicle.vinRequired;
+        },
     },
 
     components: {
diff --git a/src/store/index.js b/src/store/index.js
index fc786d3b9..3f2cf5e0d 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -84,6 +84,7 @@ const getDefaultState = () => {
                 },
                 skipVINLookup: false,
                 skipPartQuestions: false,
+                vinRequired: false,
             },
             serviceLocation: {
                 address: null,
@@ -274,6 +275,9 @@ export const mutations = {
     updateSkipVINLookup(state, skipVINLookup) {
         state.order.vehicle.skipVINLookup = skipVINLookup;
     },
+    updateVinRequired(state, vinRequired) {
+        state.order.vehicle.vinRequired = vinRequired;
+    },
     updateSkipPartQuestions(state, skipPartQuestions) {
         state.order.vehicle.skipPartQuestions = skipPartQuestions;
     },
@@ -843,6 +847,7 @@ export const mutations = {
             vehicleSpecialClass: sessionInformation.order.vehicle?.vehicleSpecialClass,
             isBigTruck: sessionInformation.order.vehicle?.isBigTruck,
             canSafeliteService: sessionInformation.order.vehicle?.canSafeliteService,
+            vinRequired: sessionInformation.order.vehicle?.vinRequired,
         });
 
         state.order.damage.glassToReplace = sessionInformation.order.damage.glassToReplace;
@@ -2617,6 +2622,7 @@ export const actions = {
                         vehicleSpecialClass: vehicle.vehicleSpecialClass,
                         isBigTruck: vehicle.isBigTruck,
                         canSafeliteService: vehicle.canSafeliteService,
+                        vinRequired: vehicle.vinRequired,
                         registration: {
                             firstName: vehicle.registration.firstName,
                             lastName: vehicle.registration.lastName,
@@ -2848,6 +2854,7 @@ export const actions = {
             imageVifColor,
             skipVINLookup,
             skipPartQuestions,
+            vinRequired,
         }
     ) {
         if (
@@ -2875,6 +2882,7 @@ export const actions = {
             context.commit(storeMutations.UPDATE_VEHICLE_IMAGE_COLOR, imageVifColor);
             context.commit(storeMutations.UPDATE_SKIP_VIN_LOOKUP, skipVINLookup);
             context.commit(storeMutations.UPDATE_SKIP_PART_QUESTIONS, skipPartQuestions);
+            context.commit(storeMutations.UPDATE_VIN_REQUIRED, vinRequired);
         }
     },