fix channel search

Author: riyanshu-patro

src/modules/channels/Channels.tsx

@@ -56,9 +56,10 @@ const Channels: FC<ChannelsProps> = () => {
   const channels =
     loadingChannels || searchingChannels
       ? Array(9).fill(0)
-      : (filters.search ? searchList : channelList)?.pages
-          .flatMap((page) => page.channels)
-          .filter((channel) => !channelFilterList.includes(channel.channel)) || [];
+      : (filters.search
+          ? searchList?.pages.flatMap((page) => page)
+          : channelList?.pages.flatMap((page) => page.channels)
+        )?.filter((channel) => !channelFilterList.includes(channel.channel)) || [];
 
   const suggestedChannels = getSuggestedChannels(channels, filters);
 

src/queries/hooks/channels/useChannelSearch.ts

@@ -31,9 +31,8 @@ export const useChannelSearch = ({ pageSize, query, chain, tag }: UseChannelSear
         chain,
         tag,
       }),
-    getNextPageParam: ({ itemCount }, allPages, lastPageParam) => {
-      console.log(itemCount, lastPageParam, pageSize, pageSize * ((lastPageParam as number) + 1) >= itemCount);
-      if (pageSize * ((lastPageParam as number) + 1) >= itemCount) {
+    getNextPageParam: ({}, allPages, lastPageParam) => {
+      if (allPages[(lastPageParam as number) - 1].length < pageSize) {
         return null;
       }
       return (lastPageParam as number) + 1;

src/queries/types/channels.ts

@@ -188,10 +188,7 @@ export type ChannelsListModelledResponse = {
   channels: Array<ChannelDetails>;
   itemcount: number;
 };
-export type ChannelsSearchListModelledResponse = {
-  channels: Array<ChannelDetails>;
-  itemCount: number;
-};
+export type ChannelsSearchListModelledResponse = Array<ChannelDetails>;
 
 export type ChannelListParams = {
   userPushSDKInstance: PushAPI;