From 3f7a7fb1c1b2cc5c8c5e45bc79cfaa92fb657a7e Mon Sep 17 00:00:00 2001
From: Jeremy-Z <Jeremy.Zimmerman@safelite.com>
Date: Wed, 21 Jan 2026 11:17:03 -0500
Subject: [PATCH] Fixed issue where navigation back for unverified use case
 from policy holder details page.

---
 .../policy-holder-details.vue                 | 28 +++++++++++++------
 .../router-constants/navigation-scenarios.js  |  2 ++
 src/router/router-constants/routing-table.js  |  6 +++-
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/layouts/policy-holder-details/policy-holder-details.vue b/src/layouts/policy-holder-details/policy-holder-details.vue
index 932b0484..b6fb812a 100644
--- a/src/layouts/policy-holder-details/policy-holder-details.vue
+++ b/src/layouts/policy-holder-details/policy-holder-details.vue
@@ -78,7 +78,7 @@
                         cmsWidgetName="SiteFooterWidget"
                         :isForwardActionDisabled="!meta.valid"
                         @ForwardClicked="forwardButtonAction"
-                        @backClicked="navigateBack" />
+                        @backClicked="backButtonAction" />
                 </div>
             </div>
         </div>
@@ -138,7 +138,6 @@ export default {
     data() {
         return {
             customerQuestions: this.getPolicyHolderDetailsFromStore(),
-            vehiclesFound: [],
             rules: {
                 firstName: globalRules.POLICYHOLDER_FIRST_NAME_REQUIRED,
                 lastName: globalRules.POLICYHOLDER_LAST_NAME_REQUIRED,
@@ -152,8 +151,8 @@ export default {
         isCoverageEnabled() {
             return this.mainStore.issConfig.isCoverageEnabled;
         },
-        vehiclesCount() {
-            return this.vehiclesFound.length;
+        isPolicyVehicleSelected() {
+            return this.mainStore.order.vehicle.policyVehicleId >= 0;
         }
     },
     methods: {
@@ -163,13 +162,10 @@ export default {
         },
 
         navigateForward() {
-            if (this.vehiclesCount > 0) {
+            if (this.isPolicyVehicleSelected) {
                 this.$router.navigate(
                     this.navigationScenarios.CLICKED_FORWARD_POLICY_VERIFIED,
-                    this.$route,
-                    {},
-                    {},
-                    this.vehiclesFound
+                    this.$route
                 );
             } else {
                 this.$router.navigate(
@@ -179,6 +175,20 @@ export default {
             }
         },
 
+        backButtonAction() {
+            if (this.isPolicyVehicleSelected) {
+                this.$router.navigate(
+                    this.navigationScenarios.CLICKED_BACK_POLICY_VERIFIED,
+                    this.$route
+                );
+            } else {
+                this.$router.navigate(
+                    this.navigationScenarios.CLICKED_BACK_POLICY_UNVERIFIED,
+                    this.$route
+                );
+            }
+        },
+
         getPolicyHolderDetailsFromStore() {
             return {
                 addressQuestions: {
diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js
index 4d6cde2a..9e86b8cf 100644
--- a/src/router/router-constants/navigation-scenarios.js
+++ b/src/router/router-constants/navigation-scenarios.js
@@ -27,6 +27,8 @@ const navigationScenarios = Object.freeze({
 
     // Policy Holder Details
     CLICKED_FORWARD_POLICY_VERIFIED: 'CLICKED_FORWARD_POLICY_VERIFIED',
+    CLICKED_BACK_POLICY_UNVERIFIED: 'CLICKED_BACK_POLICY_UNVERIFIED',
+    CLICKED_BACK_POLICY_VERIFIED: 'CLICKED_BACK_POLICY_VERIFIED',
 
     // Policy Vehicle
     CLICKED_FORWARD_LISTED_VEHICLE: 'CLICKED_FORWARD_LISTED_VEHICLE',
diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js
index c2a385ae..c526dc47 100644
--- a/src/router/router-constants/routing-table.js
+++ b/src/router/router-constants/routing-table.js
@@ -451,7 +451,11 @@ const routingTable = () => [
         issPageValue: issPageValues.POLICY_HOLDER_DETAILS,
         maps: [
             {
-                scenario: navigationScenarios.CLICKED_BACK,
+                scenario: navigationScenarios.CLICKED_BACK_POLICY_UNVERIFIED,
+                destinationIssPageValue: issPageValues.VEHICLE_SELECTION
+            },
+            {
+                scenario: navigationScenarios.CLICKED_BACK_POLICY_VERIFIED,
                 destinationIssPageValue: issPageValues.WELCOME_PAGE
             },
             {