From ab5af1546d0c0890bc713d50f53c7ecdd6da39bd Mon Sep 17 00:00:00 2001
From: jack <no@no.no>
Date: Sun, 6 Jul 2025 22:26:56 +0200
Subject: [PATCH] Add comprehensive logging and force UI updates for delivery
 status

- Add logging to track what delivery status is shown in UI
- Add logging when green/blue checkmarks appear
- Force complete dictionary reassignment to trigger SwiftUI updates
- Add diagnostics to understand why blue checkmarks aren't showing
---
 bitchat/ViewModels/ChatViewModel.swift | 26 ++++++++++++++++++--------
 bitchat/Views/ContentView.swift        |  7 +++++++
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/bitchat/ViewModels/ChatViewModel.swift b/bitchat/ViewModels/ChatViewModel.swift
index 17a1b9f2..95293e56 100644
--- a/bitchat/ViewModels/ChatViewModel.swift
+++ b/bitchat/ViewModels/ChatViewModel.swift
@@ -946,7 +946,14 @@ class ChatViewModel: ObservableObject {
     }
     
     func getPrivateChatMessages(for peerID: String) -> [BitchatMessage] {
-        return privateChats[peerID] ?? []
+        let messages = privateChats[peerID] ?? []
+        if !messages.isEmpty {
+            print("[UI] Getting \(messages.count) messages for peer \(peerID)")
+            if let lastMessage = messages.last {
+                print("[UI] Last message status: \(lastMessage.deliveryStatus?.displayText ?? "none")")
+            }
+        }
+        return messages
     }
     
     func getPeerIDForNickname(_ nickname: String) -> String? {
@@ -2135,21 +2142,24 @@ extension ChatViewModel: BitchatDelegate {
         }
         
         // Update in private chats
-        for (peerID, var chatMessages) in privateChats {
+        var updatedPrivateChats = privateChats
+        for (peerID, var chatMessages) in updatedPrivateChats {
             if let index = chatMessages.firstIndex(where: { $0.id == messageID }) {
                 var updatedMessage = chatMessages[index]
                 updatedMessage.deliveryStatus = status
                 chatMessages[index] = updatedMessage
-                privateChats[peerID] = chatMessages
+                updatedPrivateChats[peerID] = chatMessages
                 print("[Delivery] Updated message in private chat with \(peerID)")
-                
-                // Force UI update by triggering objectWillChange
-                DispatchQueue.main.async { [weak self] in
-                    self?.objectWillChange.send()
-                }
             }
         }
         
+        // Force complete reassignment to trigger SwiftUI update
+        DispatchQueue.main.async { [weak self] in
+            guard let self = self else { return }
+            self.privateChats = updatedPrivateChats
+            self.objectWillChange.send()
+        }
+        
         // Update in room messages
         for (room, var roomMsgs) in roomMessages {
             if let index = roomMsgs.firstIndex(where: { $0.id == messageID }) {
diff --git a/bitchat/Views/ContentView.swift b/bitchat/Views/ContentView.swift
index 6faaa3d8..03f2fdaf 100644
--- a/bitchat/Views/ContentView.swift
+++ b/bitchat/Views/ContentView.swift
@@ -494,6 +494,7 @@ struct ContentView: View {
                                     // Delivery status indicator for private messages
                                     if message.isPrivate && message.sender == viewModel.nickname,
                                        let status = message.deliveryStatus {
+                                        let _ = print("[UI] Message \(message.id) has status: \(status)")
                                         DeliveryStatusView(status: status, colorScheme: colorScheme)
                                             .padding(.leading, 4)
                                             .alignmentGuide(.firstTextBaseline) { _ in 12 }
@@ -1104,6 +1105,9 @@ struct DeliveryStatusView: View {
             }
             .foregroundColor(textColor.opacity(0.8))
             .help("Delivered to \(nickname)")
+            .onAppear {
+                print("[UI] Showing GREEN checkmarks for delivered status to \(nickname)")
+            }
             
         case .read(let nickname, _):
             HStack(spacing: -2) {
@@ -1114,6 +1118,9 @@ struct DeliveryStatusView: View {
             }
             .foregroundColor(Color.blue)
             .help("Read by \(nickname)")
+            .onAppear {
+                print("[UI] Showing BLUE checkmarks for read status by \(nickname)")
+            }
             
         case .failed(let reason):
             Image(systemName: "exclamationmark.triangle")