Skip to content

Commit 966387f

Browse files
committed
fix: broken loading state on slower queryChannels
1 parent 80b5f7f commit 966387f

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

package/src/components/ChannelList/ChannelList.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,7 @@ export const ChannelList = <
339339
loadingChannels,
340340
loadingNextPage,
341341
loadNextPage,
342+
ready,
342343
refreshing,
343344
refreshList,
344345
reloadList,
@@ -416,7 +417,7 @@ export const ChannelList = <
416417
const channelIdsStr = channels?.reduce((acc, channel) => `${acc}${channel.cid}`, '');
417418

418419
useEffect(() => {
419-
if (channels == null || staticChannelsActive || !enableOfflineSupport) {
420+
if (channels == null || !ready || staticChannelsActive || !enableOfflineSupport) {
420421
return;
421422
}
422423

package/src/components/ChannelList/hooks/usePaginatedChannels.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,7 @@ export const usePaginatedChannels = <
301301
activeQueryType.current === 'queryLocalDB' ? true : pagination?.isLoading || !ready,
302302
loadingNextPage: pagination?.isLoadingNext,
303303
loadNextPage: channelManager.loadNext,
304+
ready,
304305
refreshing: activeQueryType.current === 'refresh',
305306
refreshList,
306307
reloadList,

0 commit comments

Comments
 (0)