Merge branch 'main' into iOS-18

This commit is contained in:
Thomas Ricouard 2024-06-26 13:32:44 +02:00
commit 0237dd05f2
2 changed files with 4 additions and 4 deletions

View file

@ -8,7 +8,7 @@ public struct NotificationsPolicy: Codable, Sendable {
public let summary: Summary public let summary: Summary
public struct Summary: Codable, Sendable { public struct Summary: Codable, Sendable {
public let pendingRequestsCount: String public let pendingRequestsCount: Int
public let pendingNotificationsCount: String public let pendingNotificationsCount: Int
} }
} }

View file

@ -10,12 +10,12 @@ struct NotificationsHeaderFilteredView: View {
let filteredNotifications: NotificationsPolicy.Summary let filteredNotifications: NotificationsPolicy.Summary
var body: some View { var body: some View {
if let count = Int(filteredNotifications.pendingNotificationsCount), count > 0 { if filteredNotifications.pendingNotificationsCount > 0 {
HStack { HStack {
Label("notifications.content-filter.requests.title", systemImage: "archivebox") Label("notifications.content-filter.requests.title", systemImage: "archivebox")
.foregroundStyle(.secondary) .foregroundStyle(.secondary)
Spacer() Spacer()
Text(filteredNotifications.pendingNotificationsCount) Text("\(filteredNotifications.pendingNotificationsCount)")
.font(.footnote) .font(.footnote)
.fontWeight(.semibold) .fontWeight(.semibold)
.monospacedDigit() .monospacedDigit()