From 8eae4222f4b8da5c950012d23709c2f3f325179e Mon Sep 17 00:00:00 2001
From: Swapnil Bendal <84583651+Swapnil155@users.noreply.github.com>
Date: Tue, 24 Dec 2024 16:36:07 +0530
Subject: [PATCH] [fixed] - pending action

---
 .../CreateIO/IOCashDetails/Pending.jsx        | 139 +++++++++---------
 .../CreateIO/IONAVDetails/Pending.jsx         | 138 +++++++++--------
 2 files changed, 148 insertions(+), 129 deletions(-)

diff --git a/src/Pages/IO_Management/CreateIO/IOCashDetails/Pending.jsx b/src/Pages/IO_Management/CreateIO/IOCashDetails/Pending.jsx
index 06bc1d9..c6b6620 100644
--- a/src/Pages/IO_Management/CreateIO/IOCashDetails/Pending.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOCashDetails/Pending.jsx
@@ -38,7 +38,7 @@ import { useUpdateIOCaseMutation } from "../../../../Services/io.service";
 import RequestApproveModal from "./RequestApproveModal";
 import RequestRejectModal from "./RequestRejectModal";
 import AddCaseDetails from "./AddCaseDetails";
-import { encryptString } from "../../../../Constants/Constants";
+import { encryptString, isMaker } from "../../../../Constants/Constants";
 
 const formatDate = (date) => new Date(date).toLocaleDateString();
 
@@ -105,8 +105,7 @@ const Pending = () => {
     "Comments",
     "Update By",
     "Update On",
-    ...(localStorage?.getItem('role')!==encryptString(import.meta.env.VITE_VITE_MAKER) ? ["Actions"] : []),
-    
+    ...(!isMaker() ? ["Actions"] : []),
   ];
 
   const extractedArray = filteredData?.map((item, index) => ({
@@ -132,9 +131,9 @@ const Pending = () => {
           $
         </Badge>
         {parseFloat(item?.transactionAmount || 0).toLocaleString(undefined, {
-            minimumFractionDigits: 2,
-            maximumFractionDigits: 2,
-          })}
+          minimumFractionDigits: 2,
+          maximumFractionDigits: 2,
+        })}
       </Text>
     ),
     Comments: (
@@ -167,64 +166,69 @@ const Pending = () => {
     ),
     Actions: (
       <Box display={"flex"} justifyContent={"center"}>
-        {localStorage?.getItem("role") !== encryptString(import.meta.env.VITE_VITE_MAKER)  ? <Box>
-          {index===0&&<Box display={"flex"} justifyContent={"center"} gap={2}>
-        <Tooltip
-          rounded={"sm"}
-          fontSize={"xs"}
-          label="Approve"
-          bg="#fff"
-          color={"green.500"}
-          placement="left-start"
-        >
+        {!isMaker() ? (
+          <Box>
+            {index === 0 && (
+              <Box display={"flex"} justifyContent={"center"} gap={2}>
+                <Tooltip
+                  rounded={"sm"}
+                  fontSize={"xs"}
+                  label="Approve"
+                  bg="#fff"
+                  color={"green.500"}
+                  placement="left-start"
+                >
+                  <Button
+                    // colorScheme="forestGreen"
+                    // color="green.500"
+                    rounded={"sm"}
+                    size={"xs"}
+                    textTransform={"inherit"}
+                    fontWeight={500}
+                    px={2}
+                    py={1}
+                    onClick={() => {
+                      setActionId(item.id);
+                      onConfirmOpen();
+                    }}
+                    colorScheme="green"
+                    variant={"solid"}
+                    cursor={"pointer"}
+                  >
+                    <CheckIcon fontSize={"12px"} />
+                  </Button>
+                </Tooltip>
+                <Tooltip
+                  rounded={"sm"}
+                  fontSize={"xs"}
+                  label="Reject"
+                  bg="#fff"
+                  color={"red.500"}
+                  placement="left-start"
+                >
+                  <Button
+                    colorScheme="red"
+                    // color="red.500"
+                    rounded={"sm"}
+                    size={"xs"}
+                    textTransform={"inherit"}
+                    fontWeight={500}
+                    px={2}
+                    onClick={() => {
+                      setActionId(item.id);
+                      onRejectOpen();
+                    }}
+                    py={1}
+                    // variant={"solid"}
+                  >
+                    <CloseIcon fontSize={"10px"} />
+                  </Button>
+                </Tooltip>
+              </Box>
+            )}
+          </Box>
+        ) : (
           <Button
-            // colorScheme="forestGreen"
-            // color="green.500"
-            rounded={"sm"}
-            size={"xs"}
-            textTransform={"inherit"}
-            fontWeight={500}
-            px={2}
-            py={1}
-            onClick={() => {
-              setActionId(item.id);
-              onConfirmOpen();
-            }}
-            colorScheme="green"
-            variant={"solid"}
-            cursor={"pointer"}
-          >
-            <CheckIcon fontSize={"12px"} />
-          </Button>
-        </Tooltip>
-        <Tooltip
-          rounded={"sm"}
-          fontSize={"xs"}
-          label="Reject"
-          bg="#fff"
-          color={"red.500"}
-          placement="left-start"
-        >
-          <Button
-            colorScheme="red"
-            // color="red.500"
-            rounded={"sm"}
-            size={"xs"}
-            textTransform={"inherit"}
-            fontWeight={500}
-            px={2}
-            onClick={() => {
-              setActionId(item.id);
-              onRejectOpen();
-            }}
-            py={1}
-            // variant={"solid"}
-          >
-            <CloseIcon fontSize={"10px"} />
-          </Button>
-        </Tooltip></Box>}
-        
-        </Box> : <Button
             colorScheme="green"
             rounded={"sm"}
             size={"xs"}
@@ -236,7 +240,8 @@ const Pending = () => {
             }}
           >
             <ViewIcon me={"4px"} /> View
-          </Button>}
+          </Button>
+        )}
       </Box>
     ),
   }));
