From f3a8a80f4df172ff414b02c2d69ace498e23adf0 Mon Sep 17 00:00:00 2001
From: YasinShaikh123 <123150391+YasinShaikh123@users.noreply.github.com>
Date: Fri, 22 Nov 2024 13:32:28 +0530
Subject: [PATCH] update action

---
 .../CreateIO/IOCashDetails/Approved.jsx       |  4 +--
 .../CreateIO/IOCashDetails/Pending.jsx        | 25 ++++++++++++++++---
 .../CreateIO/IOCashDetails/Rejected.jsx       |  4 +--
 .../IOCashDetails/RequestApproveModal.jsx     |  4 +--
 .../CreateIO/IONAVDetails/Approved.jsx        |  4 +--
 .../CreateIO/IONAVDetails/Pending.jsx         | 22 +++++++++++++---
 .../CreateIO/IONAVDetails/Rejected.jsx        |  4 +--
 .../IONAVDetails/RequestApproveModal.jsx      |  2 +-
 .../CreateIO/IOTransaction/Approved.jsx       |  2 +-
 .../CreateIO/IOTransaction/Pending.jsx        |  4 +--
 .../CreateIO/IOTransaction/Rejected.jsx       |  2 +-
 .../IOTransaction/RequestApproveModal.jsx     |  2 +-
 .../IOTransaction/RequestExitApproveModal.jsx |  2 +-
 13 files changed, 57 insertions(+), 24 deletions(-)

diff --git a/src/Pages/IO_Management/CreateIO/IOCashDetails/Approved.jsx b/src/Pages/IO_Management/CreateIO/IOCashDetails/Approved.jsx
index 34f727a..4b78d65 100644
--- a/src/Pages/IO_Management/CreateIO/IOCashDetails/Approved.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOCashDetails/Approved.jsx
@@ -132,12 +132,12 @@ const Approved = () => {
         display={"flex"}
         alignItems={"center"}
       >
-        <Avatar
+        {/* <Avatar
           mr={2}
           size="sm"
           name={item.creator?.firstName}
           src={item.creator?.profilePhoto}
-        />
+        /> */}
         {item?.creator?.firstName}
       </Text>
     ),
diff --git a/src/Pages/IO_Management/CreateIO/IOCashDetails/Pending.jsx b/src/Pages/IO_Management/CreateIO/IOCashDetails/Pending.jsx
index dc44a53..a7be1f9 100644
--- a/src/Pages/IO_Management/CreateIO/IOCashDetails/Pending.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOCashDetails/Pending.jsx
@@ -104,7 +104,8 @@ const Pending = () => {
     "Comments",
     "Update by",
     "Update On",
-    ...(localStorage?.getItem('role')!=="Maker" ? ["Status"] : []),
+    // ...(localStorage?.getItem('role')!=="Maker" ? ["Status"] : []),
+    "Status"
   ];
 
   const extractedArray = filteredData?.map((item, index) => ({
@@ -149,12 +150,12 @@ const Pending = () => {
         display={"flex"}
         alignItems={"center"}
       >
-        <Avatar
+        {/* <Avatar
           mr={2}
           size="sm"
           name={item?.creator?.firstName}
           src={item?.creator?.profilePhoto}
-        />
+        /> */}
         {item?.creator?.firstName}
       </Text>
     ),
@@ -164,7 +165,9 @@ const Pending = () => {
       </Text>
     ),
     Status: (
-      <Box display={"flex"} justifyContent={"center"} gap={2}>
+      <Box display={"flex"} justifyContent={"center"}>
+        {localStorage?.getItem("role") !== "Maker" ? <Box>
+          <Box display={"flex"} justifyContent={"center"} gap={2}>
         <Tooltip
           rounded={"sm"}
           fontSize={"xs"}
@@ -219,6 +222,20 @@ const Pending = () => {
             <CloseIcon fontSize={"10px"} />
           </Button>
         </Tooltip>
+        </Box>
+        </Box> : <Button
+            colorScheme="green"
+            rounded={"sm"}
+            size={"xs"}
+            px={2}
+            py={1}
+            fontWeight={500}
+            onClick={() => {
+              setActionId(item.id);
+            }}
+          >
+            <ViewIcon me={"4px"} /> View
+          </Button>}
       </Box>
     ),
   }));
diff --git a/src/Pages/IO_Management/CreateIO/IOCashDetails/Rejected.jsx b/src/Pages/IO_Management/CreateIO/IOCashDetails/Rejected.jsx
index 243e624..5a6af37 100644
--- a/src/Pages/IO_Management/CreateIO/IOCashDetails/Rejected.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOCashDetails/Rejected.jsx
@@ -144,12 +144,12 @@ import AddCaseDetails from "./AddCaseDetails";
           display={"flex"}
           alignItems={"center"}
         >
-          <Avatar
+          {/* <Avatar
            mr={2}
             size="sm"
             name={item.creator?.firstName}
             src={item.creator?.profilePhoto}
-          />
+          /> */}
           {item?.creator?.firstName}
         </Text>
       ),
