update

src/Components/FormField.jsx

@@ -74,7 +74,7 @@ const FormField = ({
   <FormControl
     w={width ? width : "49%"}
     isInvalid={errors[name]}
-    isRequired={type === "date" ? false: isRequired}
+    isRequired={type === "date" ? true: isRequired}
     mb={2}
   >
     <FormLabel textAlign={"left"} fontSize={"xs"} color={"gray.600"}>

src/Pages/AccountDeletion/DeletionHistory.jsx

@@ -11,45 +11,52 @@ import {
 } from "@chakra-ui/react";
 import React, { useContext, useEffect, useState } from "react";
 import { OPACITY_ON_LOAD } from "../../Layout/animations";
-import DataTable from "../../Components/DataTable/DataTable";
+import NormalTable from "../../Components/DataTable/NormalTable";
 import Pagination from "../../Components/Pagination";
 import GlobalStateContext from "../../Contexts/GlobalStateContext";
 import CustomAlertDialog from "../../Components/CustomAlertDialog";
 import { formatDate } from "../../Components/Functions/UTCConvertor";
 import { CheckIcon, CloseIcon } from "@chakra-ui/icons";
+import { useGetDeleteHistoryQuery } from "../../Services/delete.request.service";
 // import { formatDate } from "../../Components/Functions/UTCConvertor";
 
 const DeletionHistory = () => {
   const toast = useToast();
-  const { slideFromRight, deleteHistory, setDeleteHistory } =
+  const { slideFromRight, setDeleteHistory } =
     useContext(GlobalStateContext);
   const [searchTerm, setSearchTerm] = useState("");
-  const [isLoading, setIsLoading] = useState(true);
   const [deleteAlert, setDeleteAlert] = useState(false);
   const [actionId, setActionId] = useState(false);
   const [mouseEntered, setMouseEntered] = useState(false);
   const [mouseEnteredId, setMouseEnteredId] = useState("");
 
-  useEffect(() => { 
-    // Simulate loading
-    const timer = setTimeout(() => {
-      setIsLoading(false);
-    }, 1500);
 
-    // Cleanup the timer on component unmount 
-    return () => clearTimeout(timer);
-  }, []);
+
+  const {
+    data: deleteHistory,
+    isLoading,
+    refetch
+  } = useGetDeleteHistoryQuery()
+
+
+ // Use useEffect to refetch data when the component mounts
+ useEffect(() => {
+  refetch();
+}, [refetch]);
+
+// console.log(deleteHistory?.data);
 
   // ====================================================[Table Filter]================================================================
-  const filteredData = deleteHistory.filter((item) => {
+  const filteredData = deleteHistory?.data?.rows?.filter((item) => {
     // Filter by name (case insensitive)
-    const name = item.firstName;
+    const name = item?.country;
     const searchLower = searchTerm.toLowerCase();
     const nameMatches = name.toLowerCase().includes(searchLower);
 
     return nameMatches;
   });
 
+  console.log(deleteHistory);
   // ====================================================[Table Setup]================================================================
   const tableHeadRow = [
     "Sr No.",
@@ -83,7 +90,7 @@ const DeletionHistory = () => {
         className="d-flex align-items-center web-text-small"
         fontWeight={'500'}
       >
-        {formatDate(item.RequestedOn)}
+        {formatDate(item.RequestOn)}
       </Text>
     ),
     "Client ID": (
@@ -144,13 +151,14 @@ const DeletionHistory = () => {
     ),
     "Status": (
       <Text 
-        justifyContent={slideFromRight ? "right" : "left"}
+        justifyContent={slideFromRight ? "right" : "center"}
         as={"span"}
-        color={"gray.600"}
+        color={item?.deletionStatus? "red.500": "blue.500"}
         className="d-flex align-items-center web-text-small"
-        fontWeight={'500'}
+
+        fontWeight={'600'}
       >
-        {item.status}
+        {item.deletionStatus}
       </Text>
     ),
   }));
@@ -197,7 +205,7 @@ const DeletionHistory = () => {
         </HStack>
       </Box>
 
-      <DataTable
+      <NormalTable
         emptyMessage={`We don't have any Sponers `}
         tableHeadRow={tableHeadRow}
         data={extractedArray}

src/Pages/AccountDeletion/DeletionRequestApprove.jsx

@@ -153,7 +153,7 @@ const DeletionRequestApprove = ({ isOpen, onClose, firstField, id, data:requestD
 
                 <Text fontSize="sm" fontWeight={500} color={'gray.600'}>{data?.data?.comment}</Text>
               </FormControl>
-              <FormControl mb={4}>
+              <FormControl mb={4} isRequired>
                 <FormLabel fontSize="sm">Admin Comment</FormLabel>
                 <Textarea
                   rows={5}

src/Pages/Deposit/DepositRequest/DepositRequest.jsx

@@ -68,8 +68,13 @@ const DepositRequest = () => {
     data,
     isLoading: depositRequestLoading,
     error,
+    refetch
   } = useGetDepositRequestQuery({ page: currentPage, size: pageSize });
 
+  // Use useEffect to refetch data when the component mounts
+  useEffect(() => {
+    refetch();
+  }, [refetch]);
 
 
   // ====================================================[Table Setup]================================================================
@@ -118,7 +123,6 @@ const DepositRequest = () => {
   })
   .sort((b, a) => new Date(a.createdAt) - new Date(b.createdAt));
 
-  console.log(data?.data?.rows);
 
 
   const extractedArray = filteredData?.map((item, index) => ({

src/Pages/Deposit/DepositViewHistory/DepositHistory.jsx

@@ -27,6 +27,8 @@ import {
   useDepositRejectMutation,
   useGetDepositHistoryQuery,
 } from "../../../Services/deposit.request.service";
+
+
 import { ExternalLinkIcon } from "@chakra-ui/icons";
 import { TABLE_PAGINATION } from "../../../Constants/Paginations";
 
@@ -60,10 +62,18 @@ const DepositHistory = () => {
   const {
     data,
     error,
+    refetch,
     isLoading: depositHistoryLoading,
   } = useGetDepositHistoryQuery({ page: currentPage, size: pageSize });
 
 
+   // Use useEffect to refetch data when the component mounts
+   useEffect(() => {
+    refetch();
+  }, [refetch]);
+
+
+
 
   // ====================================================[Table Setup]================================================================
   const tableHeadRow = [

src/Pages/IO_Management/CreateIO/IODetails.jsx

@@ -392,6 +392,8 @@ const IODetails = ({ enableNextTab, index, data }) => {
       section: " ",
       width: "32.3%",
       value: IObyID?.data?.InvestmentDetails,
+      maxLength:20,
+      helperText:`Maximum length should be 20 characters. You have entered ${watch()?.InvestmentDetails?.length || 0} characters.`
     },
 
     {

src/Pages/IO_Management/CreateIO/IONAVDetails.jsx

@@ -183,7 +183,7 @@ const IONAVDetails = () => {
           <Pagination totalItems={10} />
         </HStack> */}
 
-          {IODetails?.isInvestedAmount ? <Button onClick={onOpen} leftIcon={<AddIcon/>} colorScheme="forestGreen" size={'sm'} rounded={'sm'} fontSize={'xs'} >Add IO Cash</Button>:null}
+          {/* {IODetails?.isInvestedAmount ? <Button onClick={onOpen} leftIcon={<AddIcon/>} colorScheme="forestGreen" size={'sm'} rounded={'sm'} fontSize={'xs'} >Add IO Cash</Button>:null} */}
 
 
 {IODetails?.isInvestedAmount ? <Button onClick={onOpen} leftIcon={<AddIcon/>} colorScheme="forestGreen" size={'sm'} rounded={'sm'} fontSize={'xs'} >Add IO Nav</Button>:null}

src/Pages/WithDrawal/DrawalRequest/PendingRequest.jsx

@@ -53,13 +53,18 @@ const PendingRequest = () => {
     data,
     isLoading: drawalRequestLoading,
     error,
+    refetch
   } = useGetDrawalRequestQuery({ page: currentPage, size: pageSize });
 
   
 
-
+ // Use useEffect to refetch data when the component mounts
+ useEffect(() => {
+  refetch();
+}, [refetch]);
 
   useEffect(() => {
+
     // Simulate loading
     const timer = setTimeout(() => {
       setIsLoading(false);

src/Pages/WithDrawal/DrawalView/ViewHistory.jsx

@@ -22,6 +22,7 @@ import ConfirmModal from "./ConfirmModal";
 import RejectModal from "./RejectModal";
 import { TABLE_PAGINATION } from "../../../Constants/Paginations";
 import { useGetDepositHistoryQuery } from "../../../Services/deposit.request.service";
+import { useGetDrawalHistoryQuery } from "../../../Services/drawal.request.service";
 // import { useGetDrawalHistoryQuery } from "../../../Services/drawal.request.service";
 // import { formatDate } from "../../Components/Functions/UTCConvertor";
 
@@ -53,9 +54,16 @@ const ViewHistory = () => {
     data,
     error,
     isLoading: drawalHistoryLoading,
-  } = useGetDepositHistoryQuery({ page: currentPage, size: pageSize });
+    refetch
+  } = useGetDrawalHistoryQuery({ page: currentPage, size: pageSize });
 
-  console.log(data?.data?.rows);
+
+ // Use useEffect to refetch data when the component mounts
+ useEffect(() => {
+  refetch();
+}, [refetch]);
+
+  // console.log(data?.data?.rows);
 
   useEffect(() => {
     // Simulate loading

src/Services/delete.request.service.js

@@ -24,14 +24,14 @@ export const deleteRequest = createApi({
 
     approveDepositRequest: builder.mutation({
       query: ({ id, data }) => ({
-        url: `/account/admin/approved-account/${id}`,
+        url: `/account/admin/approved-request/${id}`,
         method: "PATCH",
         body: data,
       }),
       invalidatesTags: ["getDeleteRequest", "getDeleteHistory"],
     }),
 
-    depositReject: builder.mutation({
+    deleteReject: builder.mutation({
       query: ({ id, data }) => ({
         url: `/deposit/admin/rejected/${id}`,
         method: "PATCH",
@@ -40,10 +40,10 @@ export const deleteRequest = createApi({
       invalidatesTags: ["getDeleteRequest", "getDeleteHistory"],
     }),
 
-    // getDepositHistory: builder.query({
-    //   query: () => `/deposit/admin/history`,
-    //   providesTags: ["getDepositHistory"],
-    // }),
+    getDeleteHistory: builder.query({
+      query: () => `/account/admin/history`,
+      providesTags: ["getDeleteHistory"],
+    }),
   }),
 });
 
@@ -51,6 +51,7 @@ export const deleteRequest = createApi({
 export const {
   useGetDeleteRequestQuery,
   useGetDeleteRequestByIdQuery,
-  useApproveDepositRequestMutation
+  useApproveDepositRequestMutation,
+  useGetDeleteHistoryQuery
 
 } = deleteRequest;

src/Services/drawal.request.service.js

@@ -9,7 +9,7 @@ import { baseQuery } from "./token.serivce";
 export const drawalRequest = createApi({
   reducerPath: "drawalRequest",
   baseQuery: baseQuery,
-  tagTypes: ["getDrawalRequest"],
+  tagTypes: ["getDrawalRequest", "getDepositHistory"],
   endpoints: (builder) => ({
 
     getDrawalRequest: builder.query({
@@ -39,8 +39,8 @@ export const drawalRequest = createApi({
       invalidatesTags: ["getDepositRequest", "getDepositHistory"],
     }),
 
-    getDepositHistory: builder.query({
-      query: () => `/deposit/admin/history`,
+    getDrawalHistory: builder.query({
+      query: () => `/withdrawal/admin/history`,
       providesTags: ["getDepositHistory"],
     }),
   }),
@@ -52,5 +52,5 @@ export const {
   useUpdateDrawalRequestMutation,
   useGetDrawalRequestByIdQuery,
   useDepositRejectMutation,
-  useGetDepositHistoryQuery
+  useGetDrawalHistoryQuery
 } = drawalRequest;