From 9fe33430383436fa42c22c21278168398e21224c Mon Sep 17 00:00:00 2001
From: 777genius <quantjumppro@gmail.com>
Date: Tue, 14 Apr 2026 17:25:58 +0300
Subject: [PATCH] fix: hide empty member message pagination

---
 .../team/members/MemberMessagesTab.tsx        |  4 +-
 .../team/members/MemberMessagesTab.test.ts    | 71 +++++++++++++++++++
 2 files changed, 74 insertions(+), 1 deletion(-)

diff --git a/src/renderer/components/team/members/MemberMessagesTab.tsx b/src/renderer/components/team/members/MemberMessagesTab.tsx
index b2eda169..3fc87f1c 100644
--- a/src/renderer/components/team/members/MemberMessagesTab.tsx
+++ b/src/renderer/components/team/members/MemberMessagesTab.tsx
@@ -207,6 +207,8 @@ export const MemberMessagesTab = ({
           ? 'No loaded messages for this member yet'
           : 'No messages with this member'
         : 'No activity with this member';
+  const canLoadOlderMessages =
+    hasMore && activityFilter !== 'comments' && displayEntries.length > 0;
 
   return (
     <div className="space-y-3">
@@ -281,7 +283,7 @@ export const MemberMessagesTab = ({
           </div>
         )}
 
-        {hasMore && activityFilter !== 'comments' && (
+        {canLoadOlderMessages && (
           <div className="flex justify-center pt-2">
             <Button
               variant="ghost"
diff --git a/test/renderer/components/team/members/MemberMessagesTab.test.ts b/test/renderer/components/team/members/MemberMessagesTab.test.ts
index 03ac8ee0..fad6eedb 100644
--- a/test/renderer/components/team/members/MemberMessagesTab.test.ts
+++ b/test/renderer/components/team/members/MemberMessagesTab.test.ts
@@ -159,4 +159,75 @@ describe('MemberMessagesTab', () => {
       await Promise.resolve();
     });
   });
+
+  it('hides load older messages when the member has no visible activity', async () => {
+    getMessagesPage.mockResolvedValue({
+      messages: [
+        {
+          from: 'team-lead',
+          to: 'alice',
+          text: 'Message for another member',
+          summary: 'Message for another member',
+          timestamp: '2026-04-13T13:34:00.000Z',
+          read: false,
+          messageId: 'msg-other-member',
+        },
+      ],
+      nextCursor: 'older-cursor',
+      hasMore: true,
+    });
+
+    const members: ResolvedTeamMember[] = [
+      {
+        name: 'team-lead',
+        status: 'active',
+        currentTaskId: null,
+        taskCount: 0,
+        lastActiveAt: null,
+        messageCount: 0,
+        agentType: 'team-lead',
+      },
+      {
+        name: 'jack',
+        status: 'active',
+        currentTaskId: null,
+        taskCount: 0,
+        lastActiveAt: null,
+        messageCount: 0,
+      },
+      {
+        name: 'alice',
+        status: 'active',
+        currentTaskId: null,
+        taskCount: 0,
+        lastActiveAt: null,
+        messageCount: 0,
+      },
+    ];
+
+    const host = document.createElement('div');
+    document.body.appendChild(host);
+    const root = createRoot(host);
+
+    await act(async () => {
+      root.render(
+        React.createElement(MemberMessagesTab, {
+          messages: [],
+          teamName: 'demo-team',
+          memberName: 'jack',
+          members,
+          tasks: [],
+        })
+      );
+      await Promise.resolve();
+    });
+
+    expect(host.textContent).toContain('No activity with this member');
+    expect(host.textContent).not.toContain('Load older messages');
+
+    await act(async () => {
+      root.unmount();
+      await Promise.resolve();
+    });
+  });
 });