From 43130570120146e7fa4fe1c477a4d2cfd58c0cc2 Mon Sep 17 00:00:00 2001
From: YasinShaikh123 <123150391+YasinShaikh123@users.noreply.github.com>
Date: Fri, 23 Aug 2024 12:49:43 +0530
Subject: [PATCH] conflict mrg

---
 src/Pages/AccountDeletion/DeletionHistory.jsx   |  6 +++---
 src/Pages/AccountDeletion/DeletionRequest.jsx   |  4 ++--
 src/Pages/WithDrawal/DrawalView/ViewHistory.jsx |  4 ++--
 src/Services/drawal.request.service.js          | 13 +++++--------
 4 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/Pages/AccountDeletion/DeletionHistory.jsx b/src/Pages/AccountDeletion/DeletionHistory.jsx
index 2b4eebd..0ce07d0 100644
--- a/src/Pages/AccountDeletion/DeletionHistory.jsx
+++ b/src/Pages/AccountDeletion/DeletionHistory.jsx
@@ -83,7 +83,7 @@ const DeletionHistory = () => {
         className="d-flex align-items-center web-text-small"
         fontWeight={'500'}
       >
-        {formatDate(item.date)}
+        {formatDate(item.RequestedOn)}
       </Text>
     ),
     "Client ID": (
@@ -191,9 +191,9 @@ const DeletionHistory = () => {
             onChange={(e) => setSearchTerm(e.target.value)}
           />
 
-          <HStack display={"flex"} alignItems={"center"}>
+          {/* <HStack display={"flex"} alignItems={"center"}>
             <Pagination totalItems={10} />
-          </HStack>
+          </HStack> */}
         </HStack>
       </Box>
 
diff --git a/src/Pages/AccountDeletion/DeletionRequest.jsx b/src/Pages/AccountDeletion/DeletionRequest.jsx
index b5d5ff8..efe403f 100644
--- a/src/Pages/AccountDeletion/DeletionRequest.jsx
+++ b/src/Pages/AccountDeletion/DeletionRequest.jsx
@@ -243,9 +243,9 @@ const DeletionRequest = () => {
             onChange={(e) => setSearchTerm(e.target.value)}
           />
 
-          <HStack display={"flex"} alignItems={"center"}>
+          {/* <HStack display={"flex"} alignItems={"center"}>
             <Pagination totalItems={10} />
-          </HStack>
+          </HStack> */}
         </HStack>
       </Box>
 
diff --git a/src/Pages/WithDrawal/DrawalView/ViewHistory.jsx b/src/Pages/WithDrawal/DrawalView/ViewHistory.jsx
index 96b7122..63e5e43 100644
--- a/src/Pages/WithDrawal/DrawalView/ViewHistory.jsx
+++ b/src/Pages/WithDrawal/DrawalView/ViewHistory.jsx
@@ -22,7 +22,7 @@ import ConfirmModal from "./ConfirmModal";
 import RejectModal from "./RejectModal";
 import { TABLE_PAGINATION } from "../../../Constants/Paginations";
 import { useGetDepositHistoryQuery } from "../../../Services/deposit.request.service";
-import { useGetDrawalHistoryQuery } from "../../../Services/drawal.request.service";
+// import { useGetDrawalHistoryQuery } from "../../../Services/drawal.request.service";
 // import { formatDate } from "../../Components/Functions/UTCConvertor";
 
 const ViewHistory = () => {
@@ -53,7 +53,7 @@ const ViewHistory = () => {
     data,
     error,
     isLoading: drawalHistoryLoading,
-  } = useGetDrawalHistoryQuery({ page: currentPage, size: pageSize });
+  } = useGetDepositHistoryQuery({ page: currentPage, size: pageSize });
 
   console.log(data?.data?.rows);
 
diff --git a/src/Services/drawal.request.service.js b/src/Services/drawal.request.service.js
index 06f5ffd..da1c10e 100644
--- a/src/Services/drawal.request.service.js
+++ b/src/Services/drawal.request.service.js
@@ -39,12 +39,9 @@ export const drawalRequest = createApi({
       invalidatesTags: ["getDepositRequest", "getDepositHistory"],
     }),
 
-    getDrawalHistory: builder.query({
-      query: () => `/withdrawal/admin/history`,
-      providesTags: ["getDrawalHistory"],
-    // getDepositHistory: builder.query({
-    //   query: () => `/deposit/admin/history`,
-    //   providesTags: ["getDepositHistory"],
+    getDepositHistory: builder.query({
+      query: () => `/deposit/admin/history`,
+      providesTags: ["getDepositHistory"],
     }),
   }),
 });
@@ -53,7 +50,7 @@ export const drawalRequest = createApi({
 export const {
   useGetDrawalRequestQuery,
   useUpdateDrawalRequestMutation,
-  useGetDrawalHistoryQuery,
   useGetDrawalRequestByIdQuery,
-  useDepositRejectMutation
+  useDepositRejectMutation,
+  useGetDepositHistoryQuery
 } = drawalRequest;