From ef6b08d75fe408f47b1d8dfe9b754be6a0a70057 Mon Sep 17 00:00:00 2001
From: AGInoMETRICS <btconometrics@protonmail.com>
Date: Tue, 8 Jul 2025 15:54:28 +1000
Subject: [PATCH] Fix: Ensure peer list updates on main thread

---
 bitchat/ViewModels/ChatViewModel.swift | 39 +++++++++++++-------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/bitchat/ViewModels/ChatViewModel.swift b/bitchat/ViewModels/ChatViewModel.swift
index 71f54b24..bd36931e 100644
--- a/bitchat/ViewModels/ChatViewModel.swift
+++ b/bitchat/ViewModels/ChatViewModel.swift
@@ -2906,28 +2906,29 @@ extension ChatViewModel: BitchatDelegate {
     
     func didUpdatePeerList(_ peers: [String]) {
         // print("[DEBUG] Updating peer list: \(peers.count) peers: \(peers)")
-        connectedPeers = peers
-        isConnected = !peers.isEmpty
-        
-        // Clean up channel members who disconnected
-        for (channel, memberIDs) in channelMembers {
-            // Remove disconnected peers from channel members
-            let activeMembers = memberIDs.filter { memberID in
-                memberID == meshService.myPeerID || peers.contains(memberID)
+        // UI updates must run on the main thread.
+        // The delegate callback is not guaranteed to be on the main thread.
+        DispatchQueue.main.async {
+            self.connectedPeers = peers
+            self.isConnected = !peers.isEmpty
+
+            // Clean up channel members who disconnected
+            for (channel, memberIDs) in self.channelMembers {
+                let activeMembers = memberIDs.filter { memberID in
+                    memberID == self.meshService.myPeerID || peers.contains(memberID)
+                }
+                if activeMembers != memberIDs {
+                    self.channelMembers[channel] = activeMembers
+                }
             }
-            if activeMembers != memberIDs {
-                channelMembers[channel] = activeMembers
+            // Explicitly notify SwiftUI that the object has changed.
+            self.objectWillChange.send()
+            
+            if let currentChatPeer = self.selectedPrivateChatPeer,
+               !peers.contains(currentChatPeer) {
+                self.endPrivateChat()
             }
         }
-        
-        // Force UI update
-        objectWillChange.send()
-        
-        // If we're in a private chat with someone who disconnected, exit the chat
-        if let currentChatPeer = selectedPrivateChatPeer,
-           !peers.contains(currentChatPeer) {
-            endPrivateChat()
-        }
     }
     
     private func parseMentions(from content: String) -> [String] {