From 68aae3702f9d6f0562e41fd561aeca54291a0737 Mon Sep 17 00:00:00 2001
From: Katie Kroell <Katie.Kroell@safelite.com>
Date: Thu, 16 Apr 2026 10:05:41 -0400
Subject: [PATCH] fixes

---
 src/store/index.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/store/index.js b/src/store/index.js
index a43eec95..fe9bf33a 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -18,7 +18,7 @@ import { convertDateStringToDate, getDateDifferenceInDays, militaryToTwelveHourT
 import { getExperimentSettingValue, getFeatureTogglesPayloadObject } from '@/helpers/experiment-helper';
 import { findLineItemIndex, getLineItemsFlattened } from '@/helpers/line-items-helper';
 import {
-    deductibleForSelectedVehicle, endorsementsForSelectedVehicle, endorsementCodesForSelectedVehicle,
+    deductibleForSelectedVehicle, endorsementsForSelectedVehicle,
     noCoverageForSelectedVehicle,
     repairWaivedForSelectedVehicle
 } from '@/helpers/policy-vehicle-helper';
@@ -29,7 +29,6 @@ import { isMobileDevice } from '@/helpers/useragent-helper';
 import issPageValues from '@/router/router-constants/issPage-values';
 import CoverageStatuses from '@/constants/coverage-statuses';
 import { getNonFalseValuesOfPropertyInArrayOfObjects, sortArrayOfObjectsByPropertyValue } from '@/helpers/object-helper';
-import endorsementCodes from '@/constants/endorsement-codes';
 
 const storeId = 'main';
 
@@ -2121,6 +2120,9 @@ export const useMainStore = defineStore({
             this.order.policy.vehicles = [];
             this.order.policy.endorsements = [];
             this.order.policy.endorsementQuestionAnswers = [];
+            this.order.policy.cvrgEndorsementCode = null;
+            this.order.policy.educatorEndorsementAnswer = null;
+            this.order.policy.parkingGuardEndorsementAnswer = null;
             this.order.policy.policyData = null;
             this.order.policy.deductible.repair = null;
             this.order.policy.deductible.replace = null;
@@ -2301,10 +2303,12 @@ export const useMainStore = defineStore({
 
         updateEndorsementQuestionAnswers(answersArray) {
             this.order.policy.endorsementQuestionAnswers = answersArray;
-            const educatorEndorsement = answersArray.find((endorsement) => endorsement.endorsementName === endorsementOptions.EDUCATOR);
-            const parkingGuardEndorsement = answersArray.find((endorsement) => endorsement.endorsementName === endorsementOptions.PARKING_GUARD);
-            this.order.policy.educatorEndorsementAnswer = educatorEndorsement ? educatorEndorsement.selectedAnswer : null;
-            this.order.policy.parkingGuardEndorsementAnswer = parkingGuardEndorsement ? parkingGuardEndorsement.selectedAnswer : null;
+            if (answersArray !== null) {
+                const educatorEndorsement = answersArray.find((endorsement) => endorsement.endorsementName === endorsementOptions.EDUCATOR);
+                const parkingGuardEndorsement = answersArray.find((endorsement) => endorsement.endorsementName === endorsementOptions.PARKING_GUARD);
+                this.order.policy.educatorEndorsementAnswer = educatorEndorsement ? educatorEndorsement.selectedAnswer : null;
+                this.order.policy.parkingGuardEndorsementAnswer = parkingGuardEndorsement ? parkingGuardEndorsement.selectedAnswer : null;
+            }
         },
 
         updateIsRepair(isRepair) {