approve Request api

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);
     
   
     

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": (
           <Text
-           w={"60px"}
             justifyContent={slideFromRight ? "right" : "left"}
             as={"span"}
             color={"teal.900"}
@@ -147,14 +146,14 @@ import RequestReject from "./RequestReject";
           </Text>
         ),
         "First Name": (
-          <Box isTruncated={true} w={'80px'}>
+          <Box isTruncated={true}>
             <Text as={"span"} color={"teal.900"} fontWeight={"500"}>
               {item.firstName}
             </Text>
           </Box>
         ),
         "Last Name": (
-          <Box w={"50px"} isTruncated={true}>
+          <Box isTruncated={true}>
             <Text as={"span"} color={"teal.900"}>
               {item.lastName}
             </Text>
@@ -175,14 +174,14 @@ import RequestReject from "./RequestReject";
           </Box>
         ),
         "Transaction Date": (
-          <Box w={"100px"} isTruncated={true}  display={'flex'} justifyContent={'end'}>
+          <Box isTruncated={true}  display={'flex'} >
             <Text as={"span"} color={"teal.900"}>
               {item.transaction_date} 
             </Text>
           </Box>
         ),
         "Transaction Amount": (
-          <Box w={"130px"} isTruncated={true}  display={'flex'} justifyContent={'end'}>
+          <Box isTruncated={true}  display={'flex'} >
             <Text as={"span"} color={"teal.900"}>
               {/* {item.investorAmount} */}
               {parseFloat(item?.transaction_amount || 0).toLocaleString(undefined, {
@@ -320,14 +319,14 @@ import RequestReject from "./RequestReject";
           alertHandler={handleDelete}
           isLoading={isLoading}
         />
-        <RequestApprove
+        <RequestApproveModal
           // data={data?.data?.rows}
           isOpen={isConfirmOpen}
           onClose={onConfirmClose}
           id={actionId}
         // firstField={firstField}
         />
-        <RequestReject
+        <RequestRejectModal
           isOpen={isRejectOpen}
           onClose={onRejectClose}
           id={actionId} 

src/Pages/FawateerChecker/ApproveRequest/RequestApproveModal.jsx

@@ -42,7 +42,7 @@ export const conformModalSchema = yup.object().shape({
   // }),
 });
 
-const RequestApprove = ({
+const RequestApproveModal = ({
   isOpen,
   onClose,
   firstField,
@@ -239,4 +239,4 @@ const RequestApprove = ({
   );
 };
 
-export default RequestApprove;
+export default RequestApproveModal;

src/Pages/FawateerChecker/ApproveRequest/RequestRejectModal.jsx

@@ -27,7 +27,7 @@ export const conformModalSchema = yup.object().shape({
   comments: yup.string().required("Comment is required"),
 });
 
-const RequestReject = ({ isOpen, onClose, firstField ,id}) => {
+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;

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"],
     }),
 

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,
+
     ),
 });