From 159df1ec5b5b403f2a282b2f7d7af3df937fda86 Mon Sep 17 00:00:00 2001
From: Jack Kingsman <jack.kingsman@gmail.com>
Date: Wed, 8 Apr 2026 16:33:44 -0700
Subject: [PATCH] Revert "Add debug lines for fav click"

This reverts commit 8e2e039985bd32b105b97a5a437db2ddf2c6cdbd.
---
 frontend/src/App.tsx                          | 32 +++++--------------
 frontend/src/components/ChannelInfoPane.tsx   |  7 +---
 frontend/src/components/ChatHeader.tsx        |  9 ++----
 frontend/src/components/ContactInfoPane.tsx   |  7 +---
 frontend/src/components/RepeaterDashboard.tsx |  7 +---
 frontend/src/utils/contactMerge.ts            | 11 +------
 6 files changed, 15 insertions(+), 58 deletions(-)

diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index c1de3cf..c6a2ab9 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -207,36 +207,20 @@ export function App() {
 
   const handleToggleFavorite = useCallback(
     async (type: 'channel' | 'contact', id: string) => {
-      const ts = performance.now().toFixed(2);
-      console.log(
-        `[fav-debug] handleToggleFavorite called t=${ts} type=${type} id=${id.slice(0, 12)}`
-      );
-
       // Optimistically toggle the favorite flag
       if (type === 'contact') {
-        setContacts((prev) => {
-          const match = prev.find((c) => c.public_key === id);
-          console.log(
-            `[fav-debug] optimistic contact toggle t=${ts} current=${match?.favorite} → ${!match?.favorite}`
-          );
-          return prev.map((c) => (c.public_key === id ? { ...c, favorite: !c.favorite } : c));
-        });
+        setContacts((prev) =>
+          prev.map((c) => (c.public_key === id ? { ...c, favorite: !c.favorite } : c))
+        );
       } else {
-        setChannels((prev) => {
-          const match = prev.find((c) => c.key === id);
-          console.log(
-            `[fav-debug] optimistic channel toggle t=${ts} current=${match?.favorite} → ${!match?.favorite}`
-          );
-          return prev.map((c) => (c.key === id ? { ...c, favorite: !c.favorite } : c));
-        });
+        setChannels((prev) =>
+          prev.map((c) => (c.key === id ? { ...c, favorite: !c.favorite } : c))
+        );
       }
 
       try {
-        console.log(`[fav-debug] firing API request t=${ts}`);
-        const result = await api.toggleFavorite(type, id);
-        console.log(`[fav-debug] API response t=${ts}`, result);
-      } catch (err) {
-        console.error(`[fav-debug] API error t=${ts}`, err);
+        await api.toggleFavorite(type, id);
+      } catch {
         // Revert on failure
         if (type === 'contact') {
           setContacts((prev) =>
diff --git a/frontend/src/components/ChannelInfoPane.tsx b/frontend/src/components/ChannelInfoPane.tsx
index 07c2d11..8c63da6 100644
--- a/frontend/src/components/ChannelInfoPane.tsx
+++ b/frontend/src/components/ChannelInfoPane.tsx
@@ -120,12 +120,7 @@ export function ChannelInfoPane({
               <button
                 type="button"
                 className="text-sm flex items-center gap-2 hover:text-primary transition-colors"
-                onClick={(e) => {
-                  console.log(
-                    `[fav-debug] ChannelInfoPane star clicked t=${performance.now().toFixed(2)} detail=${e.detail} isTrusted=${e.isTrusted}`
-                  );
-                  onToggleFavorite('channel', channel.key);
-                }}
+                onClick={() => onToggleFavorite('channel', channel.key)}
               >
                 {channel.favorite ? (
                   <>
diff --git a/frontend/src/components/ChatHeader.tsx b/frontend/src/components/ChatHeader.tsx
index 8bdf101..3d86a3a 100644
--- a/frontend/src/components/ChatHeader.tsx
+++ b/frontend/src/components/ChatHeader.tsx
@@ -351,12 +351,9 @@ export function ChatHeader({
         {(conversation.type === 'channel' || conversation.type === 'contact') && (
           <button
             className="p-1 rounded hover:bg-accent text-lg leading-none transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
-            onClick={(e) => {
-              console.log(
-                `[fav-debug] star clicked t=${performance.now().toFixed(2)} detail=${e.detail} isTrusted=${e.isTrusted}`
-              );
-              onToggleFavorite(conversation.type as 'channel' | 'contact', conversation.id);
-            }}
+            onClick={() =>
+              onToggleFavorite(conversation.type as 'channel' | 'contact', conversation.id)
+            }
             title={favoriteTitle}
             aria-label={isFav ? 'Remove from favorites' : 'Add to favorites'}
           >
diff --git a/frontend/src/components/ContactInfoPane.tsx b/frontend/src/components/ContactInfoPane.tsx
index 3ae1c61..448d20c 100644
--- a/frontend/src/components/ContactInfoPane.tsx
+++ b/frontend/src/components/ContactInfoPane.tsx
@@ -377,12 +377,7 @@ export function ContactInfoPane({
               <button
                 type="button"
                 className="text-sm flex items-center gap-2 hover:text-primary transition-colors"
-                onClick={(e) => {
-                  console.log(
-                    `[fav-debug] ContactInfoPane star clicked t=${performance.now().toFixed(2)} detail=${e.detail} isTrusted=${e.isTrusted}`
-                  );
-                  onToggleFavorite('contact', contact.public_key);
-                }}
+                onClick={() => onToggleFavorite('contact', contact.public_key)}
                 title="Favorite contacts stay loaded on the radio for ACK support"
               >
                 {contact.favorite ? (
diff --git a/frontend/src/components/RepeaterDashboard.tsx b/frontend/src/components/RepeaterDashboard.tsx
index ef6372f..d1127ba 100644
--- a/frontend/src/components/RepeaterDashboard.tsx
+++ b/frontend/src/components/RepeaterDashboard.tsx
@@ -266,12 +266,7 @@ export function RepeaterDashboard({
           )}
           <button
             className="p-1 rounded hover:bg-accent text-lg leading-none transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
-            onClick={(e) => {
-              console.log(
-                `[fav-debug] RepeaterDashboard star clicked t=${performance.now().toFixed(2)} detail=${e.detail} isTrusted=${e.isTrusted}`
-              );
-              onToggleFavorite('contact', conversation.id);
-            }}
+            onClick={() => onToggleFavorite('contact', conversation.id)}
             title={
               isFav
                 ? 'Remove from favorites. Favorite contacts stay loaded on the radio for ACK support.'
diff --git a/frontend/src/utils/contactMerge.ts b/frontend/src/utils/contactMerge.ts
index 843be6b..dc9130d 100644
--- a/frontend/src/utils/contactMerge.ts
+++ b/frontend/src/utils/contactMerge.ts
@@ -12,16 +12,7 @@ export function mergeContactIntoList(contacts: Contact[], incoming: Contact): Co
   const idx = contacts.findIndex((c) => c.public_key === incoming.public_key);
   if (idx >= 0) {
     const existing = contacts[idx];
-    // Preserve user-action-only fields that should not be overwritten by
-    // radio-event-driven WS updates (adverts, path updates, syncs).  These
-    // fields are only changed via explicit user actions (favorite toggle,
-    // mark-read) or full REST refetches, not via mesh/radio events.
-    const merged = {
-      ...existing,
-      ...incoming,
-      favorite: existing.favorite,
-      last_read_at: existing.last_read_at,
-    };
+    const merged = { ...existing, ...incoming };
     const unchanged = (Object.keys(merged) as (keyof Contact)[]).every(
       (k) => existing[k] === merged[k]
     );