From a28c89dc0e2eac10e36cd550a6c03b9b7ee09678 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Tue, 10 Jan 2023 11:33:59 -0500
Subject: [PATCH 01/11] CSR-1052 update button type.

---
 src/common-components/modal/modal.vue      | 1 +
 src/styles/shared-input-button-styles.scss | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/common-components/modal/modal.vue b/src/common-components/modal/modal.vue
index d853dcdb2..7de269644 100644
--- a/src/common-components/modal/modal.vue
+++ b/src/common-components/modal/modal.vue
@@ -28,6 +28,7 @@
                 </div>
                 <div class="modal-footer px-5 py-4">
                     <buttonMain
+                        isPrimary
                         class="w-100"
                         ref="buttonMain"
                         suppressLoader
diff --git a/src/styles/shared-input-button-styles.scss b/src/styles/shared-input-button-styles.scss
index dbffa5b05..9af066bb0 100644
--- a/src/styles/shared-input-button-styles.scss
+++ b/src/styles/shared-input-button-styles.scss
@@ -7,7 +7,7 @@
         &.list-card {
             &:not(.selected) {
                 position: relative;
-                z-index: 4;
+                z-index: 5;
                 @include box-shadow-hover($blue-300);
             }
         }

From 3ab512ace7ab45ad7a7ebed1ad2c2530226ea294 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Tue, 10 Jan 2023 18:39:00 -0500
Subject: [PATCH 02/11] CSR-1050 move paymentServiceOptionsCopy copy to
 funnel-sub-header

---
 .../funnel-sub-header/funnel-sub-header.vue            | 10 +++++++---
 src/common-components/text-block/text-block.vue        |  2 +-
 src/layouts/quote/quote.vue                            |  4 ++--
 src/ux-components/text-link/text-link.vue              |  5 ++---
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/common-components/funnel-sub-header/funnel-sub-header.vue b/src/common-components/funnel-sub-header/funnel-sub-header.vue
index ba977c55a..5a475daab 100644
--- a/src/common-components/funnel-sub-header/funnel-sub-header.vue
+++ b/src/common-components/funnel-sub-header/funnel-sub-header.vue
@@ -15,9 +15,11 @@
         <div
             class="d-flex align-items-center justify-content-center container-fluid overflow-hidden">
             <p class="text-center small fw-normal mb-0">
-                <span>
-                    {{ subText }}
-                </span>
+                <textBlock
+                    cmsWidgetName="paymentServiceOptionsCopy"
+                    justifyText="center"
+                    typeStyle="small"
+                    class="mt-2 mb-5" />
             </p>
         </div>
     </div>
@@ -25,6 +27,7 @@
 
 <script>
 import buttonBack from "@/common-components/funnel-sub-header/button-back/button-back";
+import textBlock from "@/common-components/text-block/text-block";
 
 export default {
     name: "FunnelSubHeader",
@@ -34,6 +37,7 @@ export default {
     },
     components: {
         buttonBack,
+        textBlock,
     },
     computed: {
         text() {
diff --git a/src/common-components/text-block/text-block.vue b/src/common-components/text-block/text-block.vue
index a12d3f398..33854e143 100644
--- a/src/common-components/text-block/text-block.vue
+++ b/src/common-components/text-block/text-block.vue
@@ -1,6 +1,6 @@
 <template>
     <div
-        class="text-block d-flex w-100 mt-2"
+        class="text-block w-100 mt-2"
         :class="[justifyText, typeStyle, fontWeight]"
         v-html="this.TextBlockCopy"></div>
 </template>
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index dfada2db0..0a5792475 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -8,11 +8,11 @@
                 :displayGenericVehicleImage="false" />
             <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
             <div class="fade-on-route-transition sub-container make-tall">
-                <textBlock
+                <!-- <textBlock
                     cmsWidgetName="paymentServiceOptionsCopy"
                     justifyText="center"
                     typeStyle="small"
-                    class="mt-2 mb-5" />
+                    class="mt-2 mb-5" /> -->
                 <cashOrInsuranceQuestion
                     ref="cashOrInsurance"
                     cmsWidgetName="CashOrInsuranceQuestionWidget"
diff --git a/src/ux-components/text-link/text-link.vue b/src/ux-components/text-link/text-link.vue
index fff40d9a0..f28669a45 100644
--- a/src/ux-components/text-link/text-link.vue
+++ b/src/ux-components/text-link/text-link.vue
@@ -44,10 +44,9 @@ export default {
 
 <style lang="scss">
 a {
-    display: inline-flex !important;
     color: $blue;
-    text-underline-offset: 0.5em;
-    line-height: 26px;
+    text-underline-offset: 5px;
+    line-height: 2;
     padding: 0 0 4px 0;
     font-weight: 500;
     max-width: fit-content;

From 2264acbdffc56fe8d9858cdb7227d8da925bbb64 Mon Sep 17 00:00:00 2001
From: Scott Kiener <scott.kiener@safelite.com>
Date: Wed, 11 Jan 2023 10:15:20 -0500
Subject: [PATCH 03/11] CSR-1055 | Make sure first saveSession call is not
 asynchronous

---
 src/layouts/estimate/estimate.vue | 5 ++++-
 src/mixins/vin-pages-mixin.js     | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index 9387bd89a..f036277b7 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -111,6 +111,7 @@ import experimentMixin from "@/mixins/experiment-mixin";
 import { experimentSettings } from "@/constants/experiments";
 import vinPagesMixin from "@/mixins/vin-pages-mixin";
 import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
+import { saveSession } from "@/helpers/heritage-integration/order-helper.js";
 
 // Define Validation Rules
 defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
@@ -222,7 +223,9 @@ export default {
                 } else if (this.$store.getters.order.referralNumber?.length === 6) {
                     await this.navigateForwardWithSingleCarMatch();
                 } else if (this.isRepair) {
-                    return this.$router.navigateWithSaving(
+                    // call saveSession here - navigateWithSaving only saves asynchronously
+                    await saveSession();
+                    return this.$router.navigateWithoutSaving(
                         this.navigationScenarios.CLICKED_FORWARD_WITH_NO_QUESTIONS,
                         this.$route
                     );
diff --git a/src/mixins/vin-pages-mixin.js b/src/mixins/vin-pages-mixin.js
index e6e41aad5..8815bc06d 100644
--- a/src/mixins/vin-pages-mixin.js
+++ b/src/mixins/vin-pages-mixin.js
@@ -8,7 +8,7 @@ export default {
         async navigateForwardWithSingleCarMatch() {
             // If we have not already saved a session, we need to save one now before the lengthy call to getPartsOrQuestions
             if (!store.getters.applicationUser.savedSessionId) {
-                saveSession();
+                await saveSession();
             }
 
             const result = await this.dispatchStoreAction(storeActions.GET_PARTS_OR_QUESTIONS);

From 7cfdc815379f25e5e7b93aae993a076ac1fbb9ee Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Wed, 11 Jan 2023 13:06:12 -0500
Subject: [PATCH 04/11] Remove textblock. Add subtext copy to CMS.

---
 .../funnel-sub-header/funnel-sub-header.vue          | 12 ++++--------
 src/layouts/quote/quote.vue                          |  5 -----
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/common-components/funnel-sub-header/funnel-sub-header.vue b/src/common-components/funnel-sub-header/funnel-sub-header.vue
index 5a475daab..ae97dbb9f 100644
--- a/src/common-components/funnel-sub-header/funnel-sub-header.vue
+++ b/src/common-components/funnel-sub-header/funnel-sub-header.vue
@@ -14,12 +14,10 @@
         </div>
         <div
             class="d-flex align-items-center justify-content-center container-fluid overflow-hidden">
-            <p class="text-center small fw-normal mb-0">
-                <textBlock
-                    cmsWidgetName="paymentServiceOptionsCopy"
-                    justifyText="center"
-                    typeStyle="small"
-                    class="mt-2 mb-5" />
+            <p class="text-center small fw-normal mb-5">
+                <span>
+                    {{ subText }}
+                </span>
             </p>
         </div>
     </div>
@@ -27,7 +25,6 @@
 
 <script>
 import buttonBack from "@/common-components/funnel-sub-header/button-back/button-back";
-import textBlock from "@/common-components/text-block/text-block";
 
 export default {
     name: "FunnelSubHeader",
@@ -37,7 +34,6 @@ export default {
     },
     components: {
         buttonBack,
-        textBlock,
     },
     computed: {
         text() {
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 0a5792475..1063cacf5 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -8,11 +8,6 @@
                 :displayGenericVehicleImage="false" />
             <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
             <div class="fade-on-route-transition sub-container make-tall">
-                <!-- <textBlock
-                    cmsWidgetName="paymentServiceOptionsCopy"
-                    justifyText="center"
-                    typeStyle="small"
-                    class="mt-2 mb-5" /> -->
                 <cashOrInsuranceQuestion
                     ref="cashOrInsurance"
                     cmsWidgetName="CashOrInsuranceQuestionWidget"

From e59c03bc1311b8bbc8758fbe914883259159ff78 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Wed, 11 Jan 2023 15:26:19 -0500
Subject: [PATCH 05/11] Style updates.

---
 .../funnel-sub-header/funnel-sub-header.vue          | 10 ++++++----
 src/layouts/estimate/estimate.vue                    |  6 +++---
 src/layouts/quote/quote.vue                          | 12 +++++++++++-
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/common-components/funnel-sub-header/funnel-sub-header.vue b/src/common-components/funnel-sub-header/funnel-sub-header.vue
index ae97dbb9f..33f518674 100644
--- a/src/common-components/funnel-sub-header/funnel-sub-header.vue
+++ b/src/common-components/funnel-sub-header/funnel-sub-header.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="current_car_info-text">
+    <div class="funnel-sub-header">
         <div
             class="d-flex align-items-center justify-content-center container-fluid overflow-hidden">
             <h5 class="text-center fw-normal mb-0" :class="headerColor">
@@ -12,9 +12,8 @@
                     @click-event="clickEvent" />
             </h5>
         </div>
-        <div
-            class="d-flex align-items-center justify-content-center container-fluid overflow-hidden">
-            <p class="text-center small fw-normal mb-5">
+        <div v-if="subText" class="d-flex align-items-center justify-content-center container-fluid overflow-hidden">
+            <p class="text-center small fw-normal sub-text">
                 <span>
                     {{ subText }}
                 </span>
@@ -77,4 +76,7 @@ h5 {
 p.small {
     color: $gray-550;
 }
+.sub-text {
+    margin: 0;
+}
 </style>
diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index 9387bd89a..0459f0796 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -1,6 +1,6 @@
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
-        <div class="page-container-grouped-styles">
+        <div class="page-container-grouped-styles estimate">
             <loadingModal ref="loadingModal" />
             <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
             <vehicleBanner cmsWidgetName="VehicleBannerWidget" />
@@ -297,12 +297,12 @@ export default {
 </script>
 
 <style lang="scss">
-.vinLookupMethodHeading p {
+.estimate .vinLookupMethodHeading p {
     font-size: 1rem;
     font-weight: 500;
     color: $black;
 }
-div .current_car_info-text {
+.estimate .funnel-sub-header {
     padding-bottom: 16px;
 }
 </style>
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 1063cacf5..6ce61a7b0 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -1,6 +1,6 @@
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
-        <div class="page-container-grouped-styles">
+        <div class="page-container-grouped-styles quote">
             <loadingModal ref="loadingModal" />
             <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
             <vehicleBanner
@@ -206,3 +206,13 @@ export default {
     },
 };
 </script>
+
+<style lang="scss">
+.quote {
+    .funnel-sub-header {
+        .sub-text {
+            margin-bottom: 24px;
+        }
+    }
+}
+</style>

From ae02b41ae487ff61b814c393b378ffcba13d094c Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Wed, 11 Jan 2023 16:23:27 -0500
Subject: [PATCH 06/11] Format code.

---
 src/common-components/funnel-sub-header/funnel-sub-header.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/common-components/funnel-sub-header/funnel-sub-header.vue b/src/common-components/funnel-sub-header/funnel-sub-header.vue
index 33f518674..356e6fb0e 100644
--- a/src/common-components/funnel-sub-header/funnel-sub-header.vue
+++ b/src/common-components/funnel-sub-header/funnel-sub-header.vue
@@ -12,7 +12,9 @@
                     @click-event="clickEvent" />
             </h5>
         </div>
-        <div v-if="subText" class="d-flex align-items-center justify-content-center container-fluid overflow-hidden">
+        <div
+            v-if="subText"
+            class="d-flex align-items-center justify-content-center container-fluid overflow-hidden">
             <p class="text-center small fw-normal sub-text">
                 <span>
                     {{ subText }}

From 941097a4076cbaadc131c7cc73091fda3a0b19f2 Mon Sep 17 00:00:00 2001
From: Scott Kiener <scott.kiener@safelite.com>
Date: Mon, 16 Jan 2023 12:09:50 -0500
Subject: [PATCH 07/11] CSR-1055 | Defer most await scenarios to saveSession
 call

---
 src/helpers/heritage-integration/navigation-helper.js | 2 +-
 src/helpers/heritage-integration/order-helper.js      | 8 +++++---
 src/helpers/heritage-integration/order-helper.spec.js | 4 ++--
 src/layouts/estimate/estimate.vue                     | 4 ++--
 src/mixins/vin-pages-mixin.js                         | 2 +-
 src/router/index.js                                   | 4 ++--
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/helpers/heritage-integration/navigation-helper.js b/src/helpers/heritage-integration/navigation-helper.js
index 7030ba193..6fa248c63 100644
--- a/src/helpers/heritage-integration/navigation-helper.js
+++ b/src/helpers/heritage-integration/navigation-helper.js
@@ -46,7 +46,7 @@ export async function getPageToRouteExistingOrderTo(toRoute = {}, existingHerita
 export async function navigateToHeritageFunnel({ shouldSaveSession = true, loadingModal }) {
     // Create the order (or save existing order) when navigating to Heritage Funnel.
     if (shouldSaveSession) {
-        await saveSession();
+        await saveSession({ shouldAwaitSaveSessionQueue: true });
     }
 
     if (loadingModal && loadingModal.showModal) {
diff --git a/src/helpers/heritage-integration/order-helper.js b/src/helpers/heritage-integration/order-helper.js
index 469f38b60..05b4c4dc4 100644
--- a/src/helpers/heritage-integration/order-helper.js
+++ b/src/helpers/heritage-integration/order-helper.js
@@ -50,9 +50,9 @@ export async function loadSessionIfPresent(isConceptInsurance) {
 /*
     Will call API to save existing order, or create new one depending where it's called from.
     This will also set Referral information in the store after saving, and then
-    update the cookie.
+    update the cookie. To force synchronous behavior pass in 'true' for shouldAwaitSaveSessionQueue
 */
-export async function saveSession() {
+export async function saveSession({ shouldAwaitSaveSessionQueue = false }) {
     var saveSessionPromise;
     if (store.getters.applicationUser.saveSessionPromise) {
         // queue newest request after current saveSessionPromise resolves
@@ -66,7 +66,9 @@ export async function saveSession() {
     }
     store.commit(storeMutations.UPDATE_SAVE_SESSION_PROMISE, saveSessionPromise);
     // await here to allow for a caller to await and make the function synchronous
-    await saveSessionPromise;
+    if (!store.getters.applicationUser.savedSessionId || shouldAwaitSaveSessionQueue) {
+        await saveSessionPromise;
+    }
 }
 
 // PRIVATE FUNCTIONS //
diff --git a/src/helpers/heritage-integration/order-helper.spec.js b/src/helpers/heritage-integration/order-helper.spec.js
index 74c911e05..97b162560 100644
--- a/src/helpers/heritage-integration/order-helper.spec.js
+++ b/src/helpers/heritage-integration/order-helper.spec.js
@@ -170,7 +170,7 @@ describe("saveSession", () => {
         const mocks = setupMocksForJsFiles(mockData);
 
         // Act
-        await saveSession();
+        await saveSession({});
 
         // Assert
         expect(mocks.baseMixin.methods.dispatchStoreAction).toHaveBeenCalledWith(
@@ -231,7 +231,7 @@ describe("saveSession", () => {
         setupCookies({ funnelCookieValue: JSON.stringify(testCookieValue) });
 
         // Act
-        await saveSession();
+        await saveSession({});
 
         // Assert
         expect(cookieHelper.getFunnelCookie().DidHeritageFunnelUpdateLast).toEqual(false);
diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index f036277b7..dd16a479f 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -223,8 +223,8 @@ export default {
                 } else if (this.$store.getters.order.referralNumber?.length === 6) {
                     await this.navigateForwardWithSingleCarMatch();
                 } else if (this.isRepair) {
-                    // call saveSession here - navigateWithSaving only saves asynchronously
-                    await saveSession();
+                    // call saveSession here - navigateWithSaving saves too late in the flow
+                    await saveSession({});
                     return this.$router.navigateWithoutSaving(
                         this.navigationScenarios.CLICKED_FORWARD_WITH_NO_QUESTIONS,
                         this.$route
diff --git a/src/mixins/vin-pages-mixin.js b/src/mixins/vin-pages-mixin.js
index 8815bc06d..cad998d38 100644
--- a/src/mixins/vin-pages-mixin.js
+++ b/src/mixins/vin-pages-mixin.js
@@ -8,7 +8,7 @@ export default {
         async navigateForwardWithSingleCarMatch() {
             // If we have not already saved a session, we need to save one now before the lengthy call to getPartsOrQuestions
             if (!store.getters.applicationUser.savedSessionId) {
-                await saveSession();
+                await saveSession({});
             }
 
             const result = await this.dispatchStoreAction(storeActions.GET_PARTS_OR_QUESTIONS);
diff --git a/src/router/index.js b/src/router/index.js
index 324cba3c7..30fc8583b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -160,7 +160,7 @@ const router = createRouter({
 
 //---------------------------------------------------------- Router Functions ----------------------------------------------------------
 
-router.afterEach((to, from) => {
+router.afterEach(async (to, from) => {
     // Update lastPageVisited in the store
     store.commit(storeMutations.UPDATE_LAST_PAGE_VISITED, to.name);
 
@@ -170,7 +170,7 @@ router.afterEach((to, from) => {
             store.getters.applicationUser.savedSessionId ||
             store.getters.order.customer?.emailAddress
         ) {
-            saveSession();
+            await saveSession({});
         }
     }
 

From b5885940cefaae2baa25f55657928b23d8e463ad Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Wed, 11 Jan 2023 16:23:27 -0500
Subject: [PATCH 08/11] Revert "Format code."

This reverts commit ae02b41ae487ff61b814c393b378ffcba13d094c.
---
 src/common-components/funnel-sub-header/funnel-sub-header.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/common-components/funnel-sub-header/funnel-sub-header.vue b/src/common-components/funnel-sub-header/funnel-sub-header.vue
index 356e6fb0e..33f518674 100644
--- a/src/common-components/funnel-sub-header/funnel-sub-header.vue
+++ b/src/common-components/funnel-sub-header/funnel-sub-header.vue
@@ -12,9 +12,7 @@
                     @click-event="clickEvent" />
             </h5>
         </div>
-        <div
-            v-if="subText"
-            class="d-flex align-items-center justify-content-center container-fluid overflow-hidden">
+        <div v-if="subText" class="d-flex align-items-center justify-content-center container-fluid overflow-hidden">
             <p class="text-center small fw-normal sub-text">
                 <span>
                     {{ subText }}

From 7dfa1dc0ba2f3efc82f8996d79a278dc5fcc6242 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Wed, 11 Jan 2023 15:26:19 -0500
Subject: [PATCH 09/11] Revert "Style updates."

This reverts commit e59c03bc1311b8bbc8758fbe914883259159ff78.
---
 .../funnel-sub-header/funnel-sub-header.vue          | 10 ++++------
 src/layouts/estimate/estimate.vue                    |  6 +++---
 src/layouts/quote/quote.vue                          | 12 +-----------
 3 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/src/common-components/funnel-sub-header/funnel-sub-header.vue b/src/common-components/funnel-sub-header/funnel-sub-header.vue
index 33f518674..ae97dbb9f 100644
--- a/src/common-components/funnel-sub-header/funnel-sub-header.vue
+++ b/src/common-components/funnel-sub-header/funnel-sub-header.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="funnel-sub-header">
+    <div class="current_car_info-text">
         <div
             class="d-flex align-items-center justify-content-center container-fluid overflow-hidden">
             <h5 class="text-center fw-normal mb-0" :class="headerColor">
@@ -12,8 +12,9 @@
                     @click-event="clickEvent" />
             </h5>
         </div>
-        <div v-if="subText" class="d-flex align-items-center justify-content-center container-fluid overflow-hidden">
-            <p class="text-center small fw-normal sub-text">
+        <div
+            class="d-flex align-items-center justify-content-center container-fluid overflow-hidden">
+            <p class="text-center small fw-normal mb-5">
                 <span>
                     {{ subText }}
                 </span>
@@ -76,7 +77,4 @@ h5 {
 p.small {
     color: $gray-550;
 }
-.sub-text {
-    margin: 0;
-}
 </style>
diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index 9d7dedd04..dd16a479f 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -1,6 +1,6 @@
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
-        <div class="page-container-grouped-styles estimate">
+        <div class="page-container-grouped-styles">
             <loadingModal ref="loadingModal" />
             <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
             <vehicleBanner cmsWidgetName="VehicleBannerWidget" />
@@ -300,12 +300,12 @@ export default {
 </script>
 
 <style lang="scss">
-.estimate .vinLookupMethodHeading p {
+.vinLookupMethodHeading p {
     font-size: 1rem;
     font-weight: 500;
     color: $black;
 }
-.estimate .funnel-sub-header {
+div .current_car_info-text {
     padding-bottom: 16px;
 }
 </style>
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 6ce61a7b0..1063cacf5 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -1,6 +1,6 @@
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
-        <div class="page-container-grouped-styles quote">
+        <div class="page-container-grouped-styles">
             <loadingModal ref="loadingModal" />
             <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
             <vehicleBanner
@@ -206,13 +206,3 @@ export default {
     },
 };
 </script>
-
-<style lang="scss">
-.quote {
-    .funnel-sub-header {
-        .sub-text {
-            margin-bottom: 24px;
-        }
-    }
-}
-</style>

From 7f28e504abf66c8abffd2cfc3bee686bfe24cbf8 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Wed, 11 Jan 2023 13:06:12 -0500
Subject: [PATCH 10/11] Revert "Remove textblock. Add subtext copy to CMS."

This reverts commit 7cfdc815379f25e5e7b93aae993a076ac1fbb9ee.
---
 .../funnel-sub-header/funnel-sub-header.vue          | 12 ++++++++----
 src/layouts/quote/quote.vue                          |  5 +++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/common-components/funnel-sub-header/funnel-sub-header.vue b/src/common-components/funnel-sub-header/funnel-sub-header.vue
index ae97dbb9f..5a475daab 100644
--- a/src/common-components/funnel-sub-header/funnel-sub-header.vue
+++ b/src/common-components/funnel-sub-header/funnel-sub-header.vue
@@ -14,10 +14,12 @@
         </div>
         <div
             class="d-flex align-items-center justify-content-center container-fluid overflow-hidden">
-            <p class="text-center small fw-normal mb-5">
-                <span>
-                    {{ subText }}
-                </span>
+            <p class="text-center small fw-normal mb-0">
+                <textBlock
+                    cmsWidgetName="paymentServiceOptionsCopy"
+                    justifyText="center"
+                    typeStyle="small"
+                    class="mt-2 mb-5" />
             </p>
         </div>
     </div>
@@ -25,6 +27,7 @@
 
 <script>
 import buttonBack from "@/common-components/funnel-sub-header/button-back/button-back";
+import textBlock from "@/common-components/text-block/text-block";
 
 export default {
     name: "FunnelSubHeader",
@@ -34,6 +37,7 @@ export default {
     },
     components: {
         buttonBack,
+        textBlock,
     },
     computed: {
         text() {
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 1063cacf5..0a5792475 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -8,6 +8,11 @@
                 :displayGenericVehicleImage="false" />
             <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
             <div class="fade-on-route-transition sub-container make-tall">
+                <!-- <textBlock
+                    cmsWidgetName="paymentServiceOptionsCopy"
+                    justifyText="center"
+                    typeStyle="small"
+                    class="mt-2 mb-5" /> -->
                 <cashOrInsuranceQuestion
                     ref="cashOrInsurance"
                     cmsWidgetName="CashOrInsuranceQuestionWidget"

From 03cd254418f4496d79a99ba2f6890e7e5198cae3 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Tue, 10 Jan 2023 18:39:00 -0500
Subject: [PATCH 11/11] Revert "CSR-1050 move paymentServiceOptionsCopy copy to
 funnel-sub-header"

This reverts commit 3ab512ace7ab45ad7a7ebed1ad2c2530226ea294.
---
 .../funnel-sub-header/funnel-sub-header.vue            | 10 +++-------
 src/common-components/text-block/text-block.vue        |  2 +-
 src/layouts/quote/quote.vue                            |  4 ++--
 src/ux-components/text-link/text-link.vue              |  5 +++--
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/common-components/funnel-sub-header/funnel-sub-header.vue b/src/common-components/funnel-sub-header/funnel-sub-header.vue
index 5a475daab..ba977c55a 100644
--- a/src/common-components/funnel-sub-header/funnel-sub-header.vue
+++ b/src/common-components/funnel-sub-header/funnel-sub-header.vue
@@ -15,11 +15,9 @@
         <div
             class="d-flex align-items-center justify-content-center container-fluid overflow-hidden">
             <p class="text-center small fw-normal mb-0">
-                <textBlock
-                    cmsWidgetName="paymentServiceOptionsCopy"
-                    justifyText="center"
-                    typeStyle="small"
-                    class="mt-2 mb-5" />
+                <span>
+                    {{ subText }}
+                </span>
             </p>
         </div>
     </div>
@@ -27,7 +25,6 @@
 
 <script>
 import buttonBack from "@/common-components/funnel-sub-header/button-back/button-back";
-import textBlock from "@/common-components/text-block/text-block";
 
 export default {
     name: "FunnelSubHeader",
@@ -37,7 +34,6 @@ export default {
     },
     components: {
         buttonBack,
-        textBlock,
     },
     computed: {
         text() {
diff --git a/src/common-components/text-block/text-block.vue b/src/common-components/text-block/text-block.vue
index 33854e143..a12d3f398 100644
--- a/src/common-components/text-block/text-block.vue
+++ b/src/common-components/text-block/text-block.vue
@@ -1,6 +1,6 @@
 <template>
     <div
-        class="text-block w-100 mt-2"
+        class="text-block d-flex w-100 mt-2"
         :class="[justifyText, typeStyle, fontWeight]"
         v-html="this.TextBlockCopy"></div>
 </template>
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 0a5792475..dfada2db0 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -8,11 +8,11 @@
                 :displayGenericVehicleImage="false" />
             <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
             <div class="fade-on-route-transition sub-container make-tall">
-                <!-- <textBlock
+                <textBlock
                     cmsWidgetName="paymentServiceOptionsCopy"
                     justifyText="center"
                     typeStyle="small"
-                    class="mt-2 mb-5" /> -->
+                    class="mt-2 mb-5" />
                 <cashOrInsuranceQuestion
                     ref="cashOrInsurance"
                     cmsWidgetName="CashOrInsuranceQuestionWidget"
diff --git a/src/ux-components/text-link/text-link.vue b/src/ux-components/text-link/text-link.vue
index f28669a45..fff40d9a0 100644
--- a/src/ux-components/text-link/text-link.vue
+++ b/src/ux-components/text-link/text-link.vue
@@ -44,9 +44,10 @@ export default {
 
 <style lang="scss">
 a {
+    display: inline-flex !important;
     color: $blue;
-    text-underline-offset: 5px;
-    line-height: 2;
+    text-underline-offset: 0.5em;
+    line-height: 26px;
     padding: 0 0 4px 0;
     font-weight: 500;
     max-width: fit-content;