Show read for all notis when user has not logged in:

keccak384 · Dec 26, 2019 · 332d14f · 332d14f
1 parent afbd696
commit 332d14f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/...eens/CommonViews/Notifications/Controller/TableViewCell/KNNotificationTableViewCell.swift b/...eens/CommonViews/Notifications/Controller/TableViewCell/KNNotificationTableViewCell.swift
@@ -16,7 +16,7 @@ class KNNotificationTableViewCell: UITableViewCell {
   func updateCell(with noti: KNNotification, index: Int) {
     self.iconImageView.image = UIImage(named: "noti_icon_\(noti.label)")
     self.backgroundColor = {
-      if !noti.read { return UIColor(red: 232, green: 239, blue: 255) }
+      if !noti.read && IEOUserStorage.shared.user != nil { return UIColor(red: 232, green: 239, blue: 255) }
       if index % 2 == 0 { return UIColor(red: 255, green: 255, blue: 255) }
       return UIColor(red: 246, green: 247, blue: 251)
     }()

diff --git a/...yberNetwork/Screens/CommonViews/Notifications/Coordinator/KNNotificationCoordinator.swift b/...yberNetwork/Screens/CommonViews/Notifications/Coordinator/KNNotificationCoordinator.swift
@@ -76,7 +76,7 @@ class KNNotificationCoordinator: NSObject {
   }
 
   func markAsRead(ids: [Int], completion: @escaping (String?) -> Void) {
-    if ids.isEmpty {
+    if ids.isEmpty || IEOUserStorage.shared.user == nil {
       completion(nil)
       return
     }

diff --git a/...etwork/KyberNetwork/Screens/CommonViews/Notifications/Storage/KNNotificationStorage.swift b/...etwork/KyberNetwork/Screens/CommonViews/Notifications/Storage/KNNotificationStorage.swift
@@ -20,6 +20,7 @@ class KNNotificationStorage {
 
   func updateNotification(_ noti: KNNotification) {
     if self.realm == nil { return }
+    self.realm.beginWrite()
     self.realm.add([noti], update: .modified)
     try! self.realm.commitWrite()
     KNNotificationUtil.postNotification(for: kUpdateListNotificationsKey)

diff --git a/.../Balance/BalanceVC/Controller/HamburgerMenu/KNBalanceTabHamburgerMenuViewController.swift b/.../Balance/BalanceVC/Controller/HamburgerMenu/KNBalanceTabHamburgerMenuViewController.swift
@@ -372,7 +372,10 @@ class KNBalanceTabHamburgerMenuViewController: KNBaseViewController {
   }
 
   @objc func notificationDidUpdate(_ sender: Any?) {
-    let numUnread = KNNotificationCoordinator.shared.numberUnread
+    let numUnread: Int = {
+      if IEOUserStorage.shared.user == nil { return 0 }
+      return KNNotificationCoordinator.shared.numberUnread
+    }()
     self.update(notificationsCount: numUnread)
   }
 }