Skip to content

Make AddDelegatePage use new SelectionListWithSections #80484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
grgia merged 7 commits into from
Jan 29, 2026
Merged

Make AddDelegatePage use new SelectionListWithSections #80484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a64e3a2
Remove manual memoization
zfurtak Jan 26, 2026
66007b6
Fix sections diplay when no data
zfurtak Jan 26, 2026
8412714
Introduce sectionIndex and remove manual memoization from TaxPicker
zfurtak Jan 26, 2026
25cfa35
Adjust textoptionslistutils test
zfurtak Jan 26, 2026
5489c6f
Fix types on AddDelegatePage
zfurtak Jan 26, 2026
005ef03
Remove unecessary changes
zfurtak Jan 26, 2026
2e0b778
Merge branch 'main' into @zfurtak/migrate-AddDelegatePage
zfurtak Jan 27, 2026
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
5 changes: 3 additions & 2 deletions src/components/SelectionList/hooks/useFlattenedSections.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ function useFlattenedSections<TItem extends ListItem>(sections: Array<Section<TI
let itemsTotalCount = 0;

for (const section of sections) {
if (section.title) {
const sectionDataLength = section.data?.length ?? 0;
itemsTotalCount += sectionDataLength;
if (section.title && sectionDataLength > 0) {
disabledIndices.push(data.length);
data.push({
type: CONST.SECTION_LIST_ITEM_TYPE.HEADER,
Expand All @@ -55,7 +57,6 @@ function useFlattenedSections<TItem extends ListItem>(sections: Array<Section<TI
isDisabled: true,
});
}
itemsTotalCount += section.data?.length ?? 0;

for (const item of section.data ?? []) {
const currentIndex = data.length;
Expand Down
112 changes: 53 additions & 59 deletions src/pages/settings/Security/AddDelegate/AddDelegatePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import React, {useEffect, useMemo} from 'react';
import React, {useEffect} from 'react';
import {View} from 'react-native';
import DelegateNoAccessWrapper from '@components/DelegateNoAccessWrapper';
import HeaderWithBackButton from '@components/HeaderWithBackButton';
import ScreenWrapper from '@components/ScreenWrapper';
// eslint-disable-next-line no-restricted-imports
import SelectionList from '@components/SelectionListWithSections';
import UserListItem from '@components/SelectionListWithSections/UserListItem';
import UserListItem from '@components/SelectionList/ListItem/UserListItem';
import SelectionList from '@components/SelectionList/SelectionListWithSections';
import useLocalize from '@hooks/useLocalize';
import useOnyx from '@hooks/useOnyx';
import useSearchSelector from '@hooks/useSearchSelector';
Expand All @@ -23,18 +22,15 @@ function AddDelegatePage() {
const [isSearchingForReports] = useOnyx(ONYXKEYS.IS_SEARCHING_FOR_REPORTS, {initWithStoredValues: false, canBeMissing: true});
const [account] = useOnyx(ONYXKEYS.ACCOUNT, {canBeMissing: true});
const [countryCode = CONST.DEFAULT_COUNTRY_CODE] = useOnyx(ONYXKEYS.COUNTRY_CODE, {canBeMissing: false});
const existingDelegates = useMemo(
() =>
account?.delegatedAccess?.delegates?.reduce(
(prev, {email}) => {
// eslint-disable-next-line no-param-reassign
prev[email] = true;
return prev;
},
{} as Record<string, boolean>,
) ?? {},
[account?.delegatedAccess?.delegates],
);
const existingDelegates =
account?.delegatedAccess?.delegates?.reduce(
(prev, {email}) => {
// eslint-disable-next-line no-param-reassign
prev[email] = true;
return prev;
},
{} as Record<string, boolean>,
) ?? {};

const {searchTerm, debouncedSearchTerm, setSearchTerm, availableOptions, areOptionsInitialized, toggleSelection} = useSearchSelector({
selectionMode: CONST.SEARCH_SELECTOR.SELECTION_MODE_SINGLE,
Expand All @@ -48,51 +44,45 @@ function AddDelegatePage() {
},
});

const headerMessage = useMemo(() => {
return getHeaderMessage(
(availableOptions.recentReports?.length || 0) + (availableOptions.personalDetails?.length || 0) !== 0,
!!availableOptions.userToInvite,
debouncedSearchTerm,
countryCode,
);
}, [availableOptions.recentReports?.length, availableOptions.personalDetails?.length, availableOptions.userToInvite, debouncedSearchTerm, countryCode]);

const sections = useMemo(() => {
const sectionsList = [];

sectionsList.push({
const headerMessage = getHeaderMessage(
(availableOptions.recentReports?.length || 0) + (availableOptions.personalDetails?.length || 0) !== 0,
!!availableOptions.userToInvite,
debouncedSearchTerm,
countryCode,
);
const sectionsList = [
{
title: translate('common.recents'),
sectionIndex: 0,
data: availableOptions.recentReports,
shouldShow: availableOptions.recentReports?.length > 0,
});

sectionsList.push({
},
{
title: translate('common.contacts'),
sectionIndex: 1,
data: availableOptions.personalDetails,
shouldShow: availableOptions.personalDetails?.length > 0,
});
},
];

if (availableOptions.userToInvite) {
sectionsList.push({
title: undefined,
data: [availableOptions.userToInvite],
shouldShow: true,
});
}
if (availableOptions.userToInvite) {
sectionsList.push({
sectionIndex: 2,
title: '',
data: [availableOptions.userToInvite],
});
}

return sectionsList.map((section) => ({
...section,
data: section.data.map((option) => ({
...option,
text: option.text ?? '',
alternateText: option.alternateText ?? undefined,
keyForList: option.keyForList ?? '',
isDisabled: option.isDisabled ?? undefined,
login: option.login ?? undefined,
shouldShowSubscript: option.shouldShowSubscript ?? undefined,
})),
}));
}, [availableOptions.recentReports, availableOptions.personalDetails, availableOptions.userToInvite, translate]);
const sections = sectionsList.map((section) => ({
...section,
data: section.data.map((option, index) => ({
...option,
text: option.text ?? '',
alternateText: option.alternateText ?? undefined,
keyForList: `${option.keyForList}-${index}`,
isDisabled: option.isDisabled ?? undefined,
login: option.login ?? undefined,
shouldShowSubscript: option.shouldShowSubscript ?? undefined,
})),
}));

useEffect(() => {
searchInServer(debouncedSearchTerm);
Expand All @@ -114,12 +104,16 @@ function AddDelegatePage() {
ListItem={UserListItem}
onSelectRow={toggleSelection}
shouldSingleExecuteRowSelect
onChangeText={setSearchTerm}
textInputValue={searchTerm}
headerMessage={headerMessage}
textInputLabel={translate('selectionList.nameEmailOrPhoneNumber')}
textInputOptions={{
value: searchTerm,
onChangeText: setSearchTerm,
headerMessage,
label: translate('selectionList.nameEmailOrPhoneNumber'),
}}
showLoadingPlaceholder={!areOptionsInitialized}
isLoadingNewOptions={!!isSearchingForReports}
disableMaintainingScrollPosition
shouldShowTextInput
/>
</View>
</DelegateNoAccessWrapper>
Expand Down
Loading