@@ -314,9 +319,9 @@ const Pending = () => {
                 $
               </Badge>
               {parseFloat(IODetails?.ioCash || 0).toLocaleString(undefined, {
-            minimumFractionDigits: 2,
-            maximumFractionDigits: 2,
-          })}
+                minimumFractionDigits: 2,
+                maximumFractionDigits: 2,
+              })}
             </Th>
             <Th
               textAlign={"center"}
diff --git a/src/Pages/IO_Management/CreateIO/IONAVDetails/Pending.jsx b/src/Pages/IO_Management/CreateIO/IONAVDetails/Pending.jsx
index a249bce..d74a452 100644
--- a/src/Pages/IO_Management/CreateIO/IONAVDetails/Pending.jsx
+++ b/src/Pages/IO_Management/CreateIO/IONAVDetails/Pending.jsx
@@ -22,7 +22,7 @@ import ToastBox from "../../../../Components/ToastBox";
 import AddNavDetails from "./AddNavDetails";
 import RequestApproveModal from "./RequestApproveModal";
 import RequestRejectModal from "./RequestRejectModal";
-import { encryptString } from "../../../../Constants/Constants";
+import { encryptString, isMaker } from "../../../../Constants/Constants";
 
 const formatDate = (date) => new Date(date).toLocaleDateString();
 
