From 470ba49c0038465b7ad0ab8914482c16bc276eb2 Mon Sep 17 00:00:00 2001
From: YasinShaikh123 <123150391+YasinShaikh123@users.noreply.github.com>
Date: Thu, 21 Nov 2024 16:05:51 +0530
Subject: [PATCH 1/2] UPDATE invest modal

---
 .../IOTransaction/ViewAmountInvested.jsx      | 127 ++++++++++--------
 src/Pages/IO_Management/ViewIO/ViewIOdata.jsx |  30 +++--
 2 files changed, 88 insertions(+), 69 deletions(-)

diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/ViewAmountInvested.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/ViewAmountInvested.jsx
index d7a7607..3983f72 100644
--- a/src/Pages/IO_Management/CreateIO/IOTransaction/ViewAmountInvested.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOTransaction/ViewAmountInvested.jsx
@@ -47,7 +47,7 @@ const formatCurrency = (value) => {
   return decimal ? `${formattedInteger}.${decimal}` : formattedInteger;
 };
 
-const ViewAmountInvested = ({ isOpen, onClose, id:investorId }) => {
+const ViewAmountInvested = ({ isOpen, onClose, id: investorId }) => {
   const params = useParams();
   const toast = useToast();
   const id = params?.id;
@@ -131,7 +131,11 @@ const ViewAmountInvested = ({ isOpen, onClose, id:investorId }) => {
       Total_Amount: IODetails?.totalAmtInvestmentInUSD,
     });
   };
