diff --git a/.changeset/five-shoes-promise.md b/.changeset/five-shoes-promise.md new file mode 100644 index 00000000000..8eecf786d44 --- /dev/null +++ b/.changeset/five-shoes-promise.md @@ -0,0 +1,5 @@ +--- +'@clerk/clerk-js': patch +--- + +Avoid depending on `count` as it can be zero but invitations may still exist. diff --git a/packages/clerk-js/src/ui/components/OrganizationSwitcher/UserInvitationSuggestionList.tsx b/packages/clerk-js/src/ui/components/OrganizationSwitcher/UserInvitationSuggestionList.tsx index 2cd0e8d7f32..b4489b1520b 100644 --- a/packages/clerk-js/src/ui/components/OrganizationSwitcher/UserInvitationSuggestionList.tsx +++ b/packages/clerk-js/src/ui/components/OrganizationSwitcher/UserInvitationSuggestionList.tsx @@ -219,11 +219,11 @@ export const UserInvitationSuggestionList = (props: UserInvitationSuggestionList const { ref, userSuggestions, userInvitations } = useFetchInvitations(); const isLoading = userInvitations.isLoading || userSuggestions.isLoading; const hasNextPage = userInvitations.hasNextPage || userSuggestions.hasNextPage; - const hasAnyData = !!(userInvitations.count || userSuggestions.count); // Solve weird bug with swr while running unit tests - const userInvitationsData = userInvitations.data?.filter(a => !!a); - const userSuggestionsData = userSuggestions.data?.filter(a => !!a); + const userInvitationsData = userInvitations.data?.filter(a => !!a) || []; + const userSuggestionsData = userSuggestions.data?.filter(a => !!a) || []; + const hasAnyData = userInvitationsData.length > 0 || userSuggestionsData.length > 0; if (!hasAnyData && !isLoading) { return null;