From 5579d87845f0063af1e50daf8d81ebd231a3f0ce Mon Sep 17 00:00:00 2001
From: ford-jones <fordnicholasjones@gmail.com>
Date: Fri, 12 Sep 2025 19:52:34 +1200
Subject: [PATCH] Disable on-screen 'new message' popup for muted nodes and
 channels

---
 src/graphics/Screen.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp
index eb8093947..e688b2ccc 100644
--- a/src/graphics/Screen.cpp
+++ b/src/graphics/Screen.cpp
@@ -1419,6 +1419,7 @@ int Screen::handleTextMessage(const meshtastic_MeshPacket *packet)
             }
             // === Prepare banner content ===
             const meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(packet->from);
+            const meshtastic_Channel channel = channels.getByIndex(node->channel ? node->channel : channels.getPrimaryIndex());
             const char *longName = (node && node->has_user) ? node->user.long_name : nullptr;
 
             const char *msgRaw = reinterpret_cast<const char *>(packet->decoded.payload.bytes);
@@ -1440,15 +1441,14 @@ int Screen::handleTextMessage(const meshtastic_MeshPacket *packet)
                 } else {
                     strcpy(banner, "Alert Received");
                 }
-            } else {
+            } else if (!node->is_muted && !channel.settings.mute) {
                 if (longName && longName[0]) {
                     snprintf(banner, sizeof(banner), "New Message from\n%s", longName);
                 } else {
                     strcpy(banner, "New Message");
                 }
+                screen->showSimpleBanner(banner, 3000);
             }
-
-            screen->showSimpleBanner(banner, 3000);
         }
     }