Skip to content

Fix notifications filter reset #2343

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Dimillian merged 1 commit into from
Oct 14, 2025
Merged

Fix notifications filter reset #2343

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions Packages/Notifications/Sources/Notifications/List/NotificationsListView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,23 +70,15 @@ public struct NotificationsListView: View {
if lockedType == nil && lockedAccountId == nil {
ToolbarTitleMenu {
Button {
selectedType = nil
Task {
viewState = .loading
await fetchNotifications()
}
applyFilter(type: nil)
} label: {
Label("notifications.navigation-title", systemImage: "bell.fill")
.tint(theme.labelColor)
}
Divider()
ForEach(Notification.NotificationType.allCases, id: \.self) { type in
Button {
selectedType = type
Task {
viewState = .loading
await fetchNotifications()
}
applyFilter(type: type)
} label: {
Label {
Text(type.menuTitle())
Expand Down Expand Up @@ -277,6 +269,16 @@ public struct NotificationsListView: View {
}

extension NotificationsListView {
private func applyFilter(type: Models.Notification.NotificationType?) {
selectedType = type
dataSource.reset()
viewState = .loading

Task {
await fetchNotifications()
}
}

private func fetchNotifications() async {
do {
let result = try await dataSource.fetchNotifications(
Expand Down
Loading