diff --git a/apps/ios/Shared/Views/UserSettings/NotificationsView.swift b/apps/ios/Shared/Views/UserSettings/NotificationsView.swift index d9473bad4a..fc99750cbe 100644 --- a/apps/ios/Shared/Views/UserSettings/NotificationsView.swift +++ b/apps/ios/Shared/Views/UserSettings/NotificationsView.swift @@ -225,11 +225,7 @@ struct NotificationsView: View { let status = try await apiCheckToken(token: token) await MainActor.run { m.tokenStatus = status - if [.invalid, .expired].contains(status) { - testedSuccess = false - } else { - testedSuccess = true - } + testedSuccess = status.testSuccess showAlert( NSLocalizedString("Token status", comment: "alert title"), message: status.rawValue diff --git a/apps/ios/SimpleXChat/ChatTypes.swift b/apps/ios/SimpleXChat/ChatTypes.swift index dba26198c1..36433d142a 100644 --- a/apps/ios/SimpleXChat/ChatTypes.swift +++ b/apps/ios/SimpleXChat/ChatTypes.swift @@ -4127,6 +4127,17 @@ public enum NtfTknStatus: String, Decodable, Hashable { case confirmed = "CONFIRMED" case active = "ACTIVE" case expired = "EXPIRED" + + public var testSuccess: Bool { + switch self { + case .new: true + case .registered: true + case .invalid: false + case .confirmed: true + case .active: true + case .expired: false + } + } } public struct SndFileTransfer: Decodable, Hashable {