From b877aafc3f5fe8df7cd84a6421da16b9e6b475dd Mon Sep 17 00:00:00 2001
From: Mathew Kamkar <578302+matkam@users.noreply.github.com>
Date: Sat, 5 Jul 2025 08:22:24 -0700
Subject: [PATCH] only hide unmonitored nodes when no messages

---
 Meshtastic/Views/Messages/UserList.swift | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Meshtastic/Views/Messages/UserList.swift b/Meshtastic/Views/Messages/UserList.swift
index 41642582..bd93b495 100644
--- a/Meshtastic/Views/Messages/UserList.swift
+++ b/Meshtastic/Views/Messages/UserList.swift
@@ -337,7 +337,8 @@ struct FilteredUserList<Content: View>: View {
 			}
 		}
 		// Always apply unmessagable and connected node filters
-		let isUnmessagablePredicate = NSPredicate(format: "unmessagable == NO")
+		// Only hide unmessagable nodes if they have 0 messages
+		let isUnmessagablePredicate = NSPredicate(format: "unmessagable == NO AND (SUBQUERY(messageList, $msg, $msg.messageId != nil).@count == 0)")
 		predicates.append(isUnmessagablePredicate)
 		let isIgnoredPredicate = NSPredicate(format: "userNode.ignored == NO")
 		predicates.append(isIgnoredPredicate)