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 = () => { $ {parseFloat(item?.transactionAmount || 0).toLocaleString(undefined, { - minimumFractionDigits: 2, - maximumFractionDigits: 2, - })} + minimumFractionDigits: 2, + maximumFractionDigits: 2, + })} ), Comments: ( @@ -167,64 +166,69 @@ const Pending = () => { ), Actions: ( - {localStorage?.getItem("role") !== encryptString(import.meta.env.VITE_VITE_MAKER) ? - {index===0&& - + {!isMaker() ? ( + + {index === 0 && ( + + + + + + + + + )} + + ) : ( - - - - } - - : } + + )} ), })); @@ -314,9 +319,9 @@ const Pending = () => { $ {parseFloat(IODetails?.ioCash || 0).toLocaleString(undefined, { - minimumFractionDigits: 2, - maximumFractionDigits: 2, - })} + minimumFractionDigits: 2, + maximumFractionDigits: 2, + })} 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 = () => { $ {parseFloat(item?.transactionAmount || 0).toLocaleString(undefined, { - minimumFractionDigits: 2, - maximumFractionDigits: 2, - })} + minimumFractionDigits: 2, + maximumFractionDigits: 2, + })} ), "Last Nav Update": ( @@ -162,66 +162,80 @@ const Pending = () => { {item?.modifier?.firstName} ), - Status: ( + Status: isMaker() ? ( + + ) : ( - + - - - - - - + + + + + + + - ), }));