diff --git a/apps/ios/Shared/Model/SimpleXAPI.swift b/apps/ios/Shared/Model/SimpleXAPI.swift index 279dcebe16..134a4d6f1e 100644 --- a/apps/ios/Shared/Model/SimpleXAPI.swift +++ b/apps/ios/Shared/Model/SimpleXAPI.swift @@ -542,9 +542,14 @@ func registerToken(token: DeviceToken) { Task { do { let status = try await apiRegisterToken(token: token, notificationMode: mode) - await MainActor.run { m.tokenStatus = status } + if status == .active { + let checkedStatus = try await apiCheckToken(token: token) + await MainActor.run { m.tokenStatus = checkedStatus } + } else { + await MainActor.run { m.tokenStatus = status } + } } catch let error { - logger.error("registerToken apiRegisterToken error: \(responseError(error))") + logger.error("registerToken apiRegisterToken or apiCheckToken error: \(responseError(error))") } } } diff --git a/apps/ios/Shared/Views/UserSettings/SettingsView.swift b/apps/ios/Shared/Views/UserSettings/SettingsView.swift index 138c3689f5..be85bab182 100644 --- a/apps/ios/Shared/Views/UserSettings/SettingsView.swift +++ b/apps/ios/Shared/Views/UserSettings/SettingsView.swift @@ -479,7 +479,7 @@ struct SettingsView: View { color = theme.colors.secondary case .invalid: icon = "bolt.slash" - color = theme.colors.secondary + color = .red case .confirmed: icon = "bolt.fill" color = .yellow @@ -488,7 +488,7 @@ struct SettingsView: View { color = .green case .expired: icon = "bolt.slash.fill" - color = theme.colors.secondary + color = .red case .none: icon = "bolt" color = theme.colors.secondary