-  
+
+  console.log(
+    "=========hitttt",
+    IODetails?.ioTransactionRecords?.Approved?.[0]?.transactionAmount
+  );
 
   return (
     <Modal isOpen={isOpen} onClose={onClose}>
@@ -151,7 +155,9 @@ const ViewAmountInvested = ({ isOpen, onClose, id:investorId }) => {
               </FormLabel>
               <Input
                 type="text"
-                value={formatDate(IODetails?.ioTransactionRecords?.Approved?.[0]?.createdAt)}
+                value={formatDate(
+                  IODetails?.ioTransactionRecords?.Approved?.[0]?.createdAt
+                )}
                 size="sm"
                 rounded={"sm"}
                 textAlign={"end"}
@@ -162,64 +168,67 @@ const ViewAmountInvested = ({ isOpen, onClose, id:investorId }) => {
             </FormControl>
 
             <FormControl
-  mb={"15px"}
-  isInvalid={!!errors.Total_Amount}
-  isReadOnly
->
-  <FormLabel as={"label"} fontSize={"sm"} fontWeight={500}>
-    Amount
-  </FormLabel>
-  <Input
-    type="text"
-    value={formatCurrency(watch("Total_Amount"))}
-    size="sm"
-    rounded={"sm"}
-    textAlign={"end"}
-    focusBorderColor="forestGreen.300"
-    fontSize={"sm"}
-    readOnly
-  />
-</FormControl>
+              mb={"15px"}
+              isInvalid={!!errors.Total_Amount}
+              isReadOnly
+            >
+              <FormLabel as={"label"} fontSize={"sm"} fontWeight={500}>
+                Amount
+              </FormLabel>
+              <Input
+                type="text"
+                value={formatCurrency(watch("Total_Amount") || 0)}
+                size="sm"
+                rounded={"sm"}
+                textAlign={"end"}
+                focusBorderColor="forestGreen.300"
+                fontSize={"sm"}
+                readOnly
+              />
+            </FormControl>
 
-<FormControl
-  mb={"15px"}
-  isInvalid={!!errors.amountInvested}
-  isRequired
->
-  <FormLabel as={"label"} fontSize={"sm"} fontWeight={500}>
-    Amount to invest
-  </FormLabel>
-  <Input
-    type="text"
-    value={formatCurrency(IODetails?.ioTransactionRecords?.Approved?.[0]?.transactionAmount || 0)}
-    size="sm"
-    rounded={"sm"}
-    textAlign={"end"}
-    focusBorderColor="forestGreen.300"
-    fontSize={"sm"}
-    readOnly
-  />
-</FormControl>
-
-<FormControl mb={"15px"} isInvalid={!!errors.IoCash}>
-  <FormLabel as={"label"} fontSize={"sm"} fontWeight={500}>
-    IO Cash
-  </FormLabel>
-  <Input
-    type="text"
-    value={formatCurrency(
-      (watch("Total_Amount") || 0) -
-        (IODetails?.ioTransactionRecords?.Approved?.[0]?.transactionAmount || 0)
-    )}
-    size="sm"
-    rounded={"sm"}
-    focusBorderColor="forestGreen.300"
-    fontSize={"sm"}
-    textAlign={"right"}
-    readOnly
-  />
-</FormControl>
+            <FormControl
+              mb={"15px"}
+              isInvalid={!!errors.amountInvested}
+              isRequired
+            >
+              <FormLabel as={"label"} fontSize={"sm"} fontWeight={500}>
+                Amount to invest
+              </FormLabel>
+              <Input
+                type="text"
+                value={formatCurrency(
+                  IODetails?.ioTransactionRecords?.Pending?.[0]
+                    ?.transactionAmount || 0
+                )}
+                size="sm"
+                rounded={"sm"}
+                textAlign={"end"}
+                focusBorderColor="forestGreen.300"
+                fontSize={"sm"}
+                readOnly
+              />
+            </FormControl>
 
+            <FormControl mb={"15px"} isInvalid={!!errors.IoCash}>
+              <FormLabel as={"label"} fontSize={"sm"} fontWeight={500}>
+                IO Cash
+              </FormLabel>
+              <Input
+                type="text"
+                value={formatCurrency(
+                  (watch("Total_Amount") || 0) -
+                    (IODetails?.ioTransactionRecords?.Pending?.[0]
+                      ?.transactionAmount || 0)
+                )}
+                size="sm"
+                rounded={"sm"}
+                focusBorderColor="forestGreen.300"
+                fontSize={"sm"}
+                textAlign={"right"}
+                readOnly
+              />
+            </FormControl>
 
             <ModalFooter>
               <Box display={"flex"} justifyContent={"center"} gap={2}>
diff --git a/src/Pages/IO_Management/ViewIO/ViewIOdata.jsx b/src/Pages/IO_Management/ViewIO/ViewIOdata.jsx
index c2f5e49..dd99522 100644
--- a/src/Pages/IO_Management/ViewIO/ViewIOdata.jsx
+++ b/src/Pages/IO_Management/ViewIO/ViewIOdata.jsx
@@ -54,7 +54,7 @@ const ViewIOdata = () => {
   const tabs = [
     { label: "IO Details", content: <ViewIOdetails data={data?.data} /> },
     {
-      label: "Investment documents",
+      label: "Investment documents", 
       content: <InvestmentDocument data={data?.data} />,
     },
     { label: "Key merits", content: <KeyMerits data={data?.data} /> },
@@ -98,15 +98,25 @@ const ViewIOdata = () => {
             {tabs.map(({ label }, index) => (
               <Tab
                 px={3}
-                isDisabled={
-                  index === 0 ||
-                  index === 1 ||
-                  index === 2 ||
-                  index === 3 ||
-                  index === 4
-                    ? false
-                    : !IODetails?.isInvestedAmount
-                }
+                // isDisabled={
+                //   index === 0 ||
+                //   index === 1 ||
+                //   index === 2 ||
+                //   index === 3 ||
+                //   index === 4
+                //     ? false
+                //     : !IODetails?.isInvestedAmount
+                // }
+                
+                // isDisabled={
+                //   index === 0 ||
+                //   index === 1 ||
+                //   index === 2 ||
+                //   index === 3 ||
+                //   index === 4
+                //     ? false
+                //     : !IODetails?.isInvestedAmount
+                // }
                 key={index}
                 fontSize={"xs"}
                 _selected={{
-- 
2.34.1


From 6ffcff58a2f5493b4740b5748bfa1b180884c794 Mon Sep 17 00:00:00 2001
From: YasinShaikh123 <123150391+YasinShaikh123@users.noreply.github.com>
Date: Thu, 21 Nov 2024 17:42:27 +0530
Subject: [PATCH 2/2] update tabs

---
 .../CreateIO/IOTransaction/ViewCancel.jsx     | 18 +++++++++---------
 .../ViewDistributionInvestor.jsx              | 18 +++++++++---------
 .../CreateIO/IOTransaction/ViewExit.jsx       | 18 +++++++++---------
 src/Pages/IO_Management/ViewIO/ViewIOdata.jsx | 19 ++++++++++---------
 src/Services/io.service.js                    |  2 +-
 5 files changed, 38 insertions(+), 37 deletions(-)

diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/ViewCancel.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/ViewCancel.jsx
index 1b89458..5dc7406 100644
--- a/src/Pages/IO_Management/CreateIO/IOTransaction/ViewCancel.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOTransaction/ViewCancel.jsx
@@ -86,15 +86,15 @@ 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");
+    //   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 87b9a25..3f3c059 100644
--- a/src/Pages/IO_Management/CreateIO/IOTransaction/ViewDistributionInvestor.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOTransaction/ViewDistributionInvestor.jsx
@@ -70,15 +70,15 @@ const ViewDistributionInvestor = ({ isOpen, onClose,id:exitId }) => {
     resolver: yupResolver(investorExit),
   });
 
-  useEffect(() => {
-    console.log("hiit     useEffectc");
-    handleCalculate(id, {
-      amount: IODetails?.ioMVNAV,
-    });
-    reset({
-      amount: IODetails?.ioMVNAV,
-    });
-  }, [IODetails, id]);
+  // useEffect(() => {
+  //   console.log("hiit     useEffectc");
+  //   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/ViewExit.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/ViewExit.jsx
index 262adcf..9a5ed80 100644
--- a/src/Pages/IO_Management/CreateIO/IOTransaction/ViewExit.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOTransaction/ViewExit.jsx
@@ -76,15 +76,15 @@ 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");
+    //   handleCalculate(id, {
+    //     amount: IODetails?.ioMVNAV,
+    //   });
+    //   reset({
+    //     amount: IODetails?.ioMVNAV,
+    //   });
+    // }, [IODetails, id]);
   
     const handleCalculate = async (id, data) => {
       try {
diff --git a/src/Pages/IO_Management/ViewIO/ViewIOdata.jsx b/src/Pages/IO_Management/ViewIO/ViewIOdata.jsx
index dd99522..cb3a6d1 100644
--- a/src/Pages/IO_Management/ViewIO/ViewIOdata.jsx
+++ b/src/Pages/IO_Management/ViewIO/ViewIOdata.jsx
@@ -98,15 +98,16 @@ const ViewIOdata = () => {
             {tabs.map(({ label }, index) => (
               <Tab
                 px={3}
-                // isDisabled={
-                //   index === 0 ||
-                //   index === 1 ||
-                //   index === 2 ||
-                //   index === 3 ||
-                //   index === 4
-                //     ? false
-                //     : !IODetails?.isInvestedAmount
-                // }
+                isDisabled={
+                  index === 0 ||
+                  index === 1 ||
+                  index === 2 ||
+                  index === 3 ||
+                  index === 4 ||
+                  index === 8
+                    ? false
+                    : !IODetails?.isInvestedAmount
+                }
                 
                 // isDisabled={
                 //   index === 0 ||
diff --git a/src/Services/io.service.js b/src/Services/io.service.js
index efb5a21..f937183 100644
--- a/src/Services/io.service.js
+++ b/src/Services/io.service.js
@@ -225,7 +225,7 @@ export const ioService = createApi({
       invalidatesTags: ["getIOById"],
     }),
 
-    // ======== [ Distribution Transaction ] ========
+    // ======== [ Distribution Transaction ] ======== 
 
     getDistributionInvestor: builder.mutation({
       query: ({ id, data }) => ({
-- 
2.34.1