diff --git a/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsExpensesFromPage.tsx b/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsExpensesFromPage.tsx index abead1019d05..1a59d23f2db5 100644 --- a/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsExpensesFromPage.tsx +++ b/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsExpensesFromPage.tsx @@ -9,7 +9,7 @@ import useConfirmModal from '@hooks/useConfirmModal'; import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; import useOnyx from '@hooks/useOnyx'; -import useSearchSelector from '@hooks/useSearchSelector'; +import usePersonalDetailSearchSelector from '@hooks/usePersonalDetailSearchSelector'; import useThemeStyles from '@hooks/useThemeStyles'; import {clearInviteDraft, setWorkspaceInviteMembersDraft} from '@libs/actions/Policy/Member'; import {searchInServer} from '@libs/actions/Report'; @@ -73,12 +73,11 @@ function WorkspaceWorkflowsApprovalsExpensesFromPage({policy, isLoadingReportDat debouncedSearchTerm, availableOptions, areOptionsInitialized, - } = useSearchSelector({ + } = usePersonalDetailSearchSelector({ selectionMode: CONST.SEARCH_SELECTOR.SELECTION_MODE_MULTI, - searchContext: CONST.SEARCH_SELECTOR.SEARCH_CONTEXT_GENERAL, includeUserToInvite: true, excludeLogins: excludedUsers, - includeRecentReports: true, + includeRecentReports: false, shouldInitialize: true, }); @@ -243,12 +242,8 @@ function WorkspaceWorkflowsApprovalsExpensesFromPage({policy, isLoadingReportDat } } - // Add search results that are not already workspace members - const searchResults = [...availableOptions.recentReports, ...availableOptions.personalDetails].filter((option) => { - const isMember = policy?.employeeList?.[normalizeLogin(option.login)]; - const isAlreadyInList = members.some((m) => normalizeLogin(m.login) === normalizeLogin(option.login)); - return !isMember && !isAlreadyInList; - }); + // Add search results that aren't already in the list (selected approvers or userToInvite) + const searchResults = availableOptions.personalDetails.filter((option) => !members.some((m) => normalizeLogin(m.login) === normalizeLogin(option.login))); for (const option of searchResults) { members.push({ @@ -273,7 +268,6 @@ function WorkspaceWorkflowsApprovalsExpensesFromPage({policy, isLoadingReportDat debouncedSearchTerm, areOptionsInitialized, availableOptions.userToInvite, - availableOptions.recentReports, availableOptions.personalDetails, icons.FallbackAvatar, policyMemberEmailsToAccountIDs,