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] 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: },
];
+
+ console.log(IODetails?.ioNAVHistory);
+
+
return (
{
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 ? :""}
))}