@@ -91,7 +91,7 @@ const Pending = () => {
     "Investment Closed",
     "Comments",
     "Updated By",
-    ...(localStorage?.getItem("role") !== encryptString(import.meta.env.VITE_VITE_MAKER) ? ["Status"] : []),
+    ...(!isMaker() ? ["Status"] : []),
   ];
 
   const extractedArray = filteredData?.map((item, index) => ({
@@ -112,9 +112,9 @@ const Pending = () => {
           $
         </Badge>
         {parseFloat(item?.transactionAmount || 0).toLocaleString(undefined, {
-            minimumFractionDigits: 2,
-            maximumFractionDigits: 2,
-          })}
+          minimumFractionDigits: 2,
+          maximumFractionDigits: 2,
+        })}
       </Text>
     ),
     "Last Nav Update": (
@@ -162,66 +162,80 @@ const Pending = () => {
         {item?.modifier?.firstName}
       </Text>
     ),
-    Status: (
+    Status: isMaker() ? (
+      <Button
+        colorScheme="green"
+        rounded={"sm"}
+        size={"xs"}
+        px={2}
+        py={1}
+        fontWeight={500}
+        onClick={() => {
+          setActionId(item.id);
+        }}
+      >
+        <ViewIcon me={"4px"} /> View
+      </Button>
+    ) : (
       <Box display={"flex"} justifyContent={"center"}>
-       <Box>
+        <Box>
           <Box display={"flex"} justifyContent={"center"} gap={2}>
-        <Tooltip
-          rounded={"sm"}
-          fontSize={"xs"}
-          label="Approve"
-          bg="#fff"
-          color={"green.500"}
-          placement="left-start"
-        >
-          <Button
-            // colorScheme="forestGreen"
-            // color="green.500"
-            rounded={"sm"}
-            size={"xs"}
-            textTransform={"inherit"}
-            fontWeight={500}
-            px={2}
-            py={1}
-            onClick={() => {
-              setActionId(item.id);
-              onConfirmOpen();
-            }}
-            colorScheme="green"
-            variant={"solid"}
-            cursor={"pointer"}
-          >
-            <CheckIcon fontSize={"12px"} />
-          </Button>
-        </Tooltip>
-        <Tooltip
-          rounded={"sm"}
-          fontSize={"xs"}
-          label="Reject"
-          bg="#fff"
-          color={"red.500"}
-          placement="left-start"
-        >
-          <Button
-            colorScheme="red"
-            // color="red.500"
-            rounded={"sm"}
-            size={"xs"}
-            textTransform={"inherit"}
-            fontWeight={500}
-            px={2}
-            onClick={() => {
-              setActionId(item.id);
-              onRejectOpen();
-            }}
-            py={1}
-            // variant={"solid"}
-          >
-            <CloseIcon fontSize={"10px"} />
-          </Button>
-        </Tooltip>
+            <Tooltip
+              rounded={"sm"}
+              fontSize={"xs"}
+              label="Approve"
+              bg="#fff"
+              color={"green.500"}
+              placement="left-start"
+            >
+              <Button
+                // colorScheme="forestGreen"
+                // color="green.500"
+                rounded={"sm"}
+                size={"xs"}
+                textTransform={"inherit"}
+                fontWeight={500}
+                px={2}
+                py={1}
+                onClick={() => {
+                  setActionId(item.id);
+                  onConfirmOpen();
+                }}
+                colorScheme="green"
+                variant={"solid"}
+                cursor={"pointer"}
+              >
+                <CheckIcon fontSize={"12px"} />
+              </Button>
+            </Tooltip>
+            <Tooltip
+              rounded={"sm"}
+              fontSize={"xs"}
+              label="Reject"
+              bg="#fff"
+              color={"red.500"}
+              placement="left-start"
+            >
+              <Button
+                colorScheme="red"
+                // color="red.500"
+                rounded={"sm"}
+                size={"xs"}
+                textTransform={"inherit"}
+                fontWeight={500}
+                px={2}
+                onClick={() => {
+                  setActionId(item.id);
+                  onRejectOpen();
+                }}
+                py={1}
+                // variant={"solid"}
+              >
+                <CloseIcon fontSize={"10px"} />
+              </Button>
+            </Tooltip>
+          </Box>
         </Box>
-        </Box> 
       </Box>
     ),
   }));