From 54a510863d18d054a8263870f25a429787e1867f Mon Sep 17 00:00:00 2001 From: VH Date: Mon, 22 Jun 2026 20:41:18 +0700 Subject: [PATCH 1/3] refactor(workspace): migrate WorkspaceWorkflowsApprovalsExpensesFromPage to usePersonalDetailSearchSelector Same migration as MoneyRequestAttendeeSelector: replaces useSearchSelector with usePersonalDetailSearchSelector and renames availableOptions.recentReports to availableOptions.recentOptions. Part of the useSearchSelector -> usePersonalDetailSearchSelector migration (issue #82191). --- .../WorkspaceWorkflowsApprovalsExpensesFromPage.tsx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsExpensesFromPage.tsx b/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsExpensesFromPage.tsx index abead1019d05..e76a7341a296 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,9 +73,8 @@ 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, @@ -244,7 +243,7 @@ function WorkspaceWorkflowsApprovalsExpensesFromPage({policy, isLoadingReportDat } // Add search results that are not already workspace members - const searchResults = [...availableOptions.recentReports, ...availableOptions.personalDetails].filter((option) => { + const searchResults = [...availableOptions.recentOptions, ...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; @@ -273,7 +272,7 @@ function WorkspaceWorkflowsApprovalsExpensesFromPage({policy, isLoadingReportDat debouncedSearchTerm, areOptionsInitialized, availableOptions.userToInvite, - availableOptions.recentReports, + availableOptions.recentOptions, availableOptions.personalDetails, icons.FallbackAvatar, policyMemberEmailsToAccountIDs, From 332f98fa5f15522e1c12d6ec1381fa147a845eb6 Mon Sep 17 00:00:00 2001 From: VH Date: Wed, 24 Jun 2026 18:47:23 +0700 Subject: [PATCH 2/3] fix(workflows): drop recent-reports option from approver search This page selects individual people as workspace approvers, not chat contacts, so it doesn't need recent-report-based suggestions. Setting includeRecentReports to false matches the pattern used by other non-chat invite flows (DynamicWorkspaceInvitePage, MoneyRequestAttendeeSelector, DomainAddAdminPage) and lets the search results rely solely on availableOptions.personalDetails, which is no longer filtered against recentOptions. --- .../WorkspaceWorkflowsApprovalsExpensesFromPage.tsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsExpensesFromPage.tsx b/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsExpensesFromPage.tsx index e76a7341a296..900fd61ae2f2 100644 --- a/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsExpensesFromPage.tsx +++ b/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsExpensesFromPage.tsx @@ -77,7 +77,7 @@ function WorkspaceWorkflowsApprovalsExpensesFromPage({policy, isLoadingReportDat selectionMode: CONST.SEARCH_SELECTOR.SELECTION_MODE_MULTI, includeUserToInvite: true, excludeLogins: excludedUsers, - includeRecentReports: true, + includeRecentReports: false, shouldInitialize: true, }); @@ -243,7 +243,7 @@ function WorkspaceWorkflowsApprovalsExpensesFromPage({policy, isLoadingReportDat } // Add search results that are not already workspace members - const searchResults = [...availableOptions.recentOptions, ...availableOptions.personalDetails].filter((option) => { + const searchResults = 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; @@ -272,7 +272,6 @@ function WorkspaceWorkflowsApprovalsExpensesFromPage({policy, isLoadingReportDat debouncedSearchTerm, areOptionsInitialized, availableOptions.userToInvite, - availableOptions.recentOptions, availableOptions.personalDetails, icons.FallbackAvatar, policyMemberEmailsToAccountIDs, From 822545dfc0519f3cd19fe325ac8ebcdea607113c Mon Sep 17 00:00:00 2001 From: VH Date: Wed, 24 Jun 2026 22:44:57 +0700 Subject: [PATCH 3/3] fix(workflows): drop redundant isMember check from approver search results excludeLogins (via getExcludedUsers) intentionally leaves pending-delete and error-state policy employees unfiltered so they remain searchable, but the isMember check was blocking pending-delete employees from resurfacing in this search. Dedup against the members already in the list (selected approvers, active workspace members, userToInvite) already covers duplicates, so isMember was both redundant and incorrectly restrictive. --- .../WorkspaceWorkflowsApprovalsExpensesFromPage.tsx | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsExpensesFromPage.tsx b/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsExpensesFromPage.tsx index 900fd61ae2f2..1a59d23f2db5 100644 --- a/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsExpensesFromPage.tsx +++ b/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsExpensesFromPage.tsx @@ -242,12 +242,8 @@ function WorkspaceWorkflowsApprovalsExpensesFromPage({policy, isLoadingReportDat } } - // Add search results that are not already workspace members - const searchResults = 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({