diff --git a/src/Pages/Deposit/DepositRequest/DepositRequest.jsx b/src/Pages/Deposit/DepositRequest/DepositRequest.jsx index c5f6f22..b95a6f5 100644 --- a/src/Pages/Deposit/DepositRequest/DepositRequest.jsx +++ b/src/Pages/Deposit/DepositRequest/DepositRequest.jsx @@ -99,14 +99,14 @@ const DepositRequest = () => { }); }, 300); - // ====================================================[Table Filter]================================================================ - const filteredData = data?.data?.rows.filter((item) => { + const filteredData = data?.data?.rows + .filter((item) => { // Filter by name (case insensitive) const name = [item.firstName, item.lastName, item.countryName].filter(Boolean).join(' '); const searchLower = searchTerm.toLowerCase(); const nameMatches = name.toLowerCase().includes(searchLower); - // Filter by status + // Filter by status (Uncomment and use if needed) // const status = item.status; // const statusLower = status ? "active" : "inactive"; @@ -116,7 +116,8 @@ const DepositRequest = () => { // (statusFilter === "inactive" && status === false); return nameMatches; - }); + }) + .sort((b, a) => new Date(a.createdAt) - new Date(b.createdAt)); console.log(data?.data?.rows); diff --git a/src/Pages/Deposit/DepositViewHistory/DepositHistory.jsx b/src/Pages/Deposit/DepositViewHistory/DepositHistory.jsx index d71c1b3..f22fd5c 100644 --- a/src/Pages/Deposit/DepositViewHistory/DepositHistory.jsx +++ b/src/Pages/Deposit/DepositViewHistory/DepositHistory.jsx @@ -92,14 +92,29 @@ const DepositHistory = () => { }); }, 300); -// ====================================================[Table Filter]================================================================ -const filteredData = data?.data?.rows.filter((item) => { - // Combine firstName, lastName, and countryName for filtering + + + + +const filteredData = data?.data?.rows +.filter((item) => { + // Filter by name (case insensitive) const name = [item.firstName, item.lastName, item.countryName].filter(Boolean).join(' '); const searchLower = searchTerm.toLowerCase(); const nameMatches = name.toLowerCase().includes(searchLower); + + // Filter by status (Uncomment and use if needed) + // const status = item.status; + // const statusLower = status ? "active" : "inactive"; + + // const statusMatches = + // statusFilter === "all" || + // (statusFilter === "active" && status === true) || + // (statusFilter === "inactive" && status === false); + return nameMatches; -}); +}) +.sort((b, a) => new Date(a.createdAt) - new Date(b.createdAt)); // const handleView = (id) => {