conflict mrg

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>
 

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>
 

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

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;