fix: made timeline refresh when switching accounts - [CU-869b1pyqk] (#86)

Author: Exo1i

src/__tests__/hooks/useFollowingFeed.test.tsx

@@ -11,6 +11,38 @@ jest.mock('@/services/timeline', () => ({
   getFollowingFeed: jest.fn(),
 }));
 
+// Mock the userStore
+jest.mock('@/stores/userStore', () => ({
+  useUserStore: jest.fn((selector) => {
+    const state = {
+      user: {
+        username: 'testuser',
+        displayName: 'Test User',
+        bio: null,
+        bioEntities: null,
+        avatarUrl: null,
+        bannerUrl: null,
+        location: null,
+        websiteUrl: null,
+        birthDate: null,
+        joinedAt: null,
+        relationship: {
+          blocking: false,
+          blockedBy: false,
+          muted: false,
+          following: false,
+          follower: false,
+        },
+        followingCount: 0,
+        followersCount: 0,
+        mutualsCount: 0,
+        mutualNames: [],
+      },
+    };
+    return selector ? selector(state) : state;
+  }),
+}));
+
 const mockGetFollowingFeed = timelineService.getFollowingFeed as jest.MockedFunction<
   typeof timelineService.getFollowingFeed
 >;
@@ -329,4 +361,45 @@ describe('useFollowingFeed', () => {
     expect(allData).toHaveLength(2);
     expect(allData).toEqual(mockTweets);
   });
+
+  it('should include username in query key for account-specific caching', async () => {
+    mockGetFollowingFeed.mockResolvedValueOnce({
+      success: true,
+      message: 'Success',
+      data: mockTweets,
+      pagination: { cursor: null, nextCursor: null, hasNextPage: false },
+    });
+
+    const queryClient = new QueryClient({
+      defaultOptions: {
+        queries: {
+          retry: false,
+          gcTime: 0,
+        },
+      },
+    });
+
+    const Wrapper = ({ children }: { children: ReactNode }) => (
+      <QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
+    );
+
+    const { result } = renderHook(() => useFollowingFeed(), {
+      wrapper: Wrapper,
+    });
+
+    await waitFor(() => {
+      expect(result.current.isSuccess).toBe(true);
+    });
+
+    // Verify the query was created with the correct key including username
+    const queries = queryClient.getQueryCache().getAll();
+    expect(queries.length).toBeGreaterThan(0);
+
+    const followingQuery = queries.find(
+      (q) => Array.isArray(q.queryKey) && q.queryKey[0] === 'following-feed'
+    );
+
+    expect(followingQuery).toBeDefined();
+    expect(followingQuery?.queryKey).toEqual(['following-feed', 'testuser']);
+  });
 });

src/__tests__/screens/following_screen.test.tsx

@@ -15,6 +15,38 @@ const mockGetFollowingFeed = timelineService.getFollowingFeed as jest.MockedFunc
   typeof timelineService.getFollowingFeed
 >;
 
+// Mock the userStore
+jest.mock('@/stores/userStore', () => ({
+  useUserStore: jest.fn((selector) => {
+    const state = {
+      user: {
+        username: 'testuser',
+        displayName: 'Test User',
+        bio: null,
+        bioEntities: null,
+        avatarUrl: null,
+        bannerUrl: null,
+        location: null,
+        websiteUrl: null,
+        birthDate: null,
+        joinedAt: null,
+        relationship: {
+          blocking: false,
+          blockedBy: false,
+          muted: false,
+          following: false,
+          follower: false,
+        },
+        followingCount: 0,
+        followersCount: 0,
+        mutualsCount: 0,
+        mutualNames: [],
+      },
+    };
+    return selector ? selector(state) : state;
+  }),
+}));
+
 // Mock FlashList with simple string mock
 jest.mock('@shopify/flash-list', () => ({
   FlashList: 'FlashList',

src/hooks/useFollowingFeed.tsx

@@ -1,17 +1,21 @@
 import { useInfiniteQuery } from '@tanstack/react-query';
 
 import { getFollowingFeed } from '@/services/timeline';
+import { useUserStore } from '@/stores/userStore';
 
 const PAGE_SIZE = 5;
 
 export const useFollowingFeed = () => {
+  const username = useUserStore((state) => state.user.username);
+
   return useInfiniteQuery({
-    queryKey: ['following-feed'],
+    queryKey: ['following-feed', username],
     queryFn: async ({ pageParam }) => {
       const res = await getFollowingFeed({ cursor: pageParam, limit: PAGE_SIZE });
       return res;
     },
     initialPageParam: null as string | null,
     getNextPageParam: (lastPage) => lastPage.pagination.nextCursor,
+    enabled: !!username, // Only fetch if we have a username
   });
 };