From 4064c1f54b7642cffd24817de41bfe859d323ab6 Mon Sep 17 00:00:00 2001 From: Tomasz Misiukiewicz Date: Thu, 12 Feb 2026 15:38:05 +0100 Subject: [PATCH 1/8] Extract useActiveAdminPolicies hook to deduplicate selector boilerplate --- .../Search/SearchPageHeader/SearchFiltersBar.tsx | 7 +++---- src/hooks/useActiveAdminPolicies.ts | 16 ++++++++++++++++ src/pages/Search/SearchPage.tsx | 6 ++++-- 3 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 src/hooks/useActiveAdminPolicies.ts diff --git a/src/components/Search/SearchPageHeader/SearchFiltersBar.tsx b/src/components/Search/SearchPageHeader/SearchFiltersBar.tsx index 3d72c0443e20..f09ea1ac0a5c 100644 --- a/src/components/Search/SearchPageHeader/SearchFiltersBar.tsx +++ b/src/components/Search/SearchPageHeader/SearchFiltersBar.tsx @@ -23,9 +23,9 @@ import UserSelectPopup from '@components/Search/FilterDropdowns/UserSelectPopup' import {useSearchContext} from '@components/Search/SearchContext'; import type {BankAccountMenuItem, SearchDateFilterKeys, SearchQueryJSON, SingularSearchStatus} from '@components/Search/types'; import SearchFiltersSkeleton from '@components/Skeletons/SearchFiltersSkeleton'; +import useActiveAdminPolicies from '@hooks/useActiveAdminPolicies'; import useAdvancedSearchFilters from '@hooks/useAdvancedSearchFilters'; import useCurrencyList from '@hooks/useCurrencyList'; -import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'; import useFilterFormValues from '@hooks/useFilterFormValues'; import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; @@ -41,7 +41,6 @@ import {handleBulkPayItemSelected, updateAdvancedFilters} from '@libs/actions/Se import DateUtils from '@libs/DateUtils'; import Navigation from '@libs/Navigation/Navigation'; import {getDisplayNameOrDefault} from '@libs/PersonalDetailsUtils'; -import {getActiveAdminWorkspaces} from '@libs/PolicyUtils'; import {isExpenseReport} from '@libs/ReportUtils'; import {buildQueryStringFromFilterFormValues, getQueryWithUpdatedValues, isFilterSupported, isSearchDatePreset} from '@libs/SearchQueryUtils'; import { @@ -297,8 +296,8 @@ function SearchFiltersBar({ const value = options.find((option) => option.value === searchAdvancedFiltersForm.withdrawalType) ?? null; return [options, value]; }, [translate, searchAdvancedFiltersForm.withdrawalType]); - const {accountID} = useCurrentUserPersonalDetails(); - const activeAdminPolicies = getActiveAdminWorkspaces(allPolicies, accountID.toString()).sort((a, b) => localeCompare(a.name || '', b.name || '')); + const activeAdminPoliciesUnsorted = useActiveAdminPolicies(); + const activeAdminPolicies = useMemo(() => activeAdminPoliciesUnsorted?.sort((a, b) => localeCompare(a.name || '', b.name || '')) ?? [], [activeAdminPoliciesUnsorted, localeCompare]); const updateFilterForm = useCallback( (values: Partial) => { diff --git a/src/hooks/useActiveAdminPolicies.ts b/src/hooks/useActiveAdminPolicies.ts new file mode 100644 index 000000000000..4372723ea9d4 --- /dev/null +++ b/src/hooks/useActiveAdminPolicies.ts @@ -0,0 +1,16 @@ +import {activeAdminPoliciesSelector} from '@selectors/Policy'; +import {useCallback} from 'react'; +import type {OnyxCollection} from 'react-native-onyx'; +import ONYXKEYS from '@src/ONYXKEYS'; +import type {Policy} from '@src/types/onyx'; +import useCurrentUserPersonalDetails from './useCurrentUserPersonalDetails'; +import useOnyx from './useOnyx'; + +function useActiveAdminPolicies() { + const {login} = useCurrentUserPersonalDetails(); + const selector = useCallback((policies: OnyxCollection) => activeAdminPoliciesSelector(policies, login ?? ''), [login]); + const [activeAdminPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {canBeMissing: true, selector}, [login]); + return activeAdminPolicies; +} + +export default useActiveAdminPolicies; diff --git a/src/pages/Search/SearchPage.tsx b/src/pages/Search/SearchPage.tsx index 2dd407d49c58..f097e5715949 100644 --- a/src/pages/Search/SearchPage.tsx +++ b/src/pages/Search/SearchPage.tsx @@ -19,6 +19,7 @@ import {useSearchContext} from '@components/Search/SearchContext'; import type {SearchHeaderOptionValue} from '@components/Search/SearchPageHeader/SearchPageHeader'; import type {PaymentData, SearchParams} from '@components/Search/types'; import {usePlaybackActionsContext} from '@components/VideoPlayerContexts/PlaybackContext'; +import useActiveAdminPolicies from '@hooks/useActiveAdminPolicies'; import useAllTransactions from '@hooks/useAllTransactions'; import useBulkPayOptions from '@hooks/useBulkPayOptions'; import useConfirmModal from '@hooks/useConfirmModal'; @@ -67,7 +68,7 @@ import {getTransactionsAndReportsFromSearch} from '@libs/MergeTransactionUtils'; import Navigation from '@libs/Navigation/Navigation'; import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; import type {SearchFullscreenNavigatorParamList} from '@libs/Navigation/types'; -import {getActiveAdminWorkspaces, hasDynamicExternalWorkflow, hasOnlyPersonalPolicies as hasOnlyPersonalPoliciesUtil, isPaidGroupPolicy} from '@libs/PolicyUtils'; +import {hasDynamicExternalWorkflow, hasOnlyPersonalPolicies as hasOnlyPersonalPoliciesUtil, isPaidGroupPolicy} from '@libs/PolicyUtils'; import {isMergeActionForSelectedTransactions} from '@libs/ReportSecondaryActionUtils'; import { generateReportID, @@ -164,7 +165,8 @@ function SearchPage({route}: SearchPageProps) { const queryJSON = useMemo(() => buildSearchQueryJSON(route.params.q, route.params.rawQuery), [route.params.q, route.params.rawQuery]); const {saveScrollOffset} = useContext(ScrollOffsetContext); - const activeAdminPolicies = getActiveAdminWorkspaces(policies, currentUserPersonalDetails?.accountID.toString()).sort((a, b) => localeCompare(a.name || '', b.name || '')); + const activeAdminPoliciesUnsorted = useActiveAdminPolicies(); + const activeAdminPolicies = useMemo(() => activeAdminPoliciesUnsorted?.sort((a, b) => localeCompare(a.name || '', b.name || '')) ?? [], [activeAdminPoliciesUnsorted, localeCompare]); const expensifyIcons = useMemoizedLazyExpensifyIcons([ 'Export', 'Table', From 9fdcb2f989d047d9d27493d1bec4b9b56530d0d1 Mon Sep 17 00:00:00 2001 From: Tomasz Misiukiewicz Date: Thu, 12 Feb 2026 15:52:11 +0100 Subject: [PATCH 2/8] Expose workspace data from useAdvancedSearchFilters to deduplicate useWorkspaceList calls --- .../Search/SearchPageHeader/SearchFiltersBar.tsx | 13 +------------ src/hooks/useAdvancedSearchFilters.ts | 4 +++- src/pages/Search/AdvancedSearchFilters.tsx | 14 +------------- 3 files changed, 5 insertions(+), 26 deletions(-) diff --git a/src/components/Search/SearchPageHeader/SearchFiltersBar.tsx b/src/components/Search/SearchPageHeader/SearchFiltersBar.tsx index f09ea1ac0a5c..421c155043a6 100644 --- a/src/components/Search/SearchPageHeader/SearchFiltersBar.tsx +++ b/src/components/Search/SearchPageHeader/SearchFiltersBar.tsx @@ -35,7 +35,6 @@ import usePolicy from '@hooks/usePolicy'; import useResponsiveLayout from '@hooks/useResponsiveLayout'; import useTheme from '@hooks/useTheme'; import useThemeStyles from '@hooks/useThemeStyles'; -import useWorkspaceList from '@hooks/useWorkspaceList'; import {close} from '@libs/actions/Modal'; import {handleBulkPayItemSelected, updateAdvancedFilters} from '@libs/actions/Search'; import DateUtils from '@libs/DateUtils'; @@ -123,15 +122,7 @@ function SearchFiltersBar({ const expensifyIcons = useMemoizedLazyExpensifyIcons(['Filter', 'Columns']); const {isDelegateAccessRestricted, showDelegateNoAccessModal} = useContext(DelegateNoAccessContext); - // Get workspace data for the filter - const {sections: workspaces, shouldShowSearchInput: shouldShowWorkspaceSearchInput} = useWorkspaceList({ - policies: allPolicies, - currentUserLogin: email, - shouldShowPendingDeletePolicy: false, - selectedPolicyIDs: undefined, - searchTerm: '', - localeCompare, - }); + const {typeFiltersKeys, workspaces, shouldShowWorkspaceSearchInput} = useAdvancedSearchFilters(); const shouldDisplayWorkspaceFilter = useMemo(() => workspaces.some((section) => section.data.length > 1), [workspaces]); @@ -563,8 +554,6 @@ function SearchFiltersBar({ const workspaceValue = useMemo(() => selectedWorkspaceOptions.map((option) => option.text), [selectedWorkspaceOptions]); - const {typeFiltersKeys} = useAdvancedSearchFilters(); - /** * Builds the list of all filter chips to be displayed in the * filter bar diff --git a/src/hooks/useAdvancedSearchFilters.ts b/src/hooks/useAdvancedSearchFilters.ts index 107a7b90c6c6..83fea219d807 100644 --- a/src/hooks/useAdvancedSearchFilters.ts +++ b/src/hooks/useAdvancedSearchFilters.ts @@ -224,7 +224,7 @@ function useAdvancedSearchFilters() { const [currentUserLogin] = useOnyx(ONYXKEYS.SESSION, {canBeMissing: false, selector: emailSelector}); - const {sections: workspaces} = useWorkspaceList({ + const {sections: workspaces, shouldShowSearchInput: shouldShowWorkspaceSearchInput} = useWorkspaceList({ policies, currentUserLogin, shouldShowPendingDeletePolicy: false, @@ -267,6 +267,8 @@ function useAdvancedSearchFilters() { return { currentType, + workspaces, + shouldShowWorkspaceSearchInput, typeFiltersKeys: typeFiltersKeys[currentType] .map((section) => section diff --git a/src/pages/Search/AdvancedSearchFilters.tsx b/src/pages/Search/AdvancedSearchFilters.tsx index 6cca7b48f2dd..ecd7197bf0db 100644 --- a/src/pages/Search/AdvancedSearchFilters.tsx +++ b/src/pages/Search/AdvancedSearchFilters.tsx @@ -1,5 +1,4 @@ import {filterCardsHiddenFromSearch} from '@selectors/Card'; -import {emailSelector} from '@selectors/Session'; import React, {useMemo} from 'react'; import {View} from 'react-native'; import type {ValueOf} from 'react-native-gesture-handler/lib/typescript/typeUtils'; @@ -21,7 +20,6 @@ import useSingleExecution from '@hooks/useSingleExecution'; import useThemeStyles from '@hooks/useThemeStyles'; import useWaitForNavigation from '@hooks/useWaitForNavigation'; import type {WorkspaceListItem} from '@hooks/useWorkspaceList'; -import useWorkspaceList from '@hooks/useWorkspaceList'; import {saveSearch} from '@libs/actions/Search'; import {createCardFeedKey, getCardFeedKey, getCardFeedNamesWithType, getWorkspaceCardFeedKey} from '@libs/CardFeedUtils'; import {getCardDescription} from '@libs/CardUtils'; @@ -573,21 +571,11 @@ function AdvancedSearchFilters() { const personalDetails = usePersonalDetails(); const [policies = getEmptyObject>>()] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {canBeMissing: false}); - const [currentUserLogin] = useOnyx(ONYXKEYS.SESSION, {canBeMissing: false, selector: emailSelector}); const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails(); const taxRates = getAllTaxRates(policies); - const {sections: workspaces} = useWorkspaceList({ - policies, - currentUserLogin, - shouldShowPendingDeletePolicy: false, - selectedPolicyIDs: undefined, - searchTerm: '', - localeCompare, - }); - - const {currentType, typeFiltersKeys} = useAdvancedSearchFilters(); + const {currentType, typeFiltersKeys, workspaces} = useAdvancedSearchFilters(); const queryString = useMemo(() => { const currentQueryJSON = getCurrentSearchQueryJSON(); From cca954430d38ba3fadec4e7dd335f1bc742e7cb2 Mon Sep 17 00:00:00 2001 From: Tomasz Misiukiewicz Date: Fri, 13 Feb 2026 09:46:16 +0100 Subject: [PATCH 3/8] Extract useSortedActiveAdminPolicies hook to deduplicate sorting logic --- .../Search/SearchPageHeader/SearchFiltersBar.tsx | 7 +++---- src/hooks/useActiveAdminPolicies.ts | 1 + src/hooks/useSortedActiveAdminPolicies.ts | 13 +++++++++++++ src/pages/Search/SearchPage.tsx | 5 ++--- 4 files changed, 19 insertions(+), 7 deletions(-) create mode 100644 src/hooks/useSortedActiveAdminPolicies.ts diff --git a/src/components/Search/SearchPageHeader/SearchFiltersBar.tsx b/src/components/Search/SearchPageHeader/SearchFiltersBar.tsx index 421c155043a6..f028837a3da6 100644 --- a/src/components/Search/SearchPageHeader/SearchFiltersBar.tsx +++ b/src/components/Search/SearchPageHeader/SearchFiltersBar.tsx @@ -23,7 +23,6 @@ import UserSelectPopup from '@components/Search/FilterDropdowns/UserSelectPopup' import {useSearchContext} from '@components/Search/SearchContext'; import type {BankAccountMenuItem, SearchDateFilterKeys, SearchQueryJSON, SingularSearchStatus} from '@components/Search/types'; import SearchFiltersSkeleton from '@components/Skeletons/SearchFiltersSkeleton'; -import useActiveAdminPolicies from '@hooks/useActiveAdminPolicies'; import useAdvancedSearchFilters from '@hooks/useAdvancedSearchFilters'; import useCurrencyList from '@hooks/useCurrencyList'; import useFilterFormValues from '@hooks/useFilterFormValues'; @@ -33,6 +32,7 @@ import useNetwork from '@hooks/useNetwork'; import useOnyx from '@hooks/useOnyx'; import usePolicy from '@hooks/usePolicy'; import useResponsiveLayout from '@hooks/useResponsiveLayout'; +import useSortedActiveAdminPolicies from '@hooks/useSortedActiveAdminPolicies'; import useTheme from '@hooks/useTheme'; import useThemeStyles from '@hooks/useThemeStyles'; import {close} from '@libs/actions/Modal'; @@ -103,7 +103,7 @@ function SearchFiltersBar({ const isCurrentSelectedExpenseReport = isExpenseReport(currentSelectedReportID); const theme = useTheme(); const styles = useThemeStyles(); - const {translate, localeCompare} = useLocalize(); + const {translate} = useLocalize(); const kycWallRef = useContext(KYCWallContext); const {isOffline} = useNetwork(); @@ -287,8 +287,7 @@ function SearchFiltersBar({ const value = options.find((option) => option.value === searchAdvancedFiltersForm.withdrawalType) ?? null; return [options, value]; }, [translate, searchAdvancedFiltersForm.withdrawalType]); - const activeAdminPoliciesUnsorted = useActiveAdminPolicies(); - const activeAdminPolicies = useMemo(() => activeAdminPoliciesUnsorted?.sort((a, b) => localeCompare(a.name || '', b.name || '')) ?? [], [activeAdminPoliciesUnsorted, localeCompare]); + const activeAdminPolicies = useSortedActiveAdminPolicies(); const updateFilterForm = useCallback( (values: Partial) => { diff --git a/src/hooks/useActiveAdminPolicies.ts b/src/hooks/useActiveAdminPolicies.ts index 4372723ea9d4..30f00bf2152b 100644 --- a/src/hooks/useActiveAdminPolicies.ts +++ b/src/hooks/useActiveAdminPolicies.ts @@ -10,6 +10,7 @@ function useActiveAdminPolicies() { const {login} = useCurrentUserPersonalDetails(); const selector = useCallback((policies: OnyxCollection) => activeAdminPoliciesSelector(policies, login ?? ''), [login]); const [activeAdminPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {canBeMissing: true, selector}, [login]); + return activeAdminPolicies; } diff --git a/src/hooks/useSortedActiveAdminPolicies.ts b/src/hooks/useSortedActiveAdminPolicies.ts new file mode 100644 index 000000000000..3ba0b225487d --- /dev/null +++ b/src/hooks/useSortedActiveAdminPolicies.ts @@ -0,0 +1,13 @@ +import {useMemo} from 'react'; +import useActiveAdminPolicies from './useActiveAdminPolicies'; +import useLocalize from './useLocalize'; + +function useSortedActiveAdminPolicies() { + const {localeCompare} = useLocalize(); + const activeAdminPolicies = useActiveAdminPolicies(); + const sortedActiveAdminPolicies = useMemo(() => activeAdminPolicies?.sort((a, b) => localeCompare(a.name || '', b.name || '')) ?? [], [activeAdminPolicies, localeCompare]); + + return sortedActiveAdminPolicies; +} + +export default useSortedActiveAdminPolicies; diff --git a/src/pages/Search/SearchPage.tsx b/src/pages/Search/SearchPage.tsx index f097e5715949..afa8e342eea2 100644 --- a/src/pages/Search/SearchPage.tsx +++ b/src/pages/Search/SearchPage.tsx @@ -19,7 +19,6 @@ import {useSearchContext} from '@components/Search/SearchContext'; import type {SearchHeaderOptionValue} from '@components/Search/SearchPageHeader/SearchPageHeader'; import type {PaymentData, SearchParams} from '@components/Search/types'; import {usePlaybackActionsContext} from '@components/VideoPlayerContexts/PlaybackContext'; -import useActiveAdminPolicies from '@hooks/useActiveAdminPolicies'; import useAllTransactions from '@hooks/useAllTransactions'; import useBulkPayOptions from '@hooks/useBulkPayOptions'; import useConfirmModal from '@hooks/useConfirmModal'; @@ -37,6 +36,7 @@ import usePrevious from '@hooks/usePrevious'; import useResponsiveLayout from '@hooks/useResponsiveLayout'; import useSearchShouldCalculateTotals from '@hooks/useSearchShouldCalculateTotals'; import useSelfDMReport from '@hooks/useSelfDMReport'; +import useSortedActiveAdminPolicies from '@hooks/useSortedActiveAdminPolicies'; import useTheme from '@hooks/useTheme'; import useThemeStyles from '@hooks/useThemeStyles'; import {setupMergeTransactionDataAndNavigate} from '@libs/actions/MergeTransaction'; @@ -165,8 +165,7 @@ function SearchPage({route}: SearchPageProps) { const queryJSON = useMemo(() => buildSearchQueryJSON(route.params.q, route.params.rawQuery), [route.params.q, route.params.rawQuery]); const {saveScrollOffset} = useContext(ScrollOffsetContext); - const activeAdminPoliciesUnsorted = useActiveAdminPolicies(); - const activeAdminPolicies = useMemo(() => activeAdminPoliciesUnsorted?.sort((a, b) => localeCompare(a.name || '', b.name || '')) ?? [], [activeAdminPoliciesUnsorted, localeCompare]); + const activeAdminPolicies = useSortedActiveAdminPolicies(); const expensifyIcons = useMemoizedLazyExpensifyIcons([ 'Export', 'Table', From 1905bb4ec96522beb15052f34c7faa3a49b217d4 Mon Sep 17 00:00:00 2001 From: Tomasz Misiukiewicz Date: Fri, 13 Feb 2026 10:26:50 +0100 Subject: [PATCH 4/8] Defer policy sorting to iteration point in useBulkPayOptions Use useActiveAdminPoliciesCount for length checks and only sort policies when the iteration block is actually reached. --- src/hooks/useActiveAdminPolicies.ts | 3 ++- src/hooks/useBulkPayOptions.ts | 12 +++++++----- src/hooks/useSortedActiveAdminPolicies.ts | 3 ++- src/libs/PolicyUtils.ts | 5 +++++ src/pages/Search/SearchPage.tsx | 3 --- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/hooks/useActiveAdminPolicies.ts b/src/hooks/useActiveAdminPolicies.ts index 30f00bf2152b..10811226d092 100644 --- a/src/hooks/useActiveAdminPolicies.ts +++ b/src/hooks/useActiveAdminPolicies.ts @@ -3,13 +3,14 @@ import {useCallback} from 'react'; import type {OnyxCollection} from 'react-native-onyx'; import ONYXKEYS from '@src/ONYXKEYS'; import type {Policy} from '@src/types/onyx'; +import getEmptyArray from '@src/types/utils/getEmptyArray'; import useCurrentUserPersonalDetails from './useCurrentUserPersonalDetails'; import useOnyx from './useOnyx'; function useActiveAdminPolicies() { const {login} = useCurrentUserPersonalDetails(); const selector = useCallback((policies: OnyxCollection) => activeAdminPoliciesSelector(policies, login ?? ''), [login]); - const [activeAdminPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {canBeMissing: true, selector}, [login]); + const [activeAdminPolicies = getEmptyArray()] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {canBeMissing: true, selector}, [login]); return activeAdminPolicies; } diff --git a/src/hooks/useBulkPayOptions.ts b/src/hooks/useBulkPayOptions.ts index 60577af03503..7fba44dfa664 100644 --- a/src/hooks/useBulkPayOptions.ts +++ b/src/hooks/useBulkPayOptions.ts @@ -6,6 +6,7 @@ import {isCurrencySupportedForGlobalReimbursement} from '@libs/actions/Policy/Po import {isBankAccountPartiallySetup} from '@libs/BankAccountUtils'; import Navigation from '@libs/Navigation/Navigation'; import {formatPaymentMethods} from '@libs/PaymentUtils'; +import {sortPoliciesByName} from '@libs/PolicyUtils'; import {hasRequestFromCurrentAccount} from '@libs/ReportActionsUtils'; import { getBankAccountRoute, @@ -17,7 +18,8 @@ import { import {useSettlementButtonPaymentMethods} from '@libs/SettlementButtonUtils'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; -import type {AccountData, Policy} from '@src/types/onyx'; +import type {AccountData} from '@src/types/onyx'; +import useActiveAdminPolicies from './useActiveAdminPolicies'; import useCurrentUserPersonalDetails from './useCurrentUserPersonalDetails'; import {useMemoizedLazyExpensifyIcons} from './useLazyAsset'; import useLocalize from './useLocalize'; @@ -32,7 +34,6 @@ type UseBulkPayOptionProps = { selectedPolicyID: string | undefined; selectedReportID: string | undefined; lastPaymentMethod?: string | undefined; - activeAdminPolicies: Policy[]; isCurrencySupportedWallet?: boolean; currency: string | undefined; formattedAmount: string; @@ -50,14 +51,13 @@ type UseBulkPayOptionReturnType = { function useBulkPayOptions({ selectedPolicyID, selectedReportID, - activeAdminPolicies, isCurrencySupportedWallet, currency, formattedAmount, onlyShowPayElsewhere, }: UseBulkPayOptionProps): UseBulkPayOptionReturnType { const icons = useMemoizedLazyExpensifyIcons(['Building', 'User', 'Bank', 'Cash', 'Wallet']); - const {translate} = useLocalize(); + const {translate, localeCompare} = useLocalize(); const styles = useThemeStyles(); const {accountID} = useCurrentUserPersonalDetails(); const [userWallet] = useOnyx(ONYXKEYS.USER_WALLET, {canBeMissing: true}); @@ -70,6 +70,7 @@ function useBulkPayOptions({ const [chatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${iouReport?.chatReportID}`, {canBeMissing: true}); const {isBetaEnabled} = usePermissions(); const isPayInvoiceViaExpensifyBetaEnabled = isBetaEnabled(CONST.BETAS.PAY_INVOICE_VIA_EXPENSIFY); + const activeAdminPolicies = useActiveAdminPolicies(); const isIOUReport = isIOUReportUtil(selectedReportID); const isExpenseReport = isExpenseReportUtil(selectedReportID); const isInvoiceReport = isInvoiceReportUtil(selectedReportID); @@ -159,7 +160,8 @@ function useBulkPayOptions({ } if ((hasMultiplePolicies || hasSinglePolicy) && canUseWallet && !isPersonalOnlyOption) { - for (const activePolicy of activeAdminPolicies) { + const sortedActiveAdminPolicies = sortPoliciesByName(activeAdminPolicies, localeCompare); + for (const activePolicy of sortedActiveAdminPolicies) { const policyName = activePolicy.name; bulkPayButtonOptions.push({ text: translate('iou.payWithPolicy', truncate(policyName, {length: CONST.ADDITIONAL_ALLOWED_CHARACTERS}), ''), diff --git a/src/hooks/useSortedActiveAdminPolicies.ts b/src/hooks/useSortedActiveAdminPolicies.ts index 3ba0b225487d..258f1fedc792 100644 --- a/src/hooks/useSortedActiveAdminPolicies.ts +++ b/src/hooks/useSortedActiveAdminPolicies.ts @@ -1,11 +1,12 @@ import {useMemo} from 'react'; +import {sortPoliciesByName} from '@libs/PolicyUtils'; import useActiveAdminPolicies from './useActiveAdminPolicies'; import useLocalize from './useLocalize'; function useSortedActiveAdminPolicies() { const {localeCompare} = useLocalize(); const activeAdminPolicies = useActiveAdminPolicies(); - const sortedActiveAdminPolicies = useMemo(() => activeAdminPolicies?.sort((a, b) => localeCompare(a.name || '', b.name || '')) ?? [], [activeAdminPolicies, localeCompare]); + const sortedActiveAdminPolicies = useMemo(() => sortPoliciesByName(activeAdminPolicies, localeCompare), [activeAdminPolicies, localeCompare]); return sortedActiveAdminPolicies; } diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts index 354b19b5fd23..60cbafdb7865 100644 --- a/src/libs/PolicyUtils.ts +++ b/src/libs/PolicyUtils.ts @@ -1961,6 +1961,10 @@ function isPolicyTaxEnabled(policy: OnyxEntry): boolean { return (policy?.tax?.trackingEnabled ?? false) || isSyncTaxEnabled; } +function sortPoliciesByName(policies: Policy[], localeCompare: (a: string, b: string) => number): Policy[] { + return policies.sort((a, b) => localeCompare(a.name || '', b.name || '')); +} + export { canEditTaxRate, escapeTagName, @@ -2135,6 +2139,7 @@ export { getDefaultTimeTrackingRate, getActivePoliciesWithExpenseChatAndTimeEnabled, isPolicyTaxEnabled, + sortPoliciesByName, }; export type {MemberEmailsToAccountIDs}; diff --git a/src/pages/Search/SearchPage.tsx b/src/pages/Search/SearchPage.tsx index afa8e342eea2..85aaef3c336a 100644 --- a/src/pages/Search/SearchPage.tsx +++ b/src/pages/Search/SearchPage.tsx @@ -36,7 +36,6 @@ import usePrevious from '@hooks/usePrevious'; import useResponsiveLayout from '@hooks/useResponsiveLayout'; import useSearchShouldCalculateTotals from '@hooks/useSearchShouldCalculateTotals'; import useSelfDMReport from '@hooks/useSelfDMReport'; -import useSortedActiveAdminPolicies from '@hooks/useSortedActiveAdminPolicies'; import useTheme from '@hooks/useTheme'; import useThemeStyles from '@hooks/useThemeStyles'; import {setupMergeTransactionDataAndNavigate} from '@libs/actions/MergeTransaction'; @@ -165,7 +164,6 @@ function SearchPage({route}: SearchPageProps) { const queryJSON = useMemo(() => buildSearchQueryJSON(route.params.q, route.params.rawQuery), [route.params.q, route.params.rawQuery]); const {saveScrollOffset} = useContext(ScrollOffsetContext); - const activeAdminPolicies = useSortedActiveAdminPolicies(); const expensifyIcons = useMemoizedLazyExpensifyIcons([ 'Export', 'Table', @@ -232,7 +230,6 @@ function SearchPage({route}: SearchPageProps) { const {bulkPayButtonOptions, latestBankItems} = useBulkPayOptions({ selectedPolicyID: selectedPolicyIDs.at(0), selectedReportID: selectedTransactionReportIDs.at(0) ?? selectedReportIDs.at(0), - activeAdminPolicies, isCurrencySupportedWallet: isCurrencySupportedBulkWallet, currency: selectedBulkCurrency, formattedAmount: totalFormattedAmount, From d9ae74c52b32f6b72ed5fa0ea37226c29ebf2bef Mon Sep 17 00:00:00 2001 From: Tomasz Misiukiewicz Date: Fri, 13 Feb 2026 10:59:02 +0100 Subject: [PATCH 5/8] fix lint --- src/pages/Search/AdvancedSearchFilters.tsx | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/pages/Search/AdvancedSearchFilters.tsx b/src/pages/Search/AdvancedSearchFilters.tsx index 8b4df91dda58..224a0d2e2319 100644 --- a/src/pages/Search/AdvancedSearchFilters.tsx +++ b/src/pages/Search/AdvancedSearchFilters.tsx @@ -13,7 +13,6 @@ import type {SearchAmountFilterKeys, SearchDateFilterKeys, SearchDatePreset, Sea import SpacerView from '@components/SpacerView'; import Text from '@components/Text'; import useAdvancedSearchFilters from '@hooks/useAdvancedSearchFilters'; -import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'; import useLocalize from '@hooks/useLocalize'; import useOnyx from '@hooks/useOnyx'; import useSingleExecution from '@hooks/useSingleExecution'; @@ -27,7 +26,7 @@ import {convertToDisplayStringWithoutCurrency} from '@libs/CurrencyUtils'; import Navigation from '@libs/Navigation/Navigation'; import {createDisplayName} from '@libs/PersonalDetailsUtils'; import {getAllTaxRates, getCleanedTagName} from '@libs/PolicyUtils'; -import {computeReportName} from '@libs/ReportNameUtils'; +import {getReportName} from '@libs/ReportNameUtils'; import { buildCannedSearchQuery, buildQueryStringFromFilterFormValues, @@ -45,7 +44,7 @@ import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; import type {SearchAdvancedFiltersForm} from '@src/types/form'; import {AMOUNT_FILTER_KEYS, DATE_FILTER_KEYS} from '@src/types/form/SearchAdvancedFiltersForm'; -import type {CardList, PersonalDetailsList, Policy, Report, WorkspaceCardsList} from '@src/types/onyx'; +import type {CardList, PersonalDetailsList, Policy, Report, ReportAttributesDerivedValue, WorkspaceCardsList} from '@src/types/onyx'; import type {SearchDataTypes} from '@src/types/onyx/SearchResults'; import {getEmptyObject} from '@src/types/utils/EmptyObject'; @@ -552,9 +551,14 @@ function getFilterExpenseDisplayTitle(filters: Partial, _: LocaleContextProps['translate'], reports: OnyxCollection | undefined, currentUserAccountID: number) { +function getFilterInDisplayTitle( + filters: Partial, + _: LocaleContextProps['translate'], + reports: OnyxCollection, + reportAttributes: ReportAttributesDerivedValue['reports'], +) { return filters.in - ?.map((id) => computeReportName(reports?.[`${ONYXKEYS.COLLECTION.REPORT}${id}`], reports, undefined, undefined, undefined, undefined, undefined, currentUserAccountID)) + ?.map((id) => getReportName(reports?.[`${ONYXKEYS.COLLECTION.REPORT}${id}`], reportAttributes)) ?.filter(Boolean) ?.join(', '); } @@ -569,9 +573,9 @@ function AdvancedSearchFilters() { const [searchAdvancedFilters = getEmptyObject()] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM, {canBeMissing: true}); const [searchCards] = useOnyx(ONYXKEYS.DERIVED.NON_PERSONAL_AND_WORKSPACE_CARD_LIST, {canBeMissing: true, selector: filterCardsHiddenFromSearch}); const personalDetails = usePersonalDetails(); + const [reportAttributes] = useOnyx(ONYXKEYS.DERIVED.REPORT_ATTRIBUTES, {canBeMissing: true}); const [policies = getEmptyObject>>()] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {canBeMissing: false}); - const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails(); const taxRates = getAllTaxRates(policies); @@ -629,7 +633,7 @@ function AdvancedSearchFilters() { ) { filterTitle = baseFilterConfig[key].getTitle(searchAdvancedFilters[key] ?? [], personalDetails, formatPhoneNumber); } else if (key === CONST.SEARCH.SYNTAX_FILTER_KEYS.IN) { - filterTitle = baseFilterConfig[key].getTitle(searchAdvancedFilters, translate, reports, currentUserAccountID); + filterTitle = baseFilterConfig[key].getTitle(searchAdvancedFilters, translate, reports, reportAttributes?.reports ?? {}); } else if (key === CONST.SEARCH.SYNTAX_FILTER_KEYS.POLICY_ID) { const workspacesData = workspaces.flatMap((value) => value.data); filterTitle = baseFilterConfig[key].getTitle(searchAdvancedFilters, workspacesData); From b23dc72b415cba1677c48d3040aeaf576a49eb65 Mon Sep 17 00:00:00 2001 From: Tomasz Misiukiewicz Date: Fri, 13 Feb 2026 11:09:40 +0100 Subject: [PATCH 6/8] use getActiveAdminWorkspace in a selector --- src/selectors/Policy.ts | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/selectors/Policy.ts b/src/selectors/Policy.ts index cd8f5564ecaa..269ebd1e21b0 100644 --- a/src/selectors/Policy.ts +++ b/src/selectors/Policy.ts @@ -1,5 +1,5 @@ import type {OnyxCollection, OnyxEntry} from 'react-native-onyx'; -import {getOwnedPaidPolicies, isPaidGroupPolicy, isPolicyAdmin, shouldShowPolicy} from '@libs/PolicyUtils'; +import {getActiveAdminWorkspaces, getOwnedPaidPolicies, isPaidGroupPolicy, shouldShowPolicy} from '@libs/PolicyUtils'; import CONST from '@src/CONST'; import type {Policy, PolicyReportField} from '@src/types/onyx'; import {isEmptyObject} from '@src/types/utils/EmptyObject'; @@ -13,12 +13,7 @@ const activePolicySelector = (policy: OnyxEntry) => (policy?.type !== CO const ownerPoliciesSelector = (policies: OnyxCollection, currentUserAccountID: number) => getOwnedPaidPolicies(policies, currentUserAccountID); -const activeAdminPoliciesSelector = (policies: OnyxCollection, currentUserAccountLogin: string) => { - const adminPolicies = Object.values(policies ?? {}).filter( - (policy): policy is Policy => policy?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE && isPolicyAdmin(policy, currentUserAccountLogin), - ); - return adminPolicies; -}; +const activeAdminPoliciesSelector = (policies: OnyxCollection, currentUserAccountLogin: string) => getActiveAdminWorkspaces(policies, currentUserAccountLogin); /** * Creates a selector that aggregates all non-formula policy report fields from all policies, From 618ff760f69bac4b25371ff9801aeed49e22285e Mon Sep 17 00:00:00 2001 From: Tomasz Misiukiewicz Date: Fri, 13 Feb 2026 11:48:19 +0100 Subject: [PATCH 7/8] add tests --- tests/unit/PolicyUtilsTest.ts | 39 +++++++ .../unit/hooks/useActiveAdminPolicies.test.ts | 107 ++++++++++++++++++ .../useSortedActiveAdminPolicies.test.ts | 65 +++++++++++ tests/unit/selectors/PolicyTest.ts | 60 +++++++++- 4 files changed, 270 insertions(+), 1 deletion(-) create mode 100644 tests/unit/hooks/useActiveAdminPolicies.test.ts create mode 100644 tests/unit/hooks/useSortedActiveAdminPolicies.test.ts diff --git a/tests/unit/PolicyUtilsTest.ts b/tests/unit/PolicyUtilsTest.ts index 4947f7131bab..ba58313bde4d 100644 --- a/tests/unit/PolicyUtilsTest.ts +++ b/tests/unit/PolicyUtilsTest.ts @@ -29,6 +29,7 @@ import { isCurrentUserMemberOfAnyPolicy, isPolicyMemberWithoutPendingDelete, shouldShowPolicy, + sortPoliciesByName, sortWorkspacesBySelected, } from '@libs/PolicyUtils'; import {isWorkspaceEligibleForReportChange} from '@libs/ReportUtils'; @@ -1985,4 +1986,42 @@ describe('PolicyUtils', () => { expect(getDefaultTimeTrackingRate(policy)).toBeUndefined(); }); }); + + describe('sortPoliciesByName', () => { + const localeCompare = (a: string, b: string) => a.localeCompare(b); + + it('sorts policies alphabetically by name', () => { + const policies: Policy[] = [ + {...createRandomPolicy(1, CONST.POLICY.TYPE.TEAM), name: 'Charlie'}, + {...createRandomPolicy(2, CONST.POLICY.TYPE.TEAM), name: 'Alpha'}, + {...createRandomPolicy(3, CONST.POLICY.TYPE.TEAM), name: 'Bravo'}, + ]; + + const result = sortPoliciesByName(policies, localeCompare); + expect(result.map((p) => p.name)).toEqual(['Alpha', 'Bravo', 'Charlie']); + }); + + it('returns empty array for empty input', () => { + expect(sortPoliciesByName([], localeCompare)).toEqual([]); + }); + + it('treats undefined or empty names as empty string', () => { + const policies: Policy[] = [ + {...createRandomPolicy(1, CONST.POLICY.TYPE.TEAM), name: 'Bravo'}, + {...createRandomPolicy(2, CONST.POLICY.TYPE.TEAM), name: ''}, + {...createRandomPolicy(3, CONST.POLICY.TYPE.TEAM), name: 'Alpha'}, + ]; + + const result = sortPoliciesByName(policies, localeCompare); + expect(result.map((p) => p.name)).toEqual(['', 'Alpha', 'Bravo']); + }); + + it('returns single-element array as-is', () => { + const policies: Policy[] = [{...createRandomPolicy(1, CONST.POLICY.TYPE.TEAM), name: 'Only'}]; + + const result = sortPoliciesByName(policies, localeCompare); + expect(result).toHaveLength(1); + expect(result.at(0)?.name).toBe('Only'); + }); + }); }); diff --git a/tests/unit/hooks/useActiveAdminPolicies.test.ts b/tests/unit/hooks/useActiveAdminPolicies.test.ts new file mode 100644 index 000000000000..f95f9a64907a --- /dev/null +++ b/tests/unit/hooks/useActiveAdminPolicies.test.ts @@ -0,0 +1,107 @@ +import {renderHook, waitFor} from '@testing-library/react-native'; +import Onyx from 'react-native-onyx'; +import useActiveAdminPolicies from '@hooks/useActiveAdminPolicies'; +import CONST from '@src/CONST'; +import ONYXKEYS from '@src/ONYXKEYS'; +import type {Policy} from '@src/types/onyx'; +import createRandomPolicy from '../../utils/collections/policies'; +import waitForBatchedUpdates from '../../utils/waitForBatchedUpdates'; + +const TEST_LOGIN = 'admin@expensify.com'; + +jest.mock('@hooks/useCurrentUserPersonalDetails', () => ({ + // eslint-disable-next-line @typescript-eslint/naming-convention + __esModule: true, + default: jest.fn(() => ({login: TEST_LOGIN})), +})); + +function buildPolicy(id: number, overrides: Partial): Policy { + return { + ...createRandomPolicy(id, CONST.POLICY.TYPE.TEAM), + pendingAction: undefined, + ...overrides, + }; +} + +describe('useActiveAdminPolicies', () => { + beforeAll(() => { + Onyx.init({keys: ONYXKEYS}); + }); + + beforeEach(async () => { + await Onyx.clear(); + await waitForBatchedUpdates(); + }); + + afterEach(async () => { + await Onyx.clear(); + }); + + it('returns admin policies from Onyx', async () => { + const adminPolicy = buildPolicy(1, {name: 'Admin Workspace', role: CONST.POLICY.ROLE.ADMIN}); + await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}1`, adminPolicy); + + const {result} = renderHook(() => useActiveAdminPolicies()); + + await waitFor(() => { + expect(result.current).toHaveLength(1); + }); + expect(result.current.at(0)?.name).toBe('Admin Workspace'); + }); + + it('excludes non-admin policies', async () => { + const adminPolicy = buildPolicy(1, {name: 'Admin', role: CONST.POLICY.ROLE.ADMIN}); + const userPolicy = buildPolicy(2, {name: 'User', role: CONST.POLICY.ROLE.USER}); + + await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}1`, adminPolicy); + await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}2`, userPolicy); + + const {result} = renderHook(() => useActiveAdminPolicies()); + + await waitFor(() => { + expect(result.current).toHaveLength(1); + }); + expect(result.current.at(0)?.name).toBe('Admin'); + }); + + it('excludes personal policies', async () => { + const personalPolicy = buildPolicy(1, {name: 'Personal', role: CONST.POLICY.ROLE.ADMIN, type: CONST.POLICY.TYPE.PERSONAL}); + const teamPolicy = buildPolicy(2, {name: 'Team', role: CONST.POLICY.ROLE.ADMIN}); + + await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}1`, personalPolicy); + await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}2`, teamPolicy); + + const {result} = renderHook(() => useActiveAdminPolicies()); + + await waitFor(() => { + expect(result.current).toHaveLength(1); + }); + expect(result.current.at(0)?.name).toBe('Team'); + }); + + it('returns empty array when no policies exist', async () => { + const {result} = renderHook(() => useActiveAdminPolicies()); + + await waitFor(() => { + expect(result.current).toEqual([]); + }); + }); + + it('updates when Onyx policy data changes', async () => { + const policy1 = buildPolicy(1, {name: 'First', role: CONST.POLICY.ROLE.ADMIN}); + await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}1`, policy1); + + const {result} = renderHook(() => useActiveAdminPolicies()); + + await waitFor(() => { + expect(result.current).toHaveLength(1); + }); + + const policy2 = buildPolicy(2, {name: 'Second', role: CONST.POLICY.ROLE.ADMIN}); + await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}2`, policy2); + + await waitFor(() => { + expect(result.current).toHaveLength(2); + }); + }); +}); diff --git a/tests/unit/hooks/useSortedActiveAdminPolicies.test.ts b/tests/unit/hooks/useSortedActiveAdminPolicies.test.ts new file mode 100644 index 000000000000..ff5c6f8be22f --- /dev/null +++ b/tests/unit/hooks/useSortedActiveAdminPolicies.test.ts @@ -0,0 +1,65 @@ +import {renderHook} from '@testing-library/react-native'; +import useSortedActiveAdminPolicies from '@hooks/useSortedActiveAdminPolicies'; +import CONST from '@src/CONST'; +import type {Policy} from '@src/types/onyx'; +import createRandomPolicy from '../../utils/collections/policies'; + +const mockUseActiveAdminPolicies = jest.fn(() => []); + +jest.mock('@hooks/useActiveAdminPolicies', () => ({ + // eslint-disable-next-line @typescript-eslint/naming-convention + __esModule: true, + default: () => mockUseActiveAdminPolicies(), +})); + +jest.mock('@hooks/useLocalize', () => ({ + // eslint-disable-next-line @typescript-eslint/naming-convention + __esModule: true, + default: () => ({ + localeCompare: (a: string, b: string) => a.localeCompare(b), + }), +})); + +function buildPolicy(id: number, name: string): Policy { + return { + ...createRandomPolicy(id, CONST.POLICY.TYPE.TEAM), + name, + role: CONST.POLICY.ROLE.ADMIN, + pendingAction: undefined, + }; +} + +describe('useSortedActiveAdminPolicies', () => { + beforeEach(() => { + jest.clearAllMocks(); + }); + + it('returns policies sorted by name', () => { + mockUseActiveAdminPolicies.mockReturnValue([buildPolicy(1, 'Zebra'), buildPolicy(2, 'Alpha'), buildPolicy(3, 'Middle')]); + + const {result} = renderHook(() => useSortedActiveAdminPolicies()); + + expect(result.current.map((p) => p.name)).toEqual(['Alpha', 'Middle', 'Zebra']); + }); + + it('returns empty array when no admin policies', () => { + mockUseActiveAdminPolicies.mockReturnValue([]); + + const {result} = renderHook(() => useSortedActiveAdminPolicies()); + + expect(result.current).toEqual([]); + }); + + it('re-sorts when underlying data changes', () => { + mockUseActiveAdminPolicies.mockReturnValue([buildPolicy(1, 'Beta'), buildPolicy(2, 'Alpha')]); + + const {result, rerender} = renderHook(() => useSortedActiveAdminPolicies()); + + expect(result.current.map((p) => p.name)).toEqual(['Alpha', 'Beta']); + + mockUseActiveAdminPolicies.mockReturnValue([buildPolicy(1, 'Beta'), buildPolicy(2, 'Alpha'), buildPolicy(3, 'Aardvark')]); + rerender({}); + + expect(result.current.map((p) => p.name)).toEqual(['Aardvark', 'Alpha', 'Beta']); + }); +}); diff --git a/tests/unit/selectors/PolicyTest.ts b/tests/unit/selectors/PolicyTest.ts index 7d151d1c0189..c4f563ec06d5 100644 --- a/tests/unit/selectors/PolicyTest.ts +++ b/tests/unit/selectors/PolicyTest.ts @@ -1,4 +1,4 @@ -import {hasMultipleOutputCurrenciesSelector} from '@selectors/Policy'; +import {activeAdminPoliciesSelector, hasMultipleOutputCurrenciesSelector} from '@selectors/Policy'; import type {OnyxCollection} from 'react-native-onyx'; import CONST from '@src/CONST'; import type {Policy} from '@src/types/onyx'; @@ -46,3 +46,61 @@ describe('hasMultipleOutputCurrenciesSelector', () => { expect(hasMultipleOutputCurrenciesSelector(policies)).toBe(false); }); }); + +const TEST_LOGIN = 'admin@expensify.com'; + +function buildSelectorPolicy(id: number, overrides: Partial): Policy { + return { + ...createRandomPolicy(id, CONST.POLICY.TYPE.TEAM), + pendingAction: undefined, + ...overrides, + }; +} + +describe('activeAdminPoliciesSelector', () => { + it('returns only policies where the user is admin', () => { + const policies: OnyxCollection = { + policy1: buildSelectorPolicy(1, {name: 'Admin Policy', role: CONST.POLICY.ROLE.ADMIN}), + policy2: buildSelectorPolicy(2, {name: 'User Policy', role: CONST.POLICY.ROLE.USER}), + }; + + const result = activeAdminPoliciesSelector(policies, TEST_LOGIN); + expect(result).toHaveLength(1); + expect(result.at(0)?.name).toBe('Admin Policy'); + }); + + it('excludes personal policies', () => { + const policies: OnyxCollection = { + policy1: buildSelectorPolicy(1, {name: 'Personal Policy', role: CONST.POLICY.ROLE.ADMIN, type: CONST.POLICY.TYPE.PERSONAL}), + policy2: buildSelectorPolicy(2, {name: 'Team Policy', role: CONST.POLICY.ROLE.ADMIN}), + }; + + const result = activeAdminPoliciesSelector(policies, TEST_LOGIN); + expect(result).toHaveLength(1); + expect(result.at(0)?.name).toBe('Team Policy'); + }); + + it('excludes policies with pendingAction DELETE', () => { + const policies: OnyxCollection = { + policy1: buildSelectorPolicy(1, {name: 'Active Policy', role: CONST.POLICY.ROLE.ADMIN}), + policy2: buildSelectorPolicy(2, {name: 'Deleted Policy', role: CONST.POLICY.ROLE.ADMIN, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE}), + }; + + const result = activeAdminPoliciesSelector(policies, TEST_LOGIN); + expect(result).toHaveLength(1); + expect(result.at(0)?.name).toBe('Active Policy'); + }); + + it('returns empty array for empty collection', () => { + expect(activeAdminPoliciesSelector({}, TEST_LOGIN)).toEqual([]); + }); + + it('excludes policies where user has no role', () => { + const policies: OnyxCollection = { + policy1: buildSelectorPolicy(1, {name: 'No Role Policy', role: undefined}), + }; + + const result = activeAdminPoliciesSelector(policies, TEST_LOGIN); + expect(result).toHaveLength(0); + }); +}); From 268f430c5d37b72565b7308d37089eb9fbfbffc0 Mon Sep 17 00:00:00 2001 From: Tomasz Misiukiewicz Date: Fri, 13 Feb 2026 12:20:36 +0100 Subject: [PATCH 8/8] improve perf of SettlementButton --- src/components/SettlementButton/index.tsx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/components/SettlementButton/index.tsx b/src/components/SettlementButton/index.tsx index 5a68079d562e..5f5a993d1f96 100644 --- a/src/components/SettlementButton/index.tsx +++ b/src/components/SettlementButton/index.tsx @@ -11,6 +11,7 @@ import KYCWall from '@components/KYCWall'; import {KYCWallContext} from '@components/KYCWall/KYCWallContext'; import type {ContinueActionParams, PaymentMethod} from '@components/KYCWall/types'; import {LockedAccountContext} from '@components/LockedAccountModalProvider'; +import useActiveAdminPolicies from '@hooks/useActiveAdminPolicies'; import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'; import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; @@ -25,7 +26,7 @@ import {getLastPolicyBankAccountID, getLastPolicyPaymentMethod} from '@libs/acti import {isBankAccountPartiallySetup} from '@libs/BankAccountUtils'; import Navigation from '@libs/Navigation/Navigation'; import {formatPaymentMethods, getActivePaymentType} from '@libs/PaymentUtils'; -import {getActiveAdminWorkspaces, getPolicyEmployeeAccountIDs, isPaidGroupPolicy, isPolicyAdmin} from '@libs/PolicyUtils'; +import {getPolicyEmployeeAccountIDs, isPaidGroupPolicy, isPolicyAdmin, sortPoliciesByName} from '@libs/PolicyUtils'; import {hasRequestFromCurrentAccount} from '@libs/ReportActionsUtils'; import { doesReportBelongToWorkspace, @@ -129,11 +130,10 @@ function SettlementButton({ const lastBankAccountID = getLastPolicyBankAccountID(policyIDKey, lastPaymentMethods, iouReport?.type as keyof LastPaymentMethodType); const [fundList] = useOnyx(ONYXKEYS.FUND_LIST, {canBeMissing: true}); const [activePolicyID] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID, {canBeMissing: true}); - const [policies] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {canBeMissing: true}); const invoiceReceiverPolicyID = chatReport?.invoiceReceiver && 'policyID' in chatReport.invoiceReceiver ? chatReport.invoiceReceiver.policyID : undefined; const invoiceReceiverPolicy = usePolicy(invoiceReceiverPolicyID); const activePolicy = usePolicy(activePolicyID); - const activeAdminPolicies = getActiveAdminWorkspaces(policies, accountID.toString()).sort((a, b) => localeCompare(a.name || '', b.name || '')); + const activeAdminPolicies = useActiveAdminPolicies(); const reportID = iouReport?.reportID; const personalPolicy = usePolicy(personalPolicyID); @@ -319,7 +319,8 @@ function SettlementButton({ } if ((hasMultiplePolicies || hasSinglePolicy) && canUseWallet && !isPersonalOnlyOption) { - for (const p of activeAdminPolicies) { + const sortedActiveAdminPolicies = sortPoliciesByName(activeAdminPolicies, localeCompare); + for (const p of sortedActiveAdminPolicies) { const policyName = p.name; buttonOptions.push({ text: translate('iou.payWithPolicy', truncate(policyName, {length: CONST.ADDITIONAL_ALLOWED_CHARACTERS}), ''),