From f85245f02dd396b56e363a0d61f6eecd300e6457 Mon Sep 17 00:00:00 2001
From: Katie Kroell <Katie.Kroell@safelite.com>
Date: Mon, 9 Feb 2026 12:32:31 -0500
Subject: [PATCH 01/30] initial styling changes

---
 .../site-sub-header/site-sub-header.vue       |  4 +-
 .../service-packages/service-packages.vue     | 49 +++++++++++--------
 2 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/src/iss-components/site-sub-header/site-sub-header.vue b/src/iss-components/site-sub-header/site-sub-header.vue
index 8695f341..1dc202c3 100644
--- a/src/iss-components/site-sub-header/site-sub-header.vue
+++ b/src/iss-components/site-sub-header/site-sub-header.vue
@@ -169,8 +169,8 @@ p {
         color: $darker-gray;
     }
     &.service-packages-subtext {
-        font-weight: 500;
-        line-height: 24px;
+        font-weight: 400;
+        line-height: 26px;
         span {
             font-size: 1rem;
         }
diff --git a/src/layouts/service-packages/service-packages.vue b/src/layouts/service-packages/service-packages.vue
index 1bed0a7c..2bfe5eea 100644
--- a/src/layouts/service-packages/service-packages.vue
+++ b/src/layouts/service-packages/service-packages.vue
@@ -11,9 +11,8 @@
             <div class="iss-heritage-container-width">
                 <div class="service-packages-container iss-heritage-content-container-width">
                     <siteSubHeader
-                        class="mt-4"
-                        subHeaderClasses="mt-5"
-                        justification="left"
+                        class="subheader mt-4"
+                        justification="center"
                         cmsWidgetName="SiteSubHeaderWidget"
                         issContainingPage="service-packages" />
                     <servicePackageQuestion
@@ -25,14 +24,20 @@
                         isRequired
                         @vapsItemsSelected="vapsItemsSelectedAction"
                         @link-event="openModalAction" />
-                    <p
-                        class="caption disclaimer"
-                        v-html="PriceDisclaimerText"></p>
+                    <buttonMain
+                        ref="buttonMain"
+                        class="w-100"
+                        variant="navigation"
+                        :buttonText="'Continue'"
+                        @clickEvent="forwardButtonAction" />
                     <siteFooter
                         cmsWidgetName="SiteFooterWidget"
                         :isForwardActionDisabled="!meta.valid"
-                        @backClicked="navigateBack"
-                        @ForwardClicked="forwardButtonAction" />
+                        :isForwardButtonHidden="true"
+                        @backClicked="navigateBack" />
+                    <p
+                        class="caption disclaimer"
+                        v-html="PriceDisclaimerText"></p>
                 </div>
             </div>
             <loadingModal
@@ -72,6 +77,7 @@ import globalRules from '@/constants/global-rules';
 import servicePackageQuestion from '@/layouts/service-packages/service-package-question/service-package-question.vue';
 import issPageValues from '@/router/router-constants/issPage-values';
 import bailoutMessage from '@/constants/bailoutMessage';
+import buttonMain from '@/ux-components/button-main/button-main.vue';
 
 const store = useMainStore();
 
@@ -85,7 +91,8 @@ export default {
         Form,
         servicePackageQuestion,
         loadingModal,
-        contentGroupModal
+        contentGroupModal,
+        buttonMain
     },
     mixins: [baseFormMixin],
     async beforeRouteEnter(to, from, next) {
@@ -214,25 +221,27 @@ export default {
         min-height: 1px;
         padding-left: .9375rem;
         padding-right: .9375rem;
+        display: block;
+        :deep(.subheader-primary) {
+            display: block;
+        }
+        :deep(.subheader-secondary) {
+            display: block;
+            text-align: center;
+            margin-top: 0.75rem;
+            padding: 0px;
+        }
     }
 }
-
-.subheader-secondary {
-    margin-top: 0.5rem;
-    padding: 0px;
-}
-
 .disclaimer {
     margin: 0.5rem 0 1.5rem 0;
-
-    a {
-        color: #4d5151;
-        font-weight: 400;
+    :deep(.external-text) {
+        text-decoration: none;
     }
 }
 .service-packages {
     :deep(strong) {
-        font-weight: $font-weight-bold;
+        font-weight: 400;
     }
 }
 

From a01c66aaede79f853955485716c32498582bad48 Mon Sep 17 00:00:00 2001
From: Katie Kroell <Katie.Kroell@safelite.com>
Date: Mon, 9 Feb 2026 15:15:25 -0500
Subject: [PATCH 02/30] styling WIP

---
 .../button-question/button-question.vue                  | 9 ++++++++-
 .../service-package-question.vue                         | 4 ++--
 .../service-package-radio/service-package-radio.vue      | 5 +++++
 src/layouts/service-packages/service-packages.vue        | 6 +++++-
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/digital-components/button-question/button-question.vue b/src/digital-components/button-question/button-question.vue
index ca731b44..e8e552b3 100644
--- a/src/digital-components/button-question/button-question.vue
+++ b/src/digital-components/button-question/button-question.vue
@@ -127,6 +127,7 @@ export default {
         isOverflowScrollable: Boolean,
         isWide: Boolean,
         isCashOrInsurance: Boolean,
+        isHorizontalLayout: Boolean,
         modelValue: [Array, Number, String],
         value: [Number, String],
         validationRules: String,
@@ -211,7 +212,10 @@ export default {
                     classes = 'ui-radio d-flex';
                     break;
                 case 'servicePackageRadio':
-                    classes = 'package-main';
+                    classes = 'package-main d-flex flex-column';
+                    if (this.isHorizontalLayout) {
+                        classes += ' flex-md-row gap-3';
+                    }
                     break;
                 case 'providerPrefRadio':
                     classes = 'option-main';
@@ -231,6 +235,9 @@ export default {
                     break;
                 case 'servicePackageRadio':
                     classes = 'package-wrapper';
+                    if (this.isHorizontalLayout) {
+                        classes += ' flex-fill';
+                    }
                     break;
                 case 'providerPrefRadio':
                     classes = 'option-wrapper';
diff --git a/src/layouts/service-packages/service-package-question/service-package-question.vue b/src/layouts/service-packages/service-package-question/service-package-question.vue
index 9c0ee168..fa00e58a 100644
--- a/src/layouts/service-packages/service-package-question/service-package-question.vue
+++ b/src/layouts/service-packages/service-package-question/service-package-question.vue
@@ -7,7 +7,8 @@
         buttonTypeString="servicePackageRadio"
         :buttonTypeObject="servicePackageRadio"
         :validationRules="validationRules"
-        :isRequired="isRequired" />
+        :isRequired="isRequired"
+        :isHorizontalLayout="true" />
 </template>
 
 <script>
@@ -17,7 +18,6 @@ import damageLocationsSelected from '@/constants/damage-locations-selected';
 import servicePackageRadio from '@/layouts/service-packages/service-package-question/service-package-radio/service-package-radio.vue';
 import partTypeStrings from '@/constants/part-type-strings';
 import { useMainStore } from '@/store';
-import allGlassPartsAndItemsHavePrices from '@/layouts/service-packages/service-package-helper/service-package-helper';
 import { getPriceOfLineItem } from '@/helpers/price-calculator';
 import { getHighestFullySatisfiedTier } from '@/helpers/service-package-helper.js';
 
diff --git a/src/layouts/service-packages/service-package-question/service-package-radio/service-package-radio.vue b/src/layouts/service-packages/service-package-question/service-package-radio/service-package-radio.vue
index 3a035bf4..48776a09 100644
--- a/src/layouts/service-packages/service-package-question/service-package-radio/service-package-radio.vue
+++ b/src/layouts/service-packages/service-package-question/service-package-radio/service-package-radio.vue
@@ -123,6 +123,11 @@ export default {
 
             label {
                 display: block;
+                height: 100%;
+            }
+
+            .package-label {
+                height: 100%;
             }
 
             input[type="radio"] {
diff --git a/src/layouts/service-packages/service-packages.vue b/src/layouts/service-packages/service-packages.vue
index 2bfe5eea..d52893b5 100644
--- a/src/layouts/service-packages/service-packages.vue
+++ b/src/layouts/service-packages/service-packages.vue
@@ -9,7 +9,7 @@
                 <siteHeader cmsWidgetName="SiteHeaderWidget" />
             </div>
             <div class="iss-heritage-container-width">
-                <div class="service-packages-container iss-heritage-content-container-width">
+                <div class="service-packages-container">
                     <siteSubHeader
                         class="subheader mt-4"
                         justification="center"
@@ -217,11 +217,15 @@ export default {
 <style lang="scss" scoped>
 .iss-heritage-container-width {
     .service-packages-container {
+        @media (min-width: 992px) {
+            width: 85%; // REVISIT
+        }
         position: relative;
         min-height: 1px;
         padding-left: .9375rem;
         padding-right: .9375rem;
         display: block;
+        margin: 0 auto;
         :deep(.subheader-primary) {
             display: block;
         }

From 2ba0b4f070af6e66bd4ee02bcf4bd7a05cdc8346 Mon Sep 17 00:00:00 2001
From: Katie Kroell <Katie.Kroell@safelite.com>
Date: Tue, 10 Feb 2026 11:55:30 -0500
Subject: [PATCH 03/30] more styling updates

---
 .../button-question/button-question.vue       | 13 +++++++++-
 .../service-package-question.vue              | 13 +++++++++-
 .../service-package-radio.vue                 |  3 ++-
 .../service-packages/service-packages.vue     | 24 ++++++++++++-------
 4 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/src/digital-components/button-question/button-question.vue b/src/digital-components/button-question/button-question.vue
index e8e552b3..0812922d 100644
--- a/src/digital-components/button-question/button-question.vue
+++ b/src/digital-components/button-question/button-question.vue
@@ -236,7 +236,7 @@ export default {
                 case 'servicePackageRadio':
                     classes = 'package-wrapper';
                     if (this.isHorizontalLayout) {
-                        classes += ' flex-fill';
+                        classes += ' flex-grow-0 flex-shrink-0';
                     }
                     break;
                 case 'providerPrefRadio':
@@ -332,6 +332,12 @@ export default {
 
 <style lang="scss" scoped>
 .button-question {
+    :deep(.package-wrapper) {
+        @media (min-width: 768px) {
+            flex: 0 0 calc(33.333% - 0.67rem);
+            max-width: calc(33.333% - 0.67rem);
+        }
+    }
     color: $black;
 
     .radio-button-container {
@@ -352,6 +358,11 @@ export default {
             &.button-question-text-left {
                 text-align: left;
             }
+            &.service-package-question-text {
+                font-weight: 500;
+                text-align: center;
+                margin-bottom: 0.5rem;
+            }
         }
     }
 
diff --git a/src/layouts/service-packages/service-package-question/service-package-question.vue b/src/layouts/service-packages/service-package-question/service-package-question.vue
index fa00e58a..87f50898 100644
--- a/src/layouts/service-packages/service-package-question/service-package-question.vue
+++ b/src/layouts/service-packages/service-package-question/service-package-question.vue
@@ -2,8 +2,11 @@
     <buttonQuestion
         ref="buttonQuestion"
         v-model="selectedPackageName"
+        class="service-package-question"
         :answers="servicePackageAnswers"
         :groupName="groupName"
+        :questionText="questionText"
+        :questionTextClasses="['service-package-question-text']"
         buttonTypeString="servicePackageRadio"
         :buttonTypeObject="servicePackageRadio"
         :validationRules="validationRules"
@@ -50,7 +53,8 @@ export default {
     data() {
         return {
             servicePackageRadio,
-            selectedPackageName: ''
+            selectedPackageName: '',
+            questionText: 'Select an option:'
         };
     },
     computed: {
@@ -280,3 +284,10 @@ export default {
     }
 };
 </script>
+
+<style lang="scss" scoped>
+.service-package-question-text {
+    font-weight: 500;
+    text-align: center;
+}
+</style>
diff --git a/src/layouts/service-packages/service-package-question/service-package-radio/service-package-radio.vue b/src/layouts/service-packages/service-package-question/service-package-radio/service-package-radio.vue
index 48776a09..4f3ad667 100644
--- a/src/layouts/service-packages/service-package-question/service-package-radio/service-package-radio.vue
+++ b/src/layouts/service-packages/service-package-question/service-package-radio/service-package-radio.vue
@@ -143,7 +143,8 @@ export default {
                     width: 100%;
                     padding: 1rem;
                     border: 1px solid $gray-300;
-                    box-shadow: 0px 4px 8px -4px rgba(0, 0, 0, 0.15), 0px 4px 24px -8px rgba(0, 0, 0, 0.2);
+                    //box-shadow: 0px 4px 8px -4px rgba(0, 0, 0, 0.15), 0px 4px 24px -8px rgba(0, 0, 0, 0.2);
+                    box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.2);
                     border-radius: 0.5rem;
                     overflow: hidden;
                     min-height: 60px;
diff --git a/src/layouts/service-packages/service-packages.vue b/src/layouts/service-packages/service-packages.vue
index d52893b5..d5c959ec 100644
--- a/src/layouts/service-packages/service-packages.vue
+++ b/src/layouts/service-packages/service-packages.vue
@@ -24,21 +24,23 @@
                         isRequired
                         @vapsItemsSelected="vapsItemsSelectedAction"
                         @link-event="openModalAction" />
-                    <buttonMain
-                        ref="buttonMain"
-                        class="w-100"
-                        variant="navigation"
-                        :buttonText="'Continue'"
-                        @clickEvent="forwardButtonAction" />
+                    <div class="d-flex justify-content-center mt-8 mb-4">
+                        <buttonMain
+                            ref="buttonMain"
+                            class="continue-button"
+                            variant="navigation"
+                            :buttonText="'Continue'"
+                            @clickEvent="forwardButtonAction" />
+                    </div>
                     <siteFooter
                         cmsWidgetName="SiteFooterWidget"
                         :isForwardActionDisabled="!meta.valid"
                         :isForwardButtonHidden="true"
                         @backClicked="navigateBack" />
-                    <p
-                        class="caption disclaimer"
-                        v-html="PriceDisclaimerText"></p>
                 </div>
+                <p
+                    class="caption disclaimer"
+                    v-html="PriceDisclaimerText"></p>
             </div>
             <loadingModal
                 ref="loadingModal"
@@ -239,6 +241,7 @@ export default {
 }
 .disclaimer {
     margin: 0.5rem 0 1.5rem 0;
+    padding-left: 3rem;
     :deep(.external-text) {
         text-decoration: none;
     }
@@ -249,4 +252,7 @@ export default {
     }
 }
 
+.continue-button {
+    width: 60%
+}
 </style>

From 2fa950f32f550ef7fd813e69e3d1ecc1f060ecf6 Mon Sep 17 00:00:00 2001
From: Katie Kroell <Katie.Kroell@safelite.com>
Date: Tue, 10 Feb 2026 15:48:15 -0500
Subject: [PATCH 04/30] styling updates

---
 .../service-package-radio.vue                 | 59 +++++++++++--------
 1 file changed, 36 insertions(+), 23 deletions(-)

diff --git a/src/layouts/service-packages/service-package-question/service-package-radio/service-package-radio.vue b/src/layouts/service-packages/service-package-question/service-package-radio/service-package-radio.vue
index 4f3ad667..4e1cf8f1 100644
--- a/src/layouts/service-packages/service-package-question/service-package-radio/service-package-radio.vue
+++ b/src/layouts/service-packages/service-package-question/service-package-radio/service-package-radio.vue
@@ -10,9 +10,6 @@
                 <div>
                     <p class="m-0">
                         <span v-html="buttonLabel"></span>
-                        <span
-                            class="pricing-info"
-                            v-html="buttonAuxiliaryCopy"></span>
                     </p>
                     <p
                         v-if="buttonLabelSubCopy"
@@ -57,6 +54,11 @@
                         v-html="buttonFooterCopy"></div>
                 </div>
             </div>
+            <div class="pricing-info">
+                <span
+                    class="price float-right"
+                    v-html="buttonAuxiliaryCopy"></span>
+            </div>
         </div>
     </baseInputButton>
 </template>
@@ -142,7 +144,7 @@ export default {
                     cursor: pointer;
                     width: 100%;
                     padding: 1rem;
-                    border: 1px solid $gray-300;
+                    border: 0.666667px solid $gray-300;
                     //box-shadow: 0px 4px 8px -4px rgba(0, 0, 0, 0.15), 0px 4px 24px -8px rgba(0, 0, 0, 0.2);
                     box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.2);
                     border-radius: 0.5rem;
@@ -163,7 +165,7 @@ export default {
                         top: 5px;
                         margin-right: 1rem;
                         border-radius: 50%;
-                        border: 1px solid $gray-500;
+                        border: 0.666667px solid $gray-500;
                         width: 16px;
                         height: 16px;
                         min-width: 16px;
@@ -184,7 +186,7 @@ export default {
                 &:hover {
                     + .package-label {
                         &:before {
-                            border: 1px solid #8e9292;
+                            border: 0.666667px solid #8e9292;
                             box-shadow: 0px 0px 0px 4px #9fcee6, 0px 1px 4px rgba(0, 0, 0, 0.2);
                         }
                     }
@@ -206,20 +208,20 @@ export default {
                     }
 
                     + .package-label {
-                        background-color: $blue-100;
-                        border: 1px solid $blue;
+                        background-color: $background-color-selected;
+                        border: 0.666667px solid $heritage-blue-secondary;
                         max-height: 500px;
                     }
 
                     + .package-label {
                         &:before {
-                            box-shadow: 0px 0px 0px 1px $blue;
+                            box-shadow: 0px 0px 0px 1px $heritage-blue-secondary;
                         }
                     }
 
                     + .package-label {
                         &:after {
-                            background: $blue;
+                            background: $heritage-blue-secondary;
                         }
                     }
                 }
@@ -227,16 +229,18 @@ export default {
                 &:focus {
                     + .package-label {
                         &:before {
-                            border: 2px solid $blue;
+                            border: 2px solid $heritage-blue-secondary;
                         }
                     }
                 }
             }
 
             .package-footer {
-                color: $red;
-                font-weight: $font-weight-bold; // 600 in fmg
-                margin-top: 0.5rem; // not in fmg
+                color: #af2117;
+                font-weight: $font-weight-bold;
+                margin-top: 20px;
+                font-size: 0.875rem;
+                line-height: 21px;
             }
 
             .package-specs {
@@ -249,32 +253,29 @@ export default {
                     max-height: 500px;
                 }
                 p {
-                    font-weight: $font-weight-bold; // 600 in fmg
+                    color: #4d4e53;
+                    font-weight: 600;
                     display: flex;
                     justify-content: space-between;
 
-                    span {
-                        &.pricing-info {
-                            color: $green;
-                            font-size: 0.875rem;
-                        }
-                    }
-
                     &.sub-label {
                         color: $green;
                         text-transform: uppercase;
                         font-size: 0.75rem;
+                        font-weight: $font-weight-bold;
                     }
                 }
 
                 ul {
-                    margin: 1rem 0 0 -.6rem; // .9375rem in fmg
+                    margin:0.5rem 0 0 -.6rem; // .9375rem in fmg
                     padding: 0;
+                    color: $darker-gray;
 
                     li {
                         margin-bottom: 0.5rem;
                         font-size: 0.875rem;
                         line-height: 1.5rem;
+                        color: $darker-gray;
 
                         a {
                             line-height: 1.5rem;
@@ -302,6 +303,18 @@ export default {
                     }
                 }
             }
+
+            .pricing-info {
+                display: block;
+                span {
+                    &.price {
+                        color: #075f35;
+                        font-size: 0.875rem;
+                        font-weight: $font-weight-bold;
+                        display: inline-block;
+                    }
+                }
+            }
         }
     }
 </style>

From e3114879d4dd6d66a67cbca0bc6010e8ac0a529d Mon Sep 17 00:00:00 2001
From: Katie Kroell <Katie.Kroell@safelite.com>
Date: Tue, 10 Feb 2026 15:55:09 -0500
Subject: [PATCH 05/30] fix width

---
 src/layouts/service-packages/service-packages.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layouts/service-packages/service-packages.vue b/src/layouts/service-packages/service-packages.vue
index d5c959ec..fc735992 100644
--- a/src/layouts/service-packages/service-packages.vue
+++ b/src/layouts/service-packages/service-packages.vue
@@ -220,7 +220,7 @@ export default {
 .iss-heritage-container-width {
     .service-packages-container {
         @media (min-width: 992px) {
-            width: 85%; // REVISIT
+            width: 100%;
         }
         position: relative;
         min-height: 1px;

From 706b3429f59d497095f319ac35cfeeeaa1504dd5 Mon Sep 17 00:00:00 2001
From: Katie Kroell <Katie.Kroell@safelite.com>
Date: Wed, 11 Feb 2026 12:10:52 -0500
Subject: [PATCH 06/30] styling updates

---
 .../site-sub-header/site-sub-header.vue       |  2 +-
 .../service-package-radio.vue                 | 24 +++++++------------
 .../service-packages/service-packages.vue     |  9 ++++---
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/iss-components/site-sub-header/site-sub-header.vue b/src/iss-components/site-sub-header/site-sub-header.vue
index 1dc202c3..976cf8df 100644
--- a/src/iss-components/site-sub-header/site-sub-header.vue
+++ b/src/iss-components/site-sub-header/site-sub-header.vue
@@ -117,7 +117,7 @@ export default {
         alternateFormatting() {
             // override for service-packages unique style
             if (this.issContainingPage?.toLowerCase() === 'service-packages') {
-                return 'service-packages-subtext my-4';
+                return 'service-packages-subtext';
             }
             return this.darkGraySubText ? 'dark-gray' : 'light-gray';
         }
diff --git a/src/layouts/service-packages/service-package-question/service-package-radio/service-package-radio.vue b/src/layouts/service-packages/service-package-question/service-package-radio/service-package-radio.vue
index 4e1cf8f1..efdf6d7b 100644
--- a/src/layouts/service-packages/service-package-question/service-package-radio/service-package-radio.vue
+++ b/src/layouts/service-packages/service-package-question/service-package-radio/service-package-radio.vue
@@ -144,10 +144,10 @@ export default {
                     cursor: pointer;
                     width: 100%;
                     padding: 1rem;
-                    border: 0.666667px solid $gray-300;
+                    border: 0.666667px solid #dddddd;
                     //box-shadow: 0px 4px 8px -4px rgba(0, 0, 0, 0.15), 0px 4px 24px -8px rgba(0, 0, 0, 0.2);
                     box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.2);
-                    border-radius: 0.5rem;
+                    border-radius: 0.25rem;
                     overflow: hidden;
                     min-height: 60px;
                     max-height: 100px;
@@ -165,7 +165,7 @@ export default {
                         top: 5px;
                         margin-right: 1rem;
                         border-radius: 50%;
-                        border: 0.666667px solid $gray-500;
+                        border: 0.666667px solid #767676;
                         width: 16px;
                         height: 16px;
                         min-width: 16px;
@@ -186,7 +186,7 @@ export default {
                 &:hover {
                     + .package-label {
                         &:before {
-                            border: 0.666667px solid #8e9292;
+                            border: 0.666667px solid #767676;
                             box-shadow: 0px 0px 0px 4px #9fcee6, 0px 1px 4px rgba(0, 0, 0, 0.2);
                         }
                     }
@@ -215,24 +215,18 @@ export default {
 
                     + .package-label {
                         &:before {
-                            box-shadow: 0px 0px 0px 1px $heritage-blue-secondary;
+                            box-shadow: 0px 0px 0px 1px $heritage-blue-primary;
+                            border: none;
                         }
                     }
 
                     + .package-label {
                         &:after {
-                            background: $heritage-blue-secondary;
+                            background: $heritage-blue-primary;
                         }
                     }
                 }
 
-                &:focus {
-                    + .package-label {
-                        &:before {
-                            border: 2px solid $heritage-blue-secondary;
-                        }
-                    }
-                }
             }
 
             .package-footer {
@@ -267,12 +261,12 @@ export default {
                 }
 
                 ul {
-                    margin:0.5rem 0 0 -.6rem; // .9375rem in fmg
+                    margin:0.5rem 0 0 -.6rem;
                     padding: 0;
                     color: $darker-gray;
 
                     li {
-                        margin-bottom: 0.5rem;
+                        margin-bottom: 0.25rem;
                         font-size: 0.875rem;
                         line-height: 1.5rem;
                         color: $darker-gray;
diff --git a/src/layouts/service-packages/service-packages.vue b/src/layouts/service-packages/service-packages.vue
index fc735992..b6ab110f 100644
--- a/src/layouts/service-packages/service-packages.vue
+++ b/src/layouts/service-packages/service-packages.vue
@@ -11,7 +11,7 @@
             <div class="iss-heritage-container-width">
                 <div class="service-packages-container">
                     <siteSubHeader
-                        class="subheader mt-4"
+                        class="subheader mt-5"
                         justification="center"
                         cmsWidgetName="SiteSubHeaderWidget"
                         issContainingPage="service-packages" />
@@ -236,12 +236,15 @@ export default {
             text-align: center;
             margin-top: 0.75rem;
             padding: 0px;
+            p {
+                margin-bottom: 18px;
+            }
         }
     }
 }
 .disclaimer {
     margin: 0.5rem 0 1.5rem 0;
-    padding-left: 3rem;
+    //padding-left: 3rem;
     :deep(.external-text) {
         text-decoration: none;
     }
@@ -253,6 +256,6 @@ export default {
 }
 
 .continue-button {
-    width: 60%
+    width: 50%
 }
 </style>

From 2cdf15cb951fc67ed0b9561b969ea2725e0d360b Mon Sep 17 00:00:00 2001
From: "US\\katie.kroell" <katie.kroell@safelite.com>
Date: Wed, 11 Feb 2026 15:48:49 -0500
Subject: [PATCH 07/30] more styling fun

---
 .../service-package-radio.vue                 | 116 +++++++++++-------
 1 file changed, 73 insertions(+), 43 deletions(-)

diff --git a/src/layouts/service-packages/service-package-question/service-package-radio/service-package-radio.vue b/src/layouts/service-packages/service-package-question/service-package-radio/service-package-radio.vue
index efdf6d7b..160826ab 100644
--- a/src/layouts/service-packages/service-package-question/service-package-radio/service-package-radio.vue
+++ b/src/layouts/service-packages/service-package-question/service-package-radio/service-package-radio.vue
@@ -7,15 +7,24 @@
             :class="[buttonLabelSubCopy ? 'has-subheader' : '']"
             for="testradio">
             <div class="package-specs">
-                <div>
-                    <p class="m-0">
-                        <span v-html="buttonLabel"></span>
-                    </p>
-                    <p
-                        v-if="buttonLabelSubCopy"
-                        class="sub-label m-0"
-                        v-html="buttonLabelSubCopy">
-                    </p>
+                <div class="button-label">
+                    <div class="label-wrapper">
+                        <p class="m-0">
+                            <span
+                                class="mt-1"
+                                v-html="buttonLabel"></span>
+                        </p>
+                        <p
+                            v-if="buttonLabelSubCopy"
+                            class="sub-label m-0"
+                            v-html="buttonLabelSubCopy">
+                        </p>
+                    </div>
+                    <div class="pricing-info-mobile">
+                        <span
+                            class="price"
+                            v-html="buttonAuxiliaryCopy"></span>
+                    </div>
                 </div>
                 <div class="hide-when-closed">
                     <ul>
@@ -50,13 +59,14 @@
                     <!--ms-n6-->
                     <div
                         v-if="buttonFooterCopy"
-                        class="package-footer fw-bold caption mt-4 ml-n4 mr-3"
-                        v-html="buttonFooterCopy"></div>
+                        class="package-footer fw-bold caption mt-4 mr-3"
+                        v-html="buttonFooterCopy">
+                    </div>
                 </div>
             </div>
-            <div class="pricing-info">
+            <div class="pricing-info-desktop">
                 <span
-                    class="price float-right"
+                    class="price"
                     v-html="buttonAuxiliaryCopy"></span>
             </div>
         </div>
@@ -123,6 +133,21 @@ export default {
         .package-wrapper {
             margin: 0.5rem 0;
 
+            .button-label {
+                display: flex;
+                &:before {
+                    content: "";
+                    position: relative;
+                    top: 5px;
+                    margin-right: 1rem;
+                    border-radius: 50%;
+                    border: 0.666667px solid #767676;
+                    width: 16px;
+                    height: 16px;
+                    min-width: 16px;
+                }
+            }
+
             label {
                 display: block;
                 height: 100%;
@@ -130,6 +155,8 @@ export default {
 
             .package-label {
                 height: 100%;
+                display: flex;
+                flex-direction: column;
             }
 
             input[type="radio"] {
@@ -139,11 +166,12 @@ export default {
 
                 + .package-label {
                     display: flex;
+                    flex-direction: column;
                     align-items: flex-start;
                     position: relative;
                     cursor: pointer;
                     width: 100%;
-                    padding: 1rem;
+                    padding: 10px;
                     border: 0.666667px solid #dddddd;
                     //box-shadow: 0px 4px 8px -4px rgba(0, 0, 0, 0.15), 0px 4px 24px -8px rgba(0, 0, 0, 0.2);
                     box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.2);
@@ -159,23 +187,11 @@ export default {
                         min-height: 86px;
                     }
 
-                    &:before {
-                        content: "";
-                        position: relative;
-                        top: 5px;
-                        margin-right: 1rem;
-                        border-radius: 50%;
-                        border: 0.666667px solid #767676;
-                        width: 16px;
-                        height: 16px;
-                        min-width: 16px;
-                    }
-
                     &:after {
                         content: "";
                         position: absolute;
-                        left: 19px;
-                        top: 24px;
+                        left: 13px;
+                        top: 18px;
                         border-radius: 50%;
                         width: 10px;
                         height: 10px;
@@ -184,7 +200,7 @@ export default {
                 }
 
                 &:hover {
-                    + .package-label {
+                    + .button-label {
                         &:before {
                             border: 0.666667px solid #767676;
                             box-shadow: 0px 0px 0px 4px #9fcee6, 0px 1px 4px rgba(0, 0, 0, 0.2);
@@ -213,7 +229,7 @@ export default {
                         max-height: 500px;
                     }
 
-                    + .package-label {
+                    + .button-label {
                         &:before {
                             box-shadow: 0px 0px 0px 1px $heritage-blue-primary;
                             border: none;
@@ -238,8 +254,8 @@ export default {
             }
 
             .package-specs {
-                display: flex;
-                flex-direction: column;
+                //display: flex;
+                flex-direction: row;
                 width: 100%;
                 max-height: 0;
                 transition: all 1s ease;
@@ -249,7 +265,7 @@ export default {
                 p {
                     color: #4d4e53;
                     font-weight: 600;
-                    display: flex;
+                    //display: flex;
                     justify-content: space-between;
 
                     &.sub-label {
@@ -261,7 +277,7 @@ export default {
                 }
 
                 ul {
-                    margin:0.5rem 0 0 -.6rem;
+                    margin: 0.5rem 0 0 1.25rem;
                     padding: 0;
                     color: $darker-gray;
 
@@ -293,19 +309,33 @@ export default {
                     display: none;
                     @include media-breakpoint-up(md) {
                         display: flex;
-                        flex-direction: column;
+                        flex-direction: row;
                     }
                 }
             }
 
-            .pricing-info {
-                display: block;
-                span {
-                    &.price {
-                        color: #075f35;
-                        font-size: 0.875rem;
-                        font-weight: $font-weight-bold;
-                        display: inline-block;
+            .pricing-info-desktop {
+                @include media-breakpoint-down(md) {
+                    display: none;
+                    span {
+                        &.price {
+                            color: #075f35;
+                            font-size: 0.875rem;
+                            font-weight: $font-weight-bold;
+                        }
+                    }
+                }
+            }
+
+            .pricing-info-mobile {
+                @include media-breakpoint-up(md) {
+                    display: none;
+                    span {
+                        &.price {
+                            color: #075f35;
+                            font-size: 0.875rem;
+                            font-weight: $font-weight-bold;
+                        }
                     }
                 }
             }

From f3ab2d9886225cdf7354bf8cb3f054ef0858ccfd Mon Sep 17 00:00:00 2001
From: "US\\katie.kroell" <katie.kroell@safelite.com>
Date: Thu, 12 Feb 2026 10:12:04 -0500
Subject: [PATCH 08/30] fix price styling

---
 .../service-package-radio.vue                 | 35 ++++++++++---------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/layouts/service-packages/service-package-question/service-package-radio/service-package-radio.vue b/src/layouts/service-packages/service-package-question/service-package-radio/service-package-radio.vue
index 160826ab..e2ccda45 100644
--- a/src/layouts/service-packages/service-package-question/service-package-radio/service-package-radio.vue
+++ b/src/layouts/service-packages/service-package-question/service-package-radio/service-package-radio.vue
@@ -254,8 +254,7 @@ export default {
             }
 
             .package-specs {
-                //display: flex;
-                flex-direction: row;
+                flex: 0;
                 width: 100%;
                 max-height: 0;
                 transition: all 1s ease;
@@ -265,7 +264,6 @@ export default {
                 p {
                     color: #4d4e53;
                     font-weight: 600;
-                    //display: flex;
                     justify-content: space-between;
 
                     &.sub-label {
@@ -308,21 +306,24 @@ export default {
                 .hide-when-closed {
                     display: none;
                     @include media-breakpoint-up(md) {
-                        display: flex;
-                        flex-direction: row;
+                        display: block;
                     }
                 }
             }
 
             .pricing-info-desktop {
+                display: flex;
+                flex: 1;
+                align-items: flex-end;
                 @include media-breakpoint-down(md) {
                     display: none;
-                    span {
-                        &.price {
-                            color: #075f35;
-                            font-size: 0.875rem;
-                            font-weight: $font-weight-bold;
-                        }
+                }
+                span {
+                    &.price {
+                        color: #075f35;
+                        font-size: 0.875rem;
+                        font-weight: $font-weight-bold;
+                        padding: 1rem 0 1rem 0;
                     }
                 }
             }
@@ -330,12 +331,12 @@ export default {
             .pricing-info-mobile {
                 @include media-breakpoint-up(md) {
                     display: none;
-                    span {
-                        &.price {
-                            color: #075f35;
-                            font-size: 0.875rem;
-                            font-weight: $font-weight-bold;
-                        }
+                }
+                span {
+                    &.price {
+                        color: #075f35;
+                        font-size: 0.875rem;
+                        font-weight: $font-weight-bold;
                     }
                 }
             }

From 38175f5d013d406b081cc9b57d79689dec1ad3b2 Mon Sep 17 00:00:00 2001
From: "US\\katie.kroell" <katie.kroell@safelite.com>
Date: Thu, 12 Feb 2026 15:08:12 -0500
Subject: [PATCH 09/30] final styling updates (hopefully)

---
 .../service-package-question.vue              | 30 +++++++++----------
 .../service-package-radio.vue                 |  9 ++++--
 .../service-packages/service-packages.vue     | 18 +++++++----
 3 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/src/layouts/service-packages/service-package-question/service-package-question.vue b/src/layouts/service-packages/service-package-question/service-package-question.vue
index 87f50898..8c62c893 100644
--- a/src/layouts/service-packages/service-package-question/service-package-question.vue
+++ b/src/layouts/service-packages/service-package-question/service-package-question.vue
@@ -22,7 +22,6 @@ import servicePackageRadio from '@/layouts/service-packages/service-package-ques
 import partTypeStrings from '@/constants/part-type-strings';
 import { useMainStore } from '@/store';
 import { getPriceOfLineItem } from '@/helpers/price-calculator';
-import { getHighestFullySatisfiedTier } from '@/helpers/service-package-helper.js';
 
 const glassLocations = damageLocationsSelected;
 
@@ -62,7 +61,6 @@ export default {
             if (this.availableLineItems?.lineItems) {
                 return this.availableLineItems.lineItems;
             }
-
             return this.availableLineItems ?? [];
         },
         servicePackageAnswers() {
@@ -146,9 +144,6 @@ export default {
         }
     },
     watch: {
-        availableLineItems() {
-            this.selectDefaultPackage();
-        },
         selectedPackageName(newValue) {
             const VapsProductsInSelectedPackage = this.getVapsLineItemsForSelectedPackage(newValue);
             this.$emit('vapsItemsSelected', VapsProductsInSelectedPackage);
@@ -217,17 +212,6 @@ export default {
             });
             return vapsPrice;
         },
-        selectDefaultPackage() {
-            const { glassToReplace, isRepair } = store.order.damage;
-            const { vaps } = store.order.lineItems;
-            const defaultTier = getHighestFullySatisfiedTier(
-                glassToReplace ?? [],
-                this.availableLineItems,
-                isRepair,
-                vaps ?? []
-            );
-            this.selectedPackageName = defaultTier;
-        },
         getVapsLineItemsForSelectedPackage(packageName) {
             const vapsLineItemsForSelectedPackage = [];
             if (packageName === packageNames.TIER_TWO) {
@@ -289,5 +273,19 @@ export default {
 .service-package-question-text {
     font-weight: 500;
     text-align: center;
+    margin-bottom: 0;
+}
+
+@include media-breakpoint-up(md) {
+    :deep(.package-main) {
+        padding: 0 1.5rem 0 1.5rem;
+        .package-wrapper:nth-child(2) {
+            margin-left: 0.5rem;
+        }
+        .package-wrapper:nth-child(3) {
+            margin-right: 0;
+            margin-left: 0.5rem;
+         }
+    }
 }
 </style>
diff --git a/src/layouts/service-packages/service-package-question/service-package-radio/service-package-radio.vue b/src/layouts/service-packages/service-package-question/service-package-radio/service-package-radio.vue
index e2ccda45..bfad975a 100644
--- a/src/layouts/service-packages/service-package-question/service-package-radio/service-package-radio.vue
+++ b/src/layouts/service-packages/service-package-question/service-package-radio/service-package-radio.vue
@@ -173,7 +173,6 @@ export default {
                     width: 100%;
                     padding: 10px;
                     border: 0.666667px solid #dddddd;
-                    //box-shadow: 0px 4px 8px -4px rgba(0, 0, 0, 0.15), 0px 4px 24px -8px rgba(0, 0, 0, 0.2);
                     box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.2);
                     border-radius: 0.25rem;
                     overflow: hidden;
@@ -250,7 +249,7 @@ export default {
                 font-weight: $font-weight-bold;
                 margin-top: 20px;
                 font-size: 0.875rem;
-                line-height: 21px;
+                line-height: 24px;
             }
 
             .package-specs {
@@ -323,12 +322,16 @@ export default {
                         color: #075f35;
                         font-size: 0.875rem;
                         font-weight: $font-weight-bold;
-                        padding: 1rem 0 1rem 0;
+                        padding: 0.35rem 0 1rem 0;
                     }
                 }
             }
 
             .pricing-info-mobile {
+                display: flex;
+                flex: 1;
+                justify-content: flex-end;
+                margin-top: 0.25rem;
                 @include media-breakpoint-up(md) {
                     display: none;
                 }
diff --git a/src/layouts/service-packages/service-packages.vue b/src/layouts/service-packages/service-packages.vue
index b6ab110f..7fb7a81e 100644
--- a/src/layouts/service-packages/service-packages.vue
+++ b/src/layouts/service-packages/service-packages.vue
@@ -34,6 +34,7 @@
                     </div>
                     <siteFooter
                         cmsWidgetName="SiteFooterWidget"
+                        class="back-link"
                         :isForwardActionDisabled="!meta.valid"
                         :isForwardButtonHidden="true"
                         @backClicked="navigateBack" />
@@ -219,8 +220,16 @@ export default {
 <style lang="scss" scoped>
 .iss-heritage-container-width {
     .service-packages-container {
-        @media (min-width: 992px) {
+        @include media-breakpoint-up(md) {
             width: 100%;
+            .continue-button {
+                width: 50%
+            }
+        }
+        @include media-breakpoint-down(md) {
+            .continue-button {
+                width: 90%
+            }
         }
         position: relative;
         min-height: 1px;
@@ -243,8 +252,7 @@ export default {
     }
 }
 .disclaimer {
-    margin: 0.5rem 0 1.5rem 0;
-    //padding-left: 3rem;
+    margin: 0.5rem 1rem 1.5rem 1.5rem;
     :deep(.external-text) {
         text-decoration: none;
     }
@@ -255,7 +263,7 @@ export default {
     }
 }
 
-.continue-button {
-    width: 50%
+.back-link {
+    margin-left: 1rem;
 }
 </style>

From cb64e53daf45ca016b25ea821cf400da7cbe28a6 Mon Sep 17 00:00:00 2001
From: "US\\katie.kroell" <katie.kroell@safelite.com>
Date: Thu, 12 Feb 2026 15:38:24 -0500
Subject: [PATCH 10/30] add to do

---
 .../service-package-radio/service-package-radio.vue              | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/layouts/service-packages/service-package-question/service-package-radio/service-package-radio.vue b/src/layouts/service-packages/service-package-question/service-package-radio/service-package-radio.vue
index bfad975a..03a9f3db 100644
--- a/src/layouts/service-packages/service-package-question/service-package-radio/service-package-radio.vue
+++ b/src/layouts/service-packages/service-package-question/service-package-radio/service-package-radio.vue
@@ -123,6 +123,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+// TO DO: look into why the font renders than Heritage, even with the same specs
     .ml-n4 {
         margin-left: -$spacer * 2;
     }

From 219060bd7d0e64e231fd90e2e208366467992923 Mon Sep 17 00:00:00 2001
From: katiekroell <100247286+katiekroell@users.noreply.github.com>
Date: Thu, 12 Feb 2026 15:40:06 -0500
Subject: [PATCH 11/30] Update
 src/layouts/service-packages/service-package-question/service-package-radio/service-package-radio.vue

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 .../service-package-radio/service-package-radio.vue             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layouts/service-packages/service-package-question/service-package-radio/service-package-radio.vue b/src/layouts/service-packages/service-package-question/service-package-radio/service-package-radio.vue
index 03a9f3db..5951d611 100644
--- a/src/layouts/service-packages/service-package-question/service-package-radio/service-package-radio.vue
+++ b/src/layouts/service-packages/service-package-question/service-package-radio/service-package-radio.vue
@@ -123,7 +123,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-// TO DO: look into why the font renders than Heritage, even with the same specs
+// TO DO: look into why the font renders differently than Heritage, even with the same specs
     .ml-n4 {
         margin-left: -$spacer * 2;
     }

From d6d252930ee5d1a78eaa7053ce278588480eda6d Mon Sep 17 00:00:00 2001
From: "US\\katie.kroell" <katie.kroell@safelite.com>
Date: Thu, 12 Feb 2026 16:11:46 -0500
Subject: [PATCH 12/30] add cancel claim modal back WIP

---
 .../coverage-statement.spec.js.snap           |  1 +
 .../coverage-statement.spec.js                |  1 +
 .../coverage-statement/coverage-statement.vue | 19 ++++++++++++++-----
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/layouts/coverage-statement/__snapshots__/coverage-statement.spec.js.snap b/src/layouts/coverage-statement/__snapshots__/coverage-statement.spec.js.snap
index ef566a55..26f60304 100644
--- a/src/layouts/coverage-statement/__snapshots__/coverage-statement.spec.js.snap
+++ b/src/layouts/coverage-statement/__snapshots__/coverage-statement.spec.js.snap
@@ -2,6 +2,7 @@
 
 exports[`coverageStatement.vue returns the initial data 1`] = `
 Object {
+  "CANCEL_CLAIM_REF_NAME": "CancelClaimModal",
   "RECAL_MODAL_REF_NAME": "RecalModal",
   "baseServiceLineItems": Array [],
   "widget": Object {
diff --git a/src/layouts/coverage-statement/coverage-statement.spec.js b/src/layouts/coverage-statement/coverage-statement.spec.js
index 28a74195..ec6d20bd 100644
--- a/src/layouts/coverage-statement/coverage-statement.spec.js
+++ b/src/layouts/coverage-statement/coverage-statement.spec.js
@@ -99,6 +99,7 @@ function getMountedComponent(mainInitialState = {}, initialData = {}, methodToRu
     fetchCmsContentForPage.mockImplementation(() => Promise.resolve());
 
     const wrapper = shallowMount(coverageStatement, mountOptions);
+    wrapper.vm.$refs[CANCEL_CLAIM_REF_NAME].openModal = jest.fn();
     return { wrapper };
 }
 
diff --git a/src/layouts/coverage-statement/coverage-statement.vue b/src/layouts/coverage-statement/coverage-statement.vue
index 91dfc1a1..bdb5ae39 100644
--- a/src/layouts/coverage-statement/coverage-statement.vue
+++ b/src/layouts/coverage-statement/coverage-statement.vue
@@ -102,6 +102,10 @@
             :ref="RECAL_MODAL_REF_NAME"
             cssModalHeadlineClass="text-center"
             cmsWidgetName="RecalModal" />
+        <cancelClaimModal
+            :ref="CANCEL_CLAIM_REF_NAME"
+            @cancelClaimConfirmation="cancelClaim"
+            @returnToClaim="continueClaim" />
     </Form>
 </template>
 
@@ -110,6 +114,7 @@
 import { Form } from 'vee-validate';
 import siteHeader from '@/iss-components/site-header/site-header.vue';
 import contentGroupModal from '@/iss-components/content-group-modal/content-group-modal.vue';
+import cancelClaimModal from '@/layouts/coverage-statement/cancel-claim-modal/cancel-claim-modal.vue';
 import textBlock from '@/digital-components/text-block/text-block.vue';
 import textLink from '@/ux-components/text-link/text-link.vue';
 import buttonMain from '@/ux-components/button-main/button-main.vue';
@@ -136,6 +141,7 @@ import coverageStatuses from '@/constants/coverage-statuses';
 import coverageType from '@/constants/coverage-type';
 
 const RECAL_MODAL_REF_NAME = 'RecalModal';
+const CANCEL_CLAIM_REF_NAME = 'CancelClaimModal';
 
 export default {
     name: 'coverage-statement',
@@ -147,7 +153,8 @@ export default {
         buttonMain,
         textBlock,
         textLink,
-        siteFooter
+        siteFooter,
+        cancelClaimModal
     },
     mixins: [baseFormMixin, vehicleQuestionsMixin],
     async beforeRouteEnter(to, from, next) {
@@ -208,7 +215,8 @@ export default {
                 explanatoryText: 'ExplanatoryTextWidget',
                 nextStep: 'NextStepsWidget'
             },
-            RECAL_MODAL_REF_NAME
+            RECAL_MODAL_REF_NAME,
+            CANCEL_CLAIM_REF_NAME
         };
     },
     computed: {
@@ -448,9 +456,10 @@ export default {
         },
         formatAmountInDollars,
         cancelClaim() {
-            this.mainStore.updateIsSafeliteProvider(false);
-            this.mainStore.setBailout(bailoutMessage.RequestCallback());
-            this.navigateWithScenario(navigationScenarios.CLICKED_FORWARD_WITH_NON_SAFELITE_SHOP);
+            this.$refs[this.CANCEL_CLAIM_REF_NAME].openModal();
+            // this.mainStore.updateIsSafeliteProvider(false);
+            // this.mainStore.setBailout(bailoutMessage.RequestCallback());
+            // this.navigateWithScenario(navigationScenarios.CLICKED_FORWARD_WITH_NON_SAFELITE_SHOP);
         }
     }
 };

From 740c5e1498e243ed78014f320677a3da2dde4815 Mon Sep 17 00:00:00 2001
From: scottkiener-at-safelite <scott.kiener@safelite.com>
Date: Fri, 13 Feb 2026 14:52:28 -0500
Subject: [PATCH 13/30] Big truck, button styling

When selected but unfocused the border now matches
---
 src/iss-components/shop-list-button/shop-list-button.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/iss-components/shop-list-button/shop-list-button.vue b/src/iss-components/shop-list-button/shop-list-button.vue
index 67091bde..b7ffff54 100644
--- a/src/iss-components/shop-list-button/shop-list-button.vue
+++ b/src/iss-components/shop-list-button/shop-list-button.vue
@@ -123,7 +123,6 @@ $heritage-checked-border-color: #0070d1;
         &:checked + .list-button-content {
             background: $background-color-selected;
             border-color: $heritage-checked-border-color;
-            box-shadow: 0 0 0 1px $blue;
             .button-label-copy {
                 font-weight: 500;
                 color: $black;

From 01148a74ab2e9d0a24300fd49ddb3ee13edb3f33 Mon Sep 17 00:00:00 2001
From: Alex Humphries <Alex.Humphries@safelite.com>
Date: Fri, 13 Feb 2026 16:35:48 -0500
Subject: [PATCH 14/30] INSR-8457: Adjust spacing to account for change to
 subheader. Update colors for alert-danger icons

---
 src/layouts/address-lookup/address-lookup.vue | 8 +++++---
 src/styles/ux-variables.scss                  | 1 +
 src/ux-components/alert/alert.vue             | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue
index d3db4c1f..cf6e6e4c 100644
--- a/src/layouts/address-lookup/address-lookup.vue
+++ b/src/layouts/address-lookup/address-lookup.vue
@@ -14,9 +14,11 @@
                         ref="siteSubHeader"
                         cmsWidgetName="SiteSubHeaderWidget"
                         class="mt-4" />
-                    <customerQuestions
-                        ref="customerQuestions"
-                        v-model="customerQuestions" />
+                    <div class="mt-4">
+                        <customerQuestions
+                            ref="customerQuestions"
+                            v-model="customerQuestions" />
+                    </div>
                     <alert
                         v-if="displayVinNotFoundAlert"
                         ref="alertVinNotFound"
diff --git a/src/styles/ux-variables.scss b/src/styles/ux-variables.scss
index e9455d7f..cde2f976 100644
--- a/src/styles/ux-variables.scss
+++ b/src/styles/ux-variables.scss
@@ -218,6 +218,7 @@ $alert-yellow-bg: #fef6e8;
 $alert-yellow-color: #e86421;
 $alert-red-bg: #fbe9e8;
 $alert-red-color: $red;
+$alert-red-icon: #da291c;
 
 //Modal animation
 // This affects all [Bootstrap] modals
diff --git a/src/ux-components/alert/alert.vue b/src/ux-components/alert/alert.vue
index a6323194..34b9856d 100644
--- a/src/ux-components/alert/alert.vue
+++ b/src/ux-components/alert/alert.vue
@@ -355,7 +355,7 @@ export default {
             border-top-color: $alert-red-color;
         }
         svg {
-            fill: $red-600;
+            fill: $alert-red-icon;
             width: 1rem;
             height: 1rem;
         }

From e2f624b4b4fbe808532749af78cd803a1a3df221 Mon Sep 17 00:00:00 2001
From: Alex Humphries <Alex.Humphries@safelite.com>
Date: Fri, 13 Feb 2026 17:12:23 -0500
Subject: [PATCH 15/30] INSR-7774: Skip vehicle-lookup if not windshield
 replacement

---
 src/layouts/vehicle-damage/vehicle-damage.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index 265ad56a..5fac4f61 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -216,6 +216,13 @@ export default {
                     === damageLocationsSelected.REPAIR
             );
         },
+        isWindshieldReplace() {
+            return (
+                this.isWindshieldDamageLocation
+                && this.selectedWindshieldOptions.selectedWindshieldDamageType
+                    === damageLocationsSelected.REPLACE
+            );
+        },
         isDriverSideReplace() {
             if (!this.isSideDoorDamageLocation) return false;
 
@@ -418,7 +425,7 @@ export default {
                     this.navigationScenarios.CLICKED_FORWARD_WITH_REPAIR,
                     this.$route
                 );
-            } else if (this.mainStore.order.vehicle.vin) {
+            } else if (this.mainStore.order.vehicle.vin || !this.isWindshieldReplace) {
                 // If vin already exists, navigate directly to vin-lookup
 
                 const partsOrQuestionsResponse = await this.getPartsOrQuestions();

From 916f56a50e08b7c5e50e11c2b6044cb90129cbed Mon Sep 17 00:00:00 2001
From: Alex Humphries <Alex.Humphries@safelite.com>
Date: Fri, 13 Feb 2026 17:27:28 -0500
Subject: [PATCH 16/30] INSR-8455: Skip vehicle-lookup on back navigation when
 appropriate

---
 src/helpers/damage-helper.js                        | 9 +++++++++
 src/mixins/vehicle-questions-mixin.js               | 3 +++
 src/router/router-constants/navigation-scenarios.js | 1 +
 src/router/router-constants/routing-table.js        | 4 ++++
 4 files changed, 17 insertions(+)

diff --git a/src/helpers/damage-helper.js b/src/helpers/damage-helper.js
index 7083d7c0..be5d5370 100644
--- a/src/helpers/damage-helper.js
+++ b/src/helpers/damage-helper.js
@@ -90,6 +90,15 @@ export function getGlassList(glassPieces) {
     return names.toLowerCase();
 }
 
+export function includesWindshieldReplacement() {
+    const mainStore = useMainStore();
+    const windshieldMatches =
+        mainStore.damage.glassToReplace?.filter(
+            (glassToReplace) => glassToReplace.glassLocation === damageLocationsSelected.WINDSHIELD
+        ) ?? [];
+    return windshieldMatches.length > 0;
+}
+
 /**
  * Commented code are copied directly from DigitalConsumer.FixMyGlass
  * and have not been adjusted for ISS.
diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js
index b92bb837..d5c492d8 100644
--- a/src/mixins/vehicle-questions-mixin.js
+++ b/src/mixins/vehicle-questions-mixin.js
@@ -1,3 +1,4 @@
+import { includesWindshieldReplacement } from '@/helpers/damage-helper';
 import issPageValues from '@/router/router-constants/issPage-values';
 import navigationScenarios from '@/router/router-constants/navigation-scenarios';
 import { useMainStore } from '@/store';
@@ -457,6 +458,8 @@ export default {
             let backNavigationScenario = '';
             if (self.mainStore.order.damage.isRepair) {
                 backNavigationScenario = navigationScenarios.CLICKED_BACK_WITH_REPAIR;
+            } else if (!includesWindshieldReplacement()) {
+                backNavigationScenario = navigationScenarios.CLICKED_BACK_WITH_SKIP_VIN_AND_NO_MORE_QUESTIONS;
             } else {
                 backNavigationScenario = self.mainStore.vehicle.vin
                     ? navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS
diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js
index 6f17494d..d6fba845 100644
--- a/src/router/router-constants/navigation-scenarios.js
+++ b/src/router/router-constants/navigation-scenarios.js
@@ -61,6 +61,7 @@ const navigationScenarios = Object.freeze({
     CLICKED_BACK_WITH_MOLDING_QUESTIONS: 'CLICKED_BACK_WITH_MOLDING_QUESTIONS',
     CLICKED_BACK_WITH_CAPABILITY_QUESTIONS: 'CLICKED_BACK_WITH_CAPABILITY_QUESTIONS',
     CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS: 'CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS',
+    CLICKED_BACK_WITH_SKIP_VIN_AND_NO_MORE_QUESTIONS: 'CLICKED_BACK_WITH_SKIP_VIN_AND_NO_MORE_QUESTIONS',
     CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS: 'CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS',
 
     // Schedule
diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js
index c3075d3f..eec16cf3 100644
--- a/src/router/router-constants/routing-table.js
+++ b/src/router/router-constants/routing-table.js
@@ -536,6 +536,10 @@ const routingTable = () => [
                 scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
                 destinationIssPageValue: issPageValues.VEHICLE_DAMAGE
             },
+            {
+                scenario: navigationScenarios.CLICKED_BACK_WITH_SKIP_VIN_AND_NO_MORE_QUESTIONS,
+                destinationIssPageValue: issPageValues.VEHICLE_DAMAGE
+            },
             {
                 scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
                 destinationIssPageValue: issPageValues.VEHICLE_LOOKUP

From 00a8e89dbea878f98cfa0e9a524e35bc78fff3dd Mon Sep 17 00:00:00 2001
From: Bill Richardson <william.richardson@safelite.com>
Date: Mon, 16 Feb 2026 09:47:50 -0500
Subject: [PATCH 17/30] move alerts and update red

---
 .../license-plate-lookup.vue                  | 36 +++++++++----------
 src/ux-components/alert/alert.vue             |  2 +-
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue
index c7eab0f8..ac6bb727 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup.vue
+++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue
@@ -14,6 +14,24 @@
                         cmsWidgetName="SiteSubHeaderWidget"
                         class="mt-4"
                         subHeaderMarginClasses="mt-1" />
+                    <textboxQuestion
+                        id="license-plate-question-wrapper"
+                        v-model="licensePlate"
+                        cmsWidgetName="LicensePlateNumberQuestionWidget"
+                        isRequired
+                        disableAutoFill
+                        inputId="license-plate-question"
+                        class="mt-4"
+                        validationRules="license-plate-required" />
+                    <dropdownQuestion
+                        ref="state"
+                        v-model="licenseState"
+                        cmsWidgetName="StateQuestionWidget"
+                        inputId="8fdf9dc2e13e430eb57529499dceb3eb"
+                        :options="stateOptions"
+                        disableAutoFill
+                        validationRules="state-required"
+                        class="mt-4" />
                     <alert
                         v-if="displayVinNotFoundAlert"
                         ref="alertVinNotFound"
@@ -48,24 +66,6 @@
                         cmsWidgetName="AlertNoServiceWidget"
                         alertClass="alert-danger"
                         :isDismissable="false" />
-                    <textboxQuestion
-                        id="license-plate-question-wrapper"
-                        v-model="licensePlate"
-                        cmsWidgetName="LicensePlateNumberQuestionWidget"
-                        isRequired
-                        disableAutoFill
-                        inputId="license-plate-question"
-                        class="mt-4"
-                        validationRules="license-plate-required" />
-                    <dropdownQuestion
-                        ref="state"
-                        v-model="licenseState"
-                        cmsWidgetName="StateQuestionWidget"
-                        inputId="8fdf9dc2e13e430eb57529499dceb3eb"
-                        :options="stateOptions"
-                        disableAutoFill
-                        validationRules="state-required"
-                        class="mt-4" />
                     <siteFooter
                         ref="siteFooter"
                         class="mt-5"
diff --git a/src/ux-components/alert/alert.vue b/src/ux-components/alert/alert.vue
index a6323194..929117b5 100644
--- a/src/ux-components/alert/alert.vue
+++ b/src/ux-components/alert/alert.vue
@@ -355,7 +355,7 @@ export default {
             border-top-color: $alert-red-color;
         }
         svg {
-            fill: $red-600;
+            fill: $red;
             width: 1rem;
             height: 1rem;
         }

From 7f56849177b7e65a6b664f4e225f9d26b63012a4 Mon Sep 17 00:00:00 2001
From: Bill Richardson <william.richardson@safelite.com>
Date: Mon, 16 Feb 2026 09:57:10 -0500
Subject: [PATCH 18/30] move alerts above continue button

---
 src/layouts/vin-lookup/vin-lookup.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 66bc41a9..3bb0d637 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -14,8 +14,6 @@
                         <siteSubHeader
                             cmsWidgetName="SiteSubHeaderWidget"
                             class="mt-4" />
-                        <vinLookupAlerts
-                            :activeAlertType="activeVehicleLookupAlertType" />
                         <vinQuestion
                             v-model="vin"
                             class="mt-4"
@@ -23,6 +21,8 @@
                             :isDisabled="vinPopulatedOnPageLoad"
                             textPosition="left" />
                         <vinLocationInformation />
+                        <vinLookupAlerts
+                            :activeAlertType="activeVehicleLookupAlertType" />
                         <siteFooter
                             ref="siteFooter"
                             cmsWidgetName="SiteFooterWidget"

From b286a70e9802a637b3d4c7141362686bd6ca0c92 Mon Sep 17 00:00:00 2001
From: Katie Kroell <Katie.Kroell@safelite.com>
Date: Mon, 16 Feb 2026 10:08:05 -0500
Subject: [PATCH 19/30] cancel claim modal navigation

---
 .../coverage-statement/coverage-statement.vue      | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/layouts/coverage-statement/coverage-statement.vue b/src/layouts/coverage-statement/coverage-statement.vue
index bdb5ae39..fd3d8dd9 100644
--- a/src/layouts/coverage-statement/coverage-statement.vue
+++ b/src/layouts/coverage-statement/coverage-statement.vue
@@ -83,7 +83,7 @@
                         linkType="text"
                         text="No, I want to cancel"
                         href="#"
-                        @clickEvent="cancelClaim" />
+                        @clickEvent="openCancelClaimModal" />
                     <textBlock
                         v-if="isDisclaimerVisible"
                         class="mt-5 mb-5"
@@ -105,7 +105,7 @@
         <cancelClaimModal
             :ref="CANCEL_CLAIM_REF_NAME"
             @cancelClaimConfirmation="cancelClaim"
-            @returnToClaim="continueClaim" />
+            @returnToClaim="navigateForward" />
     </Form>
 </template>
 
@@ -455,11 +455,13 @@ export default {
             this.baseServiceLineItems = lineItems;
         },
         formatAmountInDollars,
+        openCancelClaimModal() {
+            this.$refs[CANCEL_CLAIM_REF_NAME].openModal();
+        },
         cancelClaim() {
-            this.$refs[this.CANCEL_CLAIM_REF_NAME].openModal();
-            // this.mainStore.updateIsSafeliteProvider(false);
-            // this.mainStore.setBailout(bailoutMessage.RequestCallback());
-            // this.navigateWithScenario(navigationScenarios.CLICKED_FORWARD_WITH_NON_SAFELITE_SHOP);
+            this.mainStore.updateIsSafeliteProvider(false);
+            this.mainStore.setBailout(bailoutMessage.RequestCallback());
+            this.navigateWithScenario(navigationScenarios.CLICKED_FORWARD_WITH_NON_SAFELITE_SHOP);
         }
     }
 };

From d3f0598bc59c73b42c88bebefa45fc727e41368e Mon Sep 17 00:00:00 2001
From: Alex Humphries <Alex.Humphries@safelite.com>
Date: Mon, 16 Feb 2026 10:14:44 -0500
Subject: [PATCH 20/30] INSR-8455: Add some tests, fix others

---
 .../vehicle-damage/vehicle-damage.spec.js     | 50 ++++++++++-
 .../vehicle-parts/vehicle-parts.spec.js       |  2 +
 src/mixins/vehicle-questions-mixin.spec.js    | 89 ++++++++++++++++---
 3 files changed, 128 insertions(+), 13 deletions(-)

diff --git a/src/layouts/vehicle-damage/vehicle-damage.spec.js b/src/layouts/vehicle-damage/vehicle-damage.spec.js
index 42c4ed6b..db8ae50d 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.spec.js
+++ b/src/layouts/vehicle-damage/vehicle-damage.spec.js
@@ -5,6 +5,7 @@ import routerParams from '@/router/router-constants/router-params';
 import { useMainStore } from '@/store';
 import vehicleCategories from '@/constants/vehicle-categories';
 import VehicleDamageComponent from '@/layouts/vehicle-damage/vehicle-damage.vue';
+import vehicleQuestionsMixin from '@/mixins/vehicle-questions-mixin';
 
 const mockRoute = {
     params: {}
@@ -12,6 +13,16 @@ const mockRoute = {
 const mockRouter = {
     navigate: jest.fn()
 };
+jest.mock('@/mixins/vehicle-questions-mixin', () => ({
+    methods: {
+        navigateForward: jest.fn(),
+        getPartsOrQuestions: jest.fn(() => Promise.resolve({
+            data: {
+                partsOrQuestions: []
+            }
+        }))
+    }
+}));
 const mountOptions = {
     global: {
         mixins: [
@@ -91,6 +102,43 @@ describe('vehicle-damage.vue', () => {
         expect(mockRouter.navigate)
             .toHaveBeenCalledWith(navigationScenarios.CLICKED_FORWARD_WITH_REPAIR, mockRoute);
     });
+    test('When damage selected is a replace but not windshield, navigate forward from vehicle-questions-mixin', async () => {
+        mountOptions.global.plugins = [createTestingPinia({
+            initialState: {
+                main: {
+                    order: {
+                        damage: {
+                            isRepair: false,
+                            glassToReplace: [{ glassLocation: 'Rear', glassName: 'Stationary' }]
+                        }
+                    }
+                }
+            }
+        })];
+        const wrapper = mount(VehicleDamageComponent, mountOptions);
+        const siteFooterWrapper = wrapper.getComponent({ ref: 'siteFooter' });
+
+        useMainStore().getSupportingItems = jest.fn().mockImplementation(() => Promise.resolve({
+            data: { data: [
+                {
+                    description: null,
+                    partNumber: 'SUPPLIES-REPAIR',
+                    partType: 'REPAIR FEE'
+                },
+                {
+                    description: null,
+                    partNumber: 'WSREPAIR',
+                    partType: 'REPAIR FEE'
+                }
+            ] }
+        }));
+
+        siteFooterWrapper.vm.$emit('forwardClicked');
+
+        await flushPromises();
+        expect(vehicleQuestionsMixin.methods.getPartsOrQuestions).toHaveBeenCalledTimes(1);
+        expect(vehicleQuestionsMixin.methods.navigateForward).toHaveBeenCalledTimes(1);
+    });
     test('Error in getPartsOrQuestions call => bailout true and navigate forward with CLICKED_FORWARD_WITH_BAILOUT scenario', async () => {
         mountOptions.global.plugins = [createTestingPinia({
             initialState: {
@@ -115,7 +163,7 @@ describe('vehicle-damage.vue', () => {
         const partsQuestionsErrorResponse = {
             error: 'Error getting parts'
         };
-        useMainStore().getPartsOrQuestions = jest.fn().mockImplementation(() => (
+        vehicleQuestionsMixin.methods.getPartsOrQuestions.mockImplementation(() => (
             partsQuestionsErrorResponse
         ));
         siteFooterWrapper.vm.$emit('forwardClicked');
diff --git a/src/layouts/vehicle-parts/vehicle-parts.spec.js b/src/layouts/vehicle-parts/vehicle-parts.spec.js
index e05f2298..909bf57c 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.spec.js
+++ b/src/layouts/vehicle-parts/vehicle-parts.spec.js
@@ -212,6 +212,7 @@ describe('vehicle-parts.vue', () => {
 
     test('User had part questions > navigateBack triggers a router.navigateWithoutSaving change with correct scenario', async () => {
         // Arrange
+        useMainStore().damage.glassToReplace = [{  glassLocation: 'Rear', glassName: 'Stationary' }, { glassLocation: 'Windshield', glassName: 'Single' }];
         const { wrapper } = setupMocks({
             mountOptionsMockData: {
                 router: {
@@ -244,6 +245,7 @@ describe('vehicle-parts.vue', () => {
 
     test('User did not have part questions > navigateBack triggers a router.navigate change with correct scenario', async () => {
         // Arrange
+        useMainStore().damage.glassToReplace = [{  glassLocation: 'Rear', glassName: 'Stationary' }, { glassLocation: 'Windshield', glassName: 'Single' }];
         const { wrapper } = setupMocks({
             mountOptionsMockData: {
                 router: {
diff --git a/src/mixins/vehicle-questions-mixin.spec.js b/src/mixins/vehicle-questions-mixin.spec.js
index 5efde63c..a878e09f 100644
--- a/src/mixins/vehicle-questions-mixin.spec.js
+++ b/src/mixins/vehicle-questions-mixin.spec.js
@@ -3,7 +3,7 @@ import { shallowMount } from '@vue/test-utils';
 import { setupMocksForJsFiles, getMountOptions } from '@/helpers/unit-test-helper.js';
 import issPageValues from '@/router/router-constants/issPage-values';
 import navigationScenarios from '@/router/router-constants/navigation-scenarios';
-import { useMainStore } from '@/store';
+import { useMainStore, getDefaultState } from '@/store';
 
 /** @ignore */
 function setupMocks({ issPage = issPageValues.VIN_LOOKUP }) {
@@ -53,6 +53,7 @@ function setupMocks({ issPage = issPageValues.VIN_LOOKUP }) {
 describe('vehicle-questions-mixin', () => {
     afterEach(() => {
         jest.clearAllMocks();
+        useMainStore().order = getDefaultState().order;
     });
 
     describe('hasPartQuestions', () => {
@@ -2181,19 +2182,83 @@ describe('vehicle-questions-mixin', () => {
     });
 
     describe('navigateBackByVehicleQuestions', () => {
-        test('current page is coverage-statement and damage is repair => go to vehicle-damage', () => {
-            // Arrange
-            const { wrapper } = setupMocks({ issPage: issPageValues.COVERAGE_STATEMENT });
-            useMainStore().order.damage.isRepair = true;
+        describe('current page is coverage-statement', () => {
+            test('damage is repair => go to vehicle-damage', () => {
+                // Arrange
+                const { wrapper } = setupMocks({ issPage: issPageValues.COVERAGE_STATEMENT });
+                useMainStore().order.damage.isRepair = true;
 
-            // Act
-            wrapper.vm.navigateBackByVehicleQuestions();
+                // Act
+                wrapper.vm.navigateBackByVehicleQuestions();
 
-            // Assert
-            expect(wrapper.vm.$router.navigateWithSpinner).toHaveBeenCalledWith(
-                navigationScenarios.CLICKED_BACK_WITH_REPAIR,
-                { query: { issPage: issPageValues.COVERAGE_STATEMENT } }
-            );
+                // Assert
+                expect(wrapper.vm.$router.navigateWithSpinner).toHaveBeenCalledWith(
+                    navigationScenarios.CLICKED_BACK_WITH_REPAIR,
+                    { query: { issPage: issPageValues.COVERAGE_STATEMENT } }
+                );
+            });
+            test('damage is replace but not windshield => go to vehicle-damage', () => {
+                // Arrange
+                const { wrapper } = setupMocks({ issPage: issPageValues.COVERAGE_STATEMENT });
+                useMainStore().order.damage.isRepair = false;
+                useMainStore().order.damage.glassToReplace = [{ glassLocation: 'Rear', glassName: 'Stationary' }];
+
+                // Act
+                wrapper.vm.navigateBackByVehicleQuestions();
+
+                // Assert
+                expect(wrapper.vm.$router.navigateWithSpinner).toHaveBeenCalledWith(
+                    navigationScenarios.CLICKED_BACK_WITH_SKIP_VIN_AND_NO_MORE_QUESTIONS,
+                    { query: { issPage: issPageValues.COVERAGE_STATEMENT } }
+                );
+            });
+            test('damage is replace and includes windshield, we have vin => go to vehicle-damage', () => {
+                // Arrange
+                const { wrapper } = setupMocks({ issPage: issPageValues.COVERAGE_STATEMENT });
+                useMainStore().order.damage.isRepair = false;
+                useMainStore().order.damage.glassToReplace = [{ glassLocation: 'Rear', glassName: 'Stationary' }, { glassLocation: 'Windshield', glassName: 'Single' }];
+                useMainStore().order.vehicle.vin = '5NMS3CADXLH233004';
+
+                // Act
+                wrapper.vm.navigateBackByVehicleQuestions();
+
+                // Assert
+                expect(wrapper.vm.$router.navigateWithSpinner).toHaveBeenCalledWith(
+                    navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
+                    { query: { issPage: issPageValues.COVERAGE_STATEMENT } }
+                );
+            });
+            test('damage is replace and includes windshield => go to vehicle-lookup', () => {
+                // Arrange
+                const { wrapper } = setupMocks({ issPage: issPageValues.COVERAGE_STATEMENT });
+                useMainStore().order.damage.isRepair = false;
+                useMainStore().order.damage.glassToReplace = [{ glassLocation: 'Rear', glassName: 'Stationary' }, { glassLocation: 'Windshield', glassName: 'Single' }];
+
+                // Act
+                wrapper.vm.navigateBackByVehicleQuestions();
+
+                // Assert
+                expect(wrapper.vm.$router.navigateWithSpinner).toHaveBeenCalledWith(
+                    navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
+                    { query: { issPage: issPageValues.COVERAGE_STATEMENT } }
+                );
+            });
+            test('damage is replace and includes windshield but there are parts to choose => go to vehicle-parts', () => {
+                // Arrange
+                const { wrapper } = setupMocks({ issPage: issPageValues.COVERAGE_STATEMENT });
+                useMainStore().order.damage.isRepair = false;
+                useMainStore().order.damage.glassToReplace = [{ glassLocation: 'Rear', glassName: 'Stationary' }, { glassLocation: 'Windshield', glassName: 'Single' }];
+                wrapper.vm.hasGlassLocationWithMultipleParts = jest.fn().mockReturnValue(true);
+
+                // Act
+                wrapper.vm.navigateBackByVehicleQuestions();
+
+                // Assert
+                expect(wrapper.vm.$router.navigateWithSpinner).toHaveBeenCalledWith(
+                    navigationScenarios.CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE,
+                    { query: { issPage: issPageValues.COVERAGE_STATEMENT } }
+                );
+            });
         });
 
         test(

From b6b5212638be0a438ad58dd87f05bf5e28494931 Mon Sep 17 00:00:00 2001
From: AHumphriesSL <alex.humphries@safelite.com>
Date: Mon, 16 Feb 2026 10:17:06 -0500
Subject: [PATCH 21/30] Update misleading comment

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 src/layouts/vehicle-damage/vehicle-damage.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index 5fac4f61..b486f90e 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -426,7 +426,7 @@ export default {
                     this.$route
                 );
             } else if (this.mainStore.order.vehicle.vin || !this.isWindshieldReplace) {
-                // If vin already exists, navigate directly to vin-lookup
+                // If vin already exists or not replacing windshield, get parts/questions and navigate forward
 
                 const partsOrQuestionsResponse = await this.getPartsOrQuestions();
                 if (partsOrQuestionsResponse.error) {

From 6ad3e29869bed16c5fbfc20e442b612a2d0bf23c Mon Sep 17 00:00:00 2001
From: Josh Dassinger <Joshua.Dassinger@safelite.com>
Date: Mon, 16 Feb 2026 10:55:37 -0600
Subject: [PATCH 22/30] Fixed assigning the default store state

---
 src/store/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/store/index.js b/src/store/index.js
index 676fadb7..34d77533 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -2457,7 +2457,7 @@ export const useMainStore = defineStore({
         // populate initial state
         populateInitialState(forceReset) {
             if (!sessionStorage.getItem(storeId) || forceReset) {
-                this.$state = state;
+                this.$state = getDefaultState();
             }
         },
 

From 6aae14975f5041d8d07ef29160a70e4f298d821b Mon Sep 17 00:00:00 2001
From: Alex Humphries <Alex.Humphries@safelite.com>
Date: Mon, 16 Feb 2026 12:54:46 -0500
Subject: [PATCH 23/30] Fix alert icon red

---
 src/styles/ux-variables.scss      | 1 -
 src/ux-components/alert/alert.vue | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/styles/ux-variables.scss b/src/styles/ux-variables.scss
index cde2f976..e9455d7f 100644
--- a/src/styles/ux-variables.scss
+++ b/src/styles/ux-variables.scss
@@ -218,7 +218,6 @@ $alert-yellow-bg: #fef6e8;
 $alert-yellow-color: #e86421;
 $alert-red-bg: #fbe9e8;
 $alert-red-color: $red;
-$alert-red-icon: #da291c;
 
 //Modal animation
 // This affects all [Bootstrap] modals
diff --git a/src/ux-components/alert/alert.vue b/src/ux-components/alert/alert.vue
index 34b9856d..0e0ea2be 100644
--- a/src/ux-components/alert/alert.vue
+++ b/src/ux-components/alert/alert.vue
@@ -355,7 +355,7 @@ export default {
             border-top-color: $alert-red-color;
         }
         svg {
-            fill: $alert-red-icon;
+            fill: $alert-red-color;
             width: 1rem;
             height: 1rem;
         }

From 4533c1b528e09738520e11d9122ff29517b68539 Mon Sep 17 00:00:00 2001
From: Katie Kroell <Katie.Kroell@safelite.com>
Date: Mon, 16 Feb 2026 13:44:37 -0500
Subject: [PATCH 24/30] underline external links

---
 src/layouts/coverage-statement/coverage-statement.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/layouts/coverage-statement/coverage-statement.vue b/src/layouts/coverage-statement/coverage-statement.vue
index fd3d8dd9..3b59c35c 100644
--- a/src/layouts/coverage-statement/coverage-statement.vue
+++ b/src/layouts/coverage-statement/coverage-statement.vue
@@ -545,6 +545,9 @@ export default {
             font-weight: 500;
         }
         margin-top: 6px;
+        .external-text {
+            text-decoration: underline;
+        }
         a {
             text-decoration: none;
         }

From 551b1fdf52b371c43780fedd7d75447f51982566 Mon Sep 17 00:00:00 2001
From: Josh Dassinger <Joshua.Dassinger@safelite.com>
Date: Mon, 16 Feb 2026 13:27:35 -0600
Subject: [PATCH 25/30] Initial setup of global bailout system Added
 router.navigateBailout Added global bailout handling for javascript, api, and
 router errors Removed unused / unneeded parameters passed into callHttpClient

---
 src/constants/application-config.js           |  5 ++++-
 src/constants/bailoutCode.js                  |  5 ++++-
 src/constants/bailoutMessage.js               | 12 +++++++++++
 src/global-methods.js                         | 18 +++++++---------
 src/main.js                                   | 19 ++++++++++++++---
 src/router/index.js                           | 17 ++++++++++++++-
 .../router-constants/navigation-scenarios.js  |  1 +
 src/store/index.js                            | 21 +++++--------------
 8 files changed, 66 insertions(+), 32 deletions(-)

diff --git a/src/constants/application-config.js b/src/constants/application-config.js
index 7799506f..1e5ee6d8 100644
--- a/src/constants/application-config.js
+++ b/src/constants/application-config.js
@@ -23,7 +23,10 @@ const applicationConfig = Object.freeze({
     YAHOO_CALENDAR: 'https://calendar.yahoo.com/?v=60',
     OUTLOOK_CALENDAR:
         'https://outlook.office.com/calendar/deeplink/compose?path=/calendar/action/compose&rru=addevent',
-    FRONTEND_LOGGER_PATH: "/analytics/api/v1/logging"
+    FRONTEND_LOGGER_PATH: "/analytics/api/v1/logging",
+    BAILOUT_ON_APPLICATION_ERROR: true,
+    BAILOUT_ON_API_ERROR: true,
+    BAILOUT_ON_ROUTER_ERROR: true
 });
 
 export default applicationConfig;
diff --git a/src/constants/bailoutCode.js b/src/constants/bailoutCode.js
index fb1ac071..f108570a 100644
--- a/src/constants/bailoutCode.js
+++ b/src/constants/bailoutCode.js
@@ -12,7 +12,10 @@ const bailoutCode = Object.freeze({
     NoPartsAvailable: 10,
     PartsServiceError: 11,
     SafeliteNotTheProvider: 12,
-    VehicleYMMSLookupError: 13
+    VehicleYMMSLookupError: 13,
+    ApplicationError: 14,
+    ApiError: 15,
+    RouterError: 16
 });
 
 export default bailoutCode;
diff --git a/src/constants/bailoutMessage.js b/src/constants/bailoutMessage.js
index 1daa702e..77292a1e 100644
--- a/src/constants/bailoutMessage.js
+++ b/src/constants/bailoutMessage.js
@@ -17,6 +17,18 @@ const bailoutMessage = Object.freeze({
         code: bailoutCode.Unknown,
         message: `An unknown bailout occurred: ${getItemData(error)}`
     }),
+    applicationError: (error) => ({
+        code: bailoutCode.ApplicationError,
+        message: `An application error occurred: ${getItemData(error)}`
+    }),
+    apiError: (error) => ({
+        code: bailoutCode.ApiError,
+        message: `An API error occurred: ${getItemData(error)}`
+    }),
+    routerError: (error) => ({
+        code: bailoutCode.RouterError,
+        message: `A router error occurred: ${getItemData(error)}`
+    }),
     saveSessionError: (error) => ({
         code: bailoutCode.SaveSessionError,
         message: `An error occurred during save session: ${getItemData(error)}`
diff --git a/src/global-methods.js b/src/global-methods.js
index bf515f6c..280f318d 100644
--- a/src/global-methods.js
+++ b/src/global-methods.js
@@ -15,10 +15,6 @@ axios.interceptors.response.use(
         if (typeof error.response === 'undefined') {
             // The request was not made, could be a bad url, bad connection or a CORS error.
             rejectionError = {
-                message:
-                    'A network error occurred. '
-                    + 'This could be a CORS issue or a dropped internet connection. '
-                    + 'It is impossible for us to know.',
                 cause: error,
                 response: error,
                 message: axiosResponseInterceptorMessages.NETWORK_ERROR
@@ -51,7 +47,7 @@ axios.interceptors.response.use(
 );
 
 export default {
-    callHttpClient({ method, endpoint, payload, logApiCall = true }) {
+    callHttpClient({ method, endpoint, payload, logApiCall = true, bailoutOnError = true }) {
         return new Promise((resolve, reject) => {
             const store = useMainStore();
             const cfDistroUrl = applicationConfig.CONSUMER_CF_DISTRO;
@@ -66,9 +62,10 @@ export default {
                 [headerKeys.SESSION_SEQUENCE_NUMBER]: sessionKey
             };
 
+            const url = cfDistroUrl + endpoint;
             axios({
                 method,
-                url: cfDistroUrl + endpoint,
+                url,
                 data: payloadAndAnalyticsData,
                 crossDomain: true,
                 responseType: 'json',
@@ -97,10 +94,11 @@ export default {
                         }
 
                         if (error.response.status !== 404) {
-                            global.$logger.logError(
-                                `${method}: ${endpoint}: ${error.message}`,
-                                error.response
-                            );
+                            global.$logger.logError(`${method}: ${endpoint}: ${error.message}`, error.response);
+                            if (bailoutOnError && global.bailoutOnAxiosError !== undefined)
+                            {
+                                global.bailoutOnAxiosError({ url, error });
+                            }
                         }
                         return reject(error.response);
                     }
diff --git a/src/main.js b/src/main.js
index e1c788be..243335b9 100644
--- a/src/main.js
+++ b/src/main.js
@@ -14,6 +14,8 @@ import router from './router';
 import App from './App.vue';
 
 import Logger from "@/helpers/logger";
+import bailoutMessage from '@/constants/bailoutMessage';
+import applicationConfig from '@/constants/application-config';
 // Instantiate global logging object
 global.$logger = new Logger();
 
@@ -46,15 +48,26 @@ function getPageName(vm) {
 // Vue Error Handling
 vueApp.config.errorHandler = (err, vm, info) => {
     const pageName = getPageName(vm);
-    global.$logger.logError(
-        `Page Name - ${pageName} - ${info}: ${err.message}\n${err.stack}`
-    );
+    global.$logger.logError(`Page Name - ${pageName} - ${info}: ${err.message}\n${err.stack}`);
+    if (applicationConfig.BAILOUT_ON_APPLICATION_ERROR) {
+        router.navigateBailout(bailoutMessage.applicationError(`[${pageName}] ${info}: ${err.message}\n${err.stack}`));
+    }
 };
 
 // Vue Router Error Handling
 router.onError((err) => {   
     global.$logger.logError(err.message, err.cause);
+    if (applicationConfig.BAILOUT_ON_ROUTER_ERROR) {
+        router.navigateBailout(bailoutMessage.routerError(`${err.message}\n${err.stack}`));
+    }
 });
+
+global.bailoutOnAxiosError = (error) => {
+    if (applicationConfig.BAILOUT_ON_API_ERROR) {
+        router.navigateBailout(bailoutMessage.apiError(error));
+    }
+}
+
 vueApp.mount('#app');
 
 // define global rules
diff --git a/src/router/index.js b/src/router/index.js
index b611694f..cd77544f 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -281,7 +281,10 @@ function navigate(
     }
 
     // Match our maps up and navigate if we have a destination.
-    const matchingScenarioMap = getNavigationMap(scenario, currentRoute);
+    let matchingScenarioMap = getNavigationMap(scenario, currentRoute);
+    if (!matchingScenarioMap && scenario === navigationScenarios.BAILOUT) {
+        matchingScenarioMap = { destinationIssPageValue: issPageValues.BAILOUT_PAGE }
+    }
 
     if (!matchingScenarioMap) {
         window.console.error('No matching scenario found. Please review the routing table.');
@@ -332,6 +335,18 @@ function navigateToUrl(url, optionalQuery = {}) {
     window.location.assign(externalUrl);
 }
 
+router.navigateBailout = (bailoutData = null) => {
+    if (bailoutData != null && !useMainStore().isBailout) {
+        useMainStore().setBailout(bailoutData)
+    }
+    router.navigate(
+        navigationScenarios.BAILOUT,
+        router.currentRoute.value,
+        {},
+        { [routerParams.SKIP_SAVE_SESSION]: true }
+    );
+}
+
 // Get navigation map depending on the scenario and the current 'page' you're on.
 function getNavigationMap(scenario, currentRoute) {
     const issPageValue = currentRoute.query.issPage;
diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js
index d6fba845..f0603b96 100644
--- a/src/router/router-constants/navigation-scenarios.js
+++ b/src/router/router-constants/navigation-scenarios.js
@@ -114,6 +114,7 @@ const navigationScenarios = Object.freeze({
     // Bailout
     CLICKED_FORWARD_WITH_BAILOUT: 'CLICKED_FORWARD_WITH_BAILOUT',
     CLICKED_NEED_HELP_WITH_BAILOUT: 'CLICKED_NEED_HELP_WITH_BAILOUT',
+    BAILOUT: 'BAILOUT'
 });
 
 export default navigationScenarios;
diff --git a/src/store/index.js b/src/store/index.js
index 34d77533..3e3b8a57 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -879,8 +879,7 @@ export const useMainStore = defineStore({
 
             return globalMethods.callHttpClient({
                 method: endpoints.GetMobilePremiumFee.method,
-                endpoint: `${endpoints.GetMobilePremiumFee.url}/${paymentType}/${damageType}`,
-                logApiCall: true
+                endpoint: `${endpoints.GetMobilePremiumFee.url}/${paymentType}/${damageType}`
             });
         },
         getMobileTimeSlots(startDate, endDate, zipCodeOverride = null) {
@@ -935,14 +934,7 @@ export const useMainStore = defineStore({
             return globalMethods.callHttpClient({
                 method: endpoints.GetMobileTimeSlots.method,
                 endpoint: endpoints.GetMobileTimeSlots.url,
-                payload,
-                logApiCall: true,
-                additionalSuccessEventDataHandler: (response) =>
-                    getTimeSlotsAdditionalEventData(
-                        response.data.provisionalTriggers,
-                        zipCodeOverride ?? order.serviceLocation.zipCode,
-                        response.data.days?.[0]?.date
-                    )
+                payload
             });
         },
         getShopTimeSlots(startDate, endDate, shopAppointmentType, providerNumber) {
@@ -998,8 +990,7 @@ export const useMainStore = defineStore({
             return globalMethods.callHttpClient({
                 method: endpoints.GetShopTimeSlots.method,
                 endpoint: endpoints.GetShopTimeSlots.url,
-                payload,
-                additionalSuccessEventDataHandler: (response) => provisionalTriggersToString(response.data.provisionalTriggers)
+                payload
             });
         },
         async getWipers() {
@@ -1553,8 +1544,7 @@ export const useMainStore = defineStore({
                     method: endpoints.SaveSession.method,
                     endpoint: endpoints.SaveSession.url,
                     payload,
-                    additionalSuccessEventDataHandler: () =>
-                        `Email provided: ${customer.emailAddress ? 'true' : 'false'}`
+                    bailoutOnError: false
                 }).then((response) => {
                     if (loadedFromDupeCheck) {
                         this.order.loadedSessionClearedPreviousData = true;
@@ -2466,8 +2456,7 @@ export const useMainStore = defineStore({
             return globalMethods.callHttpClient({
                 method: endpoints.GetAlertReasons.method,
                 endpoint: `${endpoints.GetAlertReasons.url}/${ctu}`,
-                payload: {},
-                logApiCall: true
+                payload: {}
             });
         },
 

From bf43bfa42c27e9facfc0acff4c8568b7de785f00 Mon Sep 17 00:00:00 2001
From: Katie Kroell <Katie.Kroell@safelite.com>
Date: Mon, 16 Feb 2026 14:51:49 -0500
Subject: [PATCH 26/30] add unit test for method

---
 .../coverage-statement/coverage-statement.spec.js    | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/layouts/coverage-statement/coverage-statement.spec.js b/src/layouts/coverage-statement/coverage-statement.spec.js
index 7bbd27dd..aa9c3058 100644
--- a/src/layouts/coverage-statement/coverage-statement.spec.js
+++ b/src/layouts/coverage-statement/coverage-statement.spec.js
@@ -673,6 +673,18 @@ describe('coverageStatement.vue', () => {
                     );
             });
         });
+        describe('openCancelClaimModal', () => {
+            test('when I want to cancel link is clicked, modal opens', () => {
+                // Arrange
+                const { wrapper } = getMountedComponent({});
+
+                // Act
+                wrapper.vm.openCancelClaimModal();
+
+                // Assert
+                expect(wrapper.vm.$refs[CANCEL_CLAIM_REF_NAME].openModal).toHaveBeenCalled();
+            });
+        });
     });
     describe('claim registration api call', () => {
         it('Loaded duplicate with previously registered claim => claim registration is not called', async () => {

From c6a65c8d27c1b2d78df88dd33f7e2beae448838d Mon Sep 17 00:00:00 2001
From: Alex Humphries <Alex.Humphries@safelite.com>
Date: Mon, 16 Feb 2026 15:01:07 -0500
Subject: [PATCH 27/30] Fix to properly remove the home address option from the
 vehicle lookup

---
 .../vin-lookup-methods/vin-lookup-methods.vue               | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/layouts/vehicle-lookup/vin-lookup-methods/vin-lookup-methods.vue b/src/layouts/vehicle-lookup/vin-lookup-methods/vin-lookup-methods.vue
index 633dc865..332ba2d7 100644
--- a/src/layouts/vehicle-lookup/vin-lookup-methods/vin-lookup-methods.vue
+++ b/src/layouts/vehicle-lookup/vin-lookup-methods/vin-lookup-methods.vue
@@ -59,10 +59,14 @@ export default {
             const isVinbyAddressPermissible = await this.getIsVinbyAddressPermissible();
             this.questionTextFromCms = this.getCmsContent(this.cmsWidgetName, 'QuestionText');
 
+            console.log(JSON.parse)
+
             const answers = this.getCmsContent(this.cmsWidgetName, 'Answers');
+            console.log(JSON.parse(JSON.stringify(answers)));
             if (Array.isArray(answers)) {
                 if (!isVinbyAddressPermissible) {
-                    answers.splice(answers.indexOf(vinLookupMethodSelections.HOMEADDRESS), 1);
+                    const homeAddressIndex = answers.findIndex(answer => answer.Name === vinLookupMethodSelections.HOMEADDRESS);
+                    answers.splice(homeAddressIndex, 1);
                 }
                 this.answersFromCms = answers;
             }

From 1cdff57208aa9f496b8e95cdc896aaafc0ab2443 Mon Sep 17 00:00:00 2001
From: Alex Humphries <Alex.Humphries@safelite.com>
Date: Mon, 16 Feb 2026 15:03:44 -0500
Subject: [PATCH 28/30] Remove console.logs

---
 .../vehicle-lookup/vin-lookup-methods/vin-lookup-methods.vue   | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/layouts/vehicle-lookup/vin-lookup-methods/vin-lookup-methods.vue b/src/layouts/vehicle-lookup/vin-lookup-methods/vin-lookup-methods.vue
index 332ba2d7..fa5868aa 100644
--- a/src/layouts/vehicle-lookup/vin-lookup-methods/vin-lookup-methods.vue
+++ b/src/layouts/vehicle-lookup/vin-lookup-methods/vin-lookup-methods.vue
@@ -59,10 +59,7 @@ export default {
             const isVinbyAddressPermissible = await this.getIsVinbyAddressPermissible();
             this.questionTextFromCms = this.getCmsContent(this.cmsWidgetName, 'QuestionText');
 
-            console.log(JSON.parse)
-
             const answers = this.getCmsContent(this.cmsWidgetName, 'Answers');
-            console.log(JSON.parse(JSON.stringify(answers)));
             if (Array.isArray(answers)) {
                 if (!isVinbyAddressPermissible) {
                     const homeAddressIndex = answers.findIndex(answer => answer.Name === vinLookupMethodSelections.HOMEADDRESS);

From 9e1fe99ad1e6359dcf04156a6a0b761501a9d9a4 Mon Sep 17 00:00:00 2001
From: Alex Humphries <Alex.Humphries@safelite.com>
Date: Tue, 17 Feb 2026 13:37:04 -0500
Subject: [PATCH 29/30] Fix for missing routing table entries for vehicle
 questions

Vehicle question pages were missing entries to account for backward
navigation for new scenarios where we skip vin entry
---
 src/router/router-constants/routing-table.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js
index eec16cf3..93336932 100644
--- a/src/router/router-constants/routing-table.js
+++ b/src/router/router-constants/routing-table.js
@@ -192,6 +192,10 @@ const routingTable = () => [
                 scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
                 destinationIssPageValue: issPageValues.VEHICLE_DAMAGE
             },
+            {
+                scenario: navigationScenarios.CLICKED_BACK_WITH_SKIP_VIN_AND_NO_MORE_QUESTIONS,
+                destinationIssPageValue: issPageValues.VEHICLE_DAMAGE
+            },
             {
                 scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
                 destinationIssPageValue: issPageValues.VEHICLE_LOOKUP
@@ -233,6 +237,10 @@ const routingTable = () => [
                 scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
                 destinationIssPageValue: issPageValues.VEHICLE_DAMAGE
             },
+            {
+                scenario: navigationScenarios.CLICKED_BACK_WITH_SKIP_VIN_AND_NO_MORE_QUESTIONS,
+                destinationIssPageValue: issPageValues.VEHICLE_DAMAGE
+            },
             {
                 scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
                 destinationIssPageValue: issPageValues.VEHICLE_LOOKUP
@@ -262,6 +270,10 @@ const routingTable = () => [
                 scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
                 destinationIssPageValue: issPageValues.VEHICLE_DAMAGE
             },
+            {
+                scenario: navigationScenarios.CLICKED_BACK_WITH_SKIP_VIN_AND_NO_MORE_QUESTIONS,
+                destinationIssPageValue: issPageValues.VEHICLE_DAMAGE
+            },
             {
                 scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
                 destinationIssPageValue: issPageValues.VEHICLE_LOOKUP
@@ -295,6 +307,10 @@ const routingTable = () => [
                 scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
                 destinationIssPageValue: issPageValues.VEHICLE_DAMAGE
             },
+            {
+                scenario: navigationScenarios.CLICKED_BACK_WITH_SKIP_VIN_AND_NO_MORE_QUESTIONS,
+                destinationIssPageValue: issPageValues.VEHICLE_DAMAGE
+            },
             {
                 scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
                 destinationIssPageValue: issPageValues.VEHICLE_LOOKUP

From e7aac9b0cf6ec33eaeacadb99db986aac80f2da9 Mon Sep 17 00:00:00 2001
From: scottkiener-at-safelite <scott.kiener@safelite.com>
Date: Tue, 17 Feb 2026 15:17:25 -0500
Subject: [PATCH 30/30] INSR-8513 | Map address title casing fix

---
 src/layouts/tpa-search/tpa-search.spec.js | 6 +++---
 src/layouts/tpa-search/tpa-search.vue     | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/layouts/tpa-search/tpa-search.spec.js b/src/layouts/tpa-search/tpa-search.spec.js
index 1562635b..a888e60f 100644
--- a/src/layouts/tpa-search/tpa-search.spec.js
+++ b/src/layouts/tpa-search/tpa-search.spec.js
@@ -355,7 +355,7 @@ describe('tpa-search.vue', () => {
 
                 // Assert
                 expect(result.length).toBe(1);
-                expect(result[0].title).toBe('test shop');
+                expect(result[0].title).toBe('Test Shop');
                 expect(result[0].addressLines.length).toBe(2);
             });
 
@@ -395,7 +395,7 @@ describe('tpa-search.vue', () => {
 
                 // Assert
                 expect(result.length).toBe(1);
-                expect(result[0].buttonLabel).toBe('auto glass shop');
+                expect(result[0].buttonLabel).toBe('Auto Glass Shop');
                 expect(result[0].buttonLabelSubCopy).toBe('5.8 mi');
                 expect(result[0].value).toBe('12345');
             });
@@ -616,7 +616,7 @@ describe('tpa-search.vue', () => {
                 const result = wrapper.vm.getShopButtonDataFromProvider(provider);
 
                 // Assert
-                expect(result.buttonLabel).toBe('test shop');
+                expect(result.buttonLabel).toBe('Test Shop');
                 expect(result.buttonLabelSubCopy).toBe('5.8 mi');
                 expect(result.value).toBe('12345');
                 expect(result.buttonBodyCopy).toContain('<br>');
diff --git a/src/layouts/tpa-search/tpa-search.vue b/src/layouts/tpa-search/tpa-search.vue
index 37748faf..99241b1f 100644
--- a/src/layouts/tpa-search/tpa-search.vue
+++ b/src/layouts/tpa-search/tpa-search.vue
@@ -265,7 +265,7 @@ export default {
         },
         providerAddresses() {
             return this.radiusFilteredAndCappedProviders?.map((provider) => ({
-                title: provider.companyName.toLowerCase(),
+                title: toTitleCase(provider.companyName),
                 fullAddress: this.getFullProviderAddress(provider),
                 addressLines: [this.getProviderAddress(provider), this.getProviderCityZipState(provider)]
             })) ?? [];
@@ -395,7 +395,7 @@ export default {
                     : null;
 
             return {
-                buttonLabel: provider?.companyName.toLowerCase() ?? '',
+                buttonLabel: toTitleCase(provider?.companyName) ?? '',
                 buttonLabelSubCopy: distance === null ? '' : `${distance} mi`,
                 buttonBodyCopy: `${this.getFullProviderAddress(provider)}<br>${
                     cellNumber ?? ''