From 84dc47b4478b41f2c0114fdb1943f1bea17fce45 Mon Sep 17 00:00:00 2001
From: YasinShaikh123 <123150391+YasinShaikh123@users.noreply.github.com>
Date: Fri, 10 Jan 2025 17:28:26 +0530
Subject: [PATCH] =?UTF-8?q?done=20changes=20and=20bug=E2=9C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Components/FormField.jsx                  |  2 +-
 .../IO_Management/InvestmentDocuments.jsx     |  4 +-
 .../ViewIO/HeaderModal/UpdateIOStatus.jsx     | 48 +++++++++++++++----
 .../InvestorDetails/BankDetails.jsx           |  2 +-
 .../InvestorDetails/InvestorDetails.jsx       |  3 +-
 src/Services/io.service.js                    |  3 +-
 6 files changed, 48 insertions(+), 14 deletions(-)

diff --git a/src/Components/FormField.jsx b/src/Components/FormField.jsx
index 2c67452..0853ad2 100644
--- a/src/Components/FormField.jsx
+++ b/src/Components/FormField.jsx
@@ -520,7 +520,7 @@ const FormField = ({
                  ps={1}
                 {...field}
                 {...props} size='md' colorScheme='forestGreen'>
-                  <Text as={"span"} fontSize={"sm"}>Is This Sharia Compliant</Text>
+                  <Text as={"span"} fontSize={"sm"}>Is This Shariah Compliant</Text>
                 </Checkbox>
               </HStack>
             );} else{
diff --git a/src/Pages/IO_Management/InvestmentDocuments.jsx b/src/Pages/IO_Management/InvestmentDocuments.jsx
index f89958f..92633cf 100644
--- a/src/Pages/IO_Management/InvestmentDocuments.jsx
+++ b/src/Pages/IO_Management/InvestmentDocuments.jsx
@@ -60,9 +60,9 @@ export const investmentDocSchema = yup.object().shape({
   //   return value && value.size <= 2 * 1024 * 1024; // 2MB in bytes
   // })
   fileName: yup.string().required("File name is required")
-  .max(30, "File name must be at most 30 characters"), // Maximum length validation,
+  .max(35, "File name must be at most 30 characters"), // Maximum length validation,
   documentNameArabic: yup.string().required("File name Arabic is required")
-  .max(25, "File name must be at most 30 characters"), 
+  .max(25, "File name must be at most 35 characters"), 
 });
 
 const InvestmentDocuments = ({
diff --git a/src/Pages/IO_Management/ViewIO/HeaderModal/UpdateIOStatus.jsx b/src/Pages/IO_Management/ViewIO/HeaderModal/UpdateIOStatus.jsx
index 6327f52..1a3a60f 100644
--- a/src/Pages/IO_Management/ViewIO/HeaderModal/UpdateIOStatus.jsx
+++ b/src/Pages/IO_Management/ViewIO/HeaderModal/UpdateIOStatus.jsx
@@ -17,6 +17,9 @@ import {
   ModalHeader,
   ModalOverlay,
   FormErrorMessage,
+  Text,
+  Textarea,
+  Box,
 } from "@chakra-ui/react";
 import {
   useGetIOprepopulateDataQuery,
@@ -37,6 +40,8 @@ const UpdateIOStatus = ({ isOpen, onClose, status }) => {
   const { data } = useGetIOprepopulateDataQuery();
   const [updateStatusIo] = useUpdateStatusIoMutation();
   const [updateCancleStatus] = useUpdateCancleStatusToMutation();
+  const [message, setMessage] = useState(null);
+  const [messageError, setMessageError] = useState(null);
 
   // useEffect(() => {
   //   setSelectedStatusId(status?.[0]?.id);
@@ -47,11 +52,14 @@ const UpdateIOStatus = ({ isOpen, onClose, status }) => {
     setSelectedStatusId(id);
   };
 
-  const handleSubmit = async () => {
+  const handleSubmit = async (data) => {
     if (!selectedStatusId) {
       setError("Please select status");
       return;
     }
+    if (!message) {
+      return setMessageError("message is required");
+    }
     setError("");
     setIsLoading(true);
     try {
@@ -60,9 +68,10 @@ const UpdateIOStatus = ({ isOpen, onClose, status }) => {
       // If selectedItem is 'Cancelled', make the updateCancelStatus API call
       if (selectedItem === import.meta.env.VITE_STATUS_CANCELLED) {
         res = await updateCancleStatus({
-          id
+          id: selectedStatusId,
+          data: { comments: message },
         });
-      } 
+      }
       // Otherwise, make the updateStatusIo API call
       else {
         res = await updateStatusIo({
@@ -72,7 +81,7 @@ const UpdateIOStatus = ({ isOpen, onClose, status }) => {
           id,
         });
       }
-  
+
       console.log("API Response:", res);
       setIsLoading(false);
       handleClose();
@@ -84,6 +93,8 @@ const UpdateIOStatus = ({ isOpen, onClose, status }) => {
   const handleClose = () => {
     setSelectedItem(null);
     setSelectedStatusId(null);
+    setMessage(null);
+    setMessageError(null);
     onClose();
     setError("");
   };
@@ -121,7 +132,8 @@ const UpdateIOStatus = ({ isOpen, onClose, status }) => {
                     colorScheme={
                       selectedItem === import.meta.env.VITE_STATUS_DRAFT
                         ? "gray"
-                        : selectedItem === import.meta.env.VITE_STATUS_PROCESSING
+                        : selectedItem ===
+                          import.meta.env.VITE_STATUS_PROCESSING
                         ? "yellow"
                         : selectedItem === import.meta.env.VITE_STATUS_OPEN
                         ? "blue"
@@ -154,7 +166,7 @@ const UpdateIOStatus = ({ isOpen, onClose, status }) => {
                       <Badge
                         rounded={"full"}
                         pt={1.5}
-                        pb={1.5} 
+                        pb={1.5}
                         ps={4}
                         pe={4}
                         mt={1.5}
@@ -163,7 +175,8 @@ const UpdateIOStatus = ({ isOpen, onClose, status }) => {
                         colorScheme={
                           statusAdmin === import.meta.env.VITE_STATUS_DRAFT
                             ? "gray"
-                            : statusAdmin === import.meta.env.VITE_STATUS_PROCESSING
+                            : statusAdmin ===
+                              import.meta.env.VITE_STATUS_PROCESSING
                             ? "yellow"
                             : statusAdmin === import.meta.env.VITE_STATUS_OPEN
                             ? "blue"
@@ -171,7 +184,8 @@ const UpdateIOStatus = ({ isOpen, onClose, status }) => {
                             ? "green"
                             : statusAdmin === import.meta.env.VITE_STATUS_EXITED
                             ? "red"
-                            : statusAdmin === import.meta.env.VITE_STATUS_CANCELLED
+                            : statusAdmin ===
+                              import.meta.env.VITE_STATUS_CANCELLED
                             ? "orange"
                             : "purple"
                         }
@@ -191,6 +205,24 @@ const UpdateIOStatus = ({ isOpen, onClose, status }) => {
               {error}
             </FormErrorMessage>
           </FormControl>
+          {selectedItem === import.meta.env.VITE_STATUS_CANCELLED && (
+            <FormControl mt={5} isRequired>
+              <FormLabel fontSize={"sm"} fontWeight={400}>
+                Message
+              </FormLabel>
+              <Textarea
+                resize={"none"}
+                rounded={5}
+                size="sm"
+                onChange={(e) => setMessage(e.target.value)}
+              />
+            </FormControl>
+          )}
+          {messageError && (
+            <Text fontSize={"sm"} color={"red"}>
+              {messageError}
+            </Text>
+          )}
         </ModalBody>
         <ModalFooter>
           <Button
diff --git a/src/Pages/Investor_Management/InvestorDetails/BankDetails.jsx b/src/Pages/Investor_Management/InvestorDetails/BankDetails.jsx
index 6297064..08cf6a8 100644
--- a/src/Pages/Investor_Management/InvestorDetails/BankDetails.jsx
+++ b/src/Pages/Investor_Management/InvestorDetails/BankDetails.jsx
@@ -203,7 +203,7 @@ const BankDetails = () => {
   return (
     <Box {...OPACITY_ON_LOAD} overflowY={"scroll"} height={"100vh"} pb={38}>
       <HStack>
-        <Text as={'span'} fontSize={'sm'} fontWeight={700}>Bank Deatils</Text>
+        <Text as={'span'} fontSize={'sm'} fontWeight={700}>Bank Details</Text>
       </HStack>
         <HStack
           display={"flex"}
diff --git a/src/Pages/Investor_Management/InvestorDetails/InvestorDetails.jsx b/src/Pages/Investor_Management/InvestorDetails/InvestorDetails.jsx
index edd5e12..5e48c00 100644
--- a/src/Pages/Investor_Management/InvestorDetails/InvestorDetails.jsx
+++ b/src/Pages/Investor_Management/InvestorDetails/InvestorDetails.jsx
@@ -248,7 +248,8 @@ const InvestorDetails = () => {
                 minimumFractionDigits: 2,
                 maximumFractionDigits: 2,
               })
-            : parseFloat(item?.Portfolio_InInvCur || 0).toLocaleString(
+            :
+             parseFloat(item?.Portfolio_InInvCur || 0).toLocaleString(
                 undefined,
                 {
                   minimumFractionDigits: 2,
diff --git a/src/Services/io.service.js b/src/Services/io.service.js
index b19cd61..41377ea 100644
--- a/src/Services/io.service.js
+++ b/src/Services/io.service.js
@@ -256,8 +256,9 @@ export const ioService = createApi({
 
     updateCancleStatusTo: builder.mutation({
       query: ({ id, data }) => ({
-        url: `/io/admin/transaction/${id}/cancel`,
+        url: `/io/admin/maker-transaction/${id}/io-cancel`,
         method: "POST",
+        body:data
       }),
       invalidatesTags: ["getIOById"],
     }),