From 29d3c08b365a255b3b6a87fb32f6f97108b6e650 Mon Sep 17 00:00:00 2001
From: Scott Kiener <scott.kiener@safelite.com>
Date: Tue, 5 Sep 2023 10:18:47 -0400
Subject: [PATCH 1/2] CSR-1617 | Defect fix - IsVinOptionalNotRepair

---
 src/helpers/heritage-integration/navigation-helper.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/helpers/heritage-integration/navigation-helper.js b/src/helpers/heritage-integration/navigation-helper.js
index 3d1115000..b9207e04b 100644
--- a/src/helpers/heritage-integration/navigation-helper.js
+++ b/src/helpers/heritage-integration/navigation-helper.js
@@ -83,18 +83,21 @@ export async function skipVinLookup() {
 }
 
 export async function skipVinLookupNotRepair() {
+    if (store.getters.damage.isRepair) {
+        return false;
+    }
+
     const isVinOptionalVehicle = store.getters.order.vehicle.make
         ? await store.dispatch(storeActions.IS_VIN_OPTIONAL_VEHICLE)
         : false;
 
     return (
-        !store.getters.damage.isRepair &&
-        (isVinOptionalVehicle ||
+        isVinOptionalVehicle ||
             !includesWindshieldReplacement() ||
             experimentMixin.methods.hasSettingEqualTo(
                 experimentSettings.SUPPRESS_VIN_CAPTURE,
                 "true"
-            ))
+            )
     );
 }
 

From a6e40db17c7b20f56ac99de65d138beba3ae5cb8 Mon Sep 17 00:00:00 2001
From: Scott Kiener <scott.kiener@safelite.com>
Date: Tue, 5 Sep 2023 10:19:31 -0400
Subject: [PATCH 2/2] CSR-1617 | Formatting

---
 src/helpers/heritage-integration/navigation-helper.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/helpers/heritage-integration/navigation-helper.js b/src/helpers/heritage-integration/navigation-helper.js
index b9207e04b..c52cef86d 100644
--- a/src/helpers/heritage-integration/navigation-helper.js
+++ b/src/helpers/heritage-integration/navigation-helper.js
@@ -93,11 +93,8 @@ export async function skipVinLookupNotRepair() {
 
     return (
         isVinOptionalVehicle ||
-            !includesWindshieldReplacement() ||
-            experimentMixin.methods.hasSettingEqualTo(
-                experimentSettings.SUPPRESS_VIN_CAPTURE,
-                "true"
-            )
+        !includesWindshieldReplacement() ||
+        experimentMixin.methods.hasSettingEqualTo(experimentSettings.SUPPRESS_VIN_CAPTURE, "true")
     );
 }