diff --git a/web/settings/relationship/add-users-list.react.js b/web/settings/relationship/add-users-list.react.js --- a/web/settings/relationship/add-users-list.react.js +++ b/web/settings/relationship/add-users-list.react.js @@ -8,7 +8,7 @@ } from 'lib/actions/relationship-actions.js'; import { useENSNames } from 'lib/hooks/ens-cache.js'; import { createLoadingStatusSelector } from 'lib/selectors/loading-selectors.js'; -import { userStoreSearchIndex as userStoreSearchIndexSelector } from 'lib/selectors/user-selectors.js'; +import { useUserSearchIndex } from 'lib/selectors/nav-selectors.js'; import { useSearchUsers } from 'lib/shared/search-utils.js'; import type { UserRelationshipStatus, @@ -22,6 +22,7 @@ useDispatchActionPromise, useServerCall, } from 'lib/utils/action-utils.js'; +import { values } from 'lib/utils/objects.js'; import AddUsersListItem from './add-users-list-item.react.js'; import css from './add-users-list.css'; @@ -55,7 +56,10 @@ } = props; const viewerID = useSelector(state => state.currentUserInfo?.id); - const userStoreSearchIndex = useSelector(userStoreSearchIndexSelector); + const userInfos = useSelector(state => state.userStore.userInfos); + const userInfosArray = React.useMemo(() => values(userInfos), [userInfos]); + + const userStoreSearchIndex = useUserSearchIndex(userInfosArray); const [userStoreSearchResults, setUserStoreSearchResults] = React.useState< $ReadOnlySet, >(new Set(userStoreSearchIndex.getSearchResults(searchText))); @@ -68,7 +72,6 @@ const serverSearchResults = useSearchUsers(searchText); const searchTextPresent = searchText.length > 0; - const userInfos = useSelector(state => state.userStore.userInfos); const mergedUserInfos = React.useMemo(() => { const mergedInfos: { [string]: GlobalAccountUserInfo | AccountUserInfo } = {};