diff --git a/src/Pages/IO_Management/CreateIO/IOCashDetails/RequestApproveModal.jsx b/src/Pages/IO_Management/CreateIO/IOCashDetails/RequestApproveModal.jsx
index 6ffbfa9..c771b46 100644
--- a/src/Pages/IO_Management/CreateIO/IOCashDetails/RequestApproveModal.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOCashDetails/RequestApproveModal.jsx
@@ -140,8 +140,8 @@ const RequestApproveModal = ({ isOpen, onClose, firstField ,id}) => {
                 </Text>
               )}
               <FormHelperText fontSize="xs" color="gray.500">
-                Maximum length should be 200 characters. You have entered
-                {watch("checkerComment")?.length || 0} characters.
+                <Box as="span" me={1}>Maximum length should be 200 characters. You have entered </Box>
+                 {watch("checkerComment")?.length || 0} characters.
               </FormHelperText>
             </FormControl>
           </ModalBody>
diff --git a/src/Pages/IO_Management/CreateIO/IONAVDetails/Approved.jsx b/src/Pages/IO_Management/CreateIO/IONAVDetails/Approved.jsx
index f6ed889..d9d777f 100644
--- a/src/Pages/IO_Management/CreateIO/IONAVDetails/Approved.jsx
+++ b/src/Pages/IO_Management/CreateIO/IONAVDetails/Approved.jsx
@@ -147,12 +147,12 @@ const Approved = () => {
         display={"flex"}
         alignItems={"center"}
       >
-        <Avatar
+        {/* <Avatar
           mr={2}
           size="sm"
           name={item.creator?.firstName}
           src={item.creator?.profilePhoto}
-        />
+        /> */}
         {item?.creator?.firstName}
       </Text>
     ),
diff --git a/src/Pages/IO_Management/CreateIO/IONAVDetails/Pending.jsx b/src/Pages/IO_Management/CreateIO/IONAVDetails/Pending.jsx
index d68239e..133d758 100644
--- a/src/Pages/IO_Management/CreateIO/IONAVDetails/Pending.jsx
+++ b/src/Pages/IO_Management/CreateIO/IONAVDetails/Pending.jsx
@@ -152,17 +152,19 @@ const Pending = () => {
         display={"flex"}
         alignItems={"center"}
       >
-        <Avatar
+        {/* <Avatar
           mr={2}
           size="sm"
           name={item.creator?.firstName}
           src={item.creator?.profilePhoto}
-        />
+        /> */}
         {item?.creator?.firstName}
       </Text>
     ),
     Status: (
-      <Box display={"flex"} justifyContent={"center"} gap={2}>
+      <Box display={"flex"} justifyContent={"center"}>
+        {localStorage?.getItem("role") !== "Maker" ? <Box>
+          <Box display={"flex"} justifyContent={"center"} gap={2}>
         <Tooltip
           rounded={"sm"}
           fontSize={"xs"}
@@ -217,6 +219,20 @@ const Pending = () => {
             <CloseIcon fontSize={"10px"} />
           </Button>
         </Tooltip>
+        </Box>
+        </Box> : <Button
+            colorScheme="green"
+            rounded={"sm"}
+            size={"xs"}
+            px={2}
+            py={1}
+            fontWeight={500}
+            onClick={() => {
+              setActionId(item.id);
+            }}
+          >
+            <ViewIcon me={"4px"} /> View
+          </Button>}
       </Box>
     ),
   }));
diff --git a/src/Pages/IO_Management/CreateIO/IONAVDetails/Rejected.jsx b/src/Pages/IO_Management/CreateIO/IONAVDetails/Rejected.jsx
index 3f0aa17..e94f61c 100644
--- a/src/Pages/IO_Management/CreateIO/IONAVDetails/Rejected.jsx
+++ b/src/Pages/IO_Management/CreateIO/IONAVDetails/Rejected.jsx
@@ -161,12 +161,12 @@ import AddNavDetails from "./AddNavDetails";
           display={"flex"}
         alignItems={"center"}
         >
