Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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,
});

Expand Down Expand Up @@ -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({
Expand All @@ -273,7 +268,6 @@ function WorkspaceWorkflowsApprovalsExpensesFromPage({policy, isLoadingReportDat
debouncedSearchTerm,
areOptionsInitialized,
availableOptions.userToInvite,
availableOptions.recentReports,
availableOptions.personalDetails,
icons.FallbackAvatar,
policyMemberEmailsToAccountIDs,
Expand Down
Loading