From 5b2efcd29208d3e5b0d27d0438b617aea50dbfde Mon Sep 17 00:00:00 2001
From: YasinShaikh123 <123150391+YasinShaikh123@users.noreply.github.com>
Date: Thu, 14 Nov 2024 16:28:55 +0530
Subject: [PATCH 01/12] update color bugs

---
 src/Pages/IO_Management/CreateIO/IODetails.jsx               | 2 +-
 .../Investor_Management/InvestorDetails/InvestorDetails.jsx  | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Pages/IO_Management/CreateIO/IODetails.jsx b/src/Pages/IO_Management/CreateIO/IODetails.jsx
index 18ff85c..de5ce86 100644
--- a/src/Pages/IO_Management/CreateIO/IODetails.jsx
+++ b/src/Pages/IO_Management/CreateIO/IODetails.jsx
@@ -70,7 +70,7 @@ const schema = yup.object().shape({
   InvestmentDetails: yup.string().notRequired(),
 
   comment: yup.string().notRequired()
-  .min(10, "Comment must be at least 10 characters long")
+  // .min(10, "Comment must be at least 10 characters long")
   .max(100, "Comment must be at most 100 characters long"),
 
   expectedReturn: yup
diff --git a/src/Pages/Investor_Management/InvestorDetails/InvestorDetails.jsx b/src/Pages/Investor_Management/InvestorDetails/InvestorDetails.jsx
index 1f7f5a9..538ee23 100644
--- a/src/Pages/Investor_Management/InvestorDetails/InvestorDetails.jsx
+++ b/src/Pages/Investor_Management/InvestorDetails/InvestorDetails.jsx
@@ -216,13 +216,14 @@ const InvestorDetails = () => {
         as={'span'}
           fontWeight={"700"}
           textTransform={"none"}
-          color={item.ioStatus ? "gray.500":item.kycStatus ? "blue.500" : "red.500"}
+          color={item?.KYCStatus === true ? "green" : "yellow.500"}
           px={2}
           py={0.5}
           variant={'solid'}
 
         >
-          {item.KYCStatus ? "Completed" : "Not complete"}
+          {/* {item.KYCStatus ? "Completed" : "Not complete"} */}
+          {item?.KYCStatus === true ? "Completed" : "NotCompleted"}
         </Text>
       </Box>
     ),

From b0c01f3a0c7a0ba62f7b2da7cec44e3809ba5634 Mon Sep 17 00:00:00 2001
From: "Siddhesh.More" <siddhesh.more@wdimails.com>
Date: Fri, 22 Nov 2024 19:00:14 +0530
Subject: [PATCH 02/12] updaate role

---
 src/Services/token.serivce.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Services/token.serivce.js b/src/Services/token.serivce.js
index 143762c..639fdf8 100644
--- a/src/Services/token.serivce.js
+++ b/src/Services/token.serivce.js
@@ -46,7 +46,7 @@ export const baseQuery = async (args, api, extraOptions) => {
         if (refreshResult.data) {
           // Save new tokens
           localStorage.setItem("accessToken", refreshResult?.data?.data?.access?.token);
-          localStorage.setItem("role", refreshResult?.data?.data?.role);
+          // localStorage.setItem("role", refreshResult?.data?.data?.role);
           // console.log(refreshResult?.data?.data?.role);
         
 

From bf7b3e1596b0aa27d2f6994b501b84eaccab506f Mon Sep 17 00:00:00 2001
From: YasinShaikh123 <123150391+YasinShaikh123@users.noreply.github.com>
Date: Fri, 22 Nov 2024 19:04:31 +0530
Subject: [PATCH 03/12] token change

---
 src/Services/token.serivce.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Services/token.serivce.js b/src/Services/token.serivce.js
index 143762c..639fdf8 100644
--- a/src/Services/token.serivce.js
+++ b/src/Services/token.serivce.js
@@ -46,7 +46,7 @@ export const baseQuery = async (args, api, extraOptions) => {
         if (refreshResult.data) {
           // Save new tokens
           localStorage.setItem("accessToken", refreshResult?.data?.data?.access?.token);
-          localStorage.setItem("role", refreshResult?.data?.data?.role);
+          // localStorage.setItem("role", refreshResult?.data?.data?.role);
           // console.log(refreshResult?.data?.data?.role);
         
 

From a12b2c9a2c702332ee47ba769355addc852708f0 Mon Sep 17 00:00:00 2001
From: YasinShaikh123 <123150391+YasinShaikh123@users.noreply.github.com>
Date: Fri, 22 Nov 2024 19:22:06 +0530
Subject: [PATCH 04/12] updaste

---
 .../IO_Management/CreateIO/IOCashDetails/AddCaseDetails.jsx | 3 ++-
 .../IO_Management/CreateIO/IOCashDetails/IOCashDetails.jsx  | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Pages/IO_Management/CreateIO/IOCashDetails/AddCaseDetails.jsx b/src/Pages/IO_Management/CreateIO/IOCashDetails/AddCaseDetails.jsx
index 3bc016d..82983d2 100644
--- a/src/Pages/IO_Management/CreateIO/IOCashDetails/AddCaseDetails.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOCashDetails/AddCaseDetails.jsx
@@ -36,7 +36,7 @@ const cashDetails = yup.object().shape({
   comments: yup.string().notRequired(),
 });
 
-const AddCaseDetails = ({ isOpen, onClose, firstField, actionId, setActionId, data }) => {
+const AddCaseDetails = ({ isOpen, onClose, firstField, actionId, setActionId, data, setActiveTab }) => {
   const params = useParams() 
   const id = params?.id
   const [file, setFile] = useState("");
@@ -88,6 +88,7 @@ const AddCaseDetails = ({ isOpen, onClose, firstField, actionId, setActionId, da
           render: () => <ToastBox message={res?.data?.message} />,
         });
         handleClose()
+        setActiveTab(1)
       }else if(res?.error){
         setIsLoading(false);
         toast({
diff --git a/src/Pages/IO_Management/CreateIO/IOCashDetails/IOCashDetails.jsx b/src/Pages/IO_Management/CreateIO/IOCashDetails/IOCashDetails.jsx
index 3055a43..e2910fe 100644
--- a/src/Pages/IO_Management/CreateIO/IOCashDetails/IOCashDetails.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOCashDetails/IOCashDetails.jsx
@@ -9,7 +9,7 @@ import {
   useDisclosure,
   useToast,
 } from "@chakra-ui/react";
-import React, { useContext, useRef } from "react";
+import React, { useContext, useRef, useState } from "react";
 import Approved from "./Approved";
 import Pending from "./Pending";
 import Rejected from "./Rejected";
@@ -29,6 +29,7 @@ const IOCashDetails = () => {
   const firstField = useRef();
 
   const [updateIOCase] = useUpdateIOCaseMutation();
+  const [activeTab, setActiveTab] = useState(0);
 
   const handleAdd = async () => {
     
@@ -56,7 +57,7 @@ const IOCashDetails = () => {
 
   return (
     <Box>
-    <Tabs variant='unstyled'>
+    <Tabs index={activeTab} onChange={(index) => setActiveTab(index)} variant='unstyled'>
       <Box
         display={"flex"}
         justifyContent={"space-between"}
@@ -119,6 +120,7 @@ const IOCashDetails = () => {
       </TabPanels>
     </Tabs>
     <AddCaseDetails
+    setActiveTab={setActiveTab}
         isOpen={isOpen}
         onClose={onClose}
         firstField={firstField}

From d4c9a5521ff1156972b3a32056afadb885d45067 Mon Sep 17 00:00:00 2001
From: YasinShaikh123 <123150391+YasinShaikh123@users.noreply.github.com>
Date: Fri, 22 Nov 2024 19:54:12 +0530
Subject: [PATCH 05/12] update modal view

---
 .../IOCashDetails/RequestApproveModal.jsx     |  2 +-
 .../IONAVDetails/RequestApproveModal.jsx      |  2 +-
 .../ApproveDistrubationModal.jsx              |  2 +-
 .../IOTransaction/ApproveInvestedModal.jsx    |  2 +-
 .../ApprovedCancelTransaction.jsx             |  2 +-
 .../CreateIO/IOTransaction/ApprovedExit.jsx   |  2 +-
 .../IOTransaction/RequestApproveModal.jsx     |  2 +-
 .../IOTransaction/RequestExitApproveModal.jsx |  2 +-
 .../IOTransaction/ViewAmountInvested.jsx      |  1 +
 .../CreateIO/IOTransaction/ViewCancel.jsx     | 20 ++++++++++--------
 .../ViewDistributionInvestor.jsx              | 11 +++++++---
 .../CreateIO/IOTransaction/ViewExit.jsx       | 21 +++++++++++--------
 src/Pages/IO_Management/ViewIO/ViewIOdata.jsx | 10 ++++++++-
 13 files changed, 49 insertions(+), 30 deletions(-)

diff --git a/src/Pages/IO_Management/CreateIO/IOCashDetails/RequestApproveModal.jsx b/src/Pages/IO_Management/CreateIO/IOCashDetails/RequestApproveModal.jsx
index c771b46..1acc243 100644
--- a/src/Pages/IO_Management/CreateIO/IOCashDetails/RequestApproveModal.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOCashDetails/RequestApproveModal.jsx
@@ -129,7 +129,7 @@ const RequestApproveModal = ({ isOpen, onClose, firstField ,id}) => {
                 fontSize="sm"
                 type="textarea"
                 size="md"
-                placeholder={"Enter your checkerComment...."}
+                placeholder={"Enter your checker comment...."}
                 rounded={"md"}
                 resize={"none"}
                 maxLength={200}
diff --git a/src/Pages/IO_Management/CreateIO/IONAVDetails/RequestApproveModal.jsx b/src/Pages/IO_Management/CreateIO/IONAVDetails/RequestApproveModal.jsx
index edad9d3..13b37ea 100644
--- a/src/Pages/IO_Management/CreateIO/IONAVDetails/RequestApproveModal.jsx
+++ b/src/Pages/IO_Management/CreateIO/IONAVDetails/RequestApproveModal.jsx
@@ -129,7 +129,7 @@ const RequestApproveModal = ({ isOpen, onClose, firstField ,id}) => {
                 fontSize="sm"
                 type="textarea"
                 size="md"
-                placeholder={"Enter your checkerComment...."}
+                placeholder={"Enter your checker comment...."}
                 rounded={"md"}
                 resize={"none"}
                 maxLength={200}
diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/ApproveDistrubationModal.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/ApproveDistrubationModal.jsx
index 639d4b7..4fb5ba8 100644
--- a/src/Pages/IO_Management/CreateIO/IOTransaction/ApproveDistrubationModal.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOTransaction/ApproveDistrubationModal.jsx
@@ -131,7 +131,7 @@ import {
                   fontSize="sm"
                   type="textarea"
                   size="md"
-                  placeholder={"Enter your checkerComment...."}
+                  placeholder={"Enter your checker comment...."}
                   rounded={"md"}
                   resize={"none"}
                   maxLength={200}
diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/ApproveInvestedModal.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/ApproveInvestedModal.jsx
index 8ea065e..b1bd5de 100644
--- a/src/Pages/IO_Management/CreateIO/IOTransaction/ApproveInvestedModal.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOTransaction/ApproveInvestedModal.jsx
@@ -129,7 +129,7 @@ import {
                   fontSize="sm"
                   type="textarea"
                   size="md"
-                  placeholder={"Enter your checkerComment...."}
+                  placeholder={"Enter your checker comment...."}
                   rounded={"md"}
                   resize={"none"}
                   maxLength={200}
diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/ApprovedCancelTransaction.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/ApprovedCancelTransaction.jsx
index 1233c75..596c62b 100644
--- a/src/Pages/IO_Management/CreateIO/IOTransaction/ApprovedCancelTransaction.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOTransaction/ApprovedCancelTransaction.jsx
@@ -113,7 +113,7 @@ import {
                   fontSize="sm"
                   type="textarea"
                   size="md"
-                  placeholder={"Enter your checkerComment...."}
+                  placeholder={"Enter your checker comment...."}
                   rounded={"md"}
                   resize={"none"}
                   maxLength={200}
diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/ApprovedExit.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/ApprovedExit.jsx
index 2b3f4fa..977fc3f 100644
--- a/src/Pages/IO_Management/CreateIO/IOTransaction/ApprovedExit.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOTransaction/ApprovedExit.jsx
@@ -127,7 +127,7 @@ import {
                   fontSize="sm"
                   type="textarea"
                   size="md"
-                  placeholder={"Enter your checkerComment...."}
+                  placeholder={"Enter your checker comment...."}
                   rounded={"md"}
                   resize={"none"}
                   maxLength={200}
diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/RequestApproveModal.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/RequestApproveModal.jsx
index 507aeb2..3a1bd92 100644
--- a/src/Pages/IO_Management/CreateIO/IOTransaction/RequestApproveModal.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOTransaction/RequestApproveModal.jsx
@@ -128,7 +128,7 @@ const RequestApproveModal = ({ isOpen, onClose, firstField ,id}) => {
                 fontSize="sm"
                 type="textarea"
                 size="md"
-                placeholder={"Enter your checkerComment...."}
+                placeholder={"Enter your checker comment...."}
                 rounded={"md"}
                 resize={"none"}
                 maxLength={200}
diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/RequestExitApproveModal.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/RequestExitApproveModal.jsx
index 5bc15c7..e6c4b5f 100644
--- a/src/Pages/IO_Management/CreateIO/IOTransaction/RequestExitApproveModal.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOTransaction/RequestExitApproveModal.jsx
@@ -128,7 +128,7 @@ import {
                   fontSize="sm"
                   type="textarea"
                   size="md"
-                  placeholder={"Enter your checkerComment...."}
+                  placeholder={"Enter your checker comment...."}
                   rounded={"md"}
                   resize={"none"}
                   maxLength={200}
diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/ViewAmountInvested.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/ViewAmountInvested.jsx
index a297a60..9af6d74 100644
--- a/src/Pages/IO_Management/CreateIO/IOTransaction/ViewAmountInvested.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOTransaction/ViewAmountInvested.jsx
@@ -116,6 +116,7 @@ const ViewAmountInvested = ({ isOpen, onClose, id: investorId }) => {
   };
 
   // const formatDate = (date) => new Date(date).toLocaleDateString();
+  
 
   const handleAmountChange = (e) => {
     // e might be an object or just a value, handle both cases
diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/ViewCancel.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/ViewCancel.jsx
index e388d02..8ae7157 100644
--- a/src/Pages/IO_Management/CreateIO/IOTransaction/ViewCancel.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOTransaction/ViewCancel.jsx
@@ -86,15 +86,17 @@ import RequestRejectModal from "./RequestRejectModal";
       resolver: yupResolver(investorExit),
     });
   
-    // useEffect(() => {
-    //   console.log("hiit     useEffectc");
-    //   handleCalculate(id, {
-    //     amount: IODetails?.ioMVNAV,
-    //   });
-    //   reset({
-    //     amount: IODetails?.ioMVNAV,
-    //   });
-    // }, [IODetails, id]);
+    useEffect(() => {
+      console.log("hiit     useEffectc");
+      if (id) {
+        handleCalculate(id, {
+          amount: IODetails?.ioMVNAV,
+        });
+       }
+      reset({
+        amount: IODetails?.ioMVNAV,
+      });
+    }, [IODetails, id]);
   
     const handleCalculate = async (id, data) => {
       try {
diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/ViewDistributionInvestor.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/ViewDistributionInvestor.jsx
index 6df053a..5f004a9 100644
--- a/src/Pages/IO_Management/CreateIO/IOTransaction/ViewDistributionInvestor.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOTransaction/ViewDistributionInvestor.jsx
@@ -72,9 +72,14 @@ const ViewDistributionInvestor = ({ isOpen, onClose,id:exitId }) => {
 
   useEffect(() => {
     console.log("hiit     useEffectc");
-    handleCalculate(id, {
-      amount: IODetails?.ioMVNAV,
-    });
+    // handleCalculate(id, {
+    //   amount: IODetails?.ioMVNAV,
+    // });
+    if (id) {
+      handleCalculate(id, {
+        amount: IODetails?.ioMVNAV,
+      });
+     }
     reset({
       amount: IODetails?.ioMVNAV,
     });
diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/ViewExit.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/ViewExit.jsx
index 1bb0b6a..ff18691 100644
--- a/src/Pages/IO_Management/CreateIO/IOTransaction/ViewExit.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOTransaction/ViewExit.jsx
@@ -76,18 +76,21 @@ import RequestRejectModal from "./RequestRejectModal";
       resolver: yupResolver(),
     });
   
-    // useEffect(() => {
-    //   console.log("hiit     useEffectc");
-    //   handleCalculate(id, {
-    //     amount: IODetails?.ioMVNAV,
-    //   });
-    //   reset({
-    //     amount: IODetails?.ioMVNAV,
-    //   });
-    // }, [IODetails, id]);
+    useEffect(() => {
+      console.log("hiit     useEffectc");
+     if (id) {
+      handleCalculate(id, {
+        amount: IODetails?.ioMVNAV,
+      });
+     }
+      reset({
+        amount: IODetails?.ioMVNAV,
+      });
+    }, [IODetails, id]);
   
     const handleCalculate = async (id, data) => {
       try {
+        
         const res = await getDistributionInvestment({ id, data });
         console.log(res?.data?.data);
   
diff --git a/src/Pages/IO_Management/ViewIO/ViewIOdata.jsx b/src/Pages/IO_Management/ViewIO/ViewIOdata.jsx
index cb3a6d1..5b68c9b 100644
--- a/src/Pages/IO_Management/ViewIO/ViewIOdata.jsx
+++ b/src/Pages/IO_Management/ViewIO/ViewIOdata.jsx
@@ -40,6 +40,7 @@ import Destribution from "../CreateIO/Destribution";
 import IOCashDetails from "../CreateIO/IOCashDetails/IOCashDetails";
 import IONAVDetails from "../CreateIO/IONAVDetails/IONAVDetails";
 import IOTransaction from "../CreateIO/IOTransaction/IOTransaction";
+import { GoDotFill } from "react-icons/go";
 
 const ViewIOdata = () => {
   const params = useParams();
@@ -74,6 +75,10 @@ const ViewIOdata = () => {
     // { label: "Distribution to Investors", content: <UnderConstruction h={'75vh'}  />  },
   ];
 
+  
+  console.log(IODetails?.ioNAVHistory);
+  
+
   return (
     <Box
       {...OPACITY_ON_LOAD}
@@ -125,8 +130,11 @@ const ViewIOdata = () => {
                   borderBottom: "2px solid #38a169",
                 }}
                 fontWeight={500}
+                position={"relative"}
               >
-                {label}
+                {label} {index === 5 &&IODetails?.ioCashStatusHistory?.Pending?.length !== 0||
+                  index === 6  && IODetails?.ioNAVStatusHistory?.Pending?.length !== 0 ||
+                  index === 8 && IODetails?.ioTransactionRecords?.Pending?.length !== 0 ? <Box as="span" right={0} color={"forestGreen"} top={1} position={"absolute"}><GoDotFill /></Box>:""}
               </Tab>
             ))}
           </Box>

From 526d2aecca0f513dd9aac0fe7b72d122264da8a5 Mon Sep 17 00:00:00 2001
From: YasinShaikh123 <123150391+YasinShaikh123@users.noreply.github.com>
Date: Fri, 22 Nov 2024 19:57:05 +0530
Subject: [PATCH 06/12] modal api useEffect

---
 src/Pages/IO_Management/CreateIO/IOTransaction/ViewCancel.jsx   | 2 +-
 .../CreateIO/IOTransaction/ViewDistributionInvestor.jsx         | 2 +-
 src/Pages/IO_Management/CreateIO/IOTransaction/ViewExit.jsx     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/ViewCancel.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/ViewCancel.jsx
index 8ae7157..b4ee8ca 100644
--- a/src/Pages/IO_Management/CreateIO/IOTransaction/ViewCancel.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOTransaction/ViewCancel.jsx
@@ -88,7 +88,7 @@ import RequestRejectModal from "./RequestRejectModal";
   
     useEffect(() => {
       console.log("hiit     useEffectc");
-      if (id) {
+      if (id && IODetails) {
         handleCalculate(id, {
           amount: IODetails?.ioMVNAV,
         });
diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/ViewDistributionInvestor.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/ViewDistributionInvestor.jsx
index 5f004a9..b0ec1d3 100644
--- a/src/Pages/IO_Management/CreateIO/IOTransaction/ViewDistributionInvestor.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOTransaction/ViewDistributionInvestor.jsx
@@ -75,7 +75,7 @@ const ViewDistributionInvestor = ({ isOpen, onClose,id:exitId }) => {
     // handleCalculate(id, {
     //   amount: IODetails?.ioMVNAV,
     // });
-    if (id) {
+    if (id && IODetails) {
       handleCalculate(id, {
         amount: IODetails?.ioMVNAV,
       });
diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/ViewExit.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/ViewExit.jsx
index ff18691..a14168a 100644
--- a/src/Pages/IO_Management/CreateIO/IOTransaction/ViewExit.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOTransaction/ViewExit.jsx
@@ -78,7 +78,7 @@ import RequestRejectModal from "./RequestRejectModal";
   
     useEffect(() => {
       console.log("hiit     useEffectc");
-     if (id) {
+     if (id && IODetails) {
       handleCalculate(id, {
         amount: IODetails?.ioMVNAV,
       });

From 3db9488444b4f61de42e587a3d622fb057188e65 Mon Sep 17 00:00:00 2001
From: Swapnil Bendal <84583651+Swapnil155@users.noreply.github.com>
Date: Fri, 22 Nov 2024 20:25:21 +0530
Subject: [PATCH 07/12] [update] - counter in pending tab

---
 .../CreateIO/IOCashDetails/IOCashDetails.jsx  | 137 +++++++++---------
 .../CreateIO/IONAVDetails/IONAVDetails.jsx    |   8 +
 .../CreateIO/IOTransaction/IOTransaction.jsx  |  14 +-
 3 files changed, 92 insertions(+), 67 deletions(-)

diff --git a/src/Pages/IO_Management/CreateIO/IOCashDetails/IOCashDetails.jsx b/src/Pages/IO_Management/CreateIO/IOCashDetails/IOCashDetails.jsx
index e2910fe..1b2fff1 100644
--- a/src/Pages/IO_Management/CreateIO/IOCashDetails/IOCashDetails.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOCashDetails/IOCashDetails.jsx
@@ -1,4 +1,5 @@
 import {
+  Badge,
   Box,
   Button,
   Tab,
@@ -24,7 +25,7 @@ const IOCashDetails = () => {
   const params = useParams();
   const toast = useToast();
   const id = params?.id;
-  const { IODetails} = useContext(GlobalStateContext);
+  const { IODetails } = useContext(GlobalStateContext);
   const { isOpen, onOpen, onClose } = useDisclosure();
   const firstField = useRef();
 
@@ -32,8 +33,6 @@ const IOCashDetails = () => {
   const [activeTab, setActiveTab] = useState(0);
 
   const handleAdd = async () => {
-    
-    
     try {
       const res = await updateIOCase(id);
       if (res?.data) {
@@ -57,70 +56,78 @@ const IOCashDetails = () => {
 
   return (
     <Box>
-    <Tabs index={activeTab} onChange={(index) => setActiveTab(index)} variant='unstyled'>
-      <Box
-        display={"flex"}
-        justifyContent={"space-between"}
-        alignItems={"center"}
-        borderBottom={"1px solid #ccc"}
+      <Tabs
+        index={activeTab}
+        onChange={(index) => setActiveTab(index)}
+        variant="unstyled"
       >
-        <TabList>
-          <Tab
-            fontSize={"sm"}
-            _selected={{
-              color: "#004118",
-              borderBottom: "2px solid #38a169",
-            }}
-          >
-            Approved
-          </Tab>
-          <Tab
-            fontSize={"sm"}
-            _selected={{
-              color: "#004118",
-              borderBottom: "2px solid #38a169",
-            }}
-          >
-            Pending
-          </Tab>
-          <Tab
-            fontSize={"sm"}
-            _selected={{
-              color: "#004118",
-              borderBottom: "2px solid #38a169",
-            }}
-          >
-            Rejected
-          </Tab>
-        </TabList>
-        {IODetails?.isInvestedAmount ? (
-        localStorage?.getItem('role') ==="Maker" && 
-        <Button
-          onClick={handleAdd}
-          leftIcon={<AddIcon />}
-          colorScheme="forestGreen"
-          size={"sm"}
-          rounded={"sm"}
-          fontSize={"xs"}
+        <Box
+          display={"flex"}
+          justifyContent={"space-between"}
+          alignItems={"center"}
+          borderBottom={"1px solid #ccc"}
         >
-          Add
-        </Button>
-         ) : null} 
-      </Box>
-      <TabPanels>
-        <TabPanel>
-          <Approved />
-        </TabPanel>
-        <TabPanel>
-          <Pending />
-        </TabPanel>
-        <TabPanel>
-          <Rejected />
-        </TabPanel>
-      </TabPanels>
-    </Tabs>
-    <AddCaseDetails
-    setActiveTab={setActiveTab}
+          <TabList>
+            <Tab
+              fontSize={"sm"}
+              _selected={{
+                color: "#004118",
+                borderBottom: "2px solid #38a169",
+              }}
+            >
+              Approved
+            </Tab>
+            <Tab
+              fontSize={"sm"}
+              _selected={{
+                color: "#004118",
+                borderBottom: "2px solid #38a169",
+              }}
+            >
+              Pending{" "}
+              <Badge rounded={"sm"} colorScheme="forestGreen" ms={2}>
+                {IODetails?.ioCashStatusHistory?.Pending.length || 0}
+              </Badge>
+            </Tab>
+            <Tab
+              fontSize={"sm"}
+              _selected={{
+                color: "#004118",
+                borderBottom: "2px solid #38a169",
+              }}
+            >
+              Rejected
+            </Tab>
+          </TabList>
+          {IODetails?.isInvestedAmount
+            ? localStorage?.getItem("role") === "Maker" && (
+                <Button
+                  onClick={handleAdd}
+                  leftIcon={<AddIcon />}
+                  colorScheme="forestGreen"
+                  size={"sm"}
+                  rounded={"sm"}
+                  fontSize={"xs"}
+                >
+                  Add
+                </Button>
+              )
+            : null}
+        </Box>
+        <TabPanels>
+          <TabPanel>
+            <Approved />
+          </TabPanel>
+          <TabPanel>
+            <Pending />
+          </TabPanel>
+          <TabPanel>
+            <Rejected />
+          </TabPanel>
+        </TabPanels>
+      </Tabs>
+      <AddCaseDetails
+        setActiveTab={setActiveTab}
         isOpen={isOpen}
         onClose={onClose}
         firstField={firstField}
diff --git a/src/Pages/IO_Management/CreateIO/IONAVDetails/IONAVDetails.jsx b/src/Pages/IO_Management/CreateIO/IONAVDetails/IONAVDetails.jsx
index 03cf067..b2d8959 100644
--- a/src/Pages/IO_Management/CreateIO/IONAVDetails/IONAVDetails.jsx
+++ b/src/Pages/IO_Management/CreateIO/IONAVDetails/IONAVDetails.jsx
@@ -54,6 +54,7 @@
 // export default IONAVDetails;
 
 import {
+  Badge,
   Box,
   Button,
   Tab,
@@ -134,6 +135,13 @@ const IONAVDetails = () => {
               }}
             >
               Pending
+              <Badge
+                rounded={"sm"}
+                colorScheme="forestGreen"
+                ms={2}
+              >
+                {IODetails?.ioNAVStatusHistory?.Pending.length || 0}
+              </Badge>
             </Tab>
             <Tab
               fontSize={"sm"}
diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/IOTransaction.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/IOTransaction.jsx
index 7ac057d..5b195ff 100644
--- a/src/Pages/IO_Management/CreateIO/IOTransaction/IOTransaction.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOTransaction/IOTransaction.jsx
@@ -1,10 +1,13 @@
-import { Tab, TabList, TabPanel, TabPanels, Tabs } from "@chakra-ui/react";
-import React from "react";
+import { Badge, Tab, TabList, TabPanel, TabPanels, Tabs } from "@chakra-ui/react";
+import React, { useContext } from "react";
 import Approved from "./Approved";
 import Pending from "./Pending";
 import Rejected from "./Rejected";
+import GlobalStateContext from "../../../../Contexts/GlobalStateContext";
 
 const IOTransaction = () => {
+  
+  const { IODetails } = useContext(GlobalStateContext);
   return (
     <Tabs>
       <TabList>
@@ -25,6 +28,13 @@ const IOTransaction = () => {
           }}
         >
           Pending
+          <Badge
+                rounded={"sm"}
+                colorScheme="forestGreen"
+                ms={2}
+              >
+                {IODetails?.ioTransactionRecords?.Pending.length || 0}
+              </Badge>
         </Tab>
         <Tab
           fontSize={"sm"}

From 0c21e997322406cf1c11007dc1a94ca3ff25e0eb Mon Sep 17 00:00:00 2001
From: YasinShaikh123 <123150391+YasinShaikh123@users.noreply.github.com>
Date: Mon, 25 Nov 2024 16:41:19 +0530
Subject: [PATCH 08/12] update comment changes

---
 .../CreateIO/IOArtifactsVideo.jsx             |  4 +-
 .../IOCashDetails/RequestApproveModal.jsx     | 14 +--
 .../IOCashDetails/RequestRejectModal.jsx      | 10 ++-
 .../IONAVDetails/RequestApproveModal.jsx      | 14 +--
 .../IONAVDetails/RequestRejectModal.jsx       | 10 ++-
 .../ApproveDistrubationModal.jsx              | 14 +--
 .../IOTransaction/ApproveInvestedModal.jsx    | 14 +--
 .../ApprovedCancelTransaction.jsx             | 10 +--
 .../CreateIO/IOTransaction/ApprovedExit.jsx   | 12 +--
 .../IOTransaction/RequestApproveModal.jsx     | 14 +--
 .../IOTransaction/RequestExitApproveModal.jsx | 14 +--
 .../IOTransaction/RequestRejectModal.jsx      |  9 +-
 .../IO_Management/CreateIO/Investors.jsx      |  4 +-
 src/Pages/IO_Management/ViewIO/ViewIOdata.jsx | 85 ++++++++++++++++---
 .../IO_Management/ViewIO/ViewIOdetails.jsx    | 36 ++++----
 .../DrawalRequest/DrawalRequestApprove.jsx    | 10 ++-
 .../DrawalRequest/DrawalRequestReject.jsx     | 12 ++-
 17 files changed, 193 insertions(+), 93 deletions(-)

diff --git a/src/Pages/IO_Management/CreateIO/IOArtifactsVideo.jsx b/src/Pages/IO_Management/CreateIO/IOArtifactsVideo.jsx
index 535f7a7..c9b71a7 100644
--- a/src/Pages/IO_Management/CreateIO/IOArtifactsVideo.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOArtifactsVideo.jsx
@@ -152,7 +152,7 @@ const IOArtifactsAdd = ({ isOpen, onClose, firstField, actionId, setActionId, da
 
           <DrawerBody>
             <Stack spacing={4}>
-              <FormControl isInvalid={errors.artifactName}>
+              <FormControl isInvalid={errors.artifactName} isRequired>
                 <FormLabel fontSize={"sm"}>Artifact Name</FormLabel>
                 <Controller
                   name="artifactName"
@@ -166,7 +166,7 @@ const IOArtifactsAdd = ({ isOpen, onClose, firstField, actionId, setActionId, da
                 </FormErrorMessage>
               </FormControl>
 
-              <FormControl isInvalid={errors.artifactStreamingURL}>
+              <FormControl isInvalid={errors.artifactStreamingURL} isRequired>
                 <FormLabel fontSize={"sm"}>Artifact Streaming URL</FormLabel>
                 <Controller
                   name="artifactStreamingURL"
diff --git a/src/Pages/IO_Management/CreateIO/IOCashDetails/RequestApproveModal.jsx b/src/Pages/IO_Management/CreateIO/IOCashDetails/RequestApproveModal.jsx
index 1acc243..a737d08 100644
--- a/src/Pages/IO_Management/CreateIO/IOCashDetails/RequestApproveModal.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOCashDetails/RequestApproveModal.jsx
@@ -25,9 +25,9 @@ import ToastBox from "../../../../Components/ToastBox";
 import { useApproveIOCaseMutation } from "../../../../Services/io.service";
 
 export const conformModalSchema = yup.object().shape({
-  // checkerComment: yup.string().required("Comment is required")
+  // comments: yup.string().required("Comment is required")
   // .max(50, "Investment name cannot be more than 50 characters"),
-  checkerComment: yup
+  comments: yup
   .string()
   .required("Comment is required")
   .max(200, "Approve Comment cannot be more than 200 characters"),
@@ -124,8 +124,8 @@ const RequestApproveModal = ({ isOpen, onClose, firstField ,id}) => {
               <Textarea
                 rows={6}
                 focusBorderColor="green.400"
-                name="checkerComment"
-                {...register("checkerComment")}
+                name="comments"
+                {...register("comments")}
                 fontSize="sm"
                 type="textarea"
                 size="md"
@@ -134,14 +134,14 @@ const RequestApproveModal = ({ isOpen, onClose, firstField ,id}) => {
                 resize={"none"}
                 maxLength={200}
               />
-              {errors.checkerComment && (
+              {errors.comments && (
                 <Text fontSize="xs" color="red">
-                  {errors.checkerComment.message}
+                  {errors.comments.message}
                 </Text>
               )}
               <FormHelperText fontSize="xs" color="gray.500">
                 <Box as="span" me={1}>Maximum length should be 200 characters. You have entered </Box>
-                 {watch("checkerComment")?.length || 0} characters.
+                 {watch("comments")?.length || 0} characters.
               </FormHelperText>
             </FormControl>
           </ModalBody>
diff --git a/src/Pages/IO_Management/CreateIO/IOCashDetails/RequestRejectModal.jsx b/src/Pages/IO_Management/CreateIO/IOCashDetails/RequestRejectModal.jsx
index 3a44d26..9e48976 100644
--- a/src/Pages/IO_Management/CreateIO/IOCashDetails/RequestRejectModal.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOCashDetails/RequestRejectModal.jsx
@@ -2,6 +2,7 @@ import {
   Box,
   Button,
   FormControl,
+  FormHelperText,
   FormLabel,
   Input,
   Modal,
@@ -24,7 +25,8 @@ import ToastBox from "../../../../Components/ToastBox";
 import { useRejectIOCaseMutation } from "../../../../Services/io.service";
 
 export const conformModalSchema = yup.object().shape({
-  comments: yup.string().required("Comment is required"),
+  comments: yup.string().required("Comment is required")
+  .max(200, "Approve Comment cannot be more than 200 characters"),
 });
 
 const RequestRejectModal = ({ isOpen, onClose, firstField ,id}) => {
@@ -35,6 +37,7 @@ const RequestRejectModal = ({ isOpen, onClose, firstField ,id}) => {
   const {
     register,
     reset,
+    watch,
     handleSubmit,
     formState: { errors },
   } = useForm({
@@ -125,12 +128,17 @@ const RequestRejectModal = ({ isOpen, onClose, firstField ,id}) => {
                 placeholder={"Enter your comments...."}
                 rounded={"md"}
                 resize={"none"}
+                maxLength={200}
               />
               {errors.comments && (
                 <Text fontSize="xs" color="red">
                   {errors.comments.message}
                 </Text>
               )}
+              <FormHelperText fontSize="xs" color="gray.500">
+                <Box as="span" me={1}>Maximum length should be 200 characters. You have entered </Box>
+                 {watch("comments")?.length || 0} characters.
+              </FormHelperText>
             </FormControl>
           </ModalBody>
           <ModalFooter>
diff --git a/src/Pages/IO_Management/CreateIO/IONAVDetails/RequestApproveModal.jsx b/src/Pages/IO_Management/CreateIO/IONAVDetails/RequestApproveModal.jsx
index 13b37ea..4d1a439 100644
--- a/src/Pages/IO_Management/CreateIO/IONAVDetails/RequestApproveModal.jsx
+++ b/src/Pages/IO_Management/CreateIO/IONAVDetails/RequestApproveModal.jsx
@@ -25,9 +25,9 @@ import ToastBox from "../../../../Components/ToastBox";
 import { useApproveIOCaseMutation, useApproveIONavMutation } from "../../../../Services/io.service";
 
 export const conformModalSchema = yup.object().shape({
-  // checkerComment: yup.string().required("Comment is required")
+  // comments: yup.string().required("Comment is required")
   // .max(50, "Investment name cannot be more than 50 characters"),
-  checkerComment: yup
+  comments: yup
   .string()
   .required("Comment is required")
   .max(200, "Approve Comment cannot be more than 200 characters"),
@@ -124,8 +124,8 @@ const RequestApproveModal = ({ isOpen, onClose, firstField ,id}) => {
               <Textarea
                 rows={6}
                 focusBorderColor="green.400"
-                name="checkerComment"
-                {...register("checkerComment")}
+                name="comments"
+                {...register("comments")}
                 fontSize="sm"
                 type="textarea"
                 size="md"
@@ -134,14 +134,14 @@ const RequestApproveModal = ({ isOpen, onClose, firstField ,id}) => {
                 resize={"none"}
                 maxLength={200}
               />
-              {errors.checkerComment && (
+              {errors.comments && (
                 <Text fontSize="xs" color="red">
-                  {errors.checkerComment.message}
+                  {errors.comments.message}
                 </Text>
               )}
               <FormHelperText fontSize="xs" color="gray.500">
               <Box as="span" me={1}>Maximum length should be 200 characters. You have entered</Box>
-                {watch("checkerComment")?.length || 0} characters.
+                {watch("comments")?.length || 0} characters.
               </FormHelperText>
             </FormControl>
           </ModalBody>
diff --git a/src/Pages/IO_Management/CreateIO/IONAVDetails/RequestRejectModal.jsx b/src/Pages/IO_Management/CreateIO/IONAVDetails/RequestRejectModal.jsx
index 3a44d26..9e48976 100644
--- a/src/Pages/IO_Management/CreateIO/IONAVDetails/RequestRejectModal.jsx
+++ b/src/Pages/IO_Management/CreateIO/IONAVDetails/RequestRejectModal.jsx
@@ -2,6 +2,7 @@ import {
   Box,
   Button,
   FormControl,
+  FormHelperText,
   FormLabel,
   Input,
   Modal,
@@ -24,7 +25,8 @@ import ToastBox from "../../../../Components/ToastBox";
 import { useRejectIOCaseMutation } from "../../../../Services/io.service";
 
 export const conformModalSchema = yup.object().shape({
-  comments: yup.string().required("Comment is required"),
+  comments: yup.string().required("Comment is required")
+  .max(200, "Approve Comment cannot be more than 200 characters"),
 });
 
 const RequestRejectModal = ({ isOpen, onClose, firstField ,id}) => {
@@ -35,6 +37,7 @@ const RequestRejectModal = ({ isOpen, onClose, firstField ,id}) => {
   const {
     register,
     reset,
+    watch,
     handleSubmit,
     formState: { errors },
   } = useForm({
@@ -125,12 +128,17 @@ const RequestRejectModal = ({ isOpen, onClose, firstField ,id}) => {
                 placeholder={"Enter your comments...."}
                 rounded={"md"}
                 resize={"none"}
+                maxLength={200}
               />
               {errors.comments && (
                 <Text fontSize="xs" color="red">
                   {errors.comments.message}
                 </Text>
               )}
+              <FormHelperText fontSize="xs" color="gray.500">
+                <Box as="span" me={1}>Maximum length should be 200 characters. You have entered </Box>
+                 {watch("comments")?.length || 0} characters.
+              </FormHelperText>
             </FormControl>
           </ModalBody>
           <ModalFooter>
diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/ApproveDistrubationModal.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/ApproveDistrubationModal.jsx
index 4fb5ba8..1ce7964 100644
--- a/src/Pages/IO_Management/CreateIO/IOTransaction/ApproveDistrubationModal.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOTransaction/ApproveDistrubationModal.jsx
@@ -25,9 +25,9 @@ import {
   import { useApproveDistributedMutation } from "../../../../Services/io.service";
   
   export const conformModalSchema = yup.object().shape({
-    // checkerComment: yup.string().required("Comment is required")
+    // comments: yup.string().required("Comment is required")
     // .max(50, "Investment name cannot be more than 50 characters"),
-    checkerComment: yup
+    comments: yup
     .string()
     .required("Comment is required")
     .max(200, "Approve Comment cannot be more than 200 characters"),
@@ -126,8 +126,8 @@ import {
                 <Textarea
                   rows={6}
                   focusBorderColor="green.400"
-                  name="checkerComment"
-                  {...register("checkerComment")}
+                  name="comments"
+                  {...register("comments")}
                   fontSize="sm"
                   type="textarea"
                   size="md"
@@ -136,14 +136,14 @@ import {
                   resize={"none"}
                   maxLength={200}
                 />
-                {errors.checkerComment && (
+                {errors.comments && (
                   <Text fontSize="xs" color="red">
-                    {errors.checkerComment.message}
+                    {errors.comments.message}
                   </Text>
                 )}
                 <FormHelperText fontSize="xs" color="gray.500">
                 <Box as="span" me={1}> Maximum length should be 200 characters. You have entered</Box>
-                  {watch("checkerComment")?.length || 0} characters.
+                  {watch("comments")?.length || 0} characters.
                 </FormHelperText>
               </FormControl>
             </ModalBody>
diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/ApproveInvestedModal.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/ApproveInvestedModal.jsx
index b1bd5de..ff29faf 100644
--- a/src/Pages/IO_Management/CreateIO/IOTransaction/ApproveInvestedModal.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOTransaction/ApproveInvestedModal.jsx
@@ -25,9 +25,9 @@ import {
   import { useApproveInvestedMutation } from "../../../../Services/io.service";
   
   export const conformModalSchema = yup.object().shape({
-    // checkerComment: yup.string().required("Comment is required")
+    // comments: yup.string().required("Comment is required")
     // .max(50, "Investment name cannot be more than 50 characters"),
-    checkerComment: yup
+    comments: yup
     .string()
     .required("Comment is required")
     .max(200, "Approve Comment cannot be more than 200 characters"),
@@ -124,8 +124,8 @@ import {
                 <Textarea
                   rows={6}
                   focusBorderColor="green.400"
-                  name="checkerComment"
-                  {...register("checkerComment")}
+                  name="comments"
+                  {...register("comments")}
                   fontSize="sm"
                   type="textarea"
                   size="md"
@@ -134,14 +134,14 @@ import {
                   resize={"none"}
                   maxLength={200}
                 />
-                {errors.checkerComment && (
+                {errors.comments && (
                   <Text fontSize="xs" color="red">
-                    {errors.checkerComment.message}
+                    {errors.comments.message}
                   </Text>
                 )}
                 <FormHelperText fontSize="xs" color="gray.500">
                 <Box as="span" me={1}>Maximum length should be 200 characters. You have entered</Box>
-                  {watch("checkerComment")?.length || 0} characters.
+                  {watch("comments")?.length || 0} characters.
                 </FormHelperText>
               </FormControl>
             </ModalBody>
diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/ApprovedCancelTransaction.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/ApprovedCancelTransaction.jsx
index 596c62b..9c0e86f 100644
--- a/src/Pages/IO_Management/CreateIO/IOTransaction/ApprovedCancelTransaction.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOTransaction/ApprovedCancelTransaction.jsx
@@ -108,8 +108,8 @@ import {
                 <Textarea
                   rows={6}
                   focusBorderColor="green.400"
-                  name="checkerComment"
-                  {...register("checkerComment")}
+                  name="comments"
+                  {...register("comments")}
                   fontSize="sm"
                   type="textarea"
                   size="md"
@@ -118,14 +118,14 @@ import {
                   resize={"none"}
                   maxLength={200}
                 />
-                {errors.checkerComment && (
+                {errors.comments && (
                   <Text fontSize="xs" color="red">
-                    {errors.checkerComment.message}
+                    {errors.comments.message}
                   </Text>
                 )}
                 <FormHelperText fontSize="xs" color="gray.500">
                   <Box as="span" me={1}>Maximum length should be 200 characters. You have entered</Box>
-                  {watch("checkerComment")?.length || 0} characters.
+                  {watch("comments")?.length || 0} characters.
                 </FormHelperText>
               </FormControl>
             </ModalBody>
diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/ApprovedExit.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/ApprovedExit.jsx
index 977fc3f..d2506bd 100644
--- a/src/Pages/IO_Management/CreateIO/IOTransaction/ApprovedExit.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOTransaction/ApprovedExit.jsx
@@ -24,7 +24,7 @@ import {
   import {  useApproveExitTransactionMutation } from "../../../../Services/io.service";
   
   export const conformModalSchema = yup.object().shape({
-    checkerComment: yup
+    comments: yup
     .string()
     .required("Comment is required")
     .max(200, "Approve Comment cannot be more than 200 characters"),
@@ -122,8 +122,8 @@ import {
                 <Textarea
                   rows={6}
                   focusBorderColor="green.400"
-                  name="checkerComment"
-                  {...register("checkerComment")}
+                  name="comments"
+                  {...register("comments")}
                   fontSize="sm"
                   type="textarea"
                   size="md"
@@ -132,14 +132,14 @@ import {
                   resize={"none"}
                   maxLength={200}
                 />
-                {errors.checkerComment && (
+                {errors.comments && (
                   <Text fontSize="xs" color="red">
-                    {errors.checkerComment.message}
+                    {errors.comments.message}
                   </Text>
                 )}
                 <FormHelperText fontSize="xs" color="gray.500">
                  <Box as="span" me={1}>Maximum length should be 200 characters. You have entered</Box>
-                  {watch("checkerComment")?.length || 0} characters.
+                  {watch("comments")?.length || 0} characters.
                 </FormHelperText>
               </FormControl>
             </ModalBody>
diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/RequestApproveModal.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/RequestApproveModal.jsx
index 3a1bd92..1eae102 100644
--- a/src/Pages/IO_Management/CreateIO/IOTransaction/RequestApproveModal.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOTransaction/RequestApproveModal.jsx
@@ -25,9 +25,9 @@ import ToastBox from "../../../../Components/ToastBox";
 import { useApproveDistributionMutation, useApproveIOCaseMutation, useApproveIONavMutation } from "../../../../Services/io.service";
 
 export const conformModalSchema = yup.object().shape({
-  // checkerComment: yup.string().required("Comment is required")
+  // comments: yup.string().required("Comment is required")
   // .max(50, "Investment name cannot be more than 50 characters"),
-  checkerComment: yup
+  comments: yup
   .string()
   .required("Comment is required")
   .max(200, "Approve Comment cannot be more than 200 characters"),
@@ -123,8 +123,8 @@ const RequestApproveModal = ({ isOpen, onClose, firstField ,id}) => {
               <Textarea
                 rows={6}
                 focusBorderColor="green.400"
-                name="checkerComment"
-                {...register("checkerComment")}
+                name="comments"
+                {...register("comments")}
                 fontSize="sm"
                 type="textarea"
                 size="md"
@@ -133,14 +133,14 @@ const RequestApproveModal = ({ isOpen, onClose, firstField ,id}) => {
                 resize={"none"}
                 maxLength={200}
               />
-              {errors.checkerComment && (
+              {errors.comments && (
                 <Text fontSize="xs" color="red">
-                  {errors.checkerComment.message}
+                  {errors.comments.message}
                 </Text>
               )}
               <FormHelperText fontSize="xs" color="gray.500">
               <Box as="span" me={1}>Maximum length should be 200 characters. You have entered</Box>
-                {watch("checkerComment")?.length || 0} characters.
+                {watch("comments")?.length || 0} characters.
               </FormHelperText>
             </FormControl>
           </ModalBody>
diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/RequestExitApproveModal.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/RequestExitApproveModal.jsx
index e6c4b5f..a5a16a5 100644
--- a/src/Pages/IO_Management/CreateIO/IOTransaction/RequestExitApproveModal.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOTransaction/RequestExitApproveModal.jsx
@@ -25,9 +25,9 @@ import {
   import { useApproveDistributionMutation, useApproveExitMutation, useApproveIOCaseMutation, useApproveIONavMutation } from "../../../../Services/io.service";
   
   export const conformModalSchema = yup.object().shape({
-    // checkerComment: yup.string().required("Comment is required")
+    // comments: yup.string().required("Comment is required")
     // .max(50, "Investment name cannot be more than 50 characters"),
-    checkerComment: yup
+    comments: yup
     .string()
     .required("Comment is required")
     .max(200, "Approve Comment cannot be more than 200 characters"),
@@ -123,8 +123,8 @@ import {
                 <Textarea
                   rows={6}
                   focusBorderColor="green.400"
-                  name="checkerComment"
-                  {...register("checkerComment")}
+                  name="comments"
+                  {...register("comments")}
                   fontSize="sm"
                   type="textarea"
                   size="md"
@@ -133,14 +133,14 @@ import {
                   resize={"none"}
                   maxLength={200}
                 />
-                {errors.checkerComment && (
+                {errors.comments && (
                   <Text fontSize="xs" color="red">
-                    {errors.checkerComment.message}
+                    {errors.comments.message}
                   </Text>
                 )}
                 <FormHelperText fontSize="xs" color="gray.500">
                 <Box as="span" me={1}>Maximum length should be 200 characters. You have entered</Box>
-                  {watch("checkerComment")?.length || 0} characters.
+                  {watch("comments")?.length || 0} characters.
                 </FormHelperText>
               </FormControl>
             </ModalBody>
diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/RequestRejectModal.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/RequestRejectModal.jsx
index d4631f4..3e1660d 100644
--- a/src/Pages/IO_Management/CreateIO/IOTransaction/RequestRejectModal.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOTransaction/RequestRejectModal.jsx
@@ -2,6 +2,7 @@ import {
   Box,
   Button,
   FormControl,
+  FormHelperText,
   FormLabel,
   Input,
   Modal,
@@ -24,7 +25,8 @@ import ToastBox from "../../../../Components/ToastBox";
 import { useRejectIOCaseMutation } from "../../../../Services/io.service";
 
 export const conformModalSchema = yup.object().shape({
-  comments: yup.string().required("Comment is required"),
+  comments: yup.string().required("Comment is required")
+  .max(200, "Approve Comment cannot be more than 200 characters"),
 });
 
 const RequestRejectModal = ({ isOpen, onClose, firstField ,id, onBigModalClose}) => {
@@ -35,6 +37,7 @@ const RequestRejectModal = ({ isOpen, onClose, firstField ,id, onBigModalClose})
   const {
     register,
     reset,
+    watch,
     handleSubmit,
     formState: { errors },
   } = useForm({
@@ -136,6 +139,10 @@ const RequestRejectModal = ({ isOpen, onClose, firstField ,id, onBigModalClose})
                   {errors.comments.message}
                 </Text>
               )}
+              <FormHelperText fontSize="xs" color="gray.500">
+              <Box as="span" me={1}>Maximum length should be 200 characters. You have entered</Box>
+                {watch("comments")?.length || 0} characters.
+              </FormHelperText>
             </FormControl>
           </ModalBody>
           <ModalFooter>
diff --git a/src/Pages/IO_Management/CreateIO/Investors.jsx b/src/Pages/IO_Management/CreateIO/Investors.jsx
index 36f0955..35a6eff 100644
--- a/src/Pages/IO_Management/CreateIO/Investors.jsx
+++ b/src/Pages/IO_Management/CreateIO/Investors.jsx
@@ -508,7 +508,7 @@ console.log(IODetails?.investors);
             > 
               Export xls
             </Button>
-            <Box as="span">
+            {/* <Box as="span">
               <Icon
                 ms={0}
                 animation={
@@ -524,7 +524,7 @@ console.log(IODetails?.investors);
                 _hover={{ bg: "gray.100" }}
                 cursor={"pointer"}
               />
-            </Box>
+            </Box> */}
           </Box>
 
           <HStack
diff --git a/src/Pages/IO_Management/ViewIO/ViewIOdata.jsx b/src/Pages/IO_Management/ViewIO/ViewIOdata.jsx
index 5b68c9b..b44b695 100644
--- a/src/Pages/IO_Management/ViewIO/ViewIOdata.jsx
+++ b/src/Pages/IO_Management/ViewIO/ViewIOdata.jsx
@@ -1,7 +1,10 @@
 import {
   Box,
   Button,
+  Icon,
   Input,
+  keyframes,
+  Stack,
   Tab,
   TabList,
   TabPanel,
@@ -16,7 +19,7 @@ import { useContext, useEffect, useState } from "react";
 import FormInputView from "../../../Components/FormInputView";
 import { useForm } from "react-hook-form"; // assuming react-hook-form is used
 import { OPACITY_ON_LOAD } from "../../../Layout/animations";
-import { ArrowBackIcon } from "@chakra-ui/icons";
+import { ArrowBackIcon, RepeatIcon } from "@chakra-ui/icons";
 import CustomAlertDialog from "../../../Components/CustomAlertDialog";
 import ViewIOdataHeader from "./ViewIOdataHeader";
 import ViewIOdetails from "./ViewIOdetails";
@@ -42,20 +45,30 @@ import IONAVDetails from "../CreateIO/IONAVDetails/IONAVDetails";
 import IOTransaction from "../CreateIO/IOTransaction/IOTransaction";
 import { GoDotFill } from "react-icons/go";
 
+const rotate = keyframes`
+  from {
+    transform: rotate(0deg);
+  }
+  to {
+    transform: rotate(360deg);
+  }
+`;
+
 const ViewIOdata = () => {
   const params = useParams();
   const id = params?.id;
-  const { data, error, isLoading } = useGetIOprepopulateDataQuery();
+  const { data, error, isLoading, refetch } = useGetIOprepopulateDataQuery();
   const { isOpen, onOpen, onClose } = useDisclosure();
   const navigate = useNavigate();
   const [isEditing, setIsEditing] = useState(false);
+  const [isRefetchLoading, setIsRefetchLoading] = useState(false);
   const { IODetails, setIODetails } = useContext(GlobalStateContext);
-  console.log(IODetails?.isInvestedAmount); 
+  console.log(IODetails?.isInvestedAmount);
 
   const tabs = [
     { label: "IO Details", content: <ViewIOdetails data={data?.data} /> },
     {
-      label: "Investment documents", 
+      label: "Investment documents",
       content: <InvestmentDocument data={data?.data} />,
     },
     { label: "Key merits", content: <KeyMerits data={data?.data} /> },
@@ -75,9 +88,14 @@ const ViewIOdata = () => {
     // { label: "Distribution to Investors", content: <UnderConstruction h={'75vh'}  />  },
   ];
 
-  
+  const handleRefresh = async () => {
+    setIsRefetchLoading(true);
+
+    await refetch();
+    setIsRefetchLoading(false);
+  };
+
   console.log(IODetails?.ioNAVHistory);
-  
 
   return (
     <Box
@@ -99,7 +117,7 @@ const ViewIOdata = () => {
 
       <Tabs mt={4}>
         <TabList justifyContent={"space-between"} pe={4} alignItems={"center"}>
-          <Box display={"flex"}>
+          <Box display={"flex"} position={"relative"} w={"100%"}>
             {tabs.map(({ label }, index) => (
               <Tab
                 px={3}
@@ -113,7 +131,6 @@ const ViewIOdata = () => {
                     ? false
                     : !IODetails?.isInvestedAmount
                 }
-                
                 // isDisabled={
                 //   index === 0 ||
                 //   index === 1 ||
@@ -132,11 +149,57 @@ const ViewIOdata = () => {
                 fontWeight={500}
                 position={"relative"}
               >
-                {label} {index === 5 &&IODetails?.ioCashStatusHistory?.Pending?.length !== 0||
-                  index === 6  && IODetails?.ioNAVStatusHistory?.Pending?.length !== 0 ||
-                  index === 8 && IODetails?.ioTransactionRecords?.Pending?.length !== 0 ? <Box as="span" right={0} color={"forestGreen"} top={1} position={"absolute"}><GoDotFill /></Box>:""}
+                {label}{" "}
+                {(index === 5 &&
+                  IODetails?.ioCashStatusHistory?.Pending?.length !== 0) ||
+                (index === 6 &&
+                  IODetails?.ioNAVStatusHistory?.Pending?.length !== 0) ||
+                (index === 8 &&
+                  IODetails?.ioTransactionRecords?.Pending?.length !== 0) ? (
+                  <Box
+                    as="span"
+                    right={0}
+                    color={"forestGreen"}
+                    top={1}
+                    position={"absolute"}
+                  >
+                    <GoDotFill />
+                  </Box>
+                ) : (
+                  ""
+                )}
               </Tab>
             ))}
+            {/* <Box as="span" position={"absolute"} right={2} bottom={1}>
+              <Icon
+                ms={0}
+                animation={
+                  isRefetchLoading ? `${rotate} 1s linear infinite` : "none"
+                }
+                bg={"gray.50"}
+                onClick={handleRefresh}
+                fontWeight={600}
+                as={RepeatIcon}
+                boxSize={8}
+                p={2}
+                rounded={"full"}
+                _hover={{ bg: "gray.100" }}
+                cursor={"pointer"}
+              />
+            </Box> */}
+            <Stack position={"absolute"} right={2} bottom={1} direction="row" spacing={4}>
+              <Button
+                isLoading={isRefetchLoading}
+                loadingText="Refresh"
+                colorScheme="forestGreen"
+                variant="solid"
+                size={'xs'}
+                onClick={handleRefresh}
+                fontWeight={400}
+              >
+                Refresh
+              </Button>
+            </Stack>
           </Box>
         </TabList>
         <TabPanels>
diff --git a/src/Pages/IO_Management/ViewIO/ViewIOdetails.jsx b/src/Pages/IO_Management/ViewIO/ViewIOdetails.jsx
index bd2d3f8..6c837be 100644
--- a/src/Pages/IO_Management/ViewIO/ViewIOdetails.jsx
+++ b/src/Pages/IO_Management/ViewIO/ViewIOdetails.jsx
@@ -1,4 +1,4 @@
-import { Box, Button } from "@chakra-ui/react";
+import { Box, Button, Text } from "@chakra-ui/react";
 import React, { useContext, useEffect } from "react";
 
 import { useNavigate, useParams } from "react-router-dom";
@@ -240,11 +240,6 @@ const ViewIOdetails = () => {
       width: "32.3%",
       value: IObyID?.data?.isShariah,
     },
-
-
-
-
-
     {
       label: "Investment Type",
       placeHolder: "Select option",
@@ -351,19 +346,22 @@ const ViewIOdetails = () => {
 
   return (
     <Box position={"relative"}>
-      <Button
-        position={"absolute"}
-        top={"-62px"}
-        right={0}
-        onClick={() => navigate(`/create-io/${params?.id}`)}
-        ps={4}
-        pe={4}
-        colorScheme="forestGreen"
-        rounded={"sm"}
-        size={"xs"}
-      >  
-        Edit IO
-      </Button>
+      <Box display={"flex"} justifyContent={"space-between"}>
+        <Text></Text>
+        <Button
+          // position={"absolute"}
+          // top={"-62px"}
+          right={0}
+          onClick={() => navigate(`/create-io/${params?.id}`)}
+          ps={4}
+          pe={4}
+          colorScheme="forestGreen"
+          rounded={"sm"}
+          size={"xs"}
+        >  
+          Edit IO
+        </Button>
+      </Box>
       <FormInputView  groupedFields={groupedFields} />
     </Box>
   );
diff --git a/src/Pages/WithDrawal/DrawalRequest/DrawalRequestApprove.jsx b/src/Pages/WithDrawal/DrawalRequest/DrawalRequestApprove.jsx
index a70e7e6..6163e42 100644
--- a/src/Pages/WithDrawal/DrawalRequest/DrawalRequestApprove.jsx
+++ b/src/Pages/WithDrawal/DrawalRequest/DrawalRequestApprove.jsx
@@ -3,6 +3,7 @@ import {
   Box,
   Button,
   FormControl,
+  FormHelperText,
   FormLabel,
   Heading,
   HStack,
@@ -36,7 +37,8 @@ const FILE_TYPES = ["image/jpeg", "image/png", "image/gif"];
 
 export const conformModalSchema = yup.object().shape({
   investorAmount: yup.string().required("Investor amount is required"),
-  comment: yup.string().notRequired(),
+  comment: yup.string().notRequired()
+  .max(200, "Approve Comment cannot be more than 200 characters"),
 });
 
 const DrawalRequestApprove = ({
@@ -59,6 +61,7 @@ const DrawalRequestApprove = ({
   const {
     control,
     register,
+    watch,
     reset,
     handleSubmit,
     formState: { errors },
@@ -259,12 +262,17 @@ const DrawalRequestApprove = ({
                   size="sm"
                   placeholder={"Enter your comments...."}
                   resize={"none"}
+                  maxLength={200}
                 />
                 {errors.comment && (
                   <Text fontSize="xs" color="red">
                     {errors.comment.message}
                   </Text>
                 )}
+                <FormHelperText fontSize="xs" color="gray.500">
+                  <Text as={"span"} me={1}>Maximum length should be 200 characters. You have entered</Text>
+                  {watch("checkerComment")?.length || 0} characters.
+                </FormHelperText>
               </FormControl>
             </ModalBody>
             <ModalFooter>
diff --git a/src/Pages/WithDrawal/DrawalRequest/DrawalRequestReject.jsx b/src/Pages/WithDrawal/DrawalRequest/DrawalRequestReject.jsx
index 3766c66..e9e3668 100644
--- a/src/Pages/WithDrawal/DrawalRequest/DrawalRequestReject.jsx
+++ b/src/Pages/WithDrawal/DrawalRequest/DrawalRequestReject.jsx
@@ -2,6 +2,7 @@ import {
     Box,
     Button,
     FormControl,
+    FormHelperText,
     FormLabel,
     Input,
     Modal,
@@ -24,7 +25,8 @@ import {
 import { useDepositRejectMutation } from "../../../Services/drawal.request.service";
   
   export const conformModalSchema = yup.object().shape({
-    comments: yup.string().required("Comment is required"),
+    comments: yup.string().required("Comment is required")
+    .max(200, "Approve Comment cannot be more than 200 characters"),
   });
   
   const DrawalRequestReject = ({ isOpen, onClose, firstField ,id}) => {
@@ -34,6 +36,7 @@ import { useDepositRejectMutation } from "../../../Services/drawal.request.servi
   
     const {
       register,
+      watch,
       reset,
       handleSubmit,
       formState: { errors },
@@ -101,16 +104,21 @@ import { useDepositRejectMutation } from "../../../Services/drawal.request.servi
                   placeholder={"Enter your comments...."}
                   rounded={"md"}
                   resize={"none"}
+                  maxLength={200}
                 />
                 {errors.comments && (
                   <Text fontSize="xs" color="red">
                     {errors.comments.message}
                   </Text>
                 )}
+                <FormHelperText fontSize="xs" color="gray.500">
+                <Text as={"span"} me={1}>Maximum length should be 200 characters. You have entered</Text>
+                  {watch("checkerComment")?.length || 0} characters.
+                </FormHelperText>
               </FormControl>
             </ModalBody>
             <ModalFooter>
-              <Button
+              <Button 
                 colorScheme="gray"
                 mr={3}
                 onClick={onClose}

From 4f8916036edc292fb7ecfc6c8e3c1ab484da7557 Mon Sep 17 00:00:00 2001
From: Swapnil Bendal <84583651+Swapnil155@users.noreply.github.com>
Date: Mon, 25 Nov 2024 16:45:52 +0530
Subject: [PATCH 09/12] [update] - condition on pending request for checkers

---
 .../CreateIO/IOCashDetails/IOCashDetails.jsx  |  9 ++++++--
 .../CreateIO/IONAVDetails/IONAVDetails.jsx    | 12 +++++-----
 .../CreateIO/IOTransaction/IOTransaction.jsx  | 22 +++++++++++--------
 3 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/src/Pages/IO_Management/CreateIO/IOCashDetails/IOCashDetails.jsx b/src/Pages/IO_Management/CreateIO/IOCashDetails/IOCashDetails.jsx
index 1b2fff1..f7fb367 100644
--- a/src/Pages/IO_Management/CreateIO/IOCashDetails/IOCashDetails.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOCashDetails/IOCashDetails.jsx
@@ -85,9 +85,14 @@ const IOCashDetails = () => {
               }}
             >
               Pending{" "}
-              <Badge rounded={"sm"} colorScheme="forestGreen" ms={2}>
+              {IODetails?.ioCashStatusHistory?.Pending.length > 0 && (
+                <Badge rounded={"sm"} colorScheme="forestGreen" ms={2}>
+                  {IODetails?.ioCashStatusHistory?.Pending.length || 0}
+                </Badge>
+              )}
+              {/* <Badge rounded={"sm"} colorScheme="forestGreen" ms={2}>
                 {IODetails?.ioCashStatusHistory?.Pending.length || 0}
-              </Badge>
+              </Badge> */}
             </Tab>
             <Tab
               fontSize={"sm"}
diff --git a/src/Pages/IO_Management/CreateIO/IONAVDetails/IONAVDetails.jsx b/src/Pages/IO_Management/CreateIO/IONAVDetails/IONAVDetails.jsx
index b2d8959..5aca373 100644
--- a/src/Pages/IO_Management/CreateIO/IONAVDetails/IONAVDetails.jsx
+++ b/src/Pages/IO_Management/CreateIO/IONAVDetails/IONAVDetails.jsx
@@ -135,13 +135,11 @@ const IONAVDetails = () => {
               }}
             >
               Pending
-              <Badge
-                rounded={"sm"}
-                colorScheme="forestGreen"
-                ms={2}
-              >
-                {IODetails?.ioNAVStatusHistory?.Pending.length || 0}
-              </Badge>
+              {IODetails?.ioNAVStatusHistory?.Pending.length > 0 && (
+                <Badge rounded={"sm"} colorScheme="forestGreen" ms={2}>
+                  {IODetails?.ioNAVStatusHistory?.Pending.length || 0}
+                </Badge>
+              )}
             </Tab>
             <Tab
               fontSize={"sm"}
diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/IOTransaction.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/IOTransaction.jsx
index 5b195ff..265a638 100644
--- a/src/Pages/IO_Management/CreateIO/IOTransaction/IOTransaction.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOTransaction/IOTransaction.jsx
@@ -1,4 +1,11 @@
-import { Badge, Tab, TabList, TabPanel, TabPanels, Tabs } from "@chakra-ui/react";
+import {
+  Badge,
+  Tab,
+  TabList,
+  TabPanel,
+  TabPanels,
+  Tabs,
+} from "@chakra-ui/react";
 import React, { useContext } from "react";
 import Approved from "./Approved";
 import Pending from "./Pending";
@@ -6,7 +13,6 @@ import Rejected from "./Rejected";
 import GlobalStateContext from "../../../../Contexts/GlobalStateContext";
 
 const IOTransaction = () => {
-  
   const { IODetails } = useContext(GlobalStateContext);
   return (
     <Tabs>
@@ -28,13 +34,11 @@ const IOTransaction = () => {
           }}
         >
           Pending
-          <Badge
-                rounded={"sm"}
-                colorScheme="forestGreen"
-                ms={2}
-              >
-                {IODetails?.ioTransactionRecords?.Pending.length || 0}
-              </Badge>
+          {IODetails?.ioTransactionRecords?.Pending.length > 0 && (
+            <Badge rounded={"sm"} colorScheme="forestGreen" ms={2}>
+              {IODetails?.ioTransactionRecords?.Pending.length || 0}
+            </Badge>
+          )}
         </Tab>
         <Tab
           fontSize={"sm"}

From 694dde0f14fbd0425471ce3ac6540cf8f8c54de0 Mon Sep 17 00:00:00 2001
From: Swapnil Bendal <84583651+Swapnil155@users.noreply.github.com>
Date: Mon, 25 Nov 2024 19:03:42 +0530
Subject: [PATCH 10/12] [fixed] - view io details

---
 src/Pages/IO_Management/ViewIO/ViewIOdata.jsx | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/Pages/IO_Management/ViewIO/ViewIOdata.jsx b/src/Pages/IO_Management/ViewIO/ViewIOdata.jsx
index b44b695..26046c6 100644
--- a/src/Pages/IO_Management/ViewIO/ViewIOdata.jsx
+++ b/src/Pages/IO_Management/ViewIO/ViewIOdata.jsx
@@ -37,7 +37,7 @@ import EditIO from "../EditIO/EditIO";
 import IOArtifacts from "../CreateIO/IOArtifacts";
 // import IOCashDetails from "../CreateIO/IOCashDetailsold";
 // import IONAVDetails from "../CreateIO/IONAVDetailsOld";
-import { useGetIOprepopulateDataQuery } from "../../../Services/io.service";
+import { useGetIOByIdQuery, useGetIOprepopulateDataQuery } from "../../../Services/io.service";
 import UnderConstruction from "../../UnderConstruction";
 import Destribution from "../CreateIO/Destribution";
 import IOCashDetails from "../CreateIO/IOCashDetails/IOCashDetails";
@@ -58,6 +58,12 @@ const ViewIOdata = () => {
   const params = useParams();
   const id = params?.id;
   const { data, error, isLoading, refetch } = useGetIOprepopulateDataQuery();
+  const {
+    data: IObyID,
+    isLoading: IObyIDisLoading,
+    error: IObyIDerror,
+    refetch: IObyIDrefetch,
+  } = useGetIOByIdQuery(id, { skip: !id });
   const { isOpen, onOpen, onClose } = useDisclosure();
   const navigate = useNavigate();
   const [isEditing, setIsEditing] = useState(false);
@@ -91,7 +97,7 @@ const ViewIOdata = () => {
   const handleRefresh = async () => {
     setIsRefetchLoading(true);
 
-    await refetch();
+    await IObyIDrefetch();
     setIsRefetchLoading(false);
   };
 

From 3b83b625c36ee27313dce66fc3d7c53f427f7ec7 Mon Sep 17 00:00:00 2001
From: YasinShaikh123 <123150391+YasinShaikh123@users.noreply.github.com>
Date: Mon, 25 Nov 2024 20:24:39 +0530
Subject: [PATCH 11/12] update Investment Details KYC

---
 src/Pages/IO_Management/ViewIO/ViewIOdata.jsx         | 2 +-
 src/Pages/Investor_Management/InvestorDetails/Kyc.jsx | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Pages/IO_Management/ViewIO/ViewIOdata.jsx b/src/Pages/IO_Management/ViewIO/ViewIOdata.jsx
index 26046c6..0360eee 100644
--- a/src/Pages/IO_Management/ViewIO/ViewIOdata.jsx
+++ b/src/Pages/IO_Management/ViewIO/ViewIOdata.jsx
@@ -193,7 +193,7 @@ const ViewIOdata = () => {
                 cursor={"pointer"}
               />
             </Box> */}
-            <Stack position={"absolute"} right={2} bottom={1} direction="row" spacing={4}>
+            <Stack position={"absolute"} right={1} bottom={1} direction="row" spacing={4}>
               <Button
                 isLoading={isRefetchLoading}
                 loadingText="Refresh"
diff --git a/src/Pages/Investor_Management/InvestorDetails/Kyc.jsx b/src/Pages/Investor_Management/InvestorDetails/Kyc.jsx
index 844f470..6884845 100644
--- a/src/Pages/Investor_Management/InvestorDetails/Kyc.jsx
+++ b/src/Pages/Investor_Management/InvestorDetails/Kyc.jsx
@@ -49,7 +49,7 @@ const Kyc = () => {
           <HStack spacing={4} mb={4}>
             <FormControl>
               <FormLabel mb={1} fontSize={"sm"}>
-                House/Unit
+                Address line 1
               </FormLabel>
               <Input
                 bg={"#ccc3"}
@@ -62,7 +62,7 @@ const Kyc = () => {
             </FormControl>
             <FormControl>
               <FormLabel mb={1} fontSize={"sm"}>
-                Road/Street
+                Address line 2
               </FormLabel>
               <Input
                 bg={"#ccc3"}

From 537304f0fbb7988b17ffb6e05cdb58daebd48f21 Mon Sep 17 00:00:00 2001
From: YasinShaikh123 <123150391+YasinShaikh123@users.noreply.github.com>
Date: Mon, 2 Dec 2024 12:23:27 +0530
Subject: [PATCH 12/12] update bug

---
 src/Components/Loaders/Loader01.jsx           | 22 +++++----
 src/Layout/DefaultLayout.jsx                  |  4 +-
 src/Pages/AccountDeletion/InvestorComment.jsx |  2 +-
 .../DepositRequest/DepositRequestApprove.jsx  | 12 +++--
 .../DepositRequest/DepositRequestReject.jsx   | 12 ++++-
 src/Pages/Fawateer/CreateRequest.jsx          | 10 +++-
 .../IO_Management/CreateIO/IOArtifacts.jsx    |  6 +--
 .../CreateIO/IOArtifactsVideo.jsx             | 12 +++--
 .../CreateIO/IOCashDetails/AddCaseDetails.jsx | 15 ++++--
 .../CreateIO/IOCashDetails/Approved.jsx       |  8 ++--
 .../CreateIO/IOCashDetails/IOCashDetails.jsx  |  4 +-
 .../CreateIO/IOCashDetails/Pending.jsx        |  8 ++--
 .../CreateIO/IOCashDetails/Rejected.jsx       |  8 ++--
 .../CreateIO/IONAVDetails/AddNavDetails.jsx   | 12 +++--
 .../CreateIO/InvestmentDocument.jsx           |  2 +-
 .../IO_Management/CreateIO/Investors.jsx      | 10 ++--
 .../IO_Management/CreateIO/KeyMerits.jsx      |  2 +-
 .../IO_Management/EditIO/InvestmentEdit.jsx   |  2 +-
 src/Pages/IO_Management/IOArtifactsAdd.jsx    | 14 ++++--
 .../IO_Management/InvestmentDocuments.jsx     | 15 ++++--
 src/Pages/IO_Management/KeyMeritsAdd.jsx      |  2 +-
 src/Pages/IO_Management/KeyMeritsEdit.jsx     |  2 +-
 .../InvestmentType/AddInvestmentType.jsx      | 12 ++---
 .../Master/InvestmentType/InvestmentType.jsx  | 39 +++++++++++++--
 src/Pages/Master/Sponser/Sponsers.jsx         |  6 +--
 src/Pages/SplashScreen.jsx                    | 48 +++++++++----------
 .../DrawalRequest/DrawalRequestReject.jsx     |  2 +-
 27 files changed, 191 insertions(+), 100 deletions(-)

diff --git a/src/Components/Loaders/Loader01.jsx b/src/Components/Loaders/Loader01.jsx
index d730e32..24b8f96 100644
--- a/src/Components/Loaders/Loader01.jsx
+++ b/src/Components/Loaders/Loader01.jsx
@@ -1,19 +1,21 @@
 import React from "react";
 import './FullscreenLoaders.css'
+import { Spinner } from "@chakra-ui/react";
 
 const Loader01 = () => {
   return (
 
-    <div className="dot-spinner">
-      <div className="dot-spinner__dot"></div>
-      <div className="dot-spinner__dot"></div>
-      <div className="dot-spinner__dot"></div>
-      <div className="dot-spinner__dot"></div>
-      <div className="dot-spinner__dot"></div>
-      <div className="dot-spinner__dot"></div>
-      <div className="dot-spinner__dot"></div>
-      <div className="dot-spinner__dot"></div>
-    </div>
+    // <div className="dot-spinner">
+    //   <div className="dot-spinner__dot"></div>
+    //   <div className="dot-spinner__dot"></div>
+    //   <div className="dot-spinner__dot"></div>
+    //   <div className="dot-spinner__dot"></div>
+    //   <div className="dot-spinner__dot"></div>
+    //   <div className="dot-spinner__dot"></div>
+    //   <div className="dot-spinner__dot"></div>
+    //   <div className="dot-spinner__dot"></div>
+    // </div>
+    <Spinner color='green.900' />
   );
 };
 
diff --git a/src/Layout/DefaultLayout.jsx b/src/Layout/DefaultLayout.jsx
index 27a771b..7afc70a 100644
--- a/src/Layout/DefaultLayout.jsx
+++ b/src/Layout/DefaultLayout.jsx
@@ -231,14 +231,14 @@ const DashboardLayout = ({ isOnline }) => {
         return (
           <span className="d-flex align-items-end gap-2">
             <RiMoneyDollarBoxLine className="h4 m-0 fw-normal" />
-            Deposit pending request
+            Deposit Pending Request
           </span>
         );
       case path.startsWith("/deposit-history"):
         return (
           <span className="d-flex align-items-end gap-2">
             <RiExchangeBoxLine className="h4 m-0 fw-normal" />
-            Deposite request
+            Deposite Request
           </span>
         );
         
diff --git a/src/Pages/AccountDeletion/InvestorComment.jsx b/src/Pages/AccountDeletion/InvestorComment.jsx
index 35c33ea..bf22ba4 100644
--- a/src/Pages/AccountDeletion/InvestorComment.jsx
+++ b/src/Pages/AccountDeletion/InvestorComment.jsx
@@ -49,7 +49,7 @@ const InvestorComment = ({ isOpen, onClose }) => {
                   fontSize="sm"
                   type="textarea"
                   size="md"
-                  placeholder={"Enter your comments...."}
+                  placeholder={"Enter your comment...."}
                   rounded={"md"}
                   resize={"none"}
                 />
diff --git a/src/Pages/Deposit/DepositRequest/DepositRequestApprove.jsx b/src/Pages/Deposit/DepositRequest/DepositRequestApprove.jsx
index b6e26a2..7090541 100644
--- a/src/Pages/Deposit/DepositRequest/DepositRequestApprove.jsx
+++ b/src/Pages/Deposit/DepositRequest/DepositRequestApprove.jsx
@@ -4,6 +4,7 @@ import {
   Button,
   FormControl,
   FormErrorMessage,
+  FormHelperText,
   FormLabel,
   Input,
   Modal,
@@ -35,7 +36,7 @@ const FILE_TYPES = ["image/jpeg", "image/png", "image/gif"];
 
 export const conformModalSchema = yup.object().shape({
   investorAmount: yup.string().required("Investor amount is required"),
-  comment: yup.string().notRequired(),
+  comment: yup.string().notRequired() .max(200, "Approve Comment cannot be more than 200 characters"),
   supporting_FileName: yup.mixed().required("File is required"),
   // .test("fileType", "Unsupported File Format", (value) => {
   //   return value && FILE_TYPES.includes(value.type);
@@ -192,7 +193,7 @@ const DepositRequestApprove = ({
                 )}
               </FormControl>
               <FormControl mb={4}>
-                <FormLabel fontSize="sm">Comments</FormLabel>
+                <FormLabel fontSize="sm">Comment</FormLabel>
                 <Textarea
                   rows={5}
                   focusBorderColor="green.400"
@@ -201,14 +202,19 @@ const DepositRequestApprove = ({
                   fontSize="sm"
                   type="textarea"
                   size="sm"
-                  placeholder={"Enter your comments...."}
+                  placeholder={"Enter your comment...."}
                   resize={"none"}
+                  maxLength={200} 
                 />
                 {errors.comment && (
                   <Text fontSize="xs" color="red">
                     {errors.comment.message}
                   </Text>
                 )}
+                <FormHelperText fontSize="xs" color="gray.500">
+                    <Box as="span" me={1}>Maximum length should be 200 characters. You have entered </Box>
+                    {watch("comment")?.length || 0} characters.
+                  </FormHelperText>
               </FormControl>
             </ModalBody>
             <ModalFooter>
diff --git a/src/Pages/Deposit/DepositRequest/DepositRequestReject.jsx b/src/Pages/Deposit/DepositRequest/DepositRequestReject.jsx
index c5e01f2..8a8ea29 100644
--- a/src/Pages/Deposit/DepositRequest/DepositRequestReject.jsx
+++ b/src/Pages/Deposit/DepositRequest/DepositRequestReject.jsx
@@ -2,6 +2,7 @@ import {
   Box,
   Button,
   FormControl,
+  FormHelperText,
   FormLabel,
   Input,
   Modal,
@@ -24,7 +25,8 @@ import { useDepositRejectMutation } from "../../../Services/deposit.request.serv
 import ToastBox from "../../../Components/ToastBox";
 
 export const conformModalSchema = yup.object().shape({
-  comments: yup.string().required("Comment is required"),
+  comments: yup.string().required("Comment is required") 
+  .max(200, "Approve Comment cannot be more than 200 characters"),
 });
 
 const DepositRequestReject = ({ isOpen, onClose, firstField ,id}) => {
@@ -35,6 +37,7 @@ const DepositRequestReject = ({ isOpen, onClose, firstField ,id}) => {
   const {
     register,
     reset,
+    watch,
     handleSubmit,
     formState: { errors },
   } = useForm({
@@ -121,15 +124,20 @@ const DepositRequestReject = ({ isOpen, onClose, firstField ,id}) => {
                 fontSize="sm"
                 type="textarea"
                 size="md"
-                placeholder={"Enter your comments...."}
+                placeholder={"Enter your comment...."}
                 rounded={"md"}
                 resize={"none"}
+                maxLength={200} 
               />
               {errors.comments && (
                 <Text fontSize="xs" color="red">
                   {errors.comments.message}
                 </Text>
               )}
+              <FormHelperText fontSize="xs" color="gray.500">
+                <Box as="span" me={1}>Maximum length should be 200 characters. You have entered </Box>
+                {watch("comments")?.length || 0} characters.
+              </FormHelperText>
             </FormControl>
           </ModalBody>
           <ModalFooter>
diff --git a/src/Pages/Fawateer/CreateRequest.jsx b/src/Pages/Fawateer/CreateRequest.jsx
index 0529ef9..07ce60c 100644
--- a/src/Pages/Fawateer/CreateRequest.jsx
+++ b/src/Pages/Fawateer/CreateRequest.jsx
@@ -45,7 +45,7 @@ const validationSchema = Yup.object().shape({
     .typeError("Transaction amount must be a number") // Custom error message if it's not a number
     .positive("Transaction amount must be greater than zero"),
   spportFile_path: Yup.mixed().required("Support file is required"),
-  makerComment: Yup.string(),
+  makerComment: Yup.string()  .max(200, "Approve Comment cannot be more than 50 characters"),
 });
 
 const CreateRequest = () => {
@@ -62,6 +62,7 @@ const CreateRequest = () => {
   const {
     control,
     register,
+    watch,
     handleSubmit,
     setValue,
     reset,
@@ -393,6 +394,7 @@ const CreateRequest = () => {
             rounded={"sm"}
             placeholder={"Description"}
             {...register("makerComment")}
+            maxLength={200}
           />
           <FormHelperText
             fontSize={"xs"}
@@ -401,6 +403,12 @@ const CreateRequest = () => {
           >
             {errors.makerComment?.message}
           </FormHelperText>
+          <FormHelperText fontSize="xs" color="gray.500">
+            <Box as="span" me={1}>
+              Maximum length should be 200 characters. You have entered
+            </Box>
+            {watch("makerComment")?.length || 0} characters.
+          </FormHelperText>
         </FormControl>
 
         {/* Submit Button */}
diff --git a/src/Pages/IO_Management/CreateIO/IOArtifacts.jsx b/src/Pages/IO_Management/CreateIO/IOArtifacts.jsx
index 870c4b2..a9777d2 100644
--- a/src/Pages/IO_Management/CreateIO/IOArtifacts.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOArtifacts.jsx
@@ -116,7 +116,7 @@ const IOArtifacts = ({ enableNextTab, index, data }) => {
         setDeleteAlertVideo(false);
         setIsLoadingBtn(false);
         toast({
-          render: () => <ToastBox message={res?.data?.message} status="error" />,
+          render: () => <ToastBox message={res?.data?.message} status="success" />,
         });
       }
     } catch (error) {
@@ -134,7 +134,7 @@ const IOArtifacts = ({ enableNextTab, index, data }) => {
         setDeleteAlertImage(false);
         setIsLoadingBtn(false);
         toast({
-          render: () => <ToastBox message={res?.data?.message} status="error" />,
+          render: () => <ToastBox message={res?.data?.message} status="success" />,
         });
 
       }
@@ -372,7 +372,7 @@ const sortedDataVideo = [...(IObyID?.data?.artifactsVideo || [])]?.sort(
           Manage IO Images
         </Box>
         <HStack>
-
+ 
 
           {IObyID?.data?.artifactsImage?.length !== 0 &&<SetDisplayOrderIOArtifactsImages data={sortedDataImage} />}
           <Button
diff --git a/src/Pages/IO_Management/CreateIO/IOArtifactsVideo.jsx b/src/Pages/IO_Management/CreateIO/IOArtifactsVideo.jsx
index c9b71a7..0e68193 100644
--- a/src/Pages/IO_Management/CreateIO/IOArtifactsVideo.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOArtifactsVideo.jsx
@@ -10,6 +10,7 @@ import {
   DrawerOverlay,
   FormControl,
   FormErrorMessage,
+  FormHelperText,
   FormLabel,
   Input,
   Stack,
@@ -26,7 +27,8 @@ import { useParams } from "react-router-dom";
 import ToastBox from "../../../Components/ToastBox";
 
 const investmentVideoSchema = yup.object().shape({
-  artifactName: yup.string().required("Artifact name is required"),
+  artifactName: yup.string().required("Artifact name is required")
+  .max(50, "Approve Comment cannot be more than 50 characters"),
   artifactStreamingURL: yup.string()
     .required("Artifact streaming URL is required")
     .url("Invalid URL format"),
@@ -158,12 +160,16 @@ const IOArtifactsAdd = ({ isOpen, onClose, firstField, actionId, setActionId, da
                   name="artifactName"
                   control={control}
                   render={({ field }) => (
-                    <Input {...field} fontSize={"sm"} type="text" size={"sm"} />
+                    <Input {...field} fontSize={"sm"} type="text" size={"sm"} maxLength={50}  />
                   )}
                 />
                 <FormErrorMessage fontSize={"xs"} fontWeight={500}>
                   {errors.artifactName?.message}
                 </FormErrorMessage>
+                <FormHelperText fontSize="xs" color="gray.500">
+                    <Box as="span" me={1}>Maximum length should be 50 characters. You have entered </Box>
+                    {watch("artifactName")?.length || 0} characters.
+                  </FormHelperText>
               </FormControl>
 
               <FormControl isInvalid={errors.artifactStreamingURL} isRequired>
@@ -211,7 +217,7 @@ const IOArtifactsAdd = ({ isOpen, onClose, firstField, actionId, setActionId, da
         isOpen={alert}
         onClose={() => setAlert(false)}
         alertHandler={handleSave}
-        message={"Are you sure you want to add this artifact?"}
+        message={"Are you sure you want to update this artifact?"}
         isLoading={isLoading}
       />
     </>
diff --git a/src/Pages/IO_Management/CreateIO/IOCashDetails/AddCaseDetails.jsx b/src/Pages/IO_Management/CreateIO/IOCashDetails/AddCaseDetails.jsx
index 82983d2..fc10f40 100644
--- a/src/Pages/IO_Management/CreateIO/IOCashDetails/AddCaseDetails.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOCashDetails/AddCaseDetails.jsx
@@ -10,6 +10,7 @@ import {
   DrawerOverlay,
   FormControl,
   FormErrorMessage,
+  FormHelperText,
   FormLabel,
   Input,
   Select,
@@ -33,7 +34,8 @@ const cashDetails = yup.object().shape({
   transactionDate: yup.string().required("Date is required"),
   ioTransType_xid: yup.number().required("Cash transaction is required"),
   transactionAmount: yup.number().required("Transaction Amount is required"),
-  comments: yup.string().notRequired(),
+  comments: yup.string().notRequired()
+  .max(200, "Approve Comment cannot be more than 200 characters"),
 });
 
 const AddCaseDetails = ({ isOpen, onClose, firstField, actionId, setActionId, data, setActiveTab }) => {
@@ -199,18 +201,23 @@ const AddCaseDetails = ({ isOpen, onClose, firstField, actionId, setActionId, da
 
 
               <FormControl isInvalid={errors.comments}>
-                <FormLabel fontSize={"sm"}>Comments</FormLabel>
+                <FormLabel fontSize={"sm"}>Comment</FormLabel>
                 <Controller
                   name="comments"
-                  control={control}
+                  control={control} 
                   render={({ field }) => (
-                    <Textarea {...field} textAlign={'left'} 
+                    <Textarea {...field} textAlign={'left'}  
+                    maxLength={200} 
                     focusBorderColor="forestGreen.300" fontSize={"sm"} type="text" size={"sm"} />
                   )}
                 />
                 <FormErrorMessage fontSize={"xs"} fontWeight={500}>
                   {errors.comments?.message}
                 </FormErrorMessage>
+                <FormHelperText fontSize="xs" color="gray.500">
+                    <Box as="span" me={1}>Maximum length should be 200 characters. You have entered </Box>
+                    {watch("comments")?.length || 0} characters.
+                  </FormHelperText>
               </FormControl>
 
             </Stack>
diff --git a/src/Pages/IO_Management/CreateIO/IOCashDetails/Approved.jsx b/src/Pages/IO_Management/CreateIO/IOCashDetails/Approved.jsx
index 749498b..4780be9 100644
--- a/src/Pages/IO_Management/CreateIO/IOCashDetails/Approved.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOCashDetails/Approved.jsx
@@ -82,11 +82,11 @@ const Approved = () => {
 
   const tableHeadRow = [
     "Sr No.",
-    "Transaction date",
+    "Transaction Date",
     "Transaction Type",
     "Amount",
     "Comments",
-    "Update by",
+    "Update By",
     "Update On",
   ];
 
@@ -97,7 +97,7 @@ const Approved = () => {
         {index + 1}.
       </Text>
     ),
-    "Transaction date": (
+    "Transaction Date": (
       <Text as={"span"} color={"gray.600"} fontWeight={"500"}>
         {formatDate(item?.transactionDate)}
       </Text>
@@ -123,7 +123,7 @@ const Approved = () => {
         {item?.comments ? item?.comments : "---"}
       </Text>
     ),
-    "Update by": (
+    "Update By": (
       <Text
         w={"100px"}
         as={"span"}
diff --git a/src/Pages/IO_Management/CreateIO/IOCashDetails/IOCashDetails.jsx b/src/Pages/IO_Management/CreateIO/IOCashDetails/IOCashDetails.jsx
index f7fb367..a66e6af 100644
--- a/src/Pages/IO_Management/CreateIO/IOCashDetails/IOCashDetails.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOCashDetails/IOCashDetails.jsx
@@ -84,10 +84,10 @@ const IOCashDetails = () => {
                 borderBottom: "2px solid #38a169",
               }}
             >
-              Pending{" "}
+              Pending
               {IODetails?.ioCashStatusHistory?.Pending.length > 0 && (
                 <Badge rounded={"sm"} colorScheme="forestGreen" ms={2}>
-                  {IODetails?.ioCashStatusHistory?.Pending.length || 0}
+                  {IODetails?.ioCashStatusHistory?.Pending.length !== 0 && IODetails?.ioCashStatusHistory?.Pending.length}
                 </Badge>
               )}
               {/* <Badge rounded={"sm"} colorScheme="forestGreen" ms={2}>
diff --git a/src/Pages/IO_Management/CreateIO/IOCashDetails/Pending.jsx b/src/Pages/IO_Management/CreateIO/IOCashDetails/Pending.jsx
index fa7e9db..b025968 100644
--- a/src/Pages/IO_Management/CreateIO/IOCashDetails/Pending.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOCashDetails/Pending.jsx
@@ -98,11 +98,11 @@ const Pending = () => {
 
   const tableHeadRow = [
     "Sr No.",
-    "Transaction date",
+    "Transaction Date",
     "Transaction Type",
     "Amount",
     "Comments",
-    "Update by",
+    "Update By",
     "Update On",
     ...(localStorage?.getItem('role')!=="Maker" ? ["Actions"] : []),
     
@@ -115,7 +115,7 @@ const Pending = () => {
         {index + 1}.
       </Text>
     ),
-    "Transaction date": (
+    "Transaction Date": (
       <Text as={"span"} color={"gray.600"} fontWeight={"500"}>
         {formatDate(item?.transactionDate)}
       </Text>
@@ -141,7 +141,7 @@ const Pending = () => {
         {item?.comments}
       </Text>
     ),
-    "Update by": (
+    "Update By": (
       <Text
         w={"100px"}
         as={"span"}
diff --git a/src/Pages/IO_Management/CreateIO/IOCashDetails/Rejected.jsx b/src/Pages/IO_Management/CreateIO/IOCashDetails/Rejected.jsx
index 470fdc8..38598ec 100644
--- a/src/Pages/IO_Management/CreateIO/IOCashDetails/Rejected.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOCashDetails/Rejected.jsx
@@ -77,11 +77,11 @@ import AddCaseDetails from "./AddCaseDetails";
   
     const tableHeadRow = [
       "Sr No.",
-      "Transaction date",
+      "Transaction Date",
       "Transaction Type",
       "Amount",
       "Comments",
-      "Update by",
+      "Update By",
       "Update On",
     ];
   
@@ -96,7 +96,7 @@ import AddCaseDetails from "./AddCaseDetails";
           {index + 1}.
         </Text>
       ),
-      "Transaction date": (
+      "Transaction Date": (
         <Text
           as={"span"}
           color={"gray.600"}
@@ -135,7 +135,7 @@ import AddCaseDetails from "./AddCaseDetails";
           {item?.comments}
         </Text>
       ),
-      "Update by": (
+      "Update By": (
         <Text
           w={"100px"}
           as={"span"}
diff --git a/src/Pages/IO_Management/CreateIO/IONAVDetails/AddNavDetails.jsx b/src/Pages/IO_Management/CreateIO/IONAVDetails/AddNavDetails.jsx
index 0427829..4d575fb 100644
--- a/src/Pages/IO_Management/CreateIO/IONAVDetails/AddNavDetails.jsx
+++ b/src/Pages/IO_Management/CreateIO/IONAVDetails/AddNavDetails.jsx
@@ -10,6 +10,7 @@ import {
   DrawerOverlay,
   FormControl,
   FormErrorMessage,
+  FormHelperText,
   FormLabel,
   HStack,
   Input,
@@ -36,7 +37,8 @@ import { formatDatee } from "../../../../Components/FormField";
 const ioNav = yup.object().shape({
   transactionDate: yup.string().required("Date is required"),
   transactionAmount: yup.number().required("New NAV is required"),
-  comments: yup.string().notRequired(),
+  comments: yup.string().notRequired()
+  .max(200, "Approve Comment cannot be more than 200 characters"),
 });
 
 const AddNavDetails = ({ isOpen, onClose, firstField, actionId, setActionId, data }) => {
@@ -204,17 +206,21 @@ console.log(calculatePercentage(1092500, 976070));
 
 
               <FormControl isInvalid={errors.comments}>
-                <FormLabel fontSize={"sm"}>Comments</FormLabel>
+                <FormLabel fontSize={"sm"}>Comment</FormLabel>
                 <Controller
                   name="comments"
                   control={control}
                   render={({ field }) => (
-                    <Textarea {...field}  fontSize={"sm"} type="text" size={"sm"} />
+                    <Textarea {...field} maxLength={200}   fontSize={"sm"} type="text" size={"sm"} />
                   )}
                 />
                 <FormErrorMessage fontSize={"xs"} fontWeight={500}>
                   {errors.comments?.message}
                 </FormErrorMessage>
+                <FormHelperText fontSize="xs" color="gray.500">
+                    <Box as="span" me={1}>Maximum length should be 200 characters. You have entered </Box>
+                    {watch("comments")?.length || 0} characters.
+                  </FormHelperText>
               </FormControl>
 
             </Stack>
diff --git a/src/Pages/IO_Management/CreateIO/InvestmentDocument.jsx b/src/Pages/IO_Management/CreateIO/InvestmentDocument.jsx
index fe617b0..bfade61 100644
--- a/src/Pages/IO_Management/CreateIO/InvestmentDocument.jsx
+++ b/src/Pages/IO_Management/CreateIO/InvestmentDocument.jsx
@@ -363,7 +363,7 @@ const InvestmentDocument = ({ control, errors, enableNextTab, index, }) => {
       <CustomAlertDialog
         onClose={() => setDeleteAlert(false)}
         isOpen={deleteAlert}
-        message="Are you sure you want to delete the sponsor?"
+        message="Are you sure you want to delete the Investment?"
         alertHandler={handleDelete}
         isLoading={isLoading}
       />
diff --git a/src/Pages/IO_Management/CreateIO/Investors.jsx b/src/Pages/IO_Management/CreateIO/Investors.jsx
index 35a6eff..3d37013 100644
--- a/src/Pages/IO_Management/CreateIO/Investors.jsx
+++ b/src/Pages/IO_Management/CreateIO/Investors.jsx
@@ -103,16 +103,16 @@ const Investors = ({ data }) => {
   // Table setup 
   const tableHeadRow = [
     "Client ID",
-    "First name",
-    "Last name",
-    "Investment amount",
+    "First Name",
+    "Last Name",
+    "Investment Amount",
     "Percentage",
     "Market Value",
     "Return on Investment",
     "Distribution",
     "Distribution Percent",
     "Total Return",
-    "Total return on Investment",
+    "Total Return on Investment",
   ];
 
   const handleUpdateStatus = debounce((id) => {
@@ -164,7 +164,7 @@ const Investors = ({ data }) => {
     "Distribution": parseFloat(item?.Distribution_Amt) || 0, // Convert to float
     "Distribution Percent": parseFloat(item?.Distribution_Per) || 0, // Convert to float
     "Total Return": parseFloat(item?.Total_Return) || 0, // Convert to float
-    "Total return on Investment": parseFloat(item?.Total_Return_On_Investment) || 0, // Convert to float
+    "Total Return on Investment": parseFloat(item?.Total_Return_On_Investment) || 0, // Convert to float
   }));
 
   console.log(exportInvestorDetails);
diff --git a/src/Pages/IO_Management/CreateIO/KeyMerits.jsx b/src/Pages/IO_Management/CreateIO/KeyMerits.jsx
index 6d2eee0..e4bd99b 100644
--- a/src/Pages/IO_Management/CreateIO/KeyMerits.jsx
+++ b/src/Pages/IO_Management/CreateIO/KeyMerits.jsx
@@ -89,7 +89,7 @@ const KeyMerits = ({ enableNextTab, index, data: prepopData }) => {
       const res = await deleteKeyMerits(actionId);
       if (res?.data?.statusCode === 200) {
         toast({
-          render: () => <ToastBox message={res?.data?.message} />,
+          render: () => <ToastBox message={res?.data?.message} status={"success"}  />,
         });
         setIsBtnLoading(false);
         setDeleteAlert(false);
diff --git a/src/Pages/IO_Management/EditIO/InvestmentEdit.jsx b/src/Pages/IO_Management/EditIO/InvestmentEdit.jsx
index 0c71ac1..76c7299 100644
--- a/src/Pages/IO_Management/EditIO/InvestmentEdit.jsx
+++ b/src/Pages/IO_Management/EditIO/InvestmentEdit.jsx
@@ -297,7 +297,7 @@ const InvestmentEdit = ({ isOpen, onClose, thirdField, id, data }) => {
         onClose={() => setAlert(false)}
         alertHandler={handleConfirm}
         isLoading={isLoading}
-        message="Are you sure you want to add this document?"
+        message="Are you sure you want to add this Investment?"
       />
     </Drawer>
   );
diff --git a/src/Pages/IO_Management/IOArtifactsAdd.jsx b/src/Pages/IO_Management/IOArtifactsAdd.jsx
index f80f838..2e3ea3f 100644
--- a/src/Pages/IO_Management/IOArtifactsAdd.jsx
+++ b/src/Pages/IO_Management/IOArtifactsAdd.jsx
@@ -10,6 +10,7 @@ import {
   DrawerOverlay,
   FormControl,
   FormErrorMessage,
+  FormHelperText,
   FormLabel,
   Icon,
   Image,
@@ -35,7 +36,7 @@ import { IoMdRemoveCircleOutline } from "react-icons/io";
 
 const investmentImageSchema = yup.object().shape({
   artifactName: yup.string().required("Artifact image name is required")
-  .max(25, "File name must be at most 25 characters"),
+  .max(50, "Approve Comment cannot be more than 50 characters"),
   artifactPathName: yup.mixed().required("Artifact image is required"),
 });
 
@@ -226,19 +227,24 @@ const IOArtifactsAdd = ({
                   <Controller
                     name="artifactName"
                     control={control}
+                    //  maxLength={50} 
                     render={({ field }) => (
                       <Input
                         {...field}
                         fontSize={"sm"}
                         type="text"
                         size={"sm"}
-                        maxLength={25} 
+                        maxLength={50} 
                       />
                     )}
-                  />
+                  /> 
                   <FormErrorMessage fontSize={"xs"} fontWeight={500}>
                     {errors.artifactName?.message}
                   </FormErrorMessage>
+                  <FormHelperText fontSize="xs" color="gray.500">
+                    <Box as="span" me={1}>Maximum length should be 50 characters. You have entered </Box>
+                    {watch("artifactName")?.length || 0} characters.
+                  </FormHelperText>
                 </FormControl>
 
                 <FormControl
@@ -354,7 +360,7 @@ const IOArtifactsAdd = ({
         isOpen={alert}
         onClose={handleAlertClose}
         alertHandler={handleSave}
-        message={"Are you sure you want to add this artifact?"}
+        message={"Are you sure you want to update this artifact?"}
         isLoading={loading}
       />
     </>
diff --git a/src/Pages/IO_Management/InvestmentDocuments.jsx b/src/Pages/IO_Management/InvestmentDocuments.jsx
index 848c0cb..f89958f 100644
--- a/src/Pages/IO_Management/InvestmentDocuments.jsx
+++ b/src/Pages/IO_Management/InvestmentDocuments.jsx
@@ -60,7 +60,7 @@ export const investmentDocSchema = yup.object().shape({
   //   return value && value.size <= 2 * 1024 * 1024; // 2MB in bytes
   // })
   fileName: yup.string().required("File name is required")
-  .max(25, "File name must be at most 25 characters"), // Maximum length validation,
+  .max(30, "File name must be at most 30 characters"), // Maximum length validation,
   documentNameArabic: yup.string().required("File name Arabic is required")
   .max(25, "File name must be at most 30 characters"), 
 });
@@ -91,6 +91,7 @@ const InvestmentDocuments = ({
   const {
     register,
     handleSubmit,
+    watch,
     reset,
     formState: { errors },
   } = useForm({
@@ -210,13 +211,17 @@ const InvestmentDocuments = ({
                   fontSize="sm"
                   type="text"
                   size="sm"
-                  maxLength={25} // Maximum length constraint in the input field
+                  maxLength={30} // Maximum length constraint in the input field
                 />
                 {errors.fileName && (
                   <Text mt={1} fontSize="xs" fontWeight={500} color="red">
                     {errors.fileName.message}
                   </Text>
                 )}
+                <FormHelperText fontSize="xs" color="gray.500">
+                    <Box as="span" me={1}>Maximum length should be 30 characters. You have entered </Box>
+                    {watch("fileName")?.length || 0} characters.
+                </FormHelperText>
               </FormControl>
 
 
@@ -229,13 +234,17 @@ const InvestmentDocuments = ({
                   type="text"
                   size="sm"
                   textAlign={'right'}
-                  maxLength={30} // Maximum length constraint in the input field
+                  maxLength={35} // Maximum length constraint in the input field
                 />
                 {errors.documentNameArabic && (
                   <Text mt={1} fontSize="xs" fontWeight={500} color="red">
                     {errors.documentNameArabic.message}
                   </Text>
                 )}
+                <FormHelperText fontSize="xs" color="gray.500">
+                    <Box as="span" me={1}>Maximum length should be 35 characters. You have entered </Box>
+                    {watch("documentNameArabic")?.length || 0} characters.
+                </FormHelperText>
               </FormControl>
 
 
diff --git a/src/Pages/IO_Management/KeyMeritsAdd.jsx b/src/Pages/IO_Management/KeyMeritsAdd.jsx
index f7582c0..950acb1 100644
--- a/src/Pages/IO_Management/KeyMeritsAdd.jsx
+++ b/src/Pages/IO_Management/KeyMeritsAdd.jsx
@@ -360,7 +360,7 @@ const KeyMeritsAdd = ({ isOpen, onClose, firstField, id, icons }) => {
         onClose={handleClose}
         // alertHandler={handleSave}
         alertHandler={handleConfirm}
-        message={"Are you sure you want to add this key merit?"}
+        message={"Are you sure you want to add this key merits?"}
         isLoading={isLoading}
       />
     </>
diff --git a/src/Pages/IO_Management/KeyMeritsEdit.jsx b/src/Pages/IO_Management/KeyMeritsEdit.jsx
index e6dbe80..8f0b888 100644
--- a/src/Pages/IO_Management/KeyMeritsEdit.jsx
+++ b/src/Pages/IO_Management/KeyMeritsEdit.jsx
@@ -367,7 +367,7 @@ const KeyMeritsEdit = ({
         isOpen={alert}
         onClose={() => setAlert(false)}
         alertHandler={handleSave}
-        message={"Are you sure you want to add this key merit?"}
+        message={"Are you sure you want to update this key merits?"}
         isLoading={isLoading}
       />
     </>
diff --git a/src/Pages/Master/InvestmentType/AddInvestmentType.jsx b/src/Pages/Master/InvestmentType/AddInvestmentType.jsx
index d37fc31..a7fdfc0 100644
--- a/src/Pages/Master/InvestmentType/AddInvestmentType.jsx
+++ b/src/Pages/Master/InvestmentType/AddInvestmentType.jsx
@@ -24,7 +24,7 @@ export const addInvestmentType = yup.object().shape({
     .string()
     .required("Investment type is required")
     .max(50, "Investment name cannot be more than 50 characters"),
-  note: yup.string().optional().max(255, "Note cannot exceed 255 characters"),
+  // note: yup.string().optional().max(255, "Note cannot exceed 255 characters"),
   investmentTypeNameArabic: yup
     .string()
     .required("Investment type in required"),
@@ -199,7 +199,7 @@ const AddInvestmentType = () => {
       placeHolder: " ",
       name: "note",
       type: "textarea",
-      // isRequired: true,
+      isRequired: false,
       section: "",
       maxLength: 255,
       helperText: `Maximum length should be 255 characters. You have entered ${
@@ -211,7 +211,7 @@ const AddInvestmentType = () => {
       placeHolder: " ",
       name: "noteArabic",
       type: "textarea",
-      // isRequired: true,
+      isRequired: false,
       arabic: true,
       section: "",
       maxLength: 255,
@@ -254,7 +254,7 @@ const AddInvestmentType = () => {
       placeHolder: " ",
       name: "note",
       type: "textarea",
-      // isRequired: true,
+      isRequired: false,
       section: "",
       maxLength: 255,
       helperText: `Maximum length should be 255 characters. You have entered ${
@@ -266,7 +266,7 @@ const AddInvestmentType = () => {
       placeHolder: " ",
       name: "noteArabic",
       type: "textarea",
-      // isRequired: true,
+      isRequired: false,
       arabic: true,
       section: "",
       maxLength: 255,
@@ -338,7 +338,7 @@ const AddInvestmentType = () => {
         isOpen={alert}
         onClose={() => setAlert(false)}
         alertHandler={handleConfirm}
-        message={id ? "Are you sure you want to update this document?" : " Are you sure you want to add this document?"}
+        message={id ? "Are you sure you want to update this Investment Type?" : " Are you sure you want to add this Investment Type?"}
         isLoading={isLoadingBtn}
       />
     </Box>
diff --git a/src/Pages/Master/InvestmentType/InvestmentType.jsx b/src/Pages/Master/InvestmentType/InvestmentType.jsx
index 9916ea0..8c92882 100644
--- a/src/Pages/Master/InvestmentType/InvestmentType.jsx
+++ b/src/Pages/Master/InvestmentType/InvestmentType.jsx
@@ -232,16 +232,49 @@ const InvestmentType = () => {
 
   // ==================== [Delete Function] =======================
 
+  // const handleDelete = async () => {
+  //   console.log(actionId);
+  //   setIsLoading(true);
+  //   try {
+  //     const response = await deleteInvestmentType(actionId);
+  //     console.log(response);
+  //     setIsLoading(false);
+  //     setDeleteAlert(false);
+  //   } catch (error) {}
+  // };
+
   const handleDelete = async () => {
     console.log(actionId);
     setIsLoading(true);
     try {
       const response = await deleteInvestmentType(actionId);
-      console.log(response);
+      console.log(response?.data);
+  
+      if (response?.error?.data?.code === 400) {
+        toast({
+          render: () => (
+            <ToastBox message={response?.error?.data?.message} status="error" />
+          ),
+        });
+      } else if (
+        response?.data?.statusCode === 201 ||
+        response?.data?.statusCode === 200
+      ) {
+        toast({
+          render: () => (
+            <ToastBox message={response?.data?.message} status="success" />
+          ),
+        });
+      }
       setIsLoading(false);
       setDeleteAlert(false);
-    } catch (error) {}
+    } catch (error) {
+      console.error(error);
+      setIsLoading(false);
+    }
   };
+  
+
 
   return (
     <Box {...OPACITY_ON_LOAD} overflowY={"scroll"} height={"100vh"} pb={38}>
@@ -315,7 +348,7 @@ const InvestmentType = () => {
       <CustomAlertDialog
         onClose={() => setDeleteAlert(false)}
         isOpen={deleteAlert}
-        message={"Are you sure you want to delete sponers?"}
+        message={"Are you sure you want to delete Investment Type?"}
         alertHandler={handleDelete}
         isLoading={isLoading}
       />
diff --git a/src/Pages/Master/Sponser/Sponsers.jsx b/src/Pages/Master/Sponser/Sponsers.jsx
index 2af1bc0..d179d77 100644
--- a/src/Pages/Master/Sponser/Sponsers.jsx
+++ b/src/Pages/Master/Sponser/Sponsers.jsx
@@ -187,13 +187,13 @@ const Sponser = () => {
       console.log(response?.data);
       if(response?.error?.data?.code === 400){
         toast({
-          render: () => <ToastBox message={response?.error?.data?.message} status={'warn'} />,
+          render: () => <ToastBox message={response?.error?.data?.message} status={'error'} />,
         });
         setIsLoading(false);
         setDeleteAlert(false);
       } else if(response?.data?.statusCode === 201 || response?.data?.statusCode === 200){
         toast({
-          render: () => <ToastBox message={response?.data?.message} status={'error'} />,
+          render: () => <ToastBox message={response?.data?.message} status={'success'} />,
         });
         setIsLoading(false);
         setDeleteAlert(false);
@@ -201,7 +201,7 @@ const Sponser = () => {
       }
     } catch (error) {}
   };
-
+ 
   console.log(isSponserLoading);
 
   
diff --git a/src/Pages/SplashScreen.jsx b/src/Pages/SplashScreen.jsx
index a975efa..9e2b656 100644
--- a/src/Pages/SplashScreen.jsx
+++ b/src/Pages/SplashScreen.jsx
@@ -1,31 +1,31 @@
-import { Box, Image, Spinner, Text } from '@chakra-ui/react'
-import React from 'react'
-import logo from '../assets/logo2.png'
+import { Box, Image, Spinner, Text } from "@chakra-ui/react";
+import React from "react";
+import logo from "../assets/logo2.png";
 
 const SplashScreen = () => {
   return (
     <Box
-    h={'100vh'}
-    display={'flex'}
-    justifyContent={'center'}
-    alignItems={'center'}
-    flexDirection={'column'}
-    gap={10}
+      h={"100vh"}
+      display={"flex"}
+      justifyContent={"center"}
+      alignItems={"center"}
+      flexDirection={"column"}
+      gap={10}
     >
-        <Image src={logo} />
-        {/* <Spinner color='green.900' size='md' /> */}
-        <div className="dot-spinner">
-    <div className="dot-spinner__dot"></div>
-    <div className="dot-spinner__dot"></div>
-    <div className="dot-spinner__dot"></div>
-    <div className="dot-spinner__dot"></div>
-    <div className="dot-spinner__dot"></div>
-    <div className="dot-spinner__dot"></div>
-    <div className="dot-spinner__dot"></div>
-    <div className="dot-spinner__dot"></div>
-</div>
+      <Image src={logo} />
+      <Spinner color='green.900' size='md' />
+      {/* <div className="dot-spinner">
+        <div className="dot-spinner__dot"></div>
+        <div className="dot-spinner__dot"></div>
+        <div className="dot-spinner__dot"></div>
+        <div className="dot-spinner__dot"></div>
+        <div className="dot-spinner__dot"></div>
+        <div className="dot-spinner__dot"></div>
+        <div className="dot-spinner__dot"></div>
+        <div className="dot-spinner__dot"></div>
+      </div> */}
     </Box>
-  )
-}
+  );
+};
 
-export default SplashScreen
\ No newline at end of file
+export default SplashScreen;
diff --git a/src/Pages/WithDrawal/DrawalRequest/DrawalRequestReject.jsx b/src/Pages/WithDrawal/DrawalRequest/DrawalRequestReject.jsx
index e9e3668..85b9a7f 100644
--- a/src/Pages/WithDrawal/DrawalRequest/DrawalRequestReject.jsx
+++ b/src/Pages/WithDrawal/DrawalRequest/DrawalRequestReject.jsx
@@ -113,7 +113,7 @@ import { useDepositRejectMutation } from "../../../Services/drawal.request.servi
                 )}
                 <FormHelperText fontSize="xs" color="gray.500">
                 <Text as={"span"} me={1}>Maximum length should be 200 characters. You have entered</Text>
-                  {watch("checkerComment")?.length || 0} characters.
+                  {watch("comments")?.length || 0} characters.
                 </FormHelperText>
               </FormControl>
             </ModalBody>