From 2690bf881a21349b311a29b80da73898c36eec35 Mon Sep 17 00:00:00 2001
From: Alex Humphries <Alex.Humphries@safelite.com>
Date: Wed, 22 Jul 2026 11:23:32 -0400
Subject: [PATCH] INSR-523: Move late claim registration to just before order
 submission

---
 src/helpers/order-helper.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/helpers/order-helper.js b/src/helpers/order-helper.js
index a4c9c44b..d8bee048 100644
--- a/src/helpers/order-helper.js
+++ b/src/helpers/order-helper.js
@@ -37,11 +37,6 @@ export async function saveSession({ shouldAwaitSaveSessionQueue = false, submitA
 export async function submitWorkOrder({ submitType }) {
     const store = useMainStore();
     store.resetSubmittedOrder();
-    await saveSession({
-        shouldAwaitSaveSessionQueue: true,
-        submitAfterSave: true,
-        bailoutOnError: true
-    });
     const shouldRegisterClaimAfterSubmission = store.isPolicyLookupSuccessful
         && store.vehicle.policyVehicleId != null
         && store.vehicle.policyVehicleId >= 0
@@ -51,6 +46,11 @@ export async function submitWorkOrder({ submitType }) {
     if (shouldRegisterClaimAfterSubmission) {
         await store.registerClaim();
     }
+    await saveSession({
+        shouldAwaitSaveSessionQueue: true,
+        submitAfterSave: true,
+        bailoutOnError: true
+    });
     await store.createSubmittedOrder(submitType);
 }