From ed27ed6939b2d80f7a5e4e6296e1f1764e692269 Mon Sep 17 00:00:00 2001
From: Swapnil Bendal <84583651+Swapnil155@users.noreply.github.com>
Date: Wed, 11 Dec 2024 19:36:06 +0530
Subject: [PATCH] [update] - io cash, IO nav and pending
---
.../CreateIO/IOCashDetails/IOCashDetails.jsx | 7 +--
.../CreateIO/IONAVDetails/IONAVDetails.jsx | 4 +-
.../CreateIO/IOTransaction/Pending.jsx | 48 ++++++++++---------
3 files changed, 31 insertions(+), 28 deletions(-)
diff --git a/src/Pages/IO_Management/CreateIO/IOCashDetails/IOCashDetails.jsx b/src/Pages/IO_Management/CreateIO/IOCashDetails/IOCashDetails.jsx
index 255c726..505ba1d 100644
--- a/src/Pages/IO_Management/CreateIO/IOCashDetails/IOCashDetails.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOCashDetails/IOCashDetails.jsx
@@ -20,7 +20,7 @@ import AddCaseDetails from "./AddCaseDetails";
import { useUpdateIOCaseMutation } from "../../../../Services/io.service";
import ToastBox from "../../../../Components/ToastBox";
import { useParams } from "react-router-dom";
-import { encryptString } from "../../../../Constants/Constants";
+import { encryptString, isMaker } from "../../../../Constants/Constants";
const IOCashDetails = () => {
const params = useParams();
@@ -88,7 +88,8 @@ const IOCashDetails = () => {
Pending
{IODetails?.ioCashStatusHistory?.Pending.length > 0 && (
- {IODetails?.ioCashStatusHistory?.Pending.length !== 0 && IODetails?.ioCashStatusHistory?.Pending.length}
+ {IODetails?.ioCashStatusHistory?.Pending.length !== 0 &&
+ IODetails?.ioCashStatusHistory?.Pending.length}
)}
{/*
@@ -106,7 +107,7 @@ const IOCashDetails = () => {
{IODetails?.isInvestedAmount
- ? localStorage?.getItem("role") === encryptString(import.meta.env.VITE_VITE_MAKER) && (
+ ? isMaker() && (
}
diff --git a/src/Pages/IO_Management/CreateIO/IONAVDetails/IONAVDetails.jsx b/src/Pages/IO_Management/CreateIO/IONAVDetails/IONAVDetails.jsx
index d9fee12..2db38b7 100644
--- a/src/Pages/IO_Management/CreateIO/IONAVDetails/IONAVDetails.jsx
+++ b/src/Pages/IO_Management/CreateIO/IONAVDetails/IONAVDetails.jsx
@@ -75,7 +75,7 @@ import ToastBox from "../../../../Components/ToastBox";
import { useParams } from "react-router-dom";
import AddNavDetails from "./AddNavDetails";
import { useUpdateIOCaseMutation } from "../../../../Services/io.service";
-import { encryptString } from "../../../../Constants/Constants";
+import { encryptString, isMaker } from "../../../../Constants/Constants";
const IONAVDetails = () => {
const params = useParams();
@@ -153,7 +153,7 @@ const IONAVDetails = () => {
{IODetails?.isInvestedAmount
- ? localStorage?.getItem("role") === encryptString(import.meta.env.VITE_VITE_MAKER) && (
+ ? isMaker() && (
}
diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/Pending.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/Pending.jsx
index d7d181a..2653a94 100644
--- a/src/Pages/IO_Management/CreateIO/IOTransaction/Pending.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOTransaction/Pending.jsx
@@ -27,7 +27,7 @@ import ViewAmountInvested from "./ViewAmountInvested";
import ViewDistributionInvestor from "./ViewDistributionInvestor";
import ViewExit from "./ViewExit";
import ViewCancel from "./ViewCancel";
-import { encryptString } from "../../../../Constants/Constants";
+import { encryptString, isMaker } from "../../../../Constants/Constants";
const formatDate = (date) => new Date(date).toLocaleDateString();
@@ -128,11 +128,7 @@ const Pending = () => {
),
"Transaction Date": (
-
+
{formatDate(item?.transactionDate)}
),
@@ -153,8 +149,13 @@ const Pending = () => {
),
"Created By": (
-
+
{item?.creator?.firstName}
),
@@ -164,8 +165,13 @@ const Pending = () => {
),
"Approved By": (
-
+
{item?.modifier?.firstName}
),
@@ -196,7 +202,11 @@ const Pending = () => {
}
}}
>
- {localStorage?.getItem("role") === encryptString(import.meta.env.VITE_VITE_MAKER) ? : null} {localStorage?.getItem("role") === encryptString(import.meta.env.VITE_VITE_MAKER) ? "View" : "Approve / Reject"}
+ {isMaker() ? : null}{" "}
+ {localStorage?.getItem("role") ===
+ encryptString(import.meta.env.VITE_VITE_MAKER)
+ ? "View"
+ : "Approve / Reject"}
),
@@ -263,20 +273,12 @@ const Pending = () => {
id={actionId}
/>
-
-
+
+