diff --git a/src/Pages/IO_Management/CreateIO/IOCashDetails.jsx b/src/Pages/IO_Management/CreateIO/IOCashDetails.jsx index 551dc5a..db3f9e2 100644 --- a/src/Pages/IO_Management/CreateIO/IOCashDetails.jsx +++ b/src/Pages/IO_Management/CreateIO/IOCashDetails.jsx @@ -81,7 +81,7 @@ const IOCashDetails = () => { const searchLower = searchTerm.toLowerCase(); const nameMatches = name.toLowerCase().includes(searchLower); return nameMatches; - }); + }).sort((b, a) => new Date(a.createdAt) - new Date(b.createdAt)); const extractedArray = filteredData?.map((item, index) => ({ diff --git a/src/Pages/IO_Management/CreateIO/IONAVDetails.jsx b/src/Pages/IO_Management/CreateIO/IONAVDetails.jsx index 9e60b75..17ed754 100644 --- a/src/Pages/IO_Management/CreateIO/IONAVDetails.jsx +++ b/src/Pages/IO_Management/CreateIO/IONAVDetails.jsx @@ -54,7 +54,7 @@ const IONAVDetails = () => { const searchLower = searchTerm.toLowerCase(); const nameMatches = name.toLowerCase().includes(searchLower); return nameMatches; - }); + }).sort((b, a) => new Date(a.transactionDate) - new Date(b.transactionDate)); const extractedArray=filteredData?.map((item, index) => ({ id: item?.id, diff --git a/src/Services/api.service.js b/src/Services/api.service.js index ab35c3d..78b90fc 100644 --- a/src/Services/api.service.js +++ b/src/Services/api.service.js @@ -3,7 +3,7 @@ import axios from "axios"; // Create an Axios instance for API calls export const api = axios.create({ // baseURL: `https://tanami.betadelivery.com/api/v1`, - baseURL: `https://sprint4.tanami.betadelivery.com/api/v1`, // Replace with your API base URL + baseURL: `https://admin.tanami.betadelivery.com/api/v1`, // Replace with your API base URL timeout: 10000, // Adjust timeout as needed headers: { "Content-Type": "application/json", diff --git a/src/Services/token.serivce.js b/src/Services/token.serivce.js index 5c2b3f2..0f34862 100644 --- a/src/Services/token.serivce.js +++ b/src/Services/token.serivce.js @@ -2,7 +2,7 @@ import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react'; // Define a base query function with RTK Query // export const baseQuery = fetchBaseQuery({ -// baseUrl: 'https://sprint4.tanami.betadelivery.com/api/v1', +// baseUrl: 'https://admin.tanami.betadelivery.com/api/v1', // prepareHeaders: (headers) => { // const token = localStorage.getItem('accessToken'); // if (token) { @@ -18,7 +18,7 @@ import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react'; // Define a base query function with token refresh logic export const baseQuery = async (args, api, extraOptions) => { let result = await fetchBaseQuery({ - baseUrl: 'https://sprint4.tanami.betadelivery.com/api/v1', + baseUrl: 'https://admin.tanami.betadelivery.com/api/v1', prepareHeaders: (headers) => { const token = localStorage.getItem('accessToken'); if (token) { @@ -34,7 +34,7 @@ export const baseQuery = async (args, api, extraOptions) => { if (refreshToken) { try { const refreshResult = await fetchBaseQuery({ - baseUrl: 'https://sprint4.tanami.betadelivery.com/api/v1', + baseUrl: 'https://admin.tanami.betadelivery.com/api/v1', })({ url: '/auth/user/regenerate-token', method: 'POST', @@ -50,7 +50,7 @@ export const baseQuery = async (args, api, extraOptions) => { // Retry the original request with the new token result = await fetchBaseQuery({ - baseUrl: 'https://sprint4.tanami.betadelivery.com/api/v1', + baseUrl: 'https://admin.tanami.betadelivery.com/api/v1', prepareHeaders: (headers) => { const token = localStorage.getItem('accessToken'); if (token) {