-           <Avatar
+           {/* <Avatar
             mr={2}
           size="sm"
           name={item.creator?.firstName}
           src={item.creator?.profilePhoto}
-        />
+        /> */}
           {item?.creator?.firstName}
         </Text>
       ),
diff --git a/src/Pages/IO_Management/CreateIO/IONAVDetails/RequestApproveModal.jsx b/src/Pages/IO_Management/CreateIO/IONAVDetails/RequestApproveModal.jsx
index 861d3ed..edad9d3 100644
--- a/src/Pages/IO_Management/CreateIO/IONAVDetails/RequestApproveModal.jsx
+++ b/src/Pages/IO_Management/CreateIO/IONAVDetails/RequestApproveModal.jsx
@@ -140,7 +140,7 @@ const RequestApproveModal = ({ isOpen, onClose, firstField ,id}) => {
                 </Text>
               )}
               <FormHelperText fontSize="xs" color="gray.500">
-                Maximum length should be 200 characters. You have entered
+              <Box as="span" me={1}>Maximum length should be 200 characters. You have entered</Box>
                 {watch("checkerComment")?.length || 0} characters.
               </FormHelperText>
             </FormControl>
diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/Approved.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/Approved.jsx
index b027b7d..4202924 100644
--- a/src/Pages/IO_Management/CreateIO/IOTransaction/Approved.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOTransaction/Approved.jsx
@@ -153,7 +153,7 @@ import {
           color={"gray.800"}
           fontWeight={"500"}
         >
-           {item?.modifier ? formatDate(item?.updatedAt) : "---" }
+           {item?.modifier?.firstName}
         </Text>
         {/* <Text
           w={"100px"}
diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/Pending.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/Pending.jsx
index 18138fc..3a795bc 100644
--- a/src/Pages/IO_Management/CreateIO/IOTransaction/Pending.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOTransaction/Pending.jsx
@@ -163,7 +163,7 @@ const Pending = () => {
       ),
       "Approved By": (
         <Text w={"100px"} as={"span"} color={"gray.800"} fontWeight={"500"}>
-          {item?.modifier ? item?.modifier : "---"}
+          {item?.modifier?.firstName}
         </Text>
       ),
       "Approved On": (
@@ -193,7 +193,7 @@ const Pending = () => {
               }
             }}
           >
-            <ViewIcon me={"4px"} /> View
+            {localStorage?.getItem("role") === "Maker" ?  <ViewIcon me={"4px"} /> : null} {localStorage?.getItem("role") === "Maker" ?  "View" : "Approve / reject"}
           </Button>
         </Box>
       ),
diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/Rejected.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/Rejected.jsx
index 388ce77..6203687 100644
--- a/src/Pages/IO_Management/CreateIO/IOTransaction/Rejected.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOTransaction/Rejected.jsx
@@ -141,7 +141,7 @@ import {
           color={"gray.800"}
           fontWeight={"500"}
         >
-           {item?.modifier ? formatDate(item?.updatedAt) : "---" }
+           {item?.modifier?.firstName}
         </Text>
       ),
       "Approved On": (
diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/RequestApproveModal.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/RequestApproveModal.jsx
index 527dbb8..507aeb2 100644
--- a/src/Pages/IO_Management/CreateIO/IOTransaction/RequestApproveModal.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOTransaction/RequestApproveModal.jsx
@@ -139,7 +139,7 @@ const RequestApproveModal = ({ isOpen, onClose, firstField ,id}) => {
                 </Text>
               )}
               <FormHelperText fontSize="xs" color="gray.500">
-                Maximum length should be 200 characters. You have entered
+              <Box as="span" me={1}>Maximum length should be 200 characters. You have entered</Box>
                 {watch("checkerComment")?.length || 0} characters.
               </FormHelperText>
             </FormControl>
diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/RequestExitApproveModal.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/RequestExitApproveModal.jsx
index 04ee265..5bc15c7 100644
--- a/src/Pages/IO_Management/CreateIO/IOTransaction/RequestExitApproveModal.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOTransaction/RequestExitApproveModal.jsx
@@ -139,7 +139,7 @@ import {
                   </Text>
                 )}
                 <FormHelperText fontSize="xs" color="gray.500">
-                  Maximum length should be 200 characters. You have entered
+                <Box as="span" me={1}>Maximum length should be 200 characters. You have entered</Box>
                   {watch("checkerComment")?.length || 0} characters.
                 </FormHelperText>
               </FormControl>