diff --git a/src/Pages/BankDepositRequest/BankDepositRequest.jsx b/src/Pages/BankDepositRequest/BankDepositRequest.jsx index 8173965..8c9d4ae 100644 --- a/src/Pages/BankDepositRequest/BankDepositRequest.jsx +++ b/src/Pages/BankDepositRequest/BankDepositRequest.jsx @@ -117,6 +117,7 @@ const BankDepositRequest = () => { "Last Name", "Country", "Phone Number", + "Deposit Amount", "Action", ]; @@ -212,17 +213,30 @@ const BankDepositRequest = () => { ), Country: ( - + {item?.countryName} ), "Phone Number": ( - + - {/* {item?.mobileNumber} */} - {item?.ISDcode + " " + item?.mobileNumber} + {item?.ISDCode} {item?.mobileNumber} + {/* {item?.ISDcode + " " + item?.mobileNumber} */} + + + ), + "Deposit Amount": ( + + + {parseFloat(item?.investorAmount || 0).toLocaleString(undefined, { + minimumFractionDigits: 2, + maximumFractionDigits: 2, + })} + + {item?.currencyCode} + ), diff --git a/src/Pages/FawateerChecker/ApproveHistory/ApproveHistoryChecker.jsx b/src/Pages/FawateerChecker/ApproveHistory/ApproveHistoryChecker.jsx index f35f272..9961cab 100644 --- a/src/Pages/FawateerChecker/ApproveHistory/ApproveHistoryChecker.jsx +++ b/src/Pages/FawateerChecker/ApproveHistory/ApproveHistoryChecker.jsx @@ -80,13 +80,15 @@ const ApproveHistory = () => { { page: debouncedSearchTerm ? undefined : currentPage, // Omit pagination for search size: debouncedSearchTerm ? undefined : pageSize, // Omit pagination for search - search: debouncedSearchTerm, + searchTerm: debouncedSearchTerm, }, { skip: debouncedSearchTerm === "" && searchTerm !== "", // Skip if search is empty and it's not the initial request } ); + console.log(data?.data?.rows); + // Use useEffect to refetch data when the component mounts useEffect(() => { refetch(); @@ -102,6 +104,15 @@ const ApproveHistory = () => { return () => clearTimeout(timer); }, []); + + useEffect(() => { + const handler = setTimeout(() => { + setDebouncedSearchTerm(searchTerm); + }, 500); // Adjust delay as needed + return () => { + clearTimeout(handler); + }; + }, [searchTerm]); // ====================================================[Table Filter]================================================================ const filteredData = data?.data?.rows?.filter((item) => { // Filter by name (case insensitive) @@ -135,7 +146,7 @@ const ApproveHistory = () => { "Status", ]; - const extractedArray = filteredData?.map((item, idx) => ({ + const extractedArray = data?.data?.rows?.map((item, idx) => ({ // id: item?.id, "Sr.no": ( { "First Name", "Last Name", "Phone Number", + "Deposit Amount (BHD)", "Action", ]; @@ -193,6 +194,19 @@ const ReversalFawateerDeposit = () => { ), + "Deposit Amount (BHD)": ( + + + {parseFloat(item?.transaction_details?.investorAmount || 0).toLocaleString(undefined, { + minimumFractionDigits: 2, + maximumFractionDigits: 2, + })} + + {item?.currencyCode} + + + + ), Action: ( `/fawateer/admin/getAll`, + // providesTags: ["getApproveHistory"], + // }), + getApproveHistory: builder.query({ query: ({ page, size, searchTerm }) => { let baseURL = `/fawateer/admin/getAll?search=${searchTerm || ""}`; @@ -57,7 +62,6 @@ export const fawateerRequest = createApi({ baseURL += `&page=${page}&size=${size}`; // Only add pagination if both are defined } return baseURL; - }, providesTags: ["getApproveHistory"], }), @@ -79,7 +83,7 @@ export const fawateerRequest = createApi({ }), invalidatesTags: ["getFawateerRequest"], }), - + }), });