diff --git a/src/Pages/Deposit/DepositRequest/DepositRequest.jsx b/src/Pages/Deposit/DepositRequest/DepositRequest.jsx
index fff3b23..edba71b 100644
--- a/src/Pages/Deposit/DepositRequest/DepositRequest.jsx
+++ b/src/Pages/Deposit/DepositRequest/DepositRequest.jsx
@@ -32,6 +32,9 @@ import DataTable from "../../../Components/DataTable/DataTable";
import DepositRequestApprove from "./DepositRequestApprove";
import DepositRequestReject from "./DepositRequestReject";
import NormalTable from "../../../Components/DataTable/NormalTable";
+import { useGetDepositRequestQuery } from "../../../Services/deposit.request.service";
+import { current } from "@reduxjs/toolkit";
+import { TABLE_PAGINATION } from "../../../Constants/Paginations";
const formatDate = (date) => new Date(date).toLocaleDateString(); // Simple date formatter
@@ -57,6 +60,17 @@ const DepositRequest = () => {
onClose: onRejectClose,
} = useDisclosure();
+ const [pageSize, setPageSize] = useState(TABLE_PAGINATION?.size);
+ const [currentPage, setCurrentPage] = useState(TABLE_PAGINATION?.page);
+
+ const {
+ data,
+ isLoading: depositRequestLoading,
+ error,
+ } = useGetDepositRequestQuery({ page: currentPage, size: pageSize });
+
+ console.log(data?.data?.rows);
+
useEffect(() => {
// Simulate loading
const timer = setTimeout(() => {
@@ -70,13 +84,13 @@ const DepositRequest = () => {
// ====================================================[Table Setup]================================================================
const tableHeadRow = [
// "Sr.no",
- "Deposit Date",
"Client ID",
"First Name",
"Last Name",
"Country",
"Phone Number",
"Amount in Investor currency",
+ "Deposit Date",
"Action",
];
@@ -94,9 +108,9 @@ const DepositRequest = () => {
}, 300);
// ====================================================[Table Filter]================================================================
- const filteredData = depositRequest.filter((item) => {
+ const filteredData = data?.data?.rows.filter((item) => {
// Filter by name (case insensitive)
- const name = item.clientId;
+ const name = item?.createdAt;
const searchLower = searchTerm.toLowerCase();
const nameMatches = name.toLowerCase().includes(searchLower);
@@ -112,7 +126,7 @@ const DepositRequest = () => {
return nameMatches;
});
- const [extractedArray, setExtractedArray] = useState(
+ const extractedArray=
filteredData?.map((item, index) => ({
// id: item?.id,
"Sr.no": (
@@ -127,18 +141,6 @@ const DepositRequest = () => {
{index + 1}
),
- "Deposit Date": (
-
- {item.date}
-
- ),
"Client ID": (
{
fontWeight={"500"}
className="d-flex align-items-center web-text-small"
>
- {item.clientId}
+ {item?.principal?.investor_details?.clientReference_id}
),
"First Name": (
- {item.firstName}
+ {item?.principal?.firstName}
),
"Last Name": (
- {item.lastName}
+ {item?.principal?.lastName}
),
Country: (
- {item.country}
+ {item?.principal?.investor_details?.country?.countryName}
),
"Phone Number": (
- {item.phoneNumber}
+ {item?.principal?.mobileNumber}
),
"Amount in Investor currency": (
- {item.amountcurrency}
+ {item?.investorAmount}
),
+ "Deposit Date": (
+
+ {formatDate(item?.createdAt)}
+
+ ),
Action: (
{
),
}))
- );
+
const handleDelete = () => {
const IOtype = investmentType.filter(
@@ -274,15 +288,21 @@ const DepositRequest = () => {
/>
-
+
-
- Deposit Amount
+ Deposit Amount (SAR)
- Fees
+ Upload Supporting*
{errors.fees && (
@@ -93,15 +95,16 @@ import {
)}
- Total Amount
- Comments
+
{errors.totalAmount && (
diff --git a/src/Pages/Investor_Management/InvestorDetails/InvestorDetails.jsx b/src/Pages/Investor_Management/InvestorDetails/InvestorDetails.jsx
index 8006148..a1f903f 100644
--- a/src/Pages/Investor_Management/InvestorDetails/InvestorDetails.jsx
+++ b/src/Pages/Investor_Management/InvestorDetails/InvestorDetails.jsx
@@ -68,7 +68,7 @@ const InvestorDetails = () => {
error,
} = useGetInvestorsQuery({ page: currentPage, size: pageSize });
- console.log(investorDetails);
+ console.log(investorDetails);
useEffect(() => {
// Simulate loading
diff --git a/src/Services/deposit.request.service.js b/src/Services/deposit.request.service.js
new file mode 100644
index 0000000..6a44aa2
--- /dev/null
+++ b/src/Services/deposit.request.service.js
@@ -0,0 +1,32 @@
+// investorDetails.service.js
+import { createApi, fetchBaseQuery } from "@reduxjs/toolkit/query/react";
+import { api } from "./api.service";
+
+const baseUrl = api?.defaults.baseURL;
+
+// Define a service using a base URL and expected endpoints
+export const depositRequest = createApi({
+ reducerPath: "depositRequest",
+ baseQuery: fetchBaseQuery({ baseUrl }),
+ tagTypes: ["getDepositRequest"],
+ endpoints: (builder) => ({
+
+ getDepositRequest: builder.query({
+ query: ({ page, size }) =>
+ `/deposit/admin/getAll`,
+ providesTags: ["getDepositRequest"],
+ }),
+
+
+ // =====[get investment details ]
+ // getDepositRequestById: builder.query({
+ // query: (id) => `/deposit/admin/getById/${id}`,
+ // providesTags: ["getRequest"],
+ // }),
+
+
+ }),
+});
+
+// Export hooks for usage in functional components
+export const { useGetDepositRequestQuery } = depositRequest;
diff --git a/src/Store/Store.js b/src/Store/Store.js
index e0399f6..39a2f72 100644
--- a/src/Store/Store.js
+++ b/src/Store/Store.js
@@ -10,6 +10,7 @@ import { api } from "../Services/api.service";
import { keyMerits } from "../Services/Key.merits.service";
import { bankDetails } from "../Services/bank.details.service";
import { contact } from "../Services/contact.service";
+import { depositRequest } from "../Services/deposit.request.service";
export const store = configureStore({
reducer: {
@@ -21,6 +22,7 @@ export const store = configureStore({
[investorTransaction.reducerPath]: investorTransaction.reducer,
[bankDetails.reducerPath]: bankDetails.reducer,
[contact.reducerPath]: contact.reducer,
+ [depositRequest.reducerPath]: depositRequest.reducer,
// Add other reducers as needed
},
middleware: (getDefaultMiddleware) =>
@@ -37,6 +39,7 @@ export const store = configureStore({
investorTransaction.middleware,
bankDetails.middleware,
contact.middleware,
+ depositRequest.middleware,
),
});