diff --git a/src/Pages/AccountDeletion/DeletionRequest.jsx b/src/Pages/AccountDeletion/DeletionRequest.jsx index 041660b..51cc49f 100644 --- a/src/Pages/AccountDeletion/DeletionRequest.jsx +++ b/src/Pages/AccountDeletion/DeletionRequest.jsx @@ -19,6 +19,7 @@ import CustomAlertDialog from "../../Components/CustomAlertDialog"; import { formatDate } from "../../Components/Functions/UTCConvertor"; import { CheckIcon, CloseIcon } from "@chakra-ui/icons"; import DeletionRequestApprove from "./DeletionRequestApprove"; +import { useGetDeleteRequestQuery } from "../../Services/delete.request.service"; // import { formatDate } from "../../Components/Functions/UTCConvertor"; const DeletionRequest = () => { @@ -32,6 +33,12 @@ const DeletionRequest = () => { const [mouseEntered, setMouseEntered] = useState(false); const [mouseEnteredId, setMouseEnteredId] = useState(""); + const { + data, + isLoading: DeletionLoading + } = useGetDeleteRequestQuery() + + const { isOpen: isConfirmOpen, onOpen: onConfirmOpen, @@ -55,7 +62,7 @@ const DeletionRequest = () => { }, []); // ====================================================[Table Filter]================================================================ - const filteredData = deleteRequest?.filter((item) => { + const filteredData = data?.data?.filter((item) => { // Filter by name (case insensitive) const name = item?.firstName; const searchLower = searchTerm.toLowerCase(); @@ -107,7 +114,7 @@ const DeletionRequest = () => { className="d-flex align-items-center web-text-small" fontWeight={'500'} > - {formatDate(item?.RequestedOn)} + {formatDate(item?.RequestOn)} ), "Client ID": ( @@ -253,7 +260,7 @@ const DeletionRequest = () => { emptyMessage={`We don't have any Sponers `} tableHeadRow={tableHeadRow} data={extractedArray} - isLoading={isLoading} + isLoading={DeletionLoading} viewActionId={actionId} setViewActionId={setActionId} // totalPages={10} diff --git a/src/Pages/AccountDeletion/DeletionRequestApprove.jsx b/src/Pages/AccountDeletion/DeletionRequestApprove.jsx index 29741eb..0b55c29 100644 --- a/src/Pages/AccountDeletion/DeletionRequestApprove.jsx +++ b/src/Pages/AccountDeletion/DeletionRequestApprove.jsx @@ -30,7 +30,7 @@ import { useApproveDepositRequestMutation, useGetDeleteRequestByIdQuery } from " const FILE_TYPES = ["image/jpeg", "image/png", "image/gif"]; export const conformModalSchema = yup.object().shape({ - comment: yup.string().notRequired(), + adminComment: yup.string().notRequired(), }); const DeletionRequestApprove = ({ isOpen, onClose, firstField, id, data:requestData }) => { @@ -68,7 +68,7 @@ const DeletionRequestApprove = ({ isOpen, onClose, firstField, id, data:requestD setIsBtnLoading(isReject?false:true) setIsBtnLoadingReject(isReject) const approveReq = { - adminComment:data?.comment, + adminComment:data?.adminComment, deletionStatus: isReject?"Reject": "Approved" } @@ -134,7 +134,7 @@ const DeletionRequestApprove = ({ isOpen, onClose, firstField, id, data:requestD Investor Comment {fileredData?.currencyCode} -