From 6e0b1f65a72be2d40852993910542e35689f93d6 Mon Sep 17 00:00:00 2001
From: Dave <Dave>
Date: Wed, 11 Feb 2026 18:12:56 -0500
Subject: [PATCH]  feature/IO-3558-Reynolds-Part-2 - Admin Panel

---
 .../jobs-convert-button.component.jsx            | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx b/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx
index ee06e93d0..88019d0ce 100644
--- a/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx
+++ b/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx
@@ -38,6 +38,7 @@ export function JobsConvertButton({ bodyshop, job, refetch, jobRO, insertAuditTr
   const [open, setOpen] = useState(false);
   const [loading, setLoading] = useState(false);
   const [earlyRoCreated, setEarlyRoCreated] = useState(!!job?.dms_id); // Track early RO creation state
+  const [earlyRoCreatedThisSession, setEarlyRoCreatedThisSession] = useState(false); // Track if created in THIS modal session
   const [mutationConvertJob] = useMutation(CONVERT_JOB_TO_RO);
   const { t } = useTranslation();
   const [form] = Form.useForm();
@@ -58,9 +59,6 @@ export function JobsConvertButton({ bodyshop, job, refetch, jobRO, insertAuditTr
   const dmsMode = getDmsMode(bodyshop, Fortellis.treatment);
   const isReynoldsMode = dmsMode === DMS_MAP.reynolds;
 
-  console.log(`2309-829038721093820938290382903`);
-  console.log(isReynoldsMode);
-
   const handleConvert = async ({ employee_csr, category, ...values }) => {
     if (parentFormIsFieldsTouched()) {
       alert(t("jobs.labels.savebeforeconversion"));
@@ -105,8 +103,8 @@ export function JobsConvertButton({ bodyshop, job, refetch, jobRO, insertAuditTr
   const submitDisabled = useCallback(() => some(allFormValues, (v) => v === undefined), [allFormValues]);
 
   const handleEarlyROSuccess = (result) => {
-    console.log("Early RO Success - result:", result);
     setEarlyRoCreated(true); // Mark early RO as created
+    setEarlyRoCreatedThisSession(true); // Mark as created in this session
     notification.success({
       title: t("jobs.successes.early_ro_created", "Early RO Created"),
       message: `RO Number: ${result.roNumber || "N/A"}`
@@ -133,6 +131,7 @@ export function JobsConvertButton({ bodyshop, job, refetch, jobRO, insertAuditTr
         loading={loading}
         onClick={() => {
           setEarlyRoCreated(!!job?.dms_id); // Initialize state based on current job
+          setEarlyRoCreatedThisSession(false); // Reset session state when opening modal
           setOpen(true);
         }}
       >
@@ -143,8 +142,8 @@ export function JobsConvertButton({ bodyshop, job, refetch, jobRO, insertAuditTr
       <Modal
         open={open}
         onCancel={handleModalClose}
-        closable={!(earlyRoCreated && !job.converted)} // Disable X button if early RO created but not converted
-        maskClosable={!(earlyRoCreated && !job.converted)} // Disable clicking outside to close
+        closable={!(earlyRoCreatedThisSession && !job.converted)} // Only restrict if created in THIS session
+        maskClosable={!(earlyRoCreatedThisSession && !job.converted)} // Only restrict if created in THIS session
         title={t("jobs.actions.convert")}
         footer={null}
         width={700}
@@ -317,10 +316,7 @@ export function JobsConvertButton({ bodyshop, job, refetch, jobRO, insertAuditTr
             >
               {t("jobs.actions.convert")}
             </Button>
-            <Button 
-              onClick={handleModalClose}
-              disabled={earlyRoCreated && !job.converted}
-            >
+            <Button onClick={handleModalClose} disabled={earlyRoCreatedThisSession && !job.converted}>
               {t("general.actions.close")}
             </Button>
           </Space>