From 29a49150b7bba489ca4c8fa7754c7bb69f40a624 Mon Sep 17 00:00:00 2001
From: YasinShaikh123 <123150391+YasinShaikh123@users.noreply.github.com>
Date: Fri, 22 Nov 2024 18:51:05 +0530
Subject: [PATCH] update modal close

---
 .../CreateIO/IOCashDetails/Pending.jsx        |  8 ++++----
 .../ApproveDistrubationModal.jsx              |  2 +-
 .../IOTransaction/ApproveInvestedModal.jsx    |  5 +++--
 .../ApprovedCancelTransaction.jsx             |  5 +++--
 .../CreateIO/IOTransaction/ApprovedExit.jsx   |  5 +++--
 .../IOTransaction/ViewAmountInvested.jsx      |  2 ++
 .../CreateIO/IOTransaction/ViewCancel.jsx     |  2 ++
 .../CreateIO/IOTransaction/ViewExit.jsx       |  2 ++
 .../IO_Management/ViewIO/ViewIOdataHeader.jsx | 20 +++++++++----------
 9 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/src/Pages/IO_Management/CreateIO/IOCashDetails/Pending.jsx b/src/Pages/IO_Management/CreateIO/IOCashDetails/Pending.jsx
index dd6716f..fa7e9db 100644
--- a/src/Pages/IO_Management/CreateIO/IOCashDetails/Pending.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOCashDetails/Pending.jsx
@@ -166,8 +166,8 @@ const Pending = () => {
     ),
     Actions: (
       <Box display={"flex"} justifyContent={"center"}>
-        {localStorage?.getItem("role") !== "Maker" ? <Box>
-          <Box display={"flex"} justifyContent={"center"} gap={2}>
+        {localStorage?.getItem("role") !== "Maker"  ? <Box>
+          {index===0&&<Box display={"flex"} justifyContent={"center"} gap={2}>
         <Tooltip
           rounded={"sm"}
           fontSize={"xs"}
@@ -221,8 +221,8 @@ const Pending = () => {
           >
             <CloseIcon fontSize={"10px"} />
           </Button>
-        </Tooltip>
-        </Box>
+        </Tooltip></Box>}
+        
         </Box> : <Button
             colorScheme="green"
             rounded={"sm"}
diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/ApproveDistrubationModal.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/ApproveDistrubationModal.jsx
index 667db8a..639d4b7 100644
--- a/src/Pages/IO_Management/CreateIO/IOTransaction/ApproveDistrubationModal.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOTransaction/ApproveDistrubationModal.jsx
@@ -142,7 +142,7 @@ import {
                   </Text>
                 )}
                 <FormHelperText fontSize="xs" color="gray.500">
-                  Maximum length should be 200 characters. You have entered
+                <Box as="span" me={1}> Maximum length should be 200 characters. You have entered</Box>
                   {watch("checkerComment")?.length || 0} characters.
                 </FormHelperText>
               </FormControl>
diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/ApproveInvestedModal.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/ApproveInvestedModal.jsx
index a165034..8ea065e 100644
--- a/src/Pages/IO_Management/CreateIO/IOTransaction/ApproveInvestedModal.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOTransaction/ApproveInvestedModal.jsx
@@ -33,7 +33,7 @@ import {
     .max(200, "Approve Comment cannot be more than 200 characters"),
   });
   
-  const ApproveInvestedModal = ({ isOpen, onClose, firstField ,id}) => {
+  const ApproveInvestedModal = ({ isOpen, onClose, firstField ,id,onBigModalClose}) => {
     const [isBtnLoading , setIsBtnLoading] = useState(false)
   
     const toast = useToast()
@@ -69,6 +69,7 @@ import {
             ),
           });
           onClose()
+          onBigModalClose()
           setIsBtnLoading(false)
         }else{
           toast({
@@ -139,7 +140,7 @@ import {
                   </Text>
                 )}
                 <FormHelperText fontSize="xs" color="gray.500">
-                  Maximum length should be 200 characters. You have entered
+                <Box as="span" me={1}>Maximum length should be 200 characters. You have entered</Box>
                   {watch("checkerComment")?.length || 0} characters.
                 </FormHelperText>
               </FormControl>
diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/ApprovedCancelTransaction.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/ApprovedCancelTransaction.jsx
index 327e5b1..1233c75 100644
--- a/src/Pages/IO_Management/CreateIO/IOTransaction/ApprovedCancelTransaction.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOTransaction/ApprovedCancelTransaction.jsx
@@ -22,7 +22,7 @@ import {
   import {useApproveCancleTransactionMutation, useApproveExitTransactionMutation} from "../../../../Services/io.service";
 
   
-  const ApprovedCancelTransaction = ({ isOpen, onClose, firstField ,id}) => {
+  const ApprovedCancelTransaction = ({ isOpen, onClose, firstField ,id,onBigModalClose}) => {
     const [isBtnLoading , setIsBtnLoading] = useState(false)
   
     const toast = useToast()
@@ -58,6 +58,7 @@ import {
             ),
           });
           onClose()
+          onBigModalClose()
           setIsBtnLoading(false)
         }else{
           toast({
@@ -123,7 +124,7 @@ import {
                   </Text>
                 )}
                 <FormHelperText fontSize="xs" color="gray.500">
-                  Maximum length should be 200 characters. You have entered
+                  <Box as="span" me={1}>Maximum length should be 200 characters. You have entered</Box>
                   {watch("checkerComment")?.length || 0} characters.
                 </FormHelperText>
               </FormControl>
diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/ApprovedExit.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/ApprovedExit.jsx
index 0c9a50d..2b3f4fa 100644
--- a/src/Pages/IO_Management/CreateIO/IOTransaction/ApprovedExit.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOTransaction/ApprovedExit.jsx
@@ -30,7 +30,7 @@ import {
     .max(200, "Approve Comment cannot be more than 200 characters"),
   });
   
-  const ApprovedExit = ({ isOpen, onClose, firstField ,id}) => {
+  const ApprovedExit = ({ isOpen, onClose, firstField ,id,onBigModalClose}) => {
     const [isBtnLoading , setIsBtnLoading] = useState(false)
   
     const toast = useToast()
@@ -66,6 +66,7 @@ import {
             ),
           });
           onClose()
+          onBigModalClose()
           setIsBtnLoading(false)
         }else{
           toast({
@@ -137,7 +138,7 @@ import {
                   </Text>
                 )}
                 <FormHelperText fontSize="xs" color="gray.500">
-                  Maximum length should be 200 characters. You have entered
+                 <Box as="span" me={1}>Maximum length should be 200 characters. You have entered</Box>
                   {watch("checkerComment")?.length || 0} characters.
                 </FormHelperText>
               </FormControl>
diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/ViewAmountInvested.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/ViewAmountInvested.jsx
index 25eef94..a297a60 100644
--- a/src/Pages/IO_Management/CreateIO/IOTransaction/ViewAmountInvested.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOTransaction/ViewAmountInvested.jsx
@@ -276,11 +276,13 @@ const ViewAmountInvested = ({ isOpen, onClose, id: investorId }) => {
       <ApproveInvestedModal
         isOpen={isConfirmOpen}
         onClose={onConfirmClose}
+        onBigModalClose={onClose}
         id={investorId}
       />
       <RequestRejectModal
         isOpen={isRejectOpen}
         onClose={onRejectClose}
+        onBigModalClose={onClose}
         id={investorId}
       />
     </Modal>
diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/ViewCancel.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/ViewCancel.jsx
index c5a2864..e388d02 100644
--- a/src/Pages/IO_Management/CreateIO/IOTransaction/ViewCancel.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOTransaction/ViewCancel.jsx
@@ -348,11 +348,13 @@ import RequestRejectModal from "./RequestRejectModal";
         <ApprovedCancelTransaction
         isOpen={isConfirmOpen}
         onClose={onConfirmClose}
+        onBigModalClose={onClose}
         id={cancleId}
       />
       <RequestRejectModal
         isOpen={isRejectOpen}
         onClose={onRejectClose}
+        onBigModalClose={onClose}
         id={cancleId}
       />
       </Modal>
diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/ViewExit.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/ViewExit.jsx
index 1b30b56..1bb0b6a 100644
--- a/src/Pages/IO_Management/CreateIO/IOTransaction/ViewExit.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOTransaction/ViewExit.jsx
@@ -309,11 +309,13 @@ import RequestRejectModal from "./RequestRejectModal";
         <ApprovedExit
             isOpen={isConfirmOpen}
             onClose={onConfirmClose}
+            onBigModalClose={onClose}
             id={investerId}
         />
         <RequestRejectModal
             isOpen={isRejectOpen}
             onClose={onRejectClose}
+            onBigModalClose={onClose}
             id={investerId}
         />
       </Modal>
diff --git a/src/Pages/IO_Management/ViewIO/ViewIOdataHeader.jsx b/src/Pages/IO_Management/ViewIO/ViewIOdataHeader.jsx
index 2d4eb78..9772dd0 100644
--- a/src/Pages/IO_Management/ViewIO/ViewIOdataHeader.jsx
+++ b/src/Pages/IO_Management/ViewIO/ViewIOdataHeader.jsx
@@ -147,11 +147,11 @@ const ViewIOdataHeader = ({ data, isLoading }) => {
        const res = await updateTransaction(id)
        
        if (res?.data) {
-         toast({
-           render: () => (
-            <ToastBox status={"success"} message={res?.data?.message} />
-           ),
-         });
+        //  toast({
+        //    render: () => (
+        //     <ToastBox status={"success"} message={res?.data?.message} />
+        //    ),
+        //  });
         //  setIsLoading(false);
         onExitOpen()
  
@@ -174,11 +174,11 @@ const ViewIOdataHeader = ({ data, isLoading }) => {
        const res = await updateTransaction(id)
        
        if (res?.data) {
-         toast({
-           render: () => (
-            <ToastBox status={"success"} message={res?.data?.message} />
-           ),
-         });
+        //  toast({
+        //    render: () => (
+        //     <ToastBox status={"success"} message={res?.data?.message} />
+        //    ),
+        //  });
         //  setIsLoading(false);
         onInvestmentOpen()