From 30144695f904fa7b749b9c789261f84da66b940e Mon Sep 17 00:00:00 2001
From: Kartik Sharma <kartik.sharma@marcoaiot.com>
Date: Tue, 7 Oct 2025 14:34:10 +0530
Subject: [PATCH 1/2] Selected organization should remain visible after
 navigating back

---
 .../Organization/OrgPickerFromSPId.jsx           | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/components/Organization/OrgPickerFromSPId.jsx b/src/components/Organization/OrgPickerFromSPId.jsx
index 69774947..dfa9cd3c 100644
--- a/src/components/Organization/OrgPickerFromSPId.jsx
+++ b/src/components/Organization/OrgPickerFromSPId.jsx
@@ -1,4 +1,4 @@
-import { useState } from "react";
+import { useEffect, useState } from "react";
 import {
   useAssignOrgToTenant,
   useOrganizationBySPRID,
@@ -14,12 +14,14 @@ import { OrgCardSkeleton } from "./OrganizationSkeleton";
 // Zod schema: only allow exactly 4 digits
 
 const OrgPickerFromSPId = ({ title, placeholder }) => {
-  const { onClose, startStep, flowType, onOpen, prevStep } =
+  const { onClose, startStep, flowType, onOpen, prevStep, orgData } =
     useOrganizationModal();
 
+
   const {
     register,
     handleSubmit,
+    setValue,
     formState: { errors },
     watch,
   } = useForm({
@@ -36,7 +38,15 @@ const OrgPickerFromSPId = ({ title, placeholder }) => {
     setSPRID(formdata.spridSearchText);
   };
 
-  const handleOrg = (orgId) => {};
+// Add this..
+   useEffect(() => {
+    if (orgData?.sprid) {
+      setValue("spridSearchText", orgData.sprid);
+      setSPRID(orgData.sprid);
+    }
+  }, [orgData, setValue]);
+
+  const handleOrg = (orgId) => { };
   const SP = watch("spridSearchText");
   return (
     <div className="d-block">
-- 
2.43.0


From 1107144201e8f8917a52fccb760358ae09a6279b Mon Sep 17 00:00:00 2001
From: Kartik Sharma <kartik.sharma@marcoaiot.com>
Date: Tue, 7 Oct 2025 15:00:45 +0530
Subject: [PATCH 2/2] Updation in SPIRD Id selection.

---
 src/components/Organization/OrgPickerFromSPId.jsx | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/components/Organization/OrgPickerFromSPId.jsx b/src/components/Organization/OrgPickerFromSPId.jsx
index dfa9cd3c..c358498f 100644
--- a/src/components/Organization/OrgPickerFromSPId.jsx
+++ b/src/components/Organization/OrgPickerFromSPId.jsx
@@ -45,6 +45,15 @@ const OrgPickerFromSPId = ({ title, placeholder }) => {
       setSPRID(orgData.sprid);
     }
   }, [orgData, setValue]);
+// Add this..
+  useEffect(() => {
+  const subscription = watch((value) => {
+    if (!value.spridSearchText) {
+      setSPRID(""); 
+    }
+  });
+  return () => subscription.unsubscribe();
+}, [watch]);
 
   const handleOrg = (orgId) => { };
   const SP = watch("spridSearchText");
-- 
2.43.0