diff --git a/src/Pages/FawateerChecker/ApproveHistory/ApproveHistory.jsx b/src/Pages/FawateerChecker/ApproveHistory/ApproveHistory.jsx index 026b5e2..b8acf4f 100644 --- a/src/Pages/FawateerChecker/ApproveHistory/ApproveHistory.jsx +++ b/src/Pages/FawateerChecker/ApproveHistory/ApproveHistory.jsx @@ -63,7 +63,7 @@ import { OPACITY_ON_LOAD } from "../../../Layout/animations"; refetch } = useGetFawateerRequestQuery(); - console.log(data?.data?.rows); + // console.log(data?.data); diff --git a/src/Pages/FawateerChecker/ApproveRequest/ApproveRequest.jsx b/src/Pages/FawateerChecker/ApproveRequest/ApproveRequest.jsx index 9da525e..0dbe812 100644 --- a/src/Pages/FawateerChecker/ApproveRequest/ApproveRequest.jsx +++ b/src/Pages/FawateerChecker/ApproveRequest/ApproveRequest.jsx @@ -20,8 +20,8 @@ import { generateSerialNumber } from "../../../Constants/Constants"; import { useGetFawateerRequestQuery } from "../../../Services/fawateer.request.service"; import { TABLE_PAGINATION } from "../../../Constants/Paginations"; import { OPACITY_ON_LOAD } from "../../../Layout/animations"; -import RequestApprove from "./RequestApprove"; -import RequestReject from "./RequestReject"; +import RequestApproveModal from "./RequestApproveModal"; +import RequestRejectModal from "./RequestRejectModal"; const ApproveRequest = () => { const toast = useToast(); @@ -63,7 +63,7 @@ import RequestReject from "./RequestReject"; refetch } = useGetFawateerRequestQuery(); - console.log(data); + console.log(data?.data?.rows); @@ -85,7 +85,7 @@ import RequestReject from "./RequestReject"; }, []); // ====================================================[Table Filter]================================================================ - const filteredData = fawateerRequest?.filter((item) => { + const filteredData = data?.data?.rows?.filter((item) => { // Filter by name (case insensitive) const name = item.firstName; const searchLower = searchTerm.toLowerCase(); @@ -136,7 +136,6 @@ import RequestReject from "./RequestReject"; ), "Client ID": ( ), "First Name": ( - + {item.firstName} ), "Last Name": ( - + {item.lastName} @@ -175,14 +174,14 @@ import RequestReject from "./RequestReject"; ), "Transaction Date": ( - + {item.transaction_date} ), "Transaction Amount": ( - + {/* {item.investorAmount} */} {parseFloat(item?.transaction_amount || 0).toLocaleString(undefined, { @@ -320,14 +319,14 @@ import RequestReject from "./RequestReject"; alertHandler={handleDelete} isLoading={isLoading} /> - - { +const RequestRejectModal = ({ isOpen, onClose, firstField ,id}) => { const [isBtnLoading , setIsBtnLoading] = useState(false) const toast = useToast() @@ -160,4 +160,4 @@ const RequestReject = ({ isOpen, onClose, firstField ,id}) => { ); }; -export default RequestReject; +export default RequestRejectModal; diff --git a/src/Services/fawateer.request.service.js b/src/Services/fawateer.request.service.js index 026691f..05e15f6 100644 --- a/src/Services/fawateer.request.service.js +++ b/src/Services/fawateer.request.service.js @@ -13,7 +13,7 @@ export const fawateerRequest = createApi({ endpoints: (builder) => ({ getFawateerRequest: builder.query({ - query: () => `/fawateer/admin/getAll`, + query: () => `/fawateer/admin/Pending`, providesTags: ["getFawateerRequest"], }), diff --git a/src/Store/Store.js b/src/Store/Store.js index 5de50f9..95a0203 100644 --- a/src/Store/Store.js +++ b/src/Store/Store.js @@ -15,6 +15,8 @@ import { apiSlice, baseQuery } from "../Services/token.serivce"; import { drawalRequest } from "../Services/drawal.request.service"; import { deleteRequest } from "../Services/delete.request.service"; import { banInvestorDetails } from "../Services/ban.investor.service"; +import { fawateerRequest } from "../Services/fawateer.request.service"; +import { fawateerMaker } from "../Services/fawateer.maker.service"; export const store = configureStore({ reducer: { @@ -31,6 +33,9 @@ export const store = configureStore({ [drawalRequest.reducerPath]: drawalRequest.reducer, [deleteRequest.reducerPath]: deleteRequest.reducer, [banInvestorDetails.reducerPath]: banInvestorDetails.reducer, + [fawateerRequest.reducerPath]: fawateerRequest.reducer, + [fawateerMaker.reducerPath]: fawateerMaker.reducer, + // Add other reducers as needed }, middleware: (getDefaultMiddleware) => @@ -52,6 +57,9 @@ export const store = configureStore({ drawalRequest.middleware, deleteRequest.middleware, banInvestorDetails.middleware, + fawateerRequest.middleware, + fawateerMaker.middleware, + ), });