From bcd0076e4435ec18c8e900f61a68240269dc3563 Mon Sep 17 00:00:00 2001
From: Johan Gunawan <johan.gunawan@safelite.com>
Date: Tue, 14 May 2024 12:37:03 -0400
Subject: [PATCH] SSR-1254. Fix existing claim still appear after WO is
 submitted. (#703)

---
 .../duplicate-check/duplicate-check.vue       | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/layouts/duplicate-check/duplicate-check.vue b/src/layouts/duplicate-check/duplicate-check.vue
index 1eb465bd..34af2e2e 100644
--- a/src/layouts/duplicate-check/duplicate-check.vue
+++ b/src/layouts/duplicate-check/duplicate-check.vue
@@ -139,20 +139,23 @@ export default {
          * @summary Steps to perform when forward button clicked.
          */
         async forwardButtonAction() {
-            if (this.selectedAnswer !== null) {
+            if (this.selectedAnswer == null) {
+                this.navigateForward();
+                return;
+            }
+
+            try {
                 const selectedReferral =
                     this.mainStore.applicationUser.duplicateOrders.find((o) => o.correlationId === this.selectedAnswer);
+
                 if (selectedReferral) {
-                    await this.mainStore
-                        .loadSession(selectedReferral)
-                        .catch(() => {})
-                        .finally(() => {
-                            this.navigateForward();
-                        });
-                    return;
+                    await this.mainStore.loadSession(selectedReferral);
                 }
+            } catch (err) {
+                console.error(`Error on loading session from duplicate check ${err}`);
+            } finally {
+                this.navigateForward();
             }
-            this.navigateForward();
         },
         navigateForward() {
             if (!this.mainStore.order.policy.policyLookupSuccessful) {
@@ -164,6 +167,7 @@ export default {
             }
 
             const policyVehicles = useMainStore().order.policy.vehicles ?? [];
+
             if (!this.mainStore.order.loadedFromDupeCheck) {
                 if (policyVehicles.length !== 0) {
                     this.$router.navigate(