From 202a335cb656354d9752d2683544c52e25ce742e Mon Sep 17 00:00:00 2001
From: Jeremy-Z <Jeremy.Zimmerman@safelite.com>
Date: Wed, 4 Feb 2026 15:15:43 -0500
Subject: [PATCH] Auto stash before merge of "feature/INSR-8130" and
 "origin/feature/INSR-8130"

Adding some additional logic to duplicate check data repopulation.
---
 src/store/index.js | 40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/src/store/index.js b/src/store/index.js
index 9727b6be..86ac47d8 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1599,25 +1599,31 @@ export const useMainStore = defineStore({
                 return;
             }
 
-            order.customer.address.streetAddress = data.customer?.address?.streetAddress;
-            order.customer.address.streetAddress2 = data.customer?.address?.streetAddress2;
-            order.customer.address.city = data.customer?.address?.city;
-            order.customer.address.state = data.customer?.address?.state;
-            order.customer.address.zipCode = data.customer?.address?.zipCode;
+            if (data?.customer) {
+                order.contactInfo.firstName = data?.customer?.firstName;
+                order.contactInfo.lastName = data?.customer?.lastName;
+                order.contactInfo.emailAddress = data?.customer?.emailAddress;
+                order.contactInfo.extension = data?.customer?.homePhone?.slice(10);
+                order.contactInfo.homePhone = data?.customer?.homePhone?.slice(0, 10);
+                order.contactInfo.servicePhone = data?.customer?.servicePhone;
+                order.contactInfo.alternativePhone = data?.customer?.alternativePhone;
+                order.contactInfo.requestTextUpdates = data?.customer?.isSmsOptIn;
 
-            order.contactInfo.firstName = data?.customer?.firstName;
-            order.contactInfo.lastName = data?.customer?.lastName;
-            order.contactInfo.emailAddress = data?.customer?.emailAddress;
-            order.contactInfo.extension = data?.customer?.homePhone?.slice(10);
-            order.contactInfo.homePhone = data?.customer?.homePhone?.slice(0, 10);
-            order.contactInfo.servicePhone = data?.customer?.servicePhone;
-            order.contactInfo.alternativePhone = data?.customer?.alternativePhone;
-            order.contactInfo.requestTextUpdates = data?.customer?.isSmsOptIn;
+                if (data?.customer?.address) {
+                    order.customer.address.streetAddress = data.customer?.address?.streetAddress;
+                    order.customer.address.streetAddress2 = data.customer?.address?.streetAddress2;
+                    order.customer.address.city = data.customer?.address?.city;
+                    order.customer.address.state = data.customer?.address?.state;
+                    order.customer.address.zipCode = data.customer?.address?.zipCode;
+                }
+            }
 
-            order.vehicle.year = data?.vehicle?.year;
-            order.vehicle.make = data?.vehicle?.make;
-            order.vehicle.model = data?.vehicle?.model;
-            order.vehicle.style = data?.vehicle?.style;
+            if (data?.vehicle) {
+                order.vehicle.year = data?.vehicle?.year;
+                order.vehicle.make = data?.vehicle?.make;
+                order.vehicle.model = data?.vehicle?.model;
+                order.vehicle.style = data?.vehicle?.style;
+            }
 
             if (this.isPolicyLookupSuccessful) {
                 if (data.insuranceCoverage) {