From f35d79ff7cfacc4d0e3919a1c35c6148def4693b Mon Sep 17 00:00:00 2001
From: Garth Vander Houwen <garthvh@yahoo.com>
Date: Tue, 29 Aug 2023 08:58:24 -0700
Subject: [PATCH] Fix a couple of bugs

---
 Meshtastic/Helpers/BLEManager.swift              | 2 +-
 Meshtastic/Persistence/UserEntityExtension.swift | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Meshtastic/Helpers/BLEManager.swift b/Meshtastic/Helpers/BLEManager.swift
index 03cd0bd9..ec12488a 100644
--- a/Meshtastic/Helpers/BLEManager.swift
+++ b/Meshtastic/Helpers/BLEManager.swift
@@ -703,10 +703,10 @@ class BLEManager: NSObject, CBPeripheralDelegate, MqttClientProxyManagerDelegate
 					newMessage.messageId = Int64(UInt32.random(in: UInt32(UInt8.max)..<UInt32.max))
 					newMessage.messageTimestamp =  Int32(Date().timeIntervalSince1970)
 					newMessage.receivedACK = false
+					newMessage.read = true
 					if toUserNum > 0 {
 						newMessage.toUser = fetchedUsers.first(where: { $0.num == toUserNum })
 						newMessage.toUser?.lastMessage = Date()
-						newMessage.read = true
 						newMessage.toUser?.objectWillChange.send()
 					}
 					newMessage.fromUser = fetchedUsers.first(where: { $0.num == fromUserNum })
diff --git a/Meshtastic/Persistence/UserEntityExtension.swift b/Meshtastic/Persistence/UserEntityExtension.swift
index ae4450ca..1786a45b 100644
--- a/Meshtastic/Persistence/UserEntityExtension.swift
+++ b/Meshtastic/Persistence/UserEntityExtension.swift
@@ -19,7 +19,7 @@ extension UserEntity {
 	
 	var unreadMessages: Int {
 		
-		let unreadMessages = receivedMessages?.filter{ ($0 as AnyObject).read == false } ?? []
+		let unreadMessages = messageList.filter{ ($0 as AnyObject).read == false } 
 		return unreadMessages.count
 	}
 }