Merge branch 'release/2026.08.13' into feature/CASH-2820

src/constants/error-messages.js

@@ -32,6 +32,7 @@ const errorMessages = {
     DATE_REQUIRED: "Please select a date",
     PHONE_REQUIRED: "Please enter your phone number",
     PHONE_FORMAT: "Phone number must be 10 digits",
+    PHONE_EXTENSION_FORMAT: "The specified extension is invalid",
     SMS_CONSENT_REQUIRED_1: "Please select checkbox to receive text messages",
     SMS_CONSENT_REQUIRED_2: "Please select at least one consent option",
     YEAR_REQUIRED: "Please select your vehicle year",

src/constants/experiments.js

@@ -58,12 +58,17 @@ const experimentSettings = {
     TIER_ONE: "TierOne",
     TIER_TWO: "TierTwo",
     TIER_THREE: "TierThree",
+    TIER_TWO_DESCRIPTION: "TierTwo_Description",
+    TIER_THREE_DESCRIPTION: "TierThree_Description",
 
     // Consent Management
     SHOW_CONSENT_MANAGEMENT: "ShowConsentManagement",
 
     // YMM
     BAILOUT_VIN_REQUIRED_VEHICLES: "BailoutVINRequiredVehicles",
+
+    // Promo Banner
+    SHOW_PROMO_BANNER: "ShowQuotePageRegionalPromoBanner",
 };
 
 const experimentTriggers = {

src/constants/query-strings.js

@@ -48,6 +48,7 @@ const queryStrings = {
     FROM_HERITAGE: "fromheritage",
     PHONE_NUMBER: "phonenumber",
     OFFER_QUOTE: "offerquote",
+    PIA_AUTH_AMOUNT_ADJUST: "piaauthamountadjust",
 };
 
 export { queryStrings };

src/constants/store-actions.js

@@ -118,6 +118,7 @@ const storeActions = {
     SAVE_CCTOKEN: "saveCCToken",
     SAVE_PAYPAL_TOKEN: "savePaypalToken",
     SAVE_NEXTGEN_SETTLED_AMOUNT: "saveNextGenSettledAmount",
+    SAVE_AUTHORIZATION_AMOUNT: "saveAuthorizationAmount",
     SAVE_IS_RECAL_ACK_OPT_IN: "saveIsRecalAckOptIn",
     SAVE_IS_RECAL_ACKNOWLEDGED_FOR_SCHEDULING: "saveIsRecalAcknowledgedForScheduling",
     SAVE_IS_OEM_GLASS_SELECTED: "saveIsOemGlassSelected",

src/constants/store-mutations.js

@@ -3,6 +3,7 @@ const storeMutations = {
     UPDATE_CCTOKEN: "updateCCToken",
     UPDATE_PAYPAL_TOKEN: "updatePaypalToken",
     UPDATE_NEXTGEN_SETTLED_AMOUNT: "updateNextGenSettledAmount",
+    UPDATE_AUTHORIZATION_AMOUNT: "updateAuthorizationAmount",
 
     // VEHICLE MUTATIONS
     UPDATE_YEAR: "updateYear",

src/digital-components/date-picker/date-picker.vue

@@ -114,11 +114,9 @@
                     </label>
                 </div>
             </div>
-            <loader
-                class="date-picker-loader"
-                :class="[loadingStatus !== 'none' ? 'show-loader' : '']"
-                loaderColor="blue"
-                loaderPosition="center" />
+            <div v-if="loadingStatus !== 'none'" class="date-picker-loader">
+                <loader loaderColor="blue" loaderPosition="center" />
+            </div>
             <div class="row form-test-error" id="date-of-month-error">
                 <ErrorMessage :name="customComponentId" class="small mt-1"></ErrorMessage>
             </div>
@@ -742,15 +740,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.date-picker-loader {
-    opacity: 0;
-    max-height: 0;
-
-    &.show-loader {
-        opacity: 1;
-        max-height: none;
-    }
-}
 .date-picker {
     position: relative;
     flex-grow: 0;
@@ -769,7 +758,13 @@ export default {
             font-family: UrbanistSemiBold;
         }
     }
-    .loader {
+    .date-picker-loader {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        width: 100%;
+
+        :deep(.loader) {
             height: 2rem;
             width: calc(100% - 1.5rem);
 
@@ -778,6 +773,7 @@ export default {
                 height: 1.5rem;
             }
         }
+    }
     .month {
         margin: 0 auto 1rem auto;
         position: relative;

src/digital-components/modal/modal.vue

@@ -39,6 +39,7 @@
                         :id="modalId + '-modalbtn'"
                         ref="modalButtonMain"
                         loaderColor="white"
+                        loaderPosition="center"
                         :isDisabled="footerButtonDisabled"
                         :buttonText="footerButtonText"
                         @click-event="validateAndEmit"

src/digital-components/modal/ux-components/modal-button-main/modal-button-main.spec.js

@@ -36,48 +36,6 @@ describe("modal-button-main.vue", () => {
         expect(button.attributes()["aria-disabled"]).toEqual("true");
     });
 
-    it("Should return loader color", async () => {
-        // Arrange
-        const wrapper = shallowMount(
-            modalButtonMain,
-            setupMocks({
-                propsData: {
-                    loaderColor: "blue",
-                    loaderEnabled: true,
-                },
-            })
-        );
-
-        // Act
-        wrapper.vm.clicked();
-        await nextTick();
-
-        // Assert
-        const loader = wrapper.find("loader-stub");
-        expect(loader.attributes("class")).toContain("blue");
-    });
-
-    it("Should return loader position", async () => {
-        // Arrange
-        const wrapper = shallowMount(
-            modalButtonMain,
-            setupMocks({
-                propsData: {
-                    loaderPosition: "right",
-                    loaderEnabled: true,
-                },
-            })
-        );
-
-        // Act
-        wrapper.vm.clicked();
-        await nextTick();
-
-        // Assert
-        const loader = wrapper.find("loader-stub");
-        expect(loader.attributes("class")).toContain("right");
-    });
-
     it("Should set 'isLoaderDisplayed' to false when calling 'removeLoader'", async () => {
         // Arrange
         const wrapper = shallowMount(

src/digital-components/modal/ux-components/modal-button-main/modal-button-main.vue

@@ -11,9 +11,9 @@
         @click="clicked">
         <span class="m-0">{{ this.buttonText }}</span>
         <loader
-            class="ms-2"
             v-if="isLoaderDisplayed && !suppressLoader"
-            v-bind:class="[this.loaderColor, this.loaderPosition]" />
+            :loaderColor="loaderColor"
+            :loaderPosition="loaderPosition" />
     </button>
 </template>
 

src/digital-components/question-chain/question-chain.spec.js

@@ -109,11 +109,11 @@ describe("Question Chain component", () => {
             expect(wrapper.emitted()).not.toHaveProperty("update:modelValue");
         });
 
-        test("should NOT emit update:modelValue if returnedAnswer contains 'nextQuestion'", () => {
+        test("should not emit update:modelValue for nextQuestion during normal forward progress", () => {
             //Arrange
             const { wrapper } = setupMocks({});
             const testQuestion = {};
-            const testReturnedAnswer = "1|nextQuestion|DB10840|No";
+            const testReturnedAnswer = "1|nextQuestion|3|No";
 
             //Act
             wrapper.vm.handleAnswer(testQuestion, testReturnedAnswer);
@@ -121,6 +121,24 @@ describe("Question Chain component", () => {
             //Assert
             expect(wrapper.emitted()).not.toHaveProperty("update:modelValue");
         });
+
+        test("should emit update:modelValue for nextQuestion when revising a saved answer", async () => {
+            //Arrange
+            const { wrapper } = setupMocks({});
+            await wrapper.setProps({ hasSavedAnswer: true });
+            const testQuestion = {};
+            const testReturnedAnswer = "1|nextQuestion|3|No";
+
+            //Act
+            wrapper.vm.handleAnswer(testQuestion, testReturnedAnswer);
+
+            //Assert
+            expect(wrapper.emitted()).toHaveProperty("update:modelValue");
+            expect(wrapper.emitted()["update:modelValue"][0][0]).toMatchObject({
+                incomplete: true,
+                index: 0,
+            });
+        });
     });
 
     describe("method getQuestionChainAnswerIfComplete...", () => {
@@ -213,25 +231,103 @@ describe("Question Chain component", () => {
             wrapper.vm.getQuestionChainAnswerIfComplete(testReturnedAnswer);
 
             //Assert
-            expect(wrapper.vm.questions[1].answerSelected).toBeUndefined;
+            expect(wrapper.vm.questions[1].answerSelected).toBeUndefined();
         });
 
-        test("should return false if returnedAnswer is a nextQuestion (not a final answer)", async () => {
+        test("should follow the No path and show the next question when changing Q1 from Yes to No", async () => {
+            const { wrapper } = setupMocks({
+                questionDataProp: [
+                    {
+                        questionSequence: 1,
+                        questionText: "Is this the Overland edition?",
+                        answers: [
+                            {
+                                answerResult: null,
+                                answerText: "Yes",
+                                nextQuestionSequence: 2,
+                            },
+                            {
+                                answerResult: null,
+                                answerText: "No",
+                                nextQuestionSequence: 5,
+                            },
+                        ],
+                    },
+                    {
+                        questionSequence: 2,
+                        questionText: "Rain sensing wipers?",
+                        answers: [
+                            { answerResult: "PART-A", answerText: "Yes", nextQuestionSequence: 3 },
+                            { answerResult: "PART-B", answerText: "No", nextQuestionSequence: 3 },
+                        ],
+                        answerSelected: "2|answer|PART-A|Yes",
+                    },
+                    {
+                        questionSequence: 3,
+                        questionText: "Laminated door glass?",
+                        answers: [
+                            {
+                                answerResult: "PART-C",
+                                answerText: "Yes",
+                                nextQuestionSequence: null,
+                            },
+                            {
+                                answerResult: "PART-D",
+                                answerText: "No",
+                                nextQuestionSequence: null,
+                            },
+                        ],
+                        answerSelected: "3|answer|PART-C|Yes",
+                    },
+                    {
+                        questionSequence: 5,
+                        questionText: "Factory installed antenna?",
+                        answers: [
+                            {
+                                answerResult: "PART-E",
+                                answerText: "Yes",
+                                nextQuestionSequence: null,
+                            },
+                            {
+                                answerResult: "PART-F",
+                                answerText: "No",
+                                nextQuestionSequence: null,
+                            },
+                        ],
+                    },
+                ],
+            });
+            await wrapper.setProps({ index: 0 });
+
+            const result = wrapper.vm.getQuestionChainAnswerIfComplete("1|nextQuestion|5|No");
+
+            expect(result.incomplete).toBe(true);
+            expect(wrapper.vm.questions[1].answerSelected).toBeUndefined();
+            expect(wrapper.vm.questions[2].answerSelected).toBeUndefined();
+            expect(wrapper.vm.currentQuestionNum).toBe(5);
+            expect(result.answeredQuestions).toHaveLength(1);
+            expect(result.answeredQuestions[0].selectedAnswerText).toBe("No");
+        });
+
+        test("should return incomplete answer if returnedAnswer is a nextQuestion (not a final answer)", async () => {
             //Arrange
             const { wrapper } = setupMocks({});
-            const testReturnedAnswer = "1|nextQuestion|DB10840|No";
+            const testReturnedAnswer = "1|nextQuestion|3|No";
 
             //Act
             const result = wrapper.vm.getQuestionChainAnswerIfComplete(testReturnedAnswer);
 
             //Assert
-            expect(result).toBeFalsy();
+            expect(result).toMatchObject({
+                incomplete: true,
+                index: 0,
+            });
         });
 
         test("should trigger scroll to .current-question if returnedAnswer is a nextQuestion (not a final answer)", async () => {
             //Arrange
             const { wrapper } = setupMocks({});
-            const testReturnedAnswer = "1|nextQuestion|DB10840|No";
+            const testReturnedAnswer = "1|nextQuestion|3|No";
 
             //Act
             wrapper.vm.getQuestionChainAnswerIfComplete(testReturnedAnswer);
@@ -323,8 +419,205 @@ describe("Question Chain component", () => {
             expect(wrapper.vm.questions[0].answers[0].problemQuestionId).toBe(9531);
             expect(wrapper.vm.questions[0].answers[1].problemQuestionId).toBe(9529);
         });
+
+        test("should normalize uppercase answerSelected to match button value on created", async () => {
+            const { wrapper } = setupMocks({
+                questionDataProp: [
+                    {
+                        questionSequence: 1,
+                        questionText: "Is your vehicle equipped with rain sensing wipers?",
+                        answerSelected: "1|ANSWER|DW01705|YES",
+                        answers: [
+                            {
+                                answerResult: "DW01705",
+                                answerText: "Yes",
+                                nextQuestionSequence: null,
+                            },
+                            {
+                                answerResult: "DW01591",
+                                answerText: "No",
+                                nextQuestionSequence: null,
+                            },
+                        ],
+                    },
+                ],
+            });
+
+            await nextTick();
+
+            expect(wrapper.vm.questions[0].answerSelected).toBe("1|answer|DW01705|Yes");
+        });
+        test("should show question 3 after answering No on Cherokee Overland question", async () => {
+            const { wrapper } = setupMocks({
+                questionDataProp: getCherokeeWindshieldQuestions(),
+            });
+            await nextTick();
+
+            const q1 = wrapper.vm.questions[0];
+            wrapper.vm.handleAnswer(q1, "1|nextQuestion|3|No");
+
+            expect(wrapper.vm.currentQuestionNum).toBe(3);
+            expect(
+                wrapper.vm.questions.filter((question) => wrapper.vm.isQuestionVisible(question))
+            ).toEqual(
+                expect.arrayContaining([
+                    expect.objectContaining({ questionSequence: 1 }),
+                    expect.objectContaining({ questionSequence: 3 }),
+                ])
+            );
+            expect(
+                wrapper.vm.questions.filter((question) => wrapper.vm.isQuestionVisible(question))
+            ).not.toEqual(
+                expect.arrayContaining([expect.objectContaining({ questionSequence: 2 })])
+            );
+        });
+
+        test("should resume at question 3 after remount when Q1 No was already saved", async () => {
+            const questionDataProp = getCherokeeWindshieldQuestions();
+            questionDataProp[0].answerSelected = "1|nextQuestion|3|No";
+
+            const { wrapper } = setupMocks({ questionDataProp });
+            await nextTick();
+
+            expect(wrapper.vm.currentQuestionNum).toBe(3);
+            expect(wrapper.vm.isQuestionVisible(wrapper.vm.questions[2])).toBe(true);
+        });
+
+        test("should resolve on Q1 Yes and not show Q2 for Honda HUD question", async () => {
+            const { wrapper } = setupMocks({
+                questionDataProp: getHondaAccordWindshieldQuestions(),
+            });
+            await nextTick();
+
+            const q1 = wrapper.vm.questions[0];
+            wrapper.vm.handleAnswer(q1, "1|answer|FW04796|Yes");
+
+            expect(wrapper.emitted()["update:modelValue"][0][0]).toMatchObject({
+                answerResult: "FW04796",
+                index: 0,
+            });
+            expect(wrapper.vm.currentQuestionNum).toBe(0);
+            expect(wrapper.vm.isQuestionVisible(wrapper.vm.questions[1])).toBe(false);
+        });
+
+        test("should resolve on Q3 No and not continue after remount", async () => {
+            const questionDataProp = getHondaAccordWindshieldQuestions();
+            questionDataProp[0].answerSelected = "1|nextQuestion|2|No";
+            questionDataProp[1].answerSelected = "2|nextQuestion|3|No";
+            questionDataProp[2].answerSelected = "3|answer|FW04793|No";
+
+            const { wrapper } = setupMocks({ questionDataProp });
+            await nextTick();
+
+            expect(wrapper.vm.currentQuestionNum).toBe(0);
+            expect(wrapper.vm.isQuestionVisible(wrapper.vm.questions[2])).toBe(true);
+            expect(
+                wrapper.vm.questions.filter((question) => wrapper.vm.isQuestionVisible(question))
+            ).toHaveLength(3);
+        });
+
+        test("should show Q2 after answering No on Honda HUD question", async () => {
+            const { wrapper } = setupMocks({
+                questionDataProp: getHondaAccordWindshieldQuestions(),
+            });
+            await nextTick();
+
+            const q1 = wrapper.vm.questions[0];
+            wrapper.vm.handleAnswer(q1, "1|nextQuestion|2|No");
+
+            expect(wrapper.vm.currentQuestionNum).toBe(2);
+            expect(wrapper.vm.isQuestionVisible(wrapper.vm.questions[1])).toBe(true);
         });
     });
+});
+
+function getHondaAccordWindshieldQuestions() {
+    return [
+        {
+            questionSequence: 1,
+            questionText:
+                "Is your vehicle equipped with a Heads-up Display which projects vehicle information, such as speed, onto the windshield?",
+            answers: [
+                { answerResult: "FW04796", answerText: "Yes", nextQuestionSequence: null },
+                { answerResult: "", answerText: "No", nextQuestionSequence: 2 },
+            ],
+        },
+        {
+            questionSequence: 2,
+            questionText:
+                "Is your vehicle equipped with an auto-dimming rearview mirror which will darken automatically when a vehicles approaches from the rear at night?",
+            answers: [
+                { answerResult: "FW04795", answerText: "Yes", nextQuestionSequence: null },
+                { answerResult: "", answerText: "No", nextQuestionSequence: 3 },
+            ],
+        },
+        {
+            questionSequence: 3,
+            questionText: "Is your vehicle equipped with a power moonroof?",
+            answers: [
+                { answerResult: "FW04794", answerText: "Yes", nextQuestionSequence: null },
+                { answerResult: "FW04793", answerText: "No", nextQuestionSequence: null },
+            ],
+        },
+    ];
+}
+
+function getCherokeeWindshieldQuestions() {
+    return [
+        {
+            questionSequence: 1,
+            questionText:
+                "Is your Cherokee the Overland edition which can be identified by having a wood and leather wrapped steering wheel?",
+            answers: [
+                { answerResult: "", answerText: "Yes", nextQuestionSequence: 2 },
+                { answerResult: "", answerText: "No", nextQuestionSequence: 3 },
+            ],
+        },
+        {
+            questionSequence: 2,
+            questionText:
+                "Is your vehicle equipped with rain sensing wipers that adjust their speed automatically when it rains?",
+            answers: [
+                { answerResult: "DW02270", answerText: "Yes", nextQuestionSequence: null },
+                { answerResult: "DW02264", answerText: "No", nextQuestionSequence: null },
+            ],
+        },
+        {
+            questionSequence: 3,
+            questionText:
+                "Is your vehicle equipped with rain sensing wipers that adjust their speed automatically when it rains?",
+            answers: [
+                { answerResult: "DW02268", answerText: "Yes", nextQuestionSequence: null },
+                { answerResult: "", answerText: "No", nextQuestionSequence: 4 },
+            ],
+        },
+        {
+            questionSequence: 4,
+            questionText:
+                "Is your vehicle equipped with automatic climate control which will change the fan speed automatically in order to maintain a set temperature?",
+            answers: [
+                { answerResult: "", answerText: "Yes", nextQuestionSequence: 5 },
+                { answerResult: "", answerText: "No", nextQuestionSequence: 6 },
+            ],
+        },
+        {
+            questionSequence: 5,
+            questionText: "Is your vehicle equipped with heated seats?",
+            answers: [
+                { answerResult: "DW02104", answerText: "Yes", nextQuestionSequence: null },
+                { answerResult: "DW02103", answerText: "No", nextQuestionSequence: null },
+            ],
+        },
+        {
+            questionSequence: 6,
+            questionText: "Is your vehicle equipped with heated seats?",
+            answers: [
+                { answerResult: "DW02102", answerText: "Yes", nextQuestionSequence: null },
+                { answerResult: "DW02101", answerText: "No", nextQuestionSequence: null },
+            ],
+        },
+    ];
+}
 
 function setupMocks({
     questionDataProp = [
@@ -351,6 +644,7 @@ function setupMocks({
     const mountOptions = getMountOptions({});
     mountOptions.propsData = {
         questionData: questionDataProp,
+        index: 0,
     };
     mountOptions["attachTo"] = document.body;
 

src/digital-components/question-chain/question-chain.vue

@@ -2,9 +2,9 @@
     <div v-for="(q, i) in questions" :key="i">
         <transition appear name="fade" mode="out-in">
             <buttonQuestion
-                v-if="q.answerSelected || q.questionSequence === currentQuestionNum"
+                v-if="isQuestionVisible(q)"
                 class="radioQuestion"
-                :class="q.questionSequence === currentQuestionNum && 'current-question'"
+                :class="isCurrentQuestion(q) && 'current-question'"
                 :questionText="q.questionText"
                 :answers="q.answers"
                 :groupName="`question-${index}-${q.questionSequence}`"
@@ -19,6 +19,11 @@
 <script>
 import buttonQuestion from "@/digital-components/button-question/button-question";
 import { useValidateForm } from "vee-validate";
+import {
+    isTerminalQuestionChainAnswer,
+    mapQuestionAnswersForChain,
+    normalizeAnswerSelectedValue,
+} from "@/helpers/question-chain-helper";
 
 export default {
     name: "questionChain",
@@ -34,54 +39,86 @@ export default {
         modelValue: Object,
         index: Number,
         answerKey: String,
+        hasSavedAnswer: Boolean,
+        hasDownstreamSavedAnswers: Boolean,
     },
     async created() {
         // do a test validation check upon create to prevent out of sync / incorrect valid states
         await useValidateForm(); // NOTE: needs to have async/await here; tested and won't work without it
 
         this.questionData.map((q, i) => {
+            const answers = mapQuestionAnswersForChain(q);
             const question = {
                 questionText: q.questionText,
                 questionSequence: q.questionSequence,
-                answers: q.answers.map((a) => {
-                    return {
-                        buttonLabel: a.answerText,
-                        // Name will either be nextQuestionSequence or answerResult
-                        // Name will be used by list-button as the input value.
-                        // It must be a single string or number, so concatenating together a string with
-                        //       4 pieces of data separated by pipe characters:
-                        //       question number|type of answer|answer value|answer text
-                        value: a.nextQuestionSequence
-                            ? q.questionSequence +
-                              "|nextQuestion|" +
-                              a.nextQuestionSequence +
-                              "|" +
-                              a.answerText
-                            : q.questionSequence + "|answer|" + a.answerResult + "|" + a.answerText,
-                        nextQuestionSequence: a.nextQuestionSequence,
-                        answerResult: a.answerResult,
-                        problemQuestionId: a.problemQuestionId,
-                        questionSequence: q.questionSequence,
-                        questionType: a.nextQuestionSequence ? "nextQuestion" : "answer",
-                    };
-                }),
-                answerSelected: q.answerSelected || "",
+                answers,
+                answerSelected: normalizeAnswerSelectedValue(q.answerSelected, answers),
             };
             if (!q.suppressThisQuestion) {
                 this.questions.push(question);
             }
         });
 
-        if (!this.modelValue?.length > 0 && this.questions.length > 0) {
-            // set this.currentQuestionNum to first valid question
-            this.currentQuestionNum = this.questions[0].questionSequence;
-            // scroll the next question into view
-            this.$nextTick(() => {
-                document.querySelector(".current-question")?.scrollIntoView({ behavior: "smooth" });
-            });
+        if (this.questions.length > 0) {
+            this.initializeCurrentQuestionNum();
+            this.scrollCurrentQuestionIntoView();
         }
     },
     methods: {
+        getQuestionSequence(question) {
+            return Number(question?.questionSequence);
+        },
+        isCurrentQuestion(question) {
+            return this.getQuestionSequence(question) === Number(this.currentQuestionNum);
+        },
+        isQuestionVisible(question) {
+            return !!question.answerSelected || this.isCurrentQuestion(question);
+        },
+        initializeCurrentQuestionNum() {
+            const lastAnsweredQuestion = [...this.questions]
+                .reverse()
+                .find((question) => question.answerSelected);
+
+            if (isTerminalQuestionChainAnswer(lastAnsweredQuestion?.answerSelected)) {
+                this.currentQuestionNum = 0;
+                return;
+            }
+
+            if (lastAnsweredQuestion?.answerSelected?.includes("|nextQuestion|")) {
+                const nextQuestionSequence = Number(
+                    lastAnsweredQuestion.answerSelected.split("|")[2]
+                );
+
+                if (
+                    this.questions.some(
+                        (question) => this.getQuestionSequence(question) === nextQuestionSequence
+                    )
+                ) {
+                    this.currentQuestionNum = nextQuestionSequence;
+                    return;
+                }
+            }
+
+            const firstUnanswered = this.questions.find((question) => !question.answerSelected);
+
+            if (firstUnanswered) {
+                this.currentQuestionNum = this.getQuestionSequence(firstUnanswered);
+            }
+        },
+        scrollCurrentQuestionIntoView() {
+            this.$nextTick(() => {
+                document.querySelector(".current-question")?.scrollIntoView({ behavior: "smooth" });
+            });
+        },
+        syncAnswerSelectedToQuestionData(questionSequence, answerSelected) {
+            const sourceQuestion = this.questionData?.find(
+                (q) => this.getQuestionSequence(q) === Number(questionSequence)
+            );
+
+            if (sourceQuestion) {
+                sourceQuestion.answerSelected = answerSelected;
+            }
+        },
         getProblemQuestionIdFromSelectedAnswer(question, selectedAnswer) {
             if (!question?.answers || !selectedAnswer) {
                 return null;
@@ -100,10 +137,20 @@ export default {
             */
 
             question.answerSelected = returnedAnswer;
-            const isQuestionChainComplete = this.getQuestionChainAnswerIfComplete(returnedAnswer);
+            this.syncAnswerSelectedToQuestionData(question.questionSequence, returnedAnswer);
+            const questionChainAnswer = this.getQuestionChainAnswerIfComplete(returnedAnswer);
 
-            if (isQuestionChainComplete) {
-                this.$emit("update:modelValue", isQuestionChainComplete);
+            if (!questionChainAnswer) {
+                return;
+            }
+
+            const shouldNotifyParent =
+                !questionChainAnswer.incomplete ||
+                this.hasSavedAnswer ||
+                this.hasDownstreamSavedAnswers;
+
+            if (shouldNotifyParent) {
+                this.$emit("update:modelValue", questionChainAnswer);
             }
         },
         getQuestionChainAnswerIfComplete(returnedAnswer) {
@@ -117,20 +164,24 @@ export default {
             //   "5|answer|DW02104|Yes"
 
             const returnedAnswerArray = returnedAnswer.split("|");
-            const questionNum = parseInt(returnedAnswerArray[0]);
+            const questionNum = Number(returnedAnswerArray[0]);
             const questionType = returnedAnswerArray[1];
             const questionAnswer = returnedAnswerArray[2];
             const answeredQuestions = [];
 
             this.questions.forEach((q) => {
+                const questionSequence = this.getQuestionSequence(q);
+
                 // find this question and mark it as "answered" by populating answerSelected
-                if (q.questionSequence === questionNum) {
+                if (questionSequence === questionNum) {
                     q.answerSelected = returnedAnswer;
+                    this.syncAnswerSelectedToQuestionData(questionSequence, returnedAnswer);
                 }
                 // remove all answers AFTER this question...
                 //      (needed in case user is changing previously answered questions)
-                if (q.questionSequence > questionNum) {
+                if (questionSequence > questionNum) {
                     delete q.answerSelected;
+                    this.syncAnswerSelectedToQuestionData(questionSequence, "");
                 }
                 if (q.answerSelected) {
                     answeredQuestions.push({
@@ -146,22 +197,21 @@ export default {
                 }
             });
 
-            // return false if there's a nextQuestion... or return an object with final answers (truthy)
+            // return incomplete answer if there's a nextQuestion... or return final answers (truthy)
             if (questionType === "nextQuestion") {
                 // update to next question index
-                this.currentQuestionNum = parseInt(questionAnswer); // update count to display next question
-                // scroll the next question into view
-                this.$nextTick(() => {
-                    document
-                        .querySelector(".current-question")
-                        .scrollIntoView({ behavior: "smooth" });
-                });
-                return false;
+                this.currentQuestionNum = Number(questionAnswer);
+                this.scrollCurrentQuestionIntoView();
+                return {
+                    incomplete: true,
+                    answeredQuestions,
+                    index: this.index,
+                };
             } else {
                 // reset current question index (removes .current-question class)
                 this.currentQuestionNum = 0; // reset count
                 const answeredQuestion = this.questions.find(
-                    (q) => q.questionSequence === questionNum
+                    (q) => this.getQuestionSequence(q) === questionNum
                 );
 
                 // return an object with the part answer, all the answered questions, and the part index

src/digital-components/textbox-question/textbox-question.vue

@@ -65,10 +65,9 @@
                             data-test="image-upload"
                             @change="imageChanged" />
                     </label>
-                    <loader
-                        v-show="isImageProcessing"
-                        loaderColor="blue"
-                        class="loading-icon"></loader>
+                    <span v-if="isImageProcessing" class="loading-icon">
+                        <loader loaderColor="blue" />
+                    </span>
                 </template>
             </template>
         </div>

src/experiment-components/donation-block.vue

@@ -50,6 +50,7 @@
                             ref="buttonMain"
                             :buttonText="DonationAddButtonCopy"
                             loaderColor="blue"
+                            loaderPosition="center"
                             class="w-100 mb-2 custom-secondary"
                             @click-event="handleDonationAction" />
                     </div>

src/experiment-components/service-package-radio-for-afterpay.vue

@@ -4,6 +4,7 @@
             class="package-label"
             :class="[
                 this.buttonLabelSubCopy ? 'has-subheader' : '',
+                this.additionalButtonData?.packageDescription ? 'has-description' : '',
                 this.additionalButtonData.isInsuranceSelected ? 'is-insurance' : '',
                 this.hasPackageDiscount() ? 'has-package-discount' : '',
             ]"
@@ -13,6 +14,10 @@
                     <p class="m-0">
                         <span v-html="this.buttonLabel"></span>
                     </p>
+                    <p
+                        class="package-description m-0"
+                        v-if="this.additionalButtonData?.packageDescription"
+                        v-html="this.additionalButtonData.packageDescription"></p>
                     <p
                         class="sub-label m-0"
                         v-if="this.buttonLabelSubCopy"
@@ -202,7 +207,7 @@ export default {
                 min-height: 52px;
                 max-height: 126px;
                 @include media-breakpoint-up(md) {
-                    max-height: 500px;
+                    max-height: 1000px;
                     padding-bottom: 4.75rem;
                 }
                 @include media-breakpoint-down(md) {
@@ -242,7 +247,8 @@ export default {
                             }
                         }
 
-                        &.has-subheader {
+                        &.has-subheader,
+                        &.has-description {
                             @media (max-width: 320px) {
                                 min-height: 100px;
                                 max-height: 160px;
@@ -255,16 +261,21 @@ export default {
                     }
                 }
 
-                &.has-subheader {
+                &.has-subheader,
+                &.has-description {
                     & > .package-specs {
                         display: inline-flex;
                     }
                 }
 
                 //Package container height with package discount AND "most popular" label
-                &.has-package-discount.has-subheader {
+                &.has-package-discount.has-subheader,
+                &.has-package-discount.has-description {
                     min-height: 170px;
                 }
+                &.has-package-discount.has-subheader.has-description {
+                    min-height: 190px;
+                }
                 //Package container height with package discount only
                 &.has-package-discount {
                     min-height: 136px;
@@ -307,30 +318,28 @@ export default {
 
             &:checked {
                 + .package-label {
-                    .package-specs {
                     max-height: 1000px;
-                    }
-                }
-                + .package-label {
-                    .package-specs {
-                        .hide-when-closed {
-                            display: block;
-                        }
-                    }
-                }
-                + .package-label {
                     border: 1px solid $blue;
-                    max-height: 500px;
+
+                    .package-specs {
+                        max-height: none;
+
+                        .hide-when-closed {
+                            max-height: none;
+                            overflow: visible;
+                            opacity: 1;
+                            transition: opacity 0.2s ease 0.15s;
+                        }
+                    }
+
                     .special-save-box {
                         background-color: $green-100;
                     }
-                }
-                + .package-label {
+
                     &:before {
                         box-shadow: 0px 0px 0px 1px $blue;
                     }
-                }
-                + .package-label {
+
                     &:after {
                         background: $blue;
                     }
@@ -356,8 +365,9 @@ export default {
             flex-direction: column;
             width: 100%;
             transition: all 0.5s ease;
+
             @include media-breakpoint-up(md) {
-                max-height: 500px;
+                max-height: none;
             }
 
             .row {
@@ -378,6 +388,13 @@ export default {
                     font-size: 0.75rem;
                     margin-left: auto;
                 }
+                &.package-description {
+                    color: $gray-550;
+                    font-size: 0.875rem;
+                    font-weight: 400;
+                    font-style: italic;
+                    white-space: normal;
+                }
             }
             span {
                 &.service-package-discount {
@@ -441,10 +458,17 @@ export default {
             }
 
             .hide-when-closed {
-                display: none;
-                @include media-breakpoint-up(md) {
                 display: flex;
                 flex-direction: column;
+                max-height: 0;
+                overflow: hidden;
+                opacity: 0;
+                transition: opacity 0.15s ease;
+
+                @include media-breakpoint-up(md) {
+                    max-height: none;
+                    opacity: 1;
+                    overflow: visible;
                 }
             }
         }

src/experiment-components/service-package-radio.vue

@@ -4,6 +4,7 @@
             class="package-label pricing-by-day-pkg-lbl"
             :class="[
                 this.buttonLabelSubCopy ? 'has-subheader' : '',
+                this.additionalButtonData?.packageDescription ? 'has-description' : '',
                 !this.additionalButtonData.hasDiscount ? 'adjust-top' : '',
             ]"
             for="testradio">
@@ -13,6 +14,10 @@
                         <p class="m-0">
                             <span v-html="this.buttonLabel"></span>
                         </p>
+                        <p
+                            class="package-description m-0"
+                            v-if="this.additionalButtonData?.packageDescription"
+                            v-html="this.additionalButtonData.packageDescription"></p>
                         <p
                             class="sub-label m-0"
                             v-if="this.buttonLabelSubCopy"
@@ -41,6 +46,10 @@
                             <span v-html="getDisplayPrice"></span>
                         </span>
                     </p>
+                    <p
+                        class="package-description m-0"
+                        v-if="this.additionalButtonData?.packageDescription"
+                        v-html="this.additionalButtonData.packageDescription"></p>
                     <p
                         class="sub-label m-0"
                         v-if="this.buttonLabelSubCopy"
@@ -259,13 +268,18 @@ export default {
                 min-height: 52px;
                 max-height: 126px;
                 @include media-breakpoint-up(md) {
-                    max-height: 500px;
+                    max-height: 1000px;
                     padding-bottom: 3rem;
                 }
                 transition: max-height 0.25s ease-in;
 
-                &.has-subheader {
+                &.has-subheader,
+                &.has-description {
                     min-height: 72px;
+
+                    & > .package-specs {
+                        display: inline-flex;
+                    }
                 }
 
                 &:before {
@@ -288,12 +302,6 @@ export default {
                     height: 10px;
                     min-width: 10px;
                 }
-
-                &.has-subheader {
-                    & > .package-specs {
-                        display: inline-flex;
-                    }
-                }
             }
 
             &:hover {
@@ -309,30 +317,28 @@ export default {
 
             &:checked {
                 + .package-label {
-                    .package-specs {
                     max-height: 1000px;
-                    }
-                }
-                + .package-label {
-                    .package-specs {
-                        .hide-when-closed {
-                            display: block;
-                        }
-                    }
-                }
-                + .package-label {
                     border: 1px solid $blue;
-                    max-height: 500px;
+
+                    .package-specs {
+                        max-height: none;
+
+                        .hide-when-closed {
+                            max-height: none;
+                            overflow: visible;
+                            opacity: 1;
+                            transition: opacity 0.2s ease 0.15s;
+                        }
+                    }
+
                     .special-save-box {
                         background-color: $green-200;
                     }
-                }
-                + .package-label {
+
                     &:before {
                         box-shadow: 0px 0px 0px 1px $blue;
                     }
-                }
-                + .package-label {
+
                     &:after {
                         background: $blue;
                     }
@@ -358,8 +364,9 @@ export default {
             flex-direction: column;
             width: 100%;
             transition: all 0.5s ease;
+
             @include media-breakpoint-up(md) {
-                max-height: 500px;
+                max-height: none;
             }
 
             span.pricing-by-day {
@@ -398,6 +405,13 @@ export default {
                     text-transform: uppercase;
                     font-size: 0.75rem;
                 }
+                &.package-description {
+                    color: $gray-550;
+                    font-size: 0.875rem;
+                    font-weight: 400;
+                    font-style: italic;
+                    white-space: normal;
+                }
             }
             span {
                 &.service-package-discount-pricing-by-day {
@@ -458,10 +472,17 @@ export default {
             }
 
             .hide-when-closed {
-                display: none;
-                @include media-breakpoint-up(md) {
                 display: flex;
                 flex-direction: column;
+                max-height: 0;
+                overflow: hidden;
+                opacity: 0;
+                transition: opacity 0.15s ease;
+
+                @include media-breakpoint-up(md) {
+                    max-height: none;
+                    opacity: 1;
+                    overflow: visible;
                 }
             }
         }

src/fmg-components/insurance-nav-bar/insurance-nav-bar.vue

@@ -28,6 +28,7 @@
                     isPrimary
                     :buttonText="overrideButtonText || buttonText"
                     loaderColor="white"
+                    loaderPosition="center"
                     :class="isForwardActionDisabled && 'form-test-invalid'"
                     :aria-disabled="isForwardActionDisabled"
                     :isDisabled="isForwardActionDisabled"
@@ -68,10 +69,6 @@ export default {
             customButtontext: "",
         };
     },
-
-    unmounted() {
-        document.onkeydown = null;
-    },
     computed: {
         backLink() {
             return (
@@ -91,15 +88,8 @@ export default {
         },
         removeLoader() {
             this.$refs.buttonMain.removeLoader();
-            document.onkeydown = function (e) {
-                return true;
-            };
         },
         buttonClick() {
-            //prevent keyboard input after button click
-            document.onkeydown = function (e) {
-                return false;
-            };
             // check session expired and initSession to recreate cookies
             if (analyticsMixin.methods.sessionExpired()) {
                 this.routeReturnUser();

src/fmg-components/layouts/questions-page-layout/questions-page-layout.spec.js

@@ -150,6 +150,43 @@ describe("questionsPageLayout.vue", () => {
 
             wrapper.unmount();
         });
+
+        test("Should return false when answerData was cleared even if answerSelected remains", async () => {
+            const { wrapper } = setupMocks({});
+            await wrapper.setProps({ index: 1 });
+
+            const testGlassPiece = {
+                questions: [
+                    {
+                        questionSequence: 1,
+                        questionText: "Is your Grand Cherokee the Laredo model?",
+                        answers: [],
+                        answerSelected: "1|answer|DD11132|Yes",
+                    },
+                ],
+                answerData: {},
+            };
+
+            expect(wrapper.vm.showThisQuestionChain(testGlassPiece, 0)).toBe(false);
+
+            wrapper.unmount();
+        });
+
+        test("Should return false for reset chains ahead of the current index", async () => {
+            const { wrapper } = setupMocks({});
+            await wrapper.setProps({ index: 1 });
+
+            const testGlassPiece = {
+                questions: [
+                    { questionSequence: 1, questionText: "Rain sensing wipers?", answers: [] },
+                ],
+                answerData: null,
+            };
+
+            expect(wrapper.vm.showThisQuestionChain(testGlassPiece, 2)).toBe(false);
+
+            wrapper.unmount();
+        });
     });
 
     describe("method handleForwardButtonAction...", () => {

src/fmg-components/layouts/questions-page-layout/questions-page-layout.vue

@@ -10,7 +10,9 @@
             </div>
             <div class="row">
                 <div class="col-12 col-md-10 col-lg-8 col-xl-7 question-chain-wrapper">
-                    <div v-for="(questionsDatum, i) in questionsData" :key="questionsDatum.key">
+                    <div
+                        v-for="(questionsDatum, i) in questionsData"
+                        :key="questionsDatum.key ?? questionsDatum.answerKey ?? i">
                         <questionChain
                             ref="questionChain"
                             v-model="selectedAnswers[questionsDatum.answerKey]"
@@ -18,10 +20,12 @@
                             :index="i"
                             v-if="showThisQuestionChain(questionsDatum, i)"
                             :answerKey="questionsDatum.answerKey"
+                            :hasSavedAnswer="!!questionsDatum.answerData?.answerResult"
+                            :hasDownstreamSavedAnswers="hasDownstreamSavedAnswers(i)"
                             :validationRules="validationRules" />
-                        <!-- Save your progress slot -->
-                        <slot></slot>
                     </div>
+                    <!-- Save your progress slot (once per page, not per glass piece) -->
+                    <slot></slot>
 
                     <navbar
                         ref="navbar"
@@ -60,12 +64,22 @@ export default {
         },
     },
     methods: {
+        hasDownstreamSavedAnswers(glassIndex) {
+            return this.questionsData
+                ?.slice(glassIndex + 1)
+                .some((glass) => glass.answerData?.answerResult);
+        },
         showThisQuestionChain(glass, i) {
-            // return false if no questions or if suppressed
             if (!glass.questions || glass.questions?.length < 1 || glass.isSuppressedPart) {
                 return false;
             }
-            return this.index === i || glass.answerData?.answerResult?.length > 0;
+
+            if (this.index === i) {
+                return true;
+            }
+
+            // Only show completed chains that still have a saved answer
+            return !!glass.answerData?.answerResult;
         },
         handleForwardButtonAction() {
             this.$emit("forwardButtonAction");

src/fmg-components/nav-bar/nav-bar.spec.js

@@ -33,21 +33,15 @@ describe("nav-bar.vue", () => {
         expect(wrapper.componentVM.customButtontext).toBe("newText");
     });
 
-    test("should run removeLoader fn on buttonMain and return false for onkeydown fn", async () => {
-        // Arrange
+    test("should run removeLoader on buttonMain", async () => {
         const wrapper = mount(navbar, {
             mixins: [mockMixin],
         });
 
-        // Act
         wrapper.vm.$refs.buttonMain.removeLoader = jest.fn();
         wrapper.vm.removeLoader();
-        const spy = jest.spyOn(document, "onkeydown");
-        document.onkeydown();
 
-        // Assert
         expect(wrapper.vm.$refs.buttonMain.removeLoader).toHaveBeenCalled();
-        expect(spy).toReturnWith(true);
     });
 });
 

src/fmg-components/nav-bar/nav-bar.vue

@@ -16,6 +16,7 @@
                     isPrimary
                     :buttonText="overrideButtonText || buttonText"
                     loaderColor="white"
+                    loaderPosition="center"
                     :class="isForwardActionDisabled && 'form-test-invalid'"
                     :aria-disabled="isForwardActionDisabled"
                     :isDisabled="isForwardActionDisabled"
@@ -69,9 +70,6 @@ export default {
         };
     },
 
-    unmounted() {
-        document.onkeydown = null;
-    },
     computed: {
         backLink() {
             return (
@@ -91,15 +89,8 @@ export default {
         },
         removeLoader() {
             this.$refs.buttonMain.removeLoader();
-            document.onkeydown = function (e) {
-                return true;
-            };
         },
         buttonClick() {
-            //prevent keyboard input after button click
-            document.onkeydown = function (e) {
-                return false;
-            };
             // check session expired and initSession to recreate cookies
             if (analyticsMixin.methods.sessionExpired()) {
                 this.routeReturnUser();

src/fmg-components/save-progress-popup-question/save-progress-popup-question.spec.js

@@ -159,13 +159,37 @@ describe("save-progress-popup-question ", () => {
             wrapper.vm.selectContactMethod("PhoneAnswer");
             wrapper.vm.modal.validate = jest.fn().mockResolvedValue({ valid: true });
             const resetSpy = jest.spyOn(wrapper.vm, "resetPhoneSendButtonStyle");
+            const scrollSpy = jest
+                .spyOn(wrapper.vm, "scrollConsentIntoView")
+                .mockResolvedValue(undefined);
 
             await wrapper.vm.validatePhoneAndSave();
 
             expect(wrapper.vm.showConsentErrors).toBe(true);
+            expect(scrollSpy).toHaveBeenCalled();
             expect(resetSpy).toHaveBeenCalled();
         });
 
+        test("should scroll consent checkboxes into view", async () => {
+            const { wrapper } = setupMocks({
+                props: {
+                    modalWidgetName: "SaveProgressPopupWidget",
+                },
+            });
+            const mockScrollIntoView = jest.fn();
+            const consentEl = document.createElement("fieldset");
+            consentEl.className = "save-progress-popup-sms-consent";
+            consentEl.scrollIntoView = mockScrollIntoView;
+            wrapper.element.appendChild(consentEl);
+
+            await wrapper.vm.scrollConsentIntoView();
+
+            expect(mockScrollIntoView).toHaveBeenCalledWith({
+                behavior: "smooth",
+                block: "nearest",
+            });
+        });
+
         test("should reset the send button loader when phone validation fails", async () => {
             const { wrapper } = setupMocks({
                 props: {
@@ -209,6 +233,66 @@ describe("save-progress-popup-question ", () => {
         });
     });
 
+    describe("footer button suppression", () => {
+        test("should suppress the modal footer button on the phone tab", async () => {
+            const { wrapper } = setupMocks({
+                props: {
+                    modalWidgetName: "SaveProgressPopupWidget",
+                },
+            });
+
+            wrapper.vm.selectContactMethod("PhoneAnswer");
+            await wrapper.vm.$nextTick();
+
+            expect(wrapper.vm.isFooterButtonSuppressed).toBe(true);
+        });
+
+        test("should show the modal footer button on the email tab before save", () => {
+            const { wrapper } = setupMocks({
+                props: {
+                    modalWidgetName: "SaveProgressPopupWidget",
+                },
+            });
+
+            expect(wrapper.vm.isFooterButtonSuppressed).toBe(false);
+        });
+
+        test("should suppress the modal footer button after a successful email save", async () => {
+            const dispatchStoreAction = jest.fn().mockResolvedValue(undefined);
+            const { wrapper } = setupMocks({
+                props: {
+                    modalWidgetName: "SaveProgressPopupWidget",
+                    pageName: "quote",
+                },
+            });
+
+            wrapper.vm.dispatchStoreAction = dispatchStoreAction;
+            wrapper.vm.userInput = "test@example.com";
+
+            await wrapper.vm.saveProgress();
+
+            expect(wrapper.vm.isFooterButtonSuppressed).toBe(true);
+        });
+
+        test("should reset the modal footer button loader before suppressing it after save", async () => {
+            const dispatchStoreAction = jest.fn().mockResolvedValue(undefined);
+            const { wrapper } = setupMocks({
+                props: {
+                    modalWidgetName: "SaveProgressPopupWidget",
+                    pageName: "quote",
+                },
+            });
+
+            wrapper.vm.dispatchStoreAction = dispatchStoreAction;
+            wrapper.vm.userInput = "test@example.com";
+            wrapper.vm.modal.resetButtonStyle = jest.fn();
+
+            await wrapper.vm.saveProgress();
+
+            expect(wrapper.vm.modal.resetButtonStyle).toHaveBeenCalled();
+        });
+    });
+
     describe("saveProgress", () => {
         test("should save phone number and sms consent when phone tab is selected", async () => {
             const dispatchStoreAction = jest.fn().mockResolvedValue(undefined);

src/fmg-components/save-progress-popup-question/save-progress-popup-question.vue

@@ -7,7 +7,7 @@
             :onModalClosedCallback="onModalClosed"
             :footerButtonText="modalButtonText"
             :isFooterButtonPrimary="true"
-            :isFooterButtonSuppressed="isPhoneTabSelected && !isProgressSaved"
+            :isFooterButtonSuppressed="isFooterButtonSuppressed"
             @footer-button-event="saveProgress">
             <p class="modal-body-inner">{{ modalBodyText }}</p>
             <fieldset class="save-progress-popup-question__tabs">
@@ -43,6 +43,7 @@
                     isRequired
                     validationRules="phone-number-required" />
                 <saveProgressPopupSmsConsentQuestion
+                    ref="smsConsentQuestion"
                     v-model="smsConsent"
                     :consentCopy="smsConsentCopy"
                     :isDisabled="isProgressSaved"
@@ -70,9 +71,14 @@
                     ref="phoneSendButton"
                     :isPrimary="true"
                     class="w-100 modal-footer-button"
+                    loaderColor="white"
+                    loaderPosition="center"
                     :buttonText="modalButtonText"
                     @click-event="validatePhoneAndSave" />
-                <p class="modal-disclaimer" v-html="modalDisclaimerText"></p>
+                <p
+                    v-if="!isProgressSaved"
+                    class="modal-disclaimer"
+                    v-html="modalDisclaimerText"></p>
             </template>
             <alert
                 class="my-4"
@@ -192,6 +198,9 @@ export default {
         isPhoneTabSelected() {
             return this.contactMethod === saveProgressPopupContactMethods.PHONE;
         },
+        isFooterButtonSuppressed() {
+            return this.isProgressSaved || this.isPhoneTabSelected;
+        },
         phoneQuestionWidgetName() {
             return PHONE_QUESTION_WIDGET;
         },
@@ -240,6 +249,7 @@ export default {
                     !hasSaveProgressSmsConsentSelection(this.smsConsent, this.showConsentManagement)
                 ) {
                     this.showConsentErrors = true;
+                    await this.scrollConsentIntoView();
                     return;
                 }
 
@@ -252,6 +262,14 @@ export default {
         resetPhoneSendButtonStyle() {
             this.$refs.phoneSendButton?.resetButtonStyle();
         },
+        async scrollConsentIntoView() {
+            await this.$nextTick();
+            const consentEl =
+                this.$refs.smsConsentQuestion?.$el ??
+                this.$el?.querySelector(".save-progress-popup-sms-consent");
+
+            consentEl?.scrollIntoView({ behavior: "smooth", block: "nearest" });
+        },
         async saveProgress() {
             await saveProgressPopupContactToStore(this.dispatchStoreAction, {
                 contactMethod: this.contactMethod,
@@ -262,6 +280,9 @@ export default {
             // send store call to send to new API (that triggers an email/SMS send)
             await saveQuote({ pageNameToLog: this.pageName });
 
+            this.modal?.resetButtonStyle();
+            this.resetPhoneSendButtonStyle();
+
             // hide save progress button; show success message alert
             this.savedContactMethod = this.contactMethod;
             this.isProgressSaved = true;
@@ -372,6 +393,11 @@ export default {
         }
     }
     .modal.modal-component .modal-dialog .modal-content {
+        max-height: calc(100dvh - 1rem);
+        display: flex;
+        flex-direction: column;
+        overflow: hidden;
+
         p.modal-body {
             padding: 0;
         }
@@ -379,6 +405,9 @@ export default {
             display: flex;
             flex-direction: column;
             padding: 0 1.5rem;
+            overflow-y: auto;
+            flex: 1 1 auto;
+            min-height: 0;
 
             .textbox-question {
                 padding: 0;
@@ -499,6 +528,8 @@ export default {
                 text-align: left;
                 order: 3;
                 margin: 0;
+                max-height: calc(100dvh - 30rem);
+                overflow-y: auto;
 
                 a {
                     text-decoration: none;
@@ -508,10 +539,6 @@ export default {
     }
 
     &.progress-saved {
-        .modal-footer-button,
-        .modal-disclaimer {
-            display: none;
-        }
         .skip-button {
             margin-bottom: 0;
         }

src/helpers/pricing-helper.js

@@ -3,6 +3,10 @@ import { storeActions } from "@/constants/store-actions";
 import baseMixin from "@/mixins/base-mixin.js";
 import { deepClone } from "@/helpers/object-helper";
 import { partNumberStrings } from "@/constants/part-number-strings";
+import { applicationConfig } from "@/constants/application-config";
+import { queryStrings } from "@/constants/query-strings";
+import { getQuerystringParameter } from "@/helpers/querystring-helper";
+import { peekQueryFromStash } from "@/router/methods/helpers/querystring-stash";
 
 export function getDisplayAmountDue(lineItemsObject, includeTax = true) {
     return getAmountDue(lineItemsObject, includeTax).toLocaleString("en-US", {
@@ -56,6 +60,35 @@ export function getAmountDue(lineItemsObject, includeTax = true) {
     return ((amountDue * 100) / 100).toFixed(2);
 }
 
+function getPiaAuthAmountAdjustment() {
+    if (applicationConfig.CURRENT_ENVIRONMENT === "Prod") {
+        return 0;
+    }
+
+    const adjustParam =
+        peekQueryFromStash(queryStrings.PIA_AUTH_AMOUNT_ADJUST) ??
+        getQuerystringParameter(queryStrings.PIA_AUTH_AMOUNT_ADJUST);
+
+    if (adjustParam == null || adjustParam === "") {
+        return 0;
+    }
+
+    const adjustment = parseFloat(adjustParam);
+    return Number.isFinite(adjustment) ? adjustment : 0;
+}
+
+export function getPiaAuthorizationAmount(lineItemsObject) {
+    const amountDue = parseFloat(getAmountDue(lineItemsObject));
+    const adjustment = getPiaAuthAmountAdjustment();
+
+    if (adjustment === 0) {
+        return amountDue.toFixed(2);
+    }
+
+    const adjustedAmount = Math.max(0.01, amountDue + adjustment);
+    return adjustedAmount.toFixed(2);
+}
+
 export function getSubTotal(lineItemsObject) {
     // this is amountDue without sales tax
     return getAmountDue(lineItemsObject, false);

src/helpers/pricing-helper.spec.js

@@ -1,9 +1,22 @@
 import {
     getDisplayAmountDue,
     getAmountDue,
+    getPiaAuthorizationAmount,
     getSubTotal,
     getSalesTax,
 } from "@/helpers/pricing-helper.js";
+import { applicationConfig } from "@/constants/application-config";
+
+jest.mock("@/helpers/querystring-helper", () => ({
+    getQuerystringParameter: jest.fn(),
+}));
+
+jest.mock("@/router/methods/helpers/querystring-stash", () => ({
+    peekQueryFromStash: jest.fn(),
+}));
+
+import { getQuerystringParameter } from "@/helpers/querystring-helper";
+import { peekQueryFromStash } from "@/router/methods/helpers/querystring-stash";
 
 const lineItems = {
     glassParts: [],
@@ -61,4 +74,30 @@ describe("pricing-helper", () => {
             expect(result).toBe("3.00");
         });
     });
+
+    describe("getPiaAuthorizationAmount", () => {
+        beforeEach(() => {
+            jest.clearAllMocks();
+            peekQueryFromStash.mockReturnValue(null);
+            getQuerystringParameter.mockReturnValue(null);
+            applicationConfig.CURRENT_ENVIRONMENT = "QA";
+        });
+
+        it("returns amount due when no adjustment is configured", () => {
+            expect(getPiaAuthorizationAmount(lineItems)).toBe("53.00");
+        });
+
+        it("ignores adjustment in production", () => {
+            applicationConfig.CURRENT_ENVIRONMENT = "Prod";
+            peekQueryFromStash.mockReturnValue("-5");
+
+            expect(getPiaAuthorizationAmount(lineItems)).toBe("53.00");
+        });
+
+        it("applies non-production query string adjustment", () => {
+            peekQueryFromStash.mockReturnValue("-5");
+
+            expect(getPiaAuthorizationAmount(lineItems)).toBe("48.00");
+        });
+    });
 });

src/helpers/question-chain-helper.js

@@ -0,0 +1,59 @@
+/**
+ * Builds the pipe-delimited value used by question-chain button options.
+ * Format: questionNumber|type|answer value|answer text
+ */
+export function buildQuestionChainAnswerValue({
+    questionSequence,
+    nextQuestionSequence,
+    answerResult,
+    answerText,
+}) {
+    if (nextQuestionSequence) {
+        return `${questionSequence}|nextQuestion|${nextQuestionSequence}|${answerText}`;
+    }
+
+    return `${questionSequence}|answer|${answerResult}|${answerText}`;
+}
+
+export function mapQuestionAnswersForChain(question) {
+    return question.answers.map((answer) => ({
+        buttonLabel: answer.answerText,
+        value: buildQuestionChainAnswerValue({
+            questionSequence: question.questionSequence,
+            nextQuestionSequence: answer.nextQuestionSequence,
+            answerResult: answer.answerResult,
+            answerText: answer.answerText,
+        }),
+        nextQuestionSequence: answer.nextQuestionSequence,
+        answerResult: answer.answerResult,
+        problemQuestionId: answer.problemQuestionId,
+        questionSequence: question.questionSequence,
+        questionType: answer.nextQuestionSequence ? "nextQuestion" : "answer",
+    }));
+}
+
+export function isTerminalQuestionChainAnswer(answerSelected) {
+    if (!answerSelected) {
+        return false;
+    }
+
+    const [, questionType, answerResult] = answerSelected.split("|");
+
+    return questionType?.toLowerCase() === "answer" && !!answerResult;
+}
+
+export function normalizeAnswerSelectedValue(answerSelected, answers) {
+    if (!answerSelected) {
+        return "";
+    }
+
+    if (answers.some((answer) => answer.value === answerSelected)) {
+        return answerSelected;
+    }
+
+    const matchedAnswer = answers.find(
+        (answer) => answer.value.toUpperCase() === String(answerSelected).toUpperCase()
+    );
+
+    return matchedAnswer?.value ?? answerSelected;
+}

src/helpers/question-chain-helper.spec.js

@@ -0,0 +1,90 @@
+import {
+    buildQuestionChainAnswerValue,
+    isTerminalQuestionChainAnswer,
+    mapQuestionAnswersForChain,
+    normalizeAnswerSelectedValue,
+} from "./question-chain-helper";
+
+describe("question-chain-helper", () => {
+    describe("buildQuestionChainAnswerValue", () => {
+        test("returns nextQuestion format when nextQuestionSequence is set", () => {
+            expect(
+                buildQuestionChainAnswerValue({
+                    questionSequence: 1,
+                    nextQuestionSequence: 3,
+                    answerResult: "ignored",
+                    answerText: "Yes",
+                })
+            ).toBe("1|nextQuestion|3|Yes");
+        });
+
+        test("returns answer format for final answers", () => {
+            expect(
+                buildQuestionChainAnswerValue({
+                    questionSequence: 1,
+                    nextQuestionSequence: null,
+                    answerResult: "DW01705",
+                    answerText: "Yes",
+                })
+            ).toBe("1|answer|DW01705|Yes");
+        });
+    });
+
+    describe("isTerminalQuestionChainAnswer", () => {
+        test("returns true when answer has a part number and no next question", () => {
+            expect(isTerminalQuestionChainAnswer("1|answer|FW04796|Yes")).toBe(true);
+            expect(isTerminalQuestionChainAnswer("3|answer|FW04793|No")).toBe(true);
+        });
+
+        test("returns false when answer continues to the next question", () => {
+            expect(isTerminalQuestionChainAnswer("1|nextQuestion|2|No")).toBe(false);
+        });
+
+        test("returns false when answer type is answer but part number is missing", () => {
+            expect(isTerminalQuestionChainAnswer("1|answer||No")).toBe(false);
+        });
+    });
+
+    describe("normalizeAnswerSelectedValue", () => {
+        const answers = [{ value: "1|answer|DW01705|Yes" }, { value: "1|answer|DW01591|No" }];
+
+        test("returns empty string when answerSelected is empty", () => {
+            expect(normalizeAnswerSelectedValue("", answers)).toBe("");
+        });
+
+        test("returns exact match when casing already matches", () => {
+            expect(normalizeAnswerSelectedValue("1|answer|DW01705|Yes", answers)).toBe(
+                "1|answer|DW01705|Yes"
+            );
+        });
+
+        test("normalizes uppercase legacy values to button value casing", () => {
+            expect(normalizeAnswerSelectedValue("1|ANSWER|DW01705|YES", answers)).toBe(
+                "1|answer|DW01705|Yes"
+            );
+        });
+    });
+
+    describe("mapQuestionAnswersForChain", () => {
+        test("maps API answers to question-chain button answers", () => {
+            const result = mapQuestionAnswersForChain({
+                questionSequence: 1,
+                answers: [
+                    {
+                        answerResult: "DW01705",
+                        answerText: "Yes",
+                        nextQuestionSequence: null,
+                        problemQuestionId: 123,
+                    },
+                ],
+            });
+
+            expect(result[0]).toMatchObject({
+                buttonLabel: "Yes",
+                value: "1|answer|DW01705|Yes",
+                problemQuestionId: 123,
+                questionType: "answer",
+            });
+        });
+    });
+});

src/helpers/service-package-helper.js

@@ -16,6 +16,11 @@ const tierExperimentSettingKeys = {
     [packageNames.TIER_THREE]: experimentSettings.TIER_THREE,
 };
 
+const tierDescriptionExperimentSettingKeys = {
+    [packageNames.TIER_TWO]: experimentSettings.TIER_TWO_DESCRIPTION,
+    [packageNames.TIER_THREE]: experimentSettings.TIER_THREE_DESCRIPTION,
+};
+
 export function containsLineItemWithPartType(typeToFind, itemsToSearch) {
     const partTypeMatches = findLineItemsWithPartType(typeToFind, itemsToSearch);
     return !!partTypeMatches?.length;
@@ -284,16 +289,24 @@ export function isServicePackageNameTestActive(experimentSettingsMap) {
 }
 
 export function getExperimentPackageDisplayName(tierName, experimentSettingsMap) {
+    return getExperimentPackageSetting(tierName, tierExperimentSettingKeys, experimentSettingsMap);
+}
+
+export function getExperimentPackageDescription(tierName, experimentSettingsMap) {
+    return getExperimentPackageSetting(
+        tierName,
+        tierDescriptionExperimentSettingKeys,
+        experimentSettingsMap
+    );
+}
+
+function getExperimentPackageSetting(tierName, settingKeys, experimentSettingsMap) {
     if (!isServicePackageNameTestActive(experimentSettingsMap)) {
         return null;
     }
 
-    const settingKey = tierExperimentSettingKeys[tierName];
-    if (!settingKey) {
-        return null;
-    }
-
-    return experimentHelper.getSettingValue(settingKey, experimentSettingsMap);
+    const settingKey = settingKeys[tierName];
+    return settingKey ? experimentHelper.getSettingValue(settingKey, experimentSettingsMap) : null;
 }
 
 function maxTier(tierA, tierB) {

src/helpers/service-package-helper.spec.js

@@ -969,34 +969,29 @@ describe("service-package-helper.js", () => {
 
     describe("getExperimentPackageDisplayName", () => {
         const { experimentSettings } = require("@/constants/experiments");
-
-        it("Returns null when the experiment is not active", () => {
-            const result = servicePackageHelper.getExperimentPackageDisplayName(
-                packageNames.TIER_ONE,
-                {}
-            );
-
-            expect(result).toBeNull();
-        });
-
-        it("Returns null when the test flag is not true", () => {
-            const result = servicePackageHelper.getExperimentPackageDisplayName(
-                packageNames.TIER_ONE,
-                {
-                    [experimentSettings.SHOW_SERVICE_PACKAGE_NAME_TEST]: "false",
-                    [experimentSettings.TIER_ONE]: "Essential",
-                }
-            );
-
-            expect(result).toBeNull();
-        });
-
-        it("Returns the experiment display name for each tier when active", () => {
-            const experimentSettingsMap = {
+        const activeExperimentSettingsMap = {
             [experimentSettings.SHOW_SERVICE_PACKAGE_NAME_TEST]: "true",
             [experimentSettings.TIER_ONE]: "Essential",
             [experimentSettings.TIER_TWO]: "Plus",
             [experimentSettings.TIER_THREE]: "Full Service",
+            [experimentSettings.TIER_TWO_DESCRIPTION]: "Most popular choice",
+            [experimentSettings.TIER_THREE_DESCRIPTION]: "Best value",
+        };
+
+        it("Returns null when the experiment is not active", () => {
+            expect(
+                servicePackageHelper.getExperimentPackageDisplayName(packageNames.TIER_ONE, {})
+            ).toBeNull();
+            expect(
+                servicePackageHelper.getExperimentPackageDescription(packageNames.TIER_TWO, {})
+            ).toBeNull();
+        });
+
+        it("Returns null when the test flag is not true", () => {
+            const experimentSettingsMap = {
+                [experimentSettings.SHOW_SERVICE_PACKAGE_NAME_TEST]: "false",
+                [experimentSettings.TIER_ONE]: "Essential",
+                [experimentSettings.TIER_TWO_DESCRIPTION]: "Most popular choice",
             };
 
             expect(
@@ -1004,28 +999,70 @@ describe("service-package-helper.js", () => {
                     packageNames.TIER_ONE,
                     experimentSettingsMap
                 )
+            ).toBeNull();
+            expect(
+                servicePackageHelper.getExperimentPackageDescription(
+                    packageNames.TIER_TWO,
+                    experimentSettingsMap
+                )
+            ).toBeNull();
+        });
+
+        it("Returns the experiment display name for each tier when active", () => {
+            expect(
+                servicePackageHelper.getExperimentPackageDisplayName(
+                    packageNames.TIER_ONE,
+                    activeExperimentSettingsMap
+                )
             ).toBe("Essential");
             expect(
                 servicePackageHelper.getExperimentPackageDisplayName(
                     packageNames.TIER_TWO,
-                    experimentSettingsMap
+                    activeExperimentSettingsMap
                 )
             ).toBe("Plus");
             expect(
                 servicePackageHelper.getExperimentPackageDisplayName(
                     packageNames.TIER_THREE,
-                    experimentSettingsMap
+                    activeExperimentSettingsMap
                 )
             ).toBe("Full Service");
         });
 
-        it("Returns null for an unknown tier", () => {
-            const result = servicePackageHelper.getExperimentPackageDisplayName("UnknownTier", {
-                [experimentSettings.SHOW_SERVICE_PACKAGE_NAME_TEST]: "true",
-                [experimentSettings.TIER_ONE]: "Essential",
+        it("Returns the experiment description for tier two and three when active", () => {
+            expect(
+                servicePackageHelper.getExperimentPackageDescription(
+                    packageNames.TIER_TWO,
+                    activeExperimentSettingsMap
+                )
+            ).toBe("Most popular choice");
+            expect(
+                servicePackageHelper.getExperimentPackageDescription(
+                    packageNames.TIER_THREE,
+                    activeExperimentSettingsMap
+                )
+            ).toBe("Best value");
         });
 
-            expect(result).toBeNull();
+        it("Returns null for unknown tiers and tiers without configured settings", () => {
+            expect(
+                servicePackageHelper.getExperimentPackageDisplayName("UnknownTier", {
+                    [experimentSettings.SHOW_SERVICE_PACKAGE_NAME_TEST]: "true",
+                    [experimentSettings.TIER_ONE]: "Essential",
+                })
+            ).toBeNull();
+            expect(
+                servicePackageHelper.getExperimentPackageDescription(
+                    packageNames.TIER_ONE,
+                    activeExperimentSettingsMap
+                )
+            ).toBeNull();
+            expect(
+                servicePackageHelper.getExperimentPackageDescription(
+                    "UnknownTier",
+                    activeExperimentSettingsMap
+                )
+            ).toBeNull();
         });
     });
 });

src/layouts/capability-questions/capability-questions.spec.js

@@ -213,7 +213,7 @@ describe("capabilityQuestions.vue", () => {
     });
 
     describe("forwardButtonAction", () => {
-        test("Should clear out answerData", () => {
+        test("Should clear out answerData", async () => {
             // Arrange
             const { wrapper } = setupMocks({});
 
@@ -245,7 +245,7 @@ describe("capabilityQuestions.vue", () => {
             });
 
             // Act
-            wrapper.vm.forwardButtonAction();
+            await wrapper.vm.forwardButtonAction();
 
             //Assert
             expect(wrapper.vm.questionsData[0].answerData).toEqual({});

src/layouts/capability-questions/capability-questions.vue

@@ -180,11 +180,6 @@ export default {
                 };
             });
 
-            // clear out answerData for future page loads; must occur prior to store save
-            this.questionsData.forEach((glass) => {
-                glass.answerData = {};
-            });
-
             // save to vuex store as order.damage.capabilityQuestionAnswers (array)
             // used in GET_PART_FROM_CAPABILITY_QUESTION_ANSWER call following this one
             await this.dispatchStoreAction(
@@ -211,6 +206,8 @@ export default {
             }
 
             this.navigateForward(partsOrQuestions);
+
+            this.clearQuestionsAnswerData();
         },
     },
     components: {

src/layouts/molding-questions/molding-questions.spec.js

@@ -217,7 +217,7 @@ describe("moldingQuestions.vue", () => {
     });
 
     describe("forwardButtonAction", () => {
-        test("Should clear out answerData", () => {
+        test("Should clear out answerData", async () => {
             // Arrange
             const { wrapper } = setupMocks({});
 
@@ -240,7 +240,7 @@ describe("moldingQuestions.vue", () => {
             });
 
             // Act
-            wrapper.vm.forwardButtonAction();
+            await wrapper.vm.forwardButtonAction();
 
             //Assert
             expect(wrapper.vm.questionsData[0].answerData).toEqual({});

src/layouts/molding-questions/molding-questions.vue

@@ -181,11 +181,6 @@ export default {
                 };
             });
 
-            // clear out answerData for future page loads; must occur prior to store save
-            this.questionsData.forEach((glass) => {
-                glass.answerData = {};
-            });
-
             // save to vuex store as order.damage.moldingQuestionArrays (array)
             await this.dispatchStoreAction(
                 this.storeActions.SAVE_MOLDING_QUESTION_ANSWERS,
@@ -209,6 +204,8 @@ export default {
             }
 
             this.navigateForward(partsOrQuestions);
+
+            this.clearQuestionsAnswerData();
         },
     },
     components: {

src/layouts/part-questions/part-questions.spec.js

@@ -258,9 +258,7 @@ describe("partQuestions.vue...", () => {
             });
 
             // Act
-            wrapper.vm.forwardButtonAction();
-
-            await nextTick();
+            await wrapper.vm.forwardButtonAction();
 
             //Assert
             expect(wrapper.vm.questionsData[0].answerData).toEqual({});

src/layouts/part-questions/part-questions.vue

@@ -182,13 +182,6 @@ export default {
                 };
             });
 
-            // clear out answerData for future page loads; must occur prior to store save
-            this.questionsData.forEach((glass) => {
-                if (glass.answerData) {
-                    glass.answerData = {};
-                }
-            });
-
             this.dispatchStoreAction(this.storeActions.SAVE_IS_OEM_GLASS_SELECTED, false, false);
 
             // save to vuex store as order.damage.partQuestionAnswers (array)
@@ -209,6 +202,8 @@ export default {
             const glassPartsForStore = partsLookup.data.glassPieceParts;
 
             this.navigateForward(glassPartsForStore);
+
+            this.clearQuestionsAnswerData();
         },
     },
     components: {

src/layouts/payment-adyen/payment-adyen.vue

@@ -24,7 +24,7 @@
                             <cart
                                 ref="cart"
                                 :damage="damageInfo"
-                                :availableVaps="[]"
+                                :availableVaps="availableVaps"
                                 :allowItemRemoval="false"
                                 v-model="lineItems"
                                 servicePackageOptionsCmsName="ServicePackageTitle"
@@ -72,7 +72,7 @@ import { endpoints } from "../../constants/endpoints";
 import { AppointmentTypeStrings } from "../../constants/schedule-constants";
 import baseMixin from "@/mixins/base-mixin.js";
 import { storeActions } from "@/constants/store-actions";
-import { getAmountDue } from "@/helpers/pricing-helper.js";
+import { getAmountDue, getPiaAuthorizationAmount } from "@/helpers/pricing-helper.js";
 import { submitWorkOrder } from "@/helpers/heritage-integration/order-helper.js";
 import { createAdyenCheckout } from "@/helpers/adyen-helper";
 import { Dropin } from "@adyen/adyen-web/auto";
@@ -364,14 +364,22 @@ export default {
                 );
             }
 
-            await baseMixin.methods.dispatchStoreAction(
-                storeActions.SAVE_NEXTGEN_SETTLED_AMOUNT,
-                this.amountDue,
-                false
-            );
+            await this.savePiaPaymentAmounts();
 
             await this.saveAndSubmitWorkOrder();
         },
+        async savePiaPaymentAmounts() {
+            await baseMixin.methods.dispatchStoreAction(
+                storeActions.SAVE_NEXTGEN_SETTLED_AMOUNT,
+                this.piaAuthorizationAmount,
+                false
+            );
+            await baseMixin.methods.dispatchStoreAction(
+                storeActions.SAVE_AUTHORIZATION_AMOUNT,
+                this.piaAuthorizationAmount,
+                false
+            );
+        },
         async handleFailedPayment(result) {
             console.log(`Result =`);
             console.log(result);
@@ -555,8 +563,12 @@ export default {
             return getAmountDue(this.$store.getters.order.lineItems);
         },
 
+        piaAuthorizationAmount() {
+            return getPiaAuthorizationAmount(this.$store.getters.order.lineItems);
+        },
+
         adyenPriceTotal() {
-            return Math.round(this.amountDue * 100);
+            return Math.round(parseFloat(this.piaAuthorizationAmount) * 100);
         },
 
         // Cart info
@@ -598,6 +610,9 @@ export default {
         lineItems() {
             return deepClone(this.$store.getters.lineItems);
         },
+        availableVaps() {
+            return this.$store.getters.order.lineItems?.vaps ?? [];
+        },
     },
 
     mounted() {

src/layouts/payment-pia-return/payment-pia-return.vue

@@ -14,12 +14,7 @@ import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
 import { Form } from "vee-validate";
 import { paymentMethods } from "@/constants/payment-method-constants";
 import baseMixin from "@/mixins/base-mixin.js";
-import {
-    getDisplayAmountDue,
-    getAmountDue,
-    getSubTotal,
-    getSalesTax,
-} from "@/helpers/pricing-helper.js";
+import { getPiaAuthorizationAmount } from "@/helpers/pricing-helper.js";
 // iframeResizer IS loaded into the page and necessary for the package to
 //   to auto scale the iFrame this page is loaded in
 // Do not remove despite showing as "unused" CASH-309
@@ -103,11 +98,7 @@ export default {
             const payerId = getQuerystringParameter(queryStrings.PAYERID);
 
             baseMixin.methods.dispatchStoreAction(storeActions.SAVE_PAYPAL_TOKEN, token, false);
-            baseMixin.methods.dispatchStoreAction(
-                storeActions.SAVE_NEXTGEN_SETTLED_AMOUNT,
-                this.getAmountDue(),
-                false
-            );
+            this.savePiaPaymentAmounts();
 
             await this.saveAndSubmitWorkOrder();
         },
@@ -160,16 +151,22 @@ export default {
                 console.log(ccToken);
 
                 baseMixin.methods.dispatchStoreAction(storeActions.SAVE_CCTOKEN, ccToken, false);
-                baseMixin.methods.dispatchStoreAction(
-                    storeActions.SAVE_NEXTGEN_SETTLED_AMOUNT,
-                    this.getAmountDue(),
-                    false
-                );
+                this.savePiaPaymentAmounts();
                 await this.saveAndSubmitWorkOrder();
             }
         },
-        getAmountDue() {
-            return getAmountDue(store.getters.order.lineItems);
+        savePiaPaymentAmounts() {
+            const authorizationAmount = getPiaAuthorizationAmount(store.getters.order.lineItems);
+            baseMixin.methods.dispatchStoreAction(
+                storeActions.SAVE_NEXTGEN_SETTLED_AMOUNT,
+                authorizationAmount,
+                false
+            );
+            baseMixin.methods.dispatchStoreAction(
+                storeActions.SAVE_AUTHORIZATION_AMOUNT,
+                authorizationAmount,
+                false
+            );
         },
         async saveAndSubmitWorkOrder() {
             // Final work order submit after returning from PIA.

src/layouts/policy-info/policy-info.spec.js

@@ -87,12 +87,12 @@ describe("policy-info.vue", () => {
             expect(wrapper.vm.displayClaimNumber).toBe(true);
         });
 
-        test("is false when only unrelated flags (e.g. otherResponsibleParty, thirdPartyVehicle, injuries) are checked", async () => {
+        test("is false when only unrelated flags (e.g. thirdPartyVehicle, injuries) are checked", async () => {
             const { wrapper } = setupMocks();
             wrapper.vm.morePolicyQuestions = {
                 additionalDamage: false,
                 rental: false,
-                otherResponsibleParty: true,
+                otherResponsibleParty: false,
                 thirdPartyVehicle: true,
                 injuries: true,
             };

src/layouts/policy-info/policy-info.vue

@@ -87,7 +87,9 @@
                                 class="mb-4"
                                 cmsWidgetName="PhoneExtensionWidget"
                                 v-model="phoneExtension"
-                                inputId="phoneExtension" />
+                                inputId="phoneExtension"
+                                maxLength="5"
+                                validationRules="phone-extension-format" />
                         </div>
                     </div>
 
@@ -321,6 +323,7 @@ defineRule("policy-number-format", (value) => {
 defineRule("zip-code-required", required(errorMessages.ZIP_REQUIRED));
 defineRule("zip-code-format", regex(/(^\d{5}$)|(^\d{5}-\d{4}$)/, errorMessages.ZIP_FORMAT));
 defineRule("phone-number-required", required(errorMessages.PHONE_REQUIRED));
+defineRule("phone-extension-format", regex(/^\d{1,5}$/, errorMessages.PHONE_EXTENSION_FORMAT));
 defineRule("date-of-loss-required", required(errorMessages.DATE_OF_LOSS_REQUIRED));
 defineRule("damage-types-required", required(errorMessages.DAMAGE_TYPES_REQUIRED));
 defineRule("state-required", required(errorMessages.STATE_REQUIRED));
@@ -493,9 +496,12 @@ export default {
             const additionalDamageFlag =
                 morePolicyQuestionAnswerToFlag[morePolicyQuestionAnswers.ADDITIONAL_DAMAGE];
             const rentalFlag = morePolicyQuestionAnswerToFlag[morePolicyQuestionAnswers.RENTAL];
+            const otherResponsibleParty =
+                morePolicyQuestionAnswerToFlag[morePolicyQuestionAnswers.OTHER_RESPONSIBLE_PARTY];
             return Boolean(
                 this.morePolicyQuestions?.[additionalDamageFlag] ||
-                    this.morePolicyQuestions?.[rentalFlag]
+                    this.morePolicyQuestions?.[rentalFlag] ||
+                    this.morePolicyQuestions?.[otherResponsibleParty]
             );
         },
     },
@@ -566,10 +572,10 @@ export default {
             return match ?? value;
         },
         getPolicyStateFromStore() {
-            return store.getters.order.customer.address.state;
+            return store.getters.order.damage.damageState;
         },
         getCityFromStore() {
-            return store.getters.order.customer.address.city;
+            return store.getters.order.damage.damageCity;
         },
         getDateOfBirthFromStore() {
             return store.getters.order.policy.dateOfBirth;
@@ -620,8 +626,8 @@ export default {
                     zipCode: this.policyZip,
                     phoneNumber: this.phoneNumber,
                     phoneExtension: this.phoneExtension,
-                    state: this.policyState,
-                    city: this.city,
+                    state: null,
+                    city: null,
                     morePolicyQuestions: this.morePolicyQuestions,
                     lossLocation: this.lossLocation,
                     lossTime: this.lossTime,
@@ -639,6 +645,8 @@ export default {
                 {
                     dateOfLoss: this.dateOfLoss,
                     damageCause: this.damageCause,
+                    damageState: this.policyState,
+                    damageCity: this.city,
                 },
                 false
             );

src/layouts/quote/afterpay-modal-banner/afterpay-modal-banner.vue

@@ -1,5 +1,9 @@
 <template>
     <div class="afterpay-modal-banner" role="alert">
+        <component
+            :is="'script'"
+            src="https://js.squarecdn.com/square-marketplace.js"
+            async></component>
         <div>
             <span
                 class="callout"
@@ -17,52 +21,19 @@
                 <span v-else v-html="token"></span>
             </span>
             <span class="nbsp">&ensp;</span>
-            <textLink
-                linkType="text"
-                :text="bannerCta"
-                href="javascript:void(0)"
-                @click-event="openModal" />
+            <a
+                href="#"
+                class="text-link"
+                data-afterpay-modal="en_US"
+                @click.prevent="onLearnMoreClick">
+                {{ bannerCta }}
+            </a>
         </div>
     </div>
-    <modal
-        :ref="modalName"
-        class="afterpay-modal"
-        :headerText="modalHeaderText"
-        :isFooterButtonSuppressed="true">
-        <template v-slot:modal-header-slot>
-            <span>{{ modalSubHeaderText }}</span>
-        </template>
-        <template v-slot>
-            <span class="afterpay-sections">
-                <span
-                    v-for="section in afterpaySectionsContent"
-                    :key="section"
-                    class="afterpay-section">
-                    <span class="section-header">
-                        <img v-if="section.AnswerImageUrl" :src="section.AnswerImageUrl" />
-                        <h3 v-if="section.Text" v-html="section.Text"></h3>
-                    </span>
-                    <span v-html="section.content"></span>
-                </span>
-            </span>
-        </template>
-        <template v-slot:modal-footer-slot>
-            <p class="modal-disclaimer" v-html="modalDisclaimerText"></p>
-        </template>
-    </modal>
 </template>
 
 <script>
-import {
-    doesCopyContainTextLink,
-    splitCopyOnCMSPlaceHolder,
-    getRouterLinkRouteFromCopy,
-    getRouterLinkDisplayTextFromCopy,
-    getExternalLink,
-    splitCMSCopyOnBR,
-} from "@/helpers/cms-content-helper";
-import textLink from "@/ux-components/text-link/text-link";
-import modal from "@/digital-components/modal/modal";
+import { splitCopyOnCMSPlaceHolder, splitCMSCopyOnBR } from "@/helpers/cms-content-helper";
 
 const INLINE_IMAGE_TOKEN = "custom:inlineImage";
 const AFTERPAY_PRICE_TOKEN = "custom:afterpayPrice";
@@ -82,25 +53,18 @@ export default {
     name: "afterpay-banner",
     props: {
         cmsWidgetName: String,
-        modalWidgetName: String,
-    },
-    data() {
-        return {};
     },
     methods: {
         isInlineImageToken,
         isAfterpayPriceToken,
         getInlineAltText,
-        doesCopyContainTextLink,
-        splitCopyOnCMSPlaceHolder,
-        getRouterLinkRouteFromCopy,
-        getRouterLinkDisplayTextFromCopy,
-        getExternalLink,
-        openModal() {
-            this.modal?.openModal();
-        },
-        closeModal() {
-            this.modal?.closeModal();
+        onLearnMoreClick() {
+            this.pushEventToGA(
+                this.$route.query[this.queryStrings.FMG_PAGE],
+                this.GaActions.CLICKED,
+                this.bannerCta,
+                true
+            );
         },
     },
     computed: {
@@ -119,31 +83,6 @@ export default {
         bannerCta() {
             return this.getCmsContent(this.cmsWidgetName, "FooterText");
         },
-        modalHeaderText() {
-            return this.getCmsContent(this.modalWidgetName, "HeaderText");
-        },
-        modalDisclaimerText() {
-            return this.getCmsContent(this.modalWidgetName, "BodyText2");
-        },
-        modalName() {
-            return this.modalWidgetName;
-        },
-        modal() {
-            return this.$refs[this.modalName];
-        },
-        afterpaySectionsContent() {
-            const sections = this.getCmsContent("AfterpayModalSectionsWidget", "Answers");
-            if (!sections) return [];
-            sections.forEach((section) => {
-                const sectionContent = this.getCmsContent(section.Name, "BodyText");
-                section["content"] = sectionContent;
-            });
-            return sections;
-        },
-    },
-    components: {
-        textLink,
-        modal,
     },
 };
 </script>
@@ -198,117 +137,9 @@ export default {
         @include media-breakpoint-up(md) {
             padding-left: 1rem;
         }
-    }
-}
-
-.afterpay-modal {
-    &.modal.modal-component {
-        :deep(.modal-dialog) {
-            margin: 0 1rem;
-            top: 0;
-
-            @include media-breakpoint-up(md) {
-                width: 100%;
-                max-width: 840px;
-                top: 3.4rem;
-                right: 0;
-                left: 0;
-                transform: none;
-                margin: 0 auto;
-                padding: 0 1rem;
-            }
-            .modal-content {
-                border-radius: 0.5rem;
-                margin: 1.5rem 0;
-
-                .modal-header.mt-6 {
-                    background-color: $blue-100;
-                    margin-top: 0;
-                    padding: 1.5rem 2rem 1.5rem 1.5rem;
-                    font-family: UrbanistSemibold;
-
-                    .modal-title.justify-content-center {
-                        // OVERRIDE
-                        justify-content: flex-start;
-                    }
-                    .btn-close {
-                        top: 1.25rem;
-                        right: 1.5rem;
-                    }
-                }
-                .afterpay-section {
-                    display: block;
-                    border: 1px solid $gray-200;
-                    border-radius: 0.25rem;
-                    padding: 1rem;
-
-                    .section-header {
-                        display: flex;
-                        align-items: center;
-                        margin-bottom: 1rem;
 
         img {
-                            width: 40px;
-                            height: 40px;
-                        }
-                        h3 {
-                            font-family: UrbanistBold;
-                            font-size: 1rem;
-                            margin: 0 0 0 0.5rem;
-                            color: $black;
-                        }
-                    }
-                    p {
-                        font-size: 0.75rem;
-                    }
-                    strong {
-                        font-family: UrbanistSemibold;
-                        font-size: 0.875rem;
-                    }
-                }
-
-                .modal-body {
-                    padding: 1.5rem;
-
-                    .afterpay-sections {
-                        @include media-breakpoint-up(md) {
-                            display: flex;
-                            column-gap: 1rem;
-                            align-items: stretch;
-                        }
-                        .afterpay-section {
-                            margin-bottom: 1rem;
-
-                            @include media-breakpoint-up(md) {
-                                flex: 0 1 33%;
-                                margin-bottom: 0;
-                            }
-
-                            &:last-of-type {
-                                margin-bottom: 0;
-                            }
-                        }
-                    }
-                }
-            }
-            &.modal-dialog-centered {
-                height: auto;
-                min-height: auto;
-            }
-        }
-    }
-
-    :deep(.modal-footer) {
-        position: relative;
-        background: $gray-100;
-
-        .modal-disclaimer {
-            font-style: italic;
-            font-size: 0.75rem;
-            a {
-                padding: 0;
-                line-height: 1.625;
-            }
+            transform: translateY(-0.1rem);
         }
     }
 }

src/layouts/quote/promo-banner/promo-banner.vue

@@ -0,0 +1,59 @@
+<template>
+    <div class="promo-banner" role="note">
+        <img class="promo-banner__icon" :src="promoTagIcon" alt="" width="31" height="36" />
+        <p class="promo-banner__copy mb-0" v-html="promoBannerBodyText"></p>
+    </div>
+</template>
+
+<script>
+export default {
+    name: "promo-banner",
+    props: {
+        cmsWidgetName: String,
+    },
+    computed: {
+        promoTagIcon() {
+            return this.getCmsContent(this.cmsWidgetName, "Image");
+        },
+        promoBannerBodyText() {
+            return this.getCmsContent(this.cmsWidgetName, "BodyText");
+        },
+    },
+};
+</script>
+
+<style lang="scss" scoped>
+.promo-banner {
+    display: flex;
+    align-items: center;
+    justify-content: flex-start;
+    gap: 1rem;
+    width: 100%;
+    padding: 1rem 1.25rem;
+    background-color: $gray-100;
+    border-radius: 1rem;
+    text-align: left;
+
+    @include media-breakpoint-up(md) {
+        justify-content: center;
+        text-align: center;
+    }
+
+    &__icon {
+        flex-shrink: 0;
+        width: 31px;
+        height: 36px;
+    }
+
+    &__copy {
+        color: $gray-650;
+        font-size: $font-size-14;
+        line-height: 1.5;
+
+        :deep(strong) {
+            font-family: UrbanistSemibold, Arial, Helvetica, sans-serif;
+            color: $black;
+        }
+    }
+}
+</style>

src/layouts/quote/quote.vue

@@ -5,6 +5,14 @@
         <div
             class="container quote position-relative"
             :class="[showSaveProgressPopup ? 'initial-popup-open' : '']">
+            <div class="row justify-content-center">
+                <div class="col-12">
+                    <promoBanner
+                        v-if="showPromoBanner"
+                        cmsWidgetName="PromoBannerWidget"
+                        class="mb-4" />
+                </div>
+            </div>
             <div class="row justify-content-center">
                 <div class="col-12">
                     <funnelSubHeader class="mb-5" cmsWidgetName="FunnelSubHeaderWidget" />
@@ -47,8 +55,7 @@
                     <!-- If Cash AND vehicle does not require recal OR if Cash AND State requires showing recal, then show Afterpay banner -->
                     <afterpayModalBanner
                         v-if="showAfterpayBanner"
-                        cmsWidgetName="AfterpayBannerWidget"
-                        modalWidgetName="AfterpayModalWidget" />
+                        cmsWidgetName="AfterpayBannerWidget" />
 
                     <!-- If vehicle requires recal AND we are hiding recal pricing info, then show recal disclaimer banner. -->
                     <recalDisclaimer
@@ -102,7 +109,12 @@
                     <textBlock
                         cmsWidgetName="quoteDisclaimer"
                         typeStyle="caption"
-                        class="mb-5 quote-disclaimer text-left text-md-center" />
+                        class="quote-disclaimer text-left text-md-center" />
+                    <textBlock
+                        v-if="showPromoBanner"
+                        cmsWidgetName="PromoBannerDisclaimerWidget"
+                        typeStyle="caption"
+                        class="quote-disclaimer text-left text-md-center" />
                 </div>
             </div>
 
@@ -134,6 +146,7 @@ import textBlock from "@/digital-components/text-block/text-block";
 import contentGroupModal from "@/fmg-components/content-group-modal/content-group-modal";
 import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
 import afterpayModalBanner from "@/layouts/quote/afterpay-modal-banner/afterpay-modal-banner";
+import promoBanner from "@/layouts/quote/promo-banner/promo-banner";
 import recalDisclaimer from "@/layouts/quote/recal-disclaimer/recal-disclaimer.vue";
 import saveProgressModalQuestion from "@/fmg-components/save-progress-modal-question/save-progress-modal-question";
 import saveProgressPopupQuestion from "@/fmg-components/save-progress-popup-question/save-progress-popup-question";
@@ -684,6 +697,12 @@ export default {
         showAfterpayBanner() {
             return !this.isRecalibrationOnOrder || !this.shouldHideRecalibration;
         },
+        showPromoBanner() {
+            return experimentMixin.methods.hasSettingEqualTo(
+                experimentSettings.SHOW_PROMO_BANNER,
+                "true"
+            );
+        },
         isRecalPriceRemove() {
             return (
                 experimentMixin.methods
@@ -1041,6 +1060,7 @@ export default {
         contentGroupModal,
         loadingModal,
         afterpayModalBanner,
+        promoBanner,
         promoModalQuestion,
         recalDisclaimer,
         saveProgressModalQuestion,
@@ -1166,4 +1186,7 @@ export default {
 :deep(.promo-modal-question a) {
     @include responsive-font-size-md(0.875rem, 1rem);
 }
+.quote-disclaimer:last-child {
+    margin-bottom: 1.5rem;
+}
 </style>

src/layouts/quote/service-package-question/service-package-question.spec.js

@@ -856,6 +856,52 @@ describe("service-package-question.vue, matching business rules for package disp
 
         getExperimentPackageLabelSpy.mockRestore();
     });
+    it("should use experiment package descriptions when ServicePackageNameTest is active", () => {
+        const getExperimentPackageDescriptionSpy = jest
+            .spyOn(servicePackageQuestion.methods, "getExperimentPackageDescription")
+            .mockImplementation((tierName) => {
+                const experimentPackageDescriptions = {
+                    [packageNames.TIER_TWO]: "Most popular choice",
+                    [packageNames.TIER_THREE]: "Best value",
+                };
+
+                return experimentPackageDescriptions[tierName] ?? null;
+            });
+
+        const packageNameKey = "05_01_CSR_Quote_Standard_Repair";
+        Object.assign(processedCmsContent, mockProcessedCmsContent[packageNameKey]);
+        mockProps.availableLineItems.push(driverFrontWiperLineItem);
+        mockProps.availableLineItems.push(passengerFrontWiperLineItem);
+        const wrapper = setupMocks({
+            mountOptionsMockData: {
+                store: {
+                    getters: {
+                        order: {
+                            damage: {
+                                isRepair: true,
+                                glassToReplace: [],
+                            },
+                        },
+                        hasAnyNonWindshieldGlassParts: false,
+                    },
+                },
+            },
+        });
+
+        expect(
+            wrapper.vm.servicePackageAnswers[0].additionalButtonData.packageDescription
+        ).toBeNull();
+        expect(wrapper.vm.servicePackageAnswers[1].additionalButtonData.packageDescription).toBe(
+            "Most popular choice"
+        );
+        expect(wrapper.vm.servicePackageAnswers[2].additionalButtonData.packageDescription).toBe(
+            "Best value"
+        );
+        expect(wrapper.vm.servicePackageAnswers[1].buttonLabelSubCopy).toBe("MOST POPULAR");
+        expect(wrapper.vm.servicePackageAnswers[2].buttonLabelSubCopy).toBe("");
+
+        getExperimentPackageDescriptionSpy.mockRestore();
+    });
     it("should use CMS package names when ServicePackageNameTest is not active", () => {
         const packageNameKey = "05_01_CSR_Quote_Standard_Repair";
         Object.assign(processedCmsContent, mockProcessedCmsContent[packageNameKey]);

src/layouts/quote/service-package-question/service-package-question.vue

@@ -159,6 +159,7 @@ export default {
                         ? false
                         : "Special: Save $" + this.getDiscountPrice(answer.Name),
                     isInsuranceSelected: this.isInsuranceSelected,
+                    packageDescription: this.getExperimentPackageDescription(answer.Name),
                 },
             }));
 
@@ -265,6 +266,19 @@ export default {
             );
         },
         getExperimentPackageLabel(tierName) {
+            return this.getExperimentPackageSetting(tierName, {
+                [packageNames.TIER_ONE]: experimentSettings.TIER_ONE,
+                [packageNames.TIER_TWO]: experimentSettings.TIER_TWO,
+                [packageNames.TIER_THREE]: experimentSettings.TIER_THREE,
+            });
+        },
+        getExperimentPackageDescription(tierName) {
+            return this.getExperimentPackageSetting(tierName, {
+                [packageNames.TIER_TWO]: experimentSettings.TIER_TWO_DESCRIPTION,
+                [packageNames.TIER_THREE]: experimentSettings.TIER_THREE_DESCRIPTION,
+            });
+        },
+        getExperimentPackageSetting(tierName, tierSettingKeys) {
             if (
                 !experimentMixin.methods.hasSettingEqualTo(
                     experimentSettings.SHOW_SERVICE_PACKAGE_NAME_TEST,
@@ -274,13 +288,8 @@ export default {
                 return null;
             }
 
-            const tierSettingKey = {
-                [packageNames.TIER_ONE]: experimentSettings.TIER_ONE,
-                [packageNames.TIER_TWO]: experimentSettings.TIER_TWO,
-                [packageNames.TIER_THREE]: experimentSettings.TIER_THREE,
-            }[tierName];
-
-            return tierSettingKey ? experimentMixin.methods.getSettingValue(tierSettingKey) : null;
+            const settingKey = tierSettingKeys[tierName];
+            return settingKey ? experimentMixin.methods.getSettingValue(settingKey) : null;
         },
         getHeaderTextFromCms(cmsWidgetName) {
             return this.getCmsContent(cmsWidgetName, "HeaderText");

src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue

@@ -2,7 +2,10 @@
     <baseInputButton v-bind="$props" @buttonClicked="handleAnswerChange" v-model="selectedValue">
         <div
             class="package-label"
-            :class="[this.buttonLabelSubCopy ? 'has-subheader' : '']"
+            :class="[
+                this.buttonLabelSubCopy ? 'has-subheader' : '',
+                this.additionalButtonData?.packageDescription ? 'has-description' : '',
+            ]"
             for="testradio">
             <div class="package-specs">
                 <div v-if="this.additionalButtonData.hasDiscount" class="row">
@@ -10,6 +13,10 @@
                         <p class="m-0">
                             <span v-html="this.buttonLabel"></span>
                         </p>
+                        <p
+                            class="package-description m-0"
+                            v-if="this.additionalButtonData?.packageDescription"
+                            v-html="this.additionalButtonData.packageDescription"></p>
                         <p
                             class="sub-label m-0"
                             v-if="this.buttonLabelSubCopy"
@@ -34,6 +41,10 @@
                             <span v-html="this.buttonAuxillaryCopy"></span>
                         </span>
                     </p>
+                    <p
+                        class="package-description m-0"
+                        v-if="this.additionalButtonData?.packageDescription"
+                        v-html="this.additionalButtonData.packageDescription"></p>
                     <p
                         class="sub-label m-0"
                         v-if="this.buttonLabelSubCopy"
@@ -185,12 +196,13 @@ export default {
                 min-height: 52px;
                 max-height: 126px;
                 @include media-breakpoint-up(md) {
-                    max-height: 500px;
+                    max-height: 1000px;
                     padding-bottom: 3rem;
                 }
                 transition: max-height 0.25s ease-in;
 
-                &.has-subheader {
+                &.has-subheader,
+                &.has-description {
                     min-height: 72px;
                 }
 
@@ -231,34 +243,33 @@ export default {
 
             &:checked {
                 + .package-label {
-                    .package-specs {
                     max-height: 1000px;
-                    }
-                }
-                + .package-label {
+                    border: 1px solid $blue;
+                    background-color: $blue-100;
+
                     .package-specs {
+                        max-height: none;
+
                         .hide-when-closed {
-                            display: block;
+                            max-height: none;
+                            overflow: visible;
+                            opacity: 1;
+                            transition: opacity 0.2s ease 0.15s;
                         }
+
                         p:first-child {
                             font-weight: 600;
                         }
                     }
-                }
-                + .package-label {
-                    border: 1px solid $blue;
-                    max-height: 500px;
-                    background-color: $blue-100;
+
                     .special-save-box {
                         background-color: $green-200;
                     }
-                }
-                + .package-label {
+
                     &:before {
                         box-shadow: 0px 0px 0px 1px $blue;
                     }
-                }
-                + .package-label {
+
                     &:after {
                         background: $blue;
                     }
@@ -284,8 +295,9 @@ export default {
             flex-direction: column;
             width: 100%;
             transition: all 0.5s ease;
+
             @include media-breakpoint-up(md) {
-                max-height: 500px;
+                max-height: none;
             }
 
             .row {
@@ -332,6 +344,13 @@ export default {
                     text-transform: uppercase;
                     font-size: 0.75rem;
                 }
+                &.package-description {
+                    color: $gray-550;
+                    font-size: 0.875rem;
+                    font-weight: 400;
+                    font-style: italic;
+                    white-space: normal;
+                }
             }
             span {
                 &.service-package-discount {
@@ -393,10 +412,17 @@ export default {
             }
 
             .hide-when-closed {
-                display: none;
-                @include media-breakpoint-up(md) {
                 display: flex;
                 flex-direction: column;
+                max-height: 0;
+                overflow: hidden;
+                opacity: 0;
+                transition: opacity 0.15s ease;
+
+                @include media-breakpoint-up(md) {
+                    max-height: none;
+                    opacity: 1;
+                    overflow: visible;
                 }
             }
         }

src/layouts/service-location/shop-question/shop-list-button/shop-list-button.vue

@@ -27,7 +27,7 @@
                         </span>
                         <loader
                             v-if="isLoaderDisplayed"
-                            :loaderPosition="left"
+                            loaderPosition="left"
                             :allowPageInteraction="true" />
                     </div>
                 </div>

src/layouts/service-location/shop-question/shop-question-popup.vue

@@ -32,10 +32,10 @@
                 :isRequired="false"
                 :validationRules="''" />
         </form>
-        <div v-show="isLoading" class="loader-wrapper">
+        <div v-if="isLoading" class="loader-wrapper">
             <loader loaderColor="blue" loaderPosition="center" />
         </div>
-        <div v-show="!isLoading">
+        <div v-if="!isLoading">
             <alert
                 ref="alertInvalidZip"
                 v-if="displayInvalidZipAlert"

src/mixins/vehicle-questions-mixin.js

@@ -7,9 +7,17 @@ import baseMixin from "@/mixins/base-mixin.js";
 import store from "@/store";
 import { getIsWindshieldOnly } from "@/helpers/damage-helper";
 import { partTypeStrings } from "@/constants/part-type-strings";
+import { buildQuestionChainAnswerValue } from "@/helpers/question-chain-helper";
 
 export default {
     methods: {
+        clearQuestionsAnswerData() {
+            this.questionsData?.forEach((glass) => {
+                if (glass.answerData) {
+                    glass.answerData = {};
+                }
+            });
+        },
         hasPartQuestions(partsOrQuestions) {
             return partsOrQuestions?.some((pq) => pq.partQuestions?.length > 0);
         },
@@ -114,11 +122,12 @@ export default {
                             );
                         });
                         // set the answerString to use for answerSelected
-                        if (chosenAns.nextQuestionSequence) {
-                            answerString = `${answeredQuestion.questionNum}|nextQuestion|${chosenAns.nextQuestionSequence}|${chosenAns.answerText}`;
-                        } else {
-                            answerString = `${answeredQuestion.questionNum}|answer|${chosenAns.answerResult}|${chosenAns.answerText}`;
-                        }
+                        answerString = buildQuestionChainAnswerValue({
+                            questionSequence: answeredQuestion.questionNum,
+                            nextQuestionSequence: chosenAns.nextQuestionSequence,
+                            answerResult: chosenAns.answerResult,
+                            answerText: chosenAns.answerText,
+                        });
 
                         // mark this question as answered (question-chain will read this)
                         glass.questions[answeredQuestion.questionNum - 1].answerSelected =
@@ -177,6 +186,8 @@ export default {
                 */
 
             const self = vm ?? this;
+            const isIncomplete = !!answer.incomplete;
+            const hadSavedAnswer = !!self.questionsData[answer.index]?.answerData?.answerResult;
 
             // clear out any preloaded answers
             self.selectedAnswers = {};
@@ -193,7 +204,6 @@ export default {
                 */
 
                 const answeredQuestionText = answeredQuestion.questionText.toUpperCase();
-                const answeredQuestionAnswer = answeredQuestion.selectedAnswer.toUpperCase();
                 const answeredQuestionAnswerText =
                     answeredQuestion.selectedAnswerText.toUpperCase();
                 const answeredQuestionNum = answeredQuestion.questionNum;
@@ -208,8 +218,7 @@ export default {
                             if (answeredQuestionIndex === 0) question.answerSelected = null;
 
                             if (answeredQuestionNum - 1 === questionIndex) {
-                                // on the right question
-                                question.answerSelected = answeredQuestionAnswer;
+                                question.answerSelected = answeredQuestion.selectedAnswer;
                             }
                         });
                     }
@@ -346,6 +355,27 @@ export default {
                 });
             });
 
+            if (isIncomplete) {
+                // User changed an earlier answer; downstream questions were cleared in the chain
+                self.questionsData[answer.index].answerData = null;
+                self.currentGlassIndex = answer.index;
+
+                if (hadSavedAnswer) {
+                    self.questionsData[answer.index].key =
+                        (self.questionsData[answer.index].key ??
+                            self.questionsData[answer.index].answerKey ??
+                            answer.index) + Date.now().toString();
+                }
+
+                return;
+            }
+
+            // Force re-render so the updated selection displays when changing a prior answer
+            self.questionsData[answer.index].key =
+                (self.questionsData[answer.index].key ??
+                    self.questionsData[answer.index].answerKey ??
+                    answer.index) + Date.now().toString();
+
             // set final answer data for the current answered glass part
             self.questionsData[answer.index].answerData = {
                 answerResult: answer.answerResult,

src/mixins/vehicle-questions-mixin.spec.js

@@ -499,6 +499,88 @@ describe("vehicle-questions-mixin", () => {
                 // Assert
                 expect(wrapper.vm.selectedAnswers).toMatchObject({});
             });
+
+            test("should clear answerData and keep currentGlassIndex when answer is incomplete", () => {
+                const answer = {
+                    incomplete: true,
+                    answeredQuestions: [
+                        {
+                            questionText: "Is this the Overland edition?",
+                            selectedAnswer: "1|nextQuestion|5|No",
+                            selectedAnswerText: "No",
+                            questionNum: 1,
+                        },
+                    ],
+                    index: 0,
+                };
+                const { wrapper } = setupMocks({});
+
+                wrapper.vm.currentGlassIndex = 1;
+                wrapper.vm.questionsData = [
+                    {
+                        glassLocation: "Windshield",
+                        glassName: "Single",
+                        questions: [
+                            {
+                                questionSequence: 1,
+                                questionText: "Is this the Overland edition?",
+                                answers: [],
+                            },
+                        ],
+                        answerData: { answerResult: "OLD-PART" },
+                        answerKey: "Windshield-Single",
+                    },
+                    {
+                        glassLocation: "Driver",
+                        glassName: "Front",
+                        questions: [],
+                        answerData: { answerResult: "OTHER-PART" },
+                    },
+                ];
+
+                wrapper.vm.handleCompletedQuestionChainAnswers(answer, "", wrapper.vm);
+
+                expect(wrapper.vm.questionsData[0].answerData).toBeNull();
+                expect(wrapper.vm.questionsData[1].answerData).toBeNull();
+                expect(wrapper.vm.currentGlassIndex).toBe(0);
+            });
+
+            test("should not bump key when incomplete answer had no saved answer", () => {
+                const answer = {
+                    incomplete: true,
+                    answeredQuestions: [
+                        {
+                            questionText: "Is this the Overland edition?",
+                            selectedAnswer: "1|nextQuestion|2|Yes",
+                            selectedAnswerText: "Yes",
+                            questionNum: 1,
+                        },
+                    ],
+                    index: 0,
+                };
+                const { wrapper } = setupMocks({});
+
+                wrapper.vm.questionsData = [
+                    {
+                        glassLocation: "Windshield",
+                        glassName: "Single",
+                        questions: [
+                            {
+                                questionSequence: 1,
+                                questionText: "Is this the Overland edition?",
+                                answers: [],
+                            },
+                        ],
+                        answerData: null,
+                        answerKey: "Windshield-Single",
+                        key: "stable-key",
+                    },
+                ];
+
+                wrapper.vm.handleCompletedQuestionChainAnswers(answer, "", wrapper.vm);
+
+                expect(wrapper.vm.questionsData[0].key).toBe("stable-key");
+            });
         });
 
         describe("questions in glass parts that are after the answered glass", () => {

src/router/methods/route-logic/adyen-return.js

@@ -2,7 +2,7 @@ import { routeData } from "@/router/constants/routes";
 import { createAdyenCheckout, getSessionInfo } from "@/helpers/adyen-helper";
 import { mapAdyenToFmgPaymentMethod, generateCcToken } from "@/helpers/adyen-helper";
 import baseMixin from "@/mixins/base-mixin.js";
-import { getAmountDue } from "@/helpers/pricing-helper";
+import { getPiaAuthorizationAmount } from "@/helpers/pricing-helper";
 import store from "@/store";
 import { storeActions } from "@/constants/store-actions";
 import { submitWorkOrder } from "@/helpers/heritage-integration/order-helper.js";
@@ -49,7 +49,7 @@ export async function adyenReturnBeforeEnter(to, from) {
 
         // TODO once afterpay info is returned, create cc token and submit order.
         const paymentMethod = mapAdyenToFmgPaymentMethod(sessionInfo?.paymentMethod);
-        const amountDue = getAmountDue(store.getters.order.lineItems);
+        const authorizationAmount = getPiaAuthorizationAmount(store.getters.order.lineItems);
         const ccToken = generateCcToken(sessionInfo);
 
         ccToken.authCode = "831001";
@@ -68,7 +68,13 @@ export async function adyenReturnBeforeEnter(to, from) {
 
         await baseMixin.methods.dispatchStoreAction(
             storeActions.SAVE_NEXTGEN_SETTLED_AMOUNT,
-            amountDue,
+            authorizationAmount,
+            false
+        );
+
+        await baseMixin.methods.dispatchStoreAction(
+            storeActions.SAVE_AUTHORIZATION_AMOUNT,
+            authorizationAmount,
             false
         );
 

src/store/index.js

@@ -133,6 +133,8 @@ const getDefaultState = () => {
                 dateOfLoss: null,
                 damageCause: null,
                 installOemGlass: null,
+                damageCity: null,
+                damageState: null,
             },
             lineItems: {
                 glassParts: null,
@@ -162,6 +164,7 @@ const getDefaultState = () => {
                 inactivePromos: null,
                 paypalToken: null,
                 nextGenSettledAmount: 0,
+                authorizationAmount: null,
                 ccToken: {
                     subscriptionId: null,
                     expMonth: null,
@@ -488,6 +491,9 @@ export const mutations = {
     updateNextGenSettledAmount(state, nextGenSettledAmount) {
         state.order.payment.nextGenSettledAmount = nextGenSettledAmount;
     },
+    updateAuthorizationAmount(state, authorizationAmount) {
+        state.order.payment.authorizationAmount = authorizationAmount;
+    },
     updateInsuranceVerifiedStatus(state, isVerified) {
         state.order.payment.insuranceCoverage.isVerified = isVerified;
     },
@@ -614,6 +620,8 @@ export const mutations = {
         if (damageDetails) {
             state.order.damage.dateOfLoss = damageDetails.dateOfLoss;
             state.order.damage.damageCause = damageDetails.damageCause;
+            state.order.damage.damageState = damageDetails.damageState;
+            state.order.damage.damageCity = damageDetails.damageCity;
         }
     },
 
@@ -887,7 +895,8 @@ export const mutations = {
             sessionInformation.order.damage?.dateOfLoss
         );
         state.order.damage.damageCause = sessionInformation.order.damage?.damageCause;
-
+        state.order.damage.damageState = sessionInformation.order.damage?.damageState;
+        state.order.damage.damageCity = sessionInformation.order.damage?.damageCity;
         state.order.damage.partQuestionAnswers =
             sessionInformation.order.damage.partQuestionAnswers;
         state.order.damage.moldingQuestionAnswers =
@@ -2008,35 +2017,30 @@ export const actions = {
         const vehicle = context.getters.vehicle;
         const damage = context.getters.damage;
         const order = context.state.order;
+        const payment = context.getters.payment;
 
-        const carId = vehicle.carId;
-        const glassArray = damage.glassToReplace;
-        const zipCode = order.serviceLocation.zipCode;
-        const vin = vehicle.vin;
-        const serviceType = damage.isRepair ? "Repair" : "Install";
-        const parentAccountNumber = context.getters.payment.parentAccountNumber;
-        const referralSeqNumber = order.referralSequenceNumber;
-
-        // create a new array to avoid mutating state
-        const glassArrayForPayload = convertGlassPieceNamingForApi(glassArray);
+        const glassArrayForPayload = convertGlassPieceNamingForApi(damage.glassToReplace);
 
         const partsOrQuestionsEndpoint = vehicle.vinRequired
             ? endpoints.GetPartsOrQuestionsV2
             : endpoints.GetPartsOrQuestions;
 
+        const requestPayload = {
+            carId: vehicle.carId,
+            glassPieces: glassArrayForPayload,
+            zip: order.serviceLocation.zipCode,
+            vin: vehicle.vin,
+            serviceType: damage.isRepair ? "Repair" : "Install",
+            referralSeqNumber: order.referralSequenceNumber,
+            parentAccountNumber: payment.parentAccountNumber,
+            billToAccountNumber: payment.billToAccountNumber,
+        };
+
         const response = await globalMethods
             .callHttpClient({
                 method: partsOrQuestionsEndpoint.method,
                 endpoint: partsOrQuestionsEndpoint.url,
-                payload: {
-                    carId: carId,
-                    glassPieces: glassArrayForPayload,
-                    zip: zipCode,
-                    vin: vin,
-                    serviceType: serviceType,
-                    referralSeqNumber: referralSeqNumber,
-                    parentAccountNumber: parentAccountNumber,
-                },
+                payload: requestPayload,
                 logApiCall: true,
                 pageNameToLog: pageNameToLog,
             })
@@ -2072,32 +2076,25 @@ export const actions = {
         const order = context.state.order;
         const payment = context.getters.payment;
 
-        const carId = vehicle.carId;
-        const glassArray = damage.glassToReplace;
-        const resultsArray = damage.partQuestionAnswers;
-        const zipCode = order.serviceLocation.zipCode;
-        const vin = vehicle.vin;
-        const serviceType = order.serviceLocation?.appointmentType;
-        const referralSeqNumber = order.referralSequenceNumber;
-        const parentAccountNumber = payment.parentAccountNumber;
+        const glassArrayForPayload = convertGlassPieceNamingForApi(damage.glassToReplace);
+        const resultsArrayForPayload = convertResultsForApi(damage.partQuestionAnswers);
 
-        // create a new array to avoid mutating state
-        const glassArrayForPayload = convertGlassPieceNamingForApi(glassArray);
-        const resultsArrayForPayload = convertResultsForApi(resultsArray);
+        const requestPayload = {
+            carId: vehicle.carId,
+            glassPieces: glassArrayForPayload,
+            answerResults: resultsArrayForPayload,
+            zip: order.serviceLocation.zipCode,
+            vin: vehicle.vin,
+            serviceType: order.serviceLocation?.appointmentType,
+            referralSeqNumber: order.referralSequenceNumber,
+            parentAccountNumber: payment.parentAccountNumber,
+            billToAccountNumber: payment.billToAccountNumber,
+        };
 
         const response = await globalMethods.callHttpClient({
             method: endpoints.GetParts.method,
             endpoint: endpoints.GetParts.url,
-            payload: {
-                carId: carId,
-                glassPieces: glassArrayForPayload,
-                answerResults: resultsArrayForPayload,
-                zip: zipCode,
-                vin: vin,
-                serviceType: serviceType,
-                referralSeqNumber: referralSeqNumber,
-                parentAccountNumber: parentAccountNumber,
-            },
+            payload: requestPayload,
             logApiCall: true,
             pageNameToLog: pageNameToLog,
         });
@@ -2860,6 +2857,8 @@ export const actions = {
                         installOemGlass: order.damage.installOemGlass,
                         dateOfLoss: order.damage.dateOfLoss,
                         damageCause: order.damage.damageCause,
+                        damageState: order.damage.damageState,
+                        damageCity: order.damage.damageCity,
                     },
                     lineItems: {
                         glassParts: lineItems.glassParts,
@@ -2893,6 +2892,9 @@ export const actions = {
                             order.payment.piaType == paymentMethods.APPLE_PAY ? true : false,
                         paypalToken: order.payment.paypalToken,
                         nextGenSettledAmount: order.payment.nextGenSettledAmount,
+                        ...(order.payment.authorizationAmount > 0
+                            ? { authorizationAmount: order.payment.authorizationAmount }
+                            : {}),
                         ccToken: {
                             subscriptionId: order.payment.ccToken.subscriptionId,
                             expMonth: order.payment.ccToken.expMonth,
@@ -3047,6 +3049,10 @@ export const actions = {
         context.commit(storeMutations.UPDATE_NEXTGEN_SETTLED_AMOUNT, nextGenSettledAmount);
     },
 
+    saveAuthorizationAmount(context, authorizationAmount) {
+        context.commit(storeMutations.UPDATE_AUTHORIZATION_AMOUNT, authorizationAmount);
+    },
+
     savePaypalToken(context, ppToken) {
         context.commit(storeMutations.UPDATE_PAYPAL_TOKEN, ppToken);
     },

src/store/store.spec.js

@@ -920,6 +920,105 @@ describe("Actions", () => {
         );
     });
 
+    it("saveSession action, includes authorizationAmount when PIA was authorized", async () => {
+        const context = createAuthorizationAmountSaveSessionContext(312.45);
+
+        globalMethods.callHttpClient.mockImplementation(() => {
+            return Promise.resolve({ data: { referralNumber: 123 } });
+        });
+
+        await actions.saveSession(context, { pageNameToLog: "test" });
+
+        expect(globalMethods.callHttpClient).toHaveBeenCalledWith(
+            expect.objectContaining({
+                payload: expect.objectContaining({
+                    order: expect.objectContaining({
+                        payment: expect.objectContaining({
+                            authorizationAmount: 312.45,
+                        }),
+                    }),
+                }),
+            })
+        );
+    });
+
+    it("saveSession action, omits authorizationAmount when PIA was not authorized", async () => {
+        const context = createAuthorizationAmountSaveSessionContext(null);
+
+        globalMethods.callHttpClient.mockImplementation(() => {
+            return Promise.resolve({ data: { referralNumber: 123 } });
+        });
+        globalMethods.callHttpClient.mockClear();
+
+        await actions.saveSession(context, { pageNameToLog: "test" });
+
+        const callPayload = globalMethods.callHttpClient.mock.calls[0][0].payload;
+        expect(callPayload.order.payment.authorizationAmount).toBeUndefined();
+    });
+
+    function createAuthorizationAmountSaveSessionContext(authorizationAmount) {
+        const context = state;
+        const damage = {
+            numberOfChips: "2",
+            partQuestionAnswers: {},
+            moldingQuestionAnswers: {},
+            capabilityQuestionAnswers: {},
+        };
+
+        context.getters = {
+            vehicle: { registration: {} },
+            order: { damage },
+            damage: {},
+            applicationUser: {
+                lastPageVisited: "test-page",
+                crmCustomerId: "xxx-xxx-xxx",
+                savedSessionId: "xxx-xxx-xxx",
+            },
+        };
+        context.state = {
+            order: {
+                damage,
+                payment: {
+                    insuranceCoverage: { isVerified: false },
+                    isInsurance: false,
+                    authorizationAmount,
+                    ccToken: {
+                        subscriptionId: authorizationAmount ? "sub-123" : null,
+                        expMonth: null,
+                        expYear: null,
+                        cardType: null,
+                        billToPostalCode: null,
+                        billToFirstName: null,
+                        billToLastName: null,
+                        referenceNumber: null,
+                        authCode: authorizationAmount ? "831001" : null,
+                        transactionId: null,
+                        transReferenceNumber: null,
+                        lastFour: null,
+                    },
+                },
+                serviceLocation: {},
+                customer: {
+                    emailAddress: "test@safelite.com",
+                    firstName: "John",
+                    lastName: "Doe",
+                    isSmsOptIn: true,
+                    phoneNumber: "1234567890",
+                    address: {
+                        streetAddress: "123 Main St",
+                        streetAddress2: "Apt 1",
+                        city: "Anytown",
+                        state: "OH",
+                        zipCode: "12345",
+                    },
+                },
+                lineItems: {},
+            },
+        };
+
+        return context;
+    }
+
     it("loadSession action, returns order information, calls mutation", async () => {
         // Arrange
         const context = state;

src/ux-components/button-main/button-main.spec.js

@@ -36,48 +36,6 @@ describe("buttonMain.vue", () => {
         expect(button.attributes()["aria-disabled"]).toEqual("true");
     });
 
-    it("Should return loader color", async () => {
-        // Arrange
-        const wrapper = shallowMount(
-            buttonMain,
-            setupMocks({
-                propsData: {
-                    loaderColor: "blue",
-                    loaderEnabled: true,
-                },
-            })
-        );
-
-        // Act
-        wrapper.vm.clicked();
-        await nextTick();
-
-        // Assert
-        const loader = wrapper.find("loader-stub");
-        expect(loader.attributes("class")).toContain("blue");
-    });
-
-    it("Should return loader position", async () => {
-        // Arrange
-        const wrapper = shallowMount(
-            buttonMain,
-            setupMocks({
-                propsData: {
-                    loaderPosition: "right",
-                    loaderEnabled: true,
-                },
-            })
-        );
-
-        // Act
-        wrapper.vm.clicked();
-        await nextTick();
-
-        // Assert
-        const loader = wrapper.find("loader-stub");
-        expect(loader.attributes("class")).toContain("right");
-    });
-
     it("Should set 'isLoaderDisplayed' to false when calling 'removeLoader'", async () => {
         // Arrange
         const wrapper = shallowMount(

src/ux-components/button-main/button-main.vue

@@ -12,7 +12,8 @@
         <loader
             class="ms-2"
             v-if="isLoaderDisplayed && !suppressLoader"
-            v-bind:class="[this.loaderColor, this.loaderPosition]" />
+            :loaderColor="loaderColor"
+            :loaderPosition="loaderPosition" />
     </button>
 </template>
 
@@ -64,6 +65,7 @@ export default {
 <style lang="scss">
 .btn {
     font-family: UrbanistSemibold, Arial, Helvetica, sans-serif;
+
     &.btn-primary {
         position: relative;
         background: $red;

src/ux-components/intercept-overlay/intercept-overlay.spec.js

@@ -1,4 +1,4 @@
-import { shallowMount } from "@vue/test-utils";
+import { mount, shallowMount } from "@vue/test-utils";
 import interceptOverlay from "./intercept-overlay";
 
 describe("intercept-overlay.vue", () => {
@@ -43,4 +43,30 @@ describe("intercept-overlay.vue", () => {
             wrapper.unmount();
         });
     });
+
+    describe("click interception", () => {
+        test("captureClick prevents default and stops propagation", () => {
+            const wrapper = shallowMount(interceptOverlay);
+            const event = { preventDefault: jest.fn(), stopPropagation: jest.fn() };
+            wrapper.vm.captureClick(event);
+            expect(event.preventDefault).toHaveBeenCalled();
+            expect(event.stopPropagation).toHaveBeenCalled();
+            wrapper.unmount();
+        });
+
+        test("clicking the overlay does not propagate to document listeners", async () => {
+            const documentClickFn = jest.fn();
+            document.addEventListener("click", documentClickFn);
+
+            const wrapper = mount(interceptOverlay, { attachTo: document.body });
+
+            const overlay = wrapper.find(".intercept-overlay");
+            await overlay.trigger("click");
+
+            expect(documentClickFn).not.toHaveBeenCalled();
+
+            document.removeEventListener("click", documentClickFn);
+            wrapper.unmount();
+        });
+    });
 });

src/ux-components/intercept-overlay/intercept-overlay.vue

@@ -1,5 +1,9 @@
 <template>
-    <div class="intercept-overlay" aria-hidden="true" @keydown.capture="blockKey"></div>
+    <div
+        class="intercept-overlay"
+        aria-hidden="true"
+        @keydown.capture="blockKey"
+        @click="captureClick"></div>
 </template>
 
 <script>
@@ -16,6 +20,10 @@ export default {
             event.preventDefault();
             event.stopImmediatePropagation();
         },
+        captureClick(event) {
+            event.preventDefault();
+            event.stopPropagation();
+        },
     },
 };
 </script>

src/ux-components/list-button/list-button.spec.js

@@ -30,60 +30,6 @@ describe("list-button.vue", () => {
             const loader = wrapper.findComponent({ name: "loader" });
             expect(loader.exists()).toBe(true);
         });
-
-        it("Should return loader color", async () => {
-            // Arrange
-            const { wrapper } = setupMocks({
-                mockData: {
-                    global: {
-                        mocks: {
-                            $route: { query: { fmgPage: "page-name" } },
-                            GaActions: GaActions,
-                            pushEventToGA: jest.fn(),
-                        },
-                    },
-                    propsData: {
-                        loaderColor: "blue",
-                        selectingInitiatesLoad: true,
-                    },
-                },
-            });
-
-            // Act
-            wrapper.vm.selectedValue = "something";
-            await wrapper.vm.$nextTick();
-
-            // Assert
-            const loader = wrapper.findComponent({ name: "loader" });
-            expect(loader.attributes("class")).toContain("blue");
-        });
-
-        it("Should return loader position", async () => {
-            // Act
-            const { wrapper } = setupMocks({
-                mockData: {
-                    global: {
-                        mocks: {
-                            $route: { query: { fmgPage: "page-name" } },
-                            GaActions: GaActions,
-                            pushEventToGA: jest.fn(),
-                        },
-                    },
-                    propsData: {
-                        loaderPosition: "right",
-                        selectingInitiatesLoad: true,
-                    },
-                },
-            });
-
-            // Act
-            wrapper.vm.selectedValue = "something";
-            await wrapper.vm.$nextTick();
-
-            // Assert
-            const loader = wrapper.findComponent({ name: "loader" });
-            expect(loader.attributes("class")).toContain("right");
-        });
     });
 
     describe("baseInputButton checks", () => {

src/ux-components/list-button/list-button.vue

@@ -18,7 +18,8 @@
             </span>
             <loader
                 v-if="isLoaderDisplayed && selectingInitiatesLoad"
-                :class="[this.loaderColor, this.loaderPosition]" />
+                :loaderColor="loaderColor"
+                :loaderPosition="loaderPosition" />
         </div>
     </baseInputButton>
 </template>

src/ux-components/loader/loader.spec.js

@@ -3,18 +3,16 @@ import loader from "./loader";
 
 describe("loader.vue", () => {
     test("if it rendered the HTML element with class", () => {
-        // Arrange/Act
         const wrapper = shallowMount(loader, {
             props: {},
         });
 
-        // Assert
         expect(wrapper.find("div").exists()).toBeTruthy();
         expect(wrapper.find(".loader").exists()).toBeTruthy();
+        wrapper.unmount();
     });
 
-    test("if it correctly passed props", () => {
-        // Arrange/Act
+    test("applies loaderColor and loaderPosition as CSS classes on the loader element", () => {
         const wrapper = shallowMount(loader, {
             props: {
                 loaderColor: "blue",
@@ -22,64 +20,95 @@ describe("loader.vue", () => {
             },
         });
 
-        // Assert
-        expect(wrapper.props()).toMatchObject({
-            loaderColor: "blue",
-            loaderPosition: "left",
-        });
+        const loaderElement = wrapper.find(".loader");
+        expect(loaderElement.classes()).toContain("blue");
+        expect(loaderElement.classes()).toContain("left");
+        wrapper.unmount();
     });
 
     describe("Blocking interaction on page", () => {
-        test("Does capture clicks if enabled (default)", async () => {
-            // Arrange
-            const div = document.createElement("div");
-            div.id = "parent";
-            document.body.appendChild(div);
+        let parent;
 
-            const parentClickFn = jest.fn();
+        beforeEach(() => {
+            parent = document.createElement("div");
+            parent.id = "loader-test-parent";
+            document.body.appendChild(parent);
+        });
 
-            div.addEventListener("click", parentClickFn);
+        afterEach(() => {
+            document.body.querySelectorAll(".intercept-overlay").forEach((el) => el.remove());
+            if (parent?.parentNode) {
+                parent.parentNode.removeChild(parent);
+            }
+        });
 
-            const wrapper = shallowMount(loader, {
+        test("teleports intercept overlay to document.body when blocking is enabled", () => {
+            const wrapper = mount(loader, {
                 props: {},
-                attachTo: "#parent",
+                attachTo: "#loader-test-parent",
             });
 
-            // Act
-            await wrapper.trigger("click");
+            const overlayInBody = document.body.querySelector(".intercept-overlay");
+            const overlayInParent = parent.querySelector(".intercept-overlay");
 
-            // Assert
-            expect(parentClickFn).not.toBeCalled();
+            expect(overlayInBody).toBeTruthy();
+            expect(overlayInParent).toBeNull();
+            expect(wrapper.find(".intercept-overlay").exists()).toBe(false);
 
-            // Cleanup
-            document.body.removeChild(div);
+            wrapper.unmount();
         });
 
-        test("Does not capture clicks if disabled", async () => {
-            // Arrange
-            const div = document.createElement("div");
-            div.id = "parent";
-            document.body.appendChild(div);
-
-            const parentClickFn = jest.fn();
-
-            div.addEventListener("click", parentClickFn);
-
-            const wrapper = shallowMount(loader, {
+        test("does not render intercept overlay when allowPageInteraction is true", () => {
+            const wrapper = mount(loader, {
                 props: {
                     allowPageInteraction: true,
                 },
-                attachTo: "#parent",
+                attachTo: "#loader-test-parent",
             });
 
-            // Act
-            await wrapper.trigger("click");
+            expect(document.body.querySelector(".intercept-overlay")).toBeNull();
+            expect(wrapper.find(".loader").exists()).toBe(true);
 
-            // Assert
-            expect(parentClickFn).toBeCalled();
+            wrapper.unmount();
+        });
 
-            // Cleanup
-            document.body.removeChild(div);
+        test("clicking the teleported overlay does not propagate to document listeners", async () => {
+            const documentClickFn = jest.fn();
+            document.addEventListener("click", documentClickFn);
+
+            const wrapper = mount(loader, {
+                props: {},
+                attachTo: "#loader-test-parent",
+            });
+
+            const overlay = document.body.querySelector(".intercept-overlay");
+            expect(overlay).toBeTruthy();
+
+            overlay.dispatchEvent(new MouseEvent("click", { bubbles: true, cancelable: true }));
+
+            expect(documentClickFn).not.toHaveBeenCalled();
+
+            document.removeEventListener("click", documentClickFn);
+            wrapper.unmount();
+        });
+
+        test("teleports overlay to body even when loader is mounted inside a button", async () => {
+            const button = document.createElement("button");
+            button.type = "button";
+            parent.appendChild(button);
+
+            const wrapper = mount(loader, {
+                props: {},
+                attachTo: button,
+            });
+
+            const overlayInBody = document.body.querySelector(".intercept-overlay");
+            const overlayInButton = button.querySelector(".intercept-overlay");
+
+            expect(overlayInBody).toBeTruthy();
+            expect(overlayInButton).toBeNull();
+
+            wrapper.unmount();
         });
     });
 });

src/ux-components/loader/loader.vue

@@ -1,17 +1,17 @@
 <template>
+    <Teleport to="body">
+        <interceptOverlay v-if="!allowPageInteraction" />
+    </Teleport>
     <div
         class="loader"
         role="alert"
         aria-label="Loading new page"
-        @click="captureClick"
-        v-bind:class="[
-            this.loaderColor,
-            this.loaderPosition,
-            this.allowPageInteraction ? 'allow-ui-interaction' : '',
-        ]"></div>
+        v-bind:class="[this.loaderColor, this.loaderPosition]"></div>
 </template>
 
 <script>
+import interceptOverlay from "../intercept-overlay/intercept-overlay.vue";
+
 export default {
     name: "loader",
     /* Specify size in number value which translates to rem value. For example, 1.5 = 1.5rem = 24px */
@@ -31,12 +31,9 @@ export default {
             default: false,
         },
     },
-    methods: {
-        captureClick(event) {
-            if (!this.allowPageInteraction) {
-                event.stopPropagation();
-            }
-        },
+    methods: {},
+    components: {
+        interceptOverlay,
     },
 };
 </script>
@@ -46,18 +43,6 @@ export default {
     display: flex;
     pointer-events: all;
 
-    //Open an overlay to prevent page interaction
-    &:before {
-        content: "";
-        position: fixed;
-        top: 0;
-        bottom: 0;
-        left: 0;
-        right: 0;
-        background-color: transparent;
-        z-index: 9999;
-        cursor: default;
-    }
     //Spinner basics
     &:after {
         content: "";
@@ -101,9 +86,5 @@ export default {
     &.black:after {
         background-color: $black;
     }
-    &.allow-ui-interaction::before {
-        //no-block to enable clicking on certain buttons with loaders while the loader is actives
-        pointer-events: none;
-    }
 }
 </style>