diff --git a/GME Remit/Extensions/DataRequest+Ext.swift b/GME Remit/Extensions/DataRequest+Ext.swift index 903f1667..8d9d4f03 100644 --- a/GME Remit/Extensions/DataRequest+Ext.swift +++ b/GME Remit/Extensions/DataRequest+Ext.swift @@ -49,7 +49,7 @@ extension DataRequest { case .failure(let error): debugPrint("DataRequest Error: \(error.localizedDescription)") if (response.response?.statusCode ?? -1) == 401 { - MainWireframe.logoutWarningAlert(message: "\(error.localizedDescription)") + MainWireframe.logoutWarningAlert(message: "You have logged in from another device.") return } failure(error) diff --git a/GME Remit/Modules/Notice/NotificationHistory/User Interface/View/NotificationCell.swift b/GME Remit/Modules/Notice/NotificationHistory/User Interface/View/NotificationCell.swift index c4c83920..182ca980 100644 --- a/GME Remit/Modules/Notice/NotificationHistory/User Interface/View/NotificationCell.swift +++ b/GME Remit/Modules/Notice/NotificationHistory/User Interface/View/NotificationCell.swift @@ -9,17 +9,19 @@ import UIKit class NotificationCell: UITableViewCell { - - @IBOutlet private weak var titleLabel: UILabel! - @IBOutlet private weak var dateLabel: UILabel! - @IBOutlet private weak var newIconImageView: UIImageView! - - func setModel(_ model: NoticeModel) { - newIconImageView.isHidden = false - titleLabel.text = model.title - dateLabel.text = model.date + @IBOutlet private weak var titleLabel: UILabel! + @IBOutlet private weak var dateLabel: UILabel! + @IBOutlet private weak var newIconImageView: UIImageView! - newIconImageView.isHidden = model.isRead == "1" - } + func setModel(_ model: NoticeModel) { + titleLabel.text = model.title + dateLabel.text = model.date + + if model.isRead == "1" { + newIconImageView.image = UIImage(named: "checked") + } else { + newIconImageView.image = UIImage(named: "uncheck") + } + } } diff --git a/GME Remit/Modules/Notice/NotificationHistory/User Interface/View/NotificationHistory.storyboard b/GME Remit/Modules/Notice/NotificationHistory/User Interface/View/NotificationHistory.storyboard index b4e7dec7..4838db21 100644 --- a/GME Remit/Modules/Notice/NotificationHistory/User Interface/View/NotificationHistory.storyboard +++ b/GME Remit/Modules/Notice/NotificationHistory/User Interface/View/NotificationHistory.storyboard @@ -56,15 +56,17 @@ - - - + + + + + - + - + + + + - + + @@ -161,6 +167,7 @@ +