Re-Quest/frontend
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Remove notifications from the list when marked as read while viewing the 'unread' tab.

Browse Source
This commit is contained in:
pradeepkumar
2026-03-19 16:22:57 +05:30
parent 896f49d1e1
commit 6aa4b62df3
2 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/app/(agent)/agent/notifications/page.tsx
View File

@@ -64,10 +64,16 @@ export default function AgentNotificationsPage() {
const markAsRead = async (id: string) => {
try {
await notificationsApiService.markAsRead(id);
setNotifications((prev) =>
prev.map((n) => (n.id === id ? { ...n, read: true } : n))
);
if (filter === 'unread') {
// Remove from list when viewing unread tab
setNotifications((prev) => prev.filter((n) => n.id !== id));
} else {
setNotifications((prev) =>
prev.map((n) => (n.id === id ? { ...n, read: true } : n))
);
}
setUnreadCount((prev) => Math.max(0, prev - 1));
setTotalCount((prev) => prev); // total doesn't change, notification still exists
} catch (err) {
console.error('Failed to mark as read:', err);
}
@@ -76,7 +82,11 @@ export default function AgentNotificationsPage() {
const markAllAsRead = async () => {
try {
await notificationsApiService.markAllAsRead();
setNotifications((prev) => prev.map((n) => ({ ...n, read: true })));
if (filter === 'unread') {
setNotifications([]);
} else {
setNotifications((prev) => prev.map((n) => ({ ...n, read: true })));
}
setUnreadCount(0);
} catch (err) {
console.error('Failed to mark all as read:', err);

16
src/app/(user)/user/notifications/page.tsx
View File

@@ -62,9 +62,13 @@ export default function UserNotificationsPage() {
const markAsRead = async (id: string) => {
try {
await notificationsApiService.markAsRead(id);
setNotifications((prev) =>
prev.map((n) => (n.id === id ? { ...n, read: true } : n))
);
if (filter === 'unread') {
setNotifications((prev) => prev.filter((n) => n.id !== id));
} else {
setNotifications((prev) =>
prev.map((n) => (n.id === id ? { ...n, read: true } : n))
);
}
setUnreadCount((prev) => Math.max(0, prev - 1));
} catch (err) {
console.error('Failed to mark as read:', err);
@@ -74,7 +78,11 @@ export default function UserNotificationsPage() {
const markAllAsRead = async () => {
try {
await notificationsApiService.markAllAsRead();
setNotifications((prev) => prev.map((n) => ({ ...n, read: true })));
if (filter === 'unread') {
setNotifications([]);
} else {
setNotifications((prev) => prev.map((n) => ({ ...n, read: true })));
}
setUnreadCount(0);
} catch (err) {
console.error('Failed to mark all as read:', err);