Skip to content

fix: properly resolve activeQueryType state #3004

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 10, 2025
Merged

fix: properly resolve activeQueryType state #3004

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions package/src/components/ChannelList/hooks/usePaginatedChannels.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export const usePaginatedChannels = <
}: Parameters<StreamChatGenerics>) => {
const [error, setError] = useState<Error | undefined>(undefined);
const [staticChannelsActive, setStaticChannelsActive] = useState<boolean>(false);
const activeQueryType = useRef<QueryType | null>('queryLocalDB');
const [activeQueryType, setActiveQueryType] = useState<QueryType | null>('queryLocalDB');
const activeChannels = useActiveChannelsRefContext();
const isMountedRef = useIsMountedRef();
const { client } = useChatContext<StreamChatGenerics>();
Expand Down Expand Up @@ -114,7 +114,7 @@ export const usePaginatedChannels = <
setError(undefined);
activeRequestId.current++;
const currentRequestId = activeRequestId.current;
activeQueryType.current = queryType;
setActiveQueryType(queryType);

const newOptions = {
limit: options?.limit ?? MAX_QUERY_CHANNELS_LIMIT,
Expand Down Expand Up @@ -152,7 +152,7 @@ export const usePaginatedChannels = <
// querying.current check is needed in order to make sure the next query call doesnt flick an error
// state and then succeed (reconnect case)
if (retryCount === MAX_NUMBER_OF_RETRIES && !isQueryingRef.current) {
activeQueryType.current = null;
setActiveQueryType(null);
console.warn(err);

setError(
Expand All @@ -166,7 +166,7 @@ export const usePaginatedChannels = <
return queryChannels(queryType, retryCount + 1);
}

activeQueryType.current = null;
setActiveQueryType(null);
};

const refreshList = async () => {
Expand Down Expand Up @@ -229,7 +229,7 @@ export const usePaginatedChannels = <
return false;
}

activeQueryType.current = null;
setActiveQueryType(null);

return true;
};
Expand Down Expand Up @@ -279,7 +279,7 @@ export const usePaginatedChannels = <
error,
hasNextPage,
loadingChannels:
activeQueryType.current === 'queryLocalDB'
activeQueryType === 'queryLocalDB'
? true
: // Although channels.length === 0 should come as a given when we have !channelListInitialized,
// due to the way offline storage works currently we have to do this additional
Expand All @@ -290,7 +290,7 @@ export const usePaginatedChannels = <
pagination?.isLoading || (!channelListInitialized && channels.length === 0),
loadingNextPage: pagination?.isLoadingNext,
loadNextPage: channelManager.loadNext,
refreshing: activeQueryType.current === 'refresh',
refreshing: activeQueryType === 'refresh',
refreshList,
reloadList,
staticChannelsActive,
Expand Down