diff --git a/src/Pages/Fawateer/FawateerRequest.jsx b/src/Pages/Fawateer/FawateerRequest.jsx index b21df91..5adffd9 100644 --- a/src/Pages/Fawateer/FawateerRequest.jsx +++ b/src/Pages/Fawateer/FawateerRequest.jsx @@ -79,6 +79,8 @@ const FawateerRequest = () => { clearTimeout(handler); }; }, [searchTerm]); + + const { data: investorDetails, isLoading: investorDetailsLoading, diff --git a/src/Pages/FawateerChecker/ApproveHistory/ApproveHistory.jsx b/src/Pages/FawateerChecker/ApproveHistory/ApproveHistory.jsx index b8acf4f..4c7042c 100644 --- a/src/Pages/FawateerChecker/ApproveHistory/ApproveHistory.jsx +++ b/src/Pages/FawateerChecker/ApproveHistory/ApproveHistory.jsx @@ -19,7 +19,7 @@ import DrawalRequestReject from "../../WithDrawal/DrawalRequest/DrawalRequestRej import NormalTable from "../../../Components/DataTable/NormalTable"; import DrawalRequestApprove from "../../WithDrawal/DrawalRequest/DrawalRequestApprove"; import { generateSerialNumber } from "../../../Constants/Constants"; -import { useGetFawateerRequestQuery } from "../../../Services/fawateer.request.service"; +import { useGetApproveHistoryQuery, useGetFawateerRequestQuery } from "../../../Services/fawateer.request.service"; import { TABLE_PAGINATION } from "../../../Constants/Paginations"; import { OPACITY_ON_LOAD } from "../../../Layout/animations"; @@ -61,9 +61,9 @@ import { OPACITY_ON_LOAD } from "../../../Layout/animations"; isLoading: drawalRequestLoading, error, refetch - } = useGetFawateerRequestQuery(); + } = useGetApproveHistoryQuery(); - // console.log(data?.data); + console.log(data); @@ -115,7 +115,7 @@ import { OPACITY_ON_LOAD } from "../../../Layout/animations"; "Phone Number", "Transaction Date", "Transaction Amount", - "Action", + "Status" ]; @@ -182,7 +182,7 @@ import { OPACITY_ON_LOAD } from "../../../Layout/animations"; ), "Transaction Amount": ( - + {/* {item.investorAmount} */} {parseFloat(item?.transaction_amount || 0).toLocaleString(undefined, { @@ -193,62 +193,11 @@ import { OPACITY_ON_LOAD } from "../../../Layout/animations"; ), - Action: ( - - - - - - - + "Status": ( + + + {item.transactionStatus} + ), })); diff --git a/src/Pages/FawateerChecker/ApproveRequest/ApproveRequest.jsx b/src/Pages/FawateerChecker/ApproveRequest/ApproveRequest.jsx index 0dbecb6..39f8897 100644 --- a/src/Pages/FawateerChecker/ApproveRequest/ApproveRequest.jsx +++ b/src/Pages/FawateerChecker/ApproveRequest/ApproveRequest.jsx @@ -136,6 +136,7 @@ import RequestRejectModal from "./RequestRejectModal"; "Phone Number", "Transaction Date", "Transaction Amount", + "Status", role === "Checker"&&"Action", ]; @@ -213,6 +214,13 @@ import RequestRejectModal from "./RequestRejectModal"; ), + "Status": ( + + + {item.transactionStatus} + + + ), Action: ( ({ @@ -24,14 +24,15 @@ export const fawateerRequest = createApi({ providesTags: ["getFawateerRequest"], }), - // getDrawalHistory: builder.query({ - // query: () => `/withdrawal/admin/history`, - // providesTags: ["getDepositHistory"], - // }), + getApproveHistory: builder.query({ + query: () => `/fawateer/admin/getAll`, + providesTags: ["getApproveHistory"], + }), }), }); // Export hooks for usage in functional components export const { useGetFawateerRequestQuery, + useGetApproveHistoryQuery } = fawateerRequest;