fix: inbox refresh loop, wrong connection status, overlapping banner

Three issues in the Inbox page:

1. "WhatsApp not connected" banner always showed even when connected.
   The connection check queried .from("whatsapp_configs") (plural) but
   the actual table is whatsapp_config (singular). Query always returned
   no rows, so status was never "connected". Changed to the correct
   table name and also switched .single() → .maybeSingle() so a missing
   row returns null cleanly instead of throwing PGRST116.

2. The banner overlapped message content — it used absolute positioning
   at top-14, left-60, which floated over the thread's header. Restructured
   the page layout so the banner is part of the flex column (pushes panels
   down) instead of overlapping them.

3. The inbox "kept refreshing every second" — an infinite loop between
   MessageThread's fetch and the realtime subscription in the page:

   MessageThread useEffect depended on a fetchMessages callback that had
   [conversation, onMessagesLoaded] deps. After fetching messages, it
   always issued a conversations.unread_count=0 UPDATE. That UPDATE fired
   a postgres_changes event. The page's handleConversationEvent received
   it and called setActiveConversation({...prev, ...conv}) — creating a
   NEW OBJECT REFERENCE for the conversation prop. That changed the
   conversation prop passed to MessageThread → fetchMessages changed →
   useEffect re-fired → reset unread → fired another realtime event →
   loop forever (visible as ~1-2 refreshes per second).

   Fix:
   - useEffect now depends on conversation?.id only (a stable string),
     not the full object reference.
   - onMessagesLoaded is read through a ref so it doesn't need to be
     a dependency.
   - unread_count reset only runs when the conversation actually has
     unread messages (avoids UPDATE-thrashing realtime).

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Arnas Donauskas 2026-04-16 21:10:50 +03:00
parent b8923c6056
commit 976f1ff8ac
No known key found for this signature in database
2 changed files with 82 additions and 52 deletions

View File

@ -8,7 +8,7 @@ import { ConversationList } from "@/components/inbox/conversation-list";
import { MessageThread } from "@/components/inbox/message-thread"; import { MessageThread } from "@/components/inbox/message-thread";
import { ContactSidebar } from "@/components/inbox/contact-sidebar"; import { ContactSidebar } from "@/components/inbox/contact-sidebar";
import { toast } from "sonner"; import { toast } from "sonner";
import { Wifi, WifiOff } from "lucide-react"; import { WifiOff } from "lucide-react";
export default function InboxPage() { export default function InboxPage() {
const [conversations, setConversations] = useState<Conversation[]>([]); const [conversations, setConversations] = useState<Conversation[]>([]);
@ -31,11 +31,13 @@ export default function InboxPage() {
if (!user) return; if (!user) return;
// Table is `whatsapp_config` (singular) — the previous "whatsapp_configs"
// query always returned no rows, so the banner always showed "not connected".
const { data } = await supabase const { data } = await supabase
.from("whatsapp_configs") .from("whatsapp_config")
.select("status") .select("status")
.eq("user_id", user.id) .eq("user_id", user.id)
.single(); .maybeSingle();
setWhatsappConnected(data?.status === "connected"); setWhatsappConnected(data?.status === "connected");
}; };
@ -167,10 +169,11 @@ export default function InboxPage() {
); );
return ( return (
<div className="-m-6 flex h-[calc(100vh-3.5rem)] overflow-hidden"> <div className="-m-6 flex h-[calc(100vh-3.5rem)] flex-col overflow-hidden">
{/* WhatsApp connection banner */} {/* WhatsApp connection banner — in the flex column, not absolute,
so it pushes the panels down instead of overlapping them. */}
{whatsappConnected === false && ( {whatsappConnected === false && (
<div className="absolute left-60 right-0 top-14 z-10 flex items-center justify-center gap-2 bg-amber-500/10 px-4 py-2"> <div className="flex shrink-0 items-center justify-center gap-2 border-b border-amber-500/20 bg-amber-500/10 px-4 py-2">
<WifiOff className="h-4 w-4 text-amber-400" /> <WifiOff className="h-4 w-4 text-amber-400" />
<p className="text-xs text-amber-400"> <p className="text-xs text-amber-400">
WhatsApp is not connected. Go to Settings to connect your account. WhatsApp is not connected. Go to Settings to connect your account.
@ -178,6 +181,7 @@ export default function InboxPage() {
</div> </div>
)} )}
<div className="flex flex-1 overflow-hidden">
{/* Left panel: Conversation list */} {/* Left panel: Conversation list */}
<ConversationList <ConversationList
activeConversationId={activeConversation?.id ?? null} activeConversationId={activeConversation?.id ?? null}
@ -201,5 +205,6 @@ export default function InboxPage() {
<ContactSidebar contact={activeContact} /> <ContactSidebar contact={activeContact} />
</div> </div>
</div> </div>
</div>
); );
} }

View File

@ -101,36 +101,61 @@ export function MessageThread({
return { expired, remaining }; return { expired, remaining };
}, [messages]); }, [messages]);
const fetchMessages = useCallback(async () => { // Store latest callback in a ref so fetchMessages doesn't need to
if (!conversation) return; // depend on `onMessagesLoaded` — otherwise parent re-renders cause
setLoading(true); // fetchMessages to change → useEffect re-fires → refetch → realtime
// UPDATE on conversations.unread_count → parent re-renders → LOOP.
const onMessagesLoadedRef = useRef(onMessagesLoaded);
onMessagesLoadedRef.current = onMessagesLoaded;
const conversationId = conversation?.id;
const hasUnread = (conversation?.unread_count ?? 0) > 0;
useEffect(() => {
if (!conversationId) return;
const supabase = createClient(); const supabase = createClient();
let cancelled = false;
(async () => {
setLoading(true);
const { data, error } = await supabase const { data, error } = await supabase
.from("messages") .from("messages")
.select("*") .select("*")
.eq("conversation_id", conversation.id) .eq("conversation_id", conversationId)
.order("created_at", { ascending: true }); .order("created_at", { ascending: true });
if (cancelled) return;
if (error) { if (error) {
console.error("Failed to fetch messages:", error); console.error("Failed to fetch messages:", error);
} else { } else {
onMessagesLoaded(data ?? []); onMessagesLoadedRef.current(data ?? []);
} }
// Reset unread count // Only issue the unread_count reset when there's actually something
// to reset. Unconditional updates fire a realtime UPDATE event every
// time, which — combined with the parent's conversation-event handler
// — used to retrigger this effect in a loop.
if (hasUnread) {
await supabase await supabase
.from("conversations") .from("conversations")
.update({ unread_count: 0 }) .update({ unread_count: 0 })
.eq("id", conversation.id); .eq("id", conversationId);
}
setLoading(false); if (!cancelled) setLoading(false);
}, [conversation, onMessagesLoaded]); })();
useEffect(() => { return () => {
fetchMessages(); cancelled = true;
}, [fetchMessages]); };
// Re-fetch only when the selected conversation changes. `hasUnread`
// is used inside but is a boolean derived from conversation; the
// conversationId dep is the real trigger.
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [conversationId]);
// Auto-scroll to bottom on new messages // Auto-scroll to bottom on new messages
useEffect(() => { useEffect(() => {