Skip to content

[CP Staging] Revert "Make AddUnreportedExpense use new SelectionList" #76275

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
mountiny merged 1 commit into from
Nov 28, 2025
Merged

[CP Staging] Revert "Make AddUnreportedExpense use new SelectionList" #76275

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
69 changes: 26 additions & 43 deletions src/pages/AddUnreportedExpense.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import HeaderWithBackButton from '@components/HeaderWithBackButton';
import LottieAnimations from '@components/LottieAnimations';
import {useSession} from '@components/OnyxListItemProvider';
import ScreenWrapper from '@components/ScreenWrapper';
import SelectionList from '@components/SelectionList';
import type {ListItem, SelectionListHandle} from '@components/SelectionList/types';
import SelectionList from '@components/SelectionListWithSections';
import type {ListItem, SectionListDataType, SelectionListHandle} from '@components/SelectionListWithSections/types';
import UnreportedExpensesSkeleton from '@components/Skeletons/UnreportedExpensesSkeleton';
import useDebouncedState from '@hooks/useDebouncedState';
import useLocalize from '@hooks/useLocalize';
Expand Down Expand Up @@ -153,14 +153,7 @@ function AddUnreportedExpense({route}: AddUnreportedExpensePageType) {
});
}, [debouncedSearchValue, shouldShowTextInput, transactions]);

const unreportedExpenses = useMemo(() => {
return createUnreportedExpenseSections(filteredTransactions)
.flatMap((section) => section.data)
.map((item) => ({
...item,
isSelected: selectedIds.has(item.transactionID),
}));
}, [filteredTransactions, selectedIds]);
const sections: Array<SectionListDataType<Transaction & ListItem>> = useMemo(() => createUnreportedExpenseSections(filteredTransactions), [filteredTransactions]);

const handleConfirm = useCallback(() => {
if (selectedIds.size === 0) {
Expand Down Expand Up @@ -219,39 +212,11 @@ function AddUnreportedExpense({route}: AddUnreportedExpensePageType) {
}, [errorMessage, styles, translate, handleConfirm]);

const headerMessage = useMemo(() => {
if (debouncedSearchValue.trim() && unreportedExpenses?.length === 0) {
if (debouncedSearchValue.trim() && sections.at(0)?.data.length === 0) {
return translate('common.noResultsFound');
}
return '';
}, [debouncedSearchValue, unreportedExpenses?.length, translate]);

const textInputOptions = useMemo(
() => ({
value: searchValue,
label: shouldShowTextInput ? translate('iou.findExpense') : undefined,
onChangeText: setSearchValue,
headerMessage,
}),
[searchValue, shouldShowTextInput, translate, setSearchValue, headerMessage],
);

const onSelectRow = useCallback(
(item: {transactionID: string}) => {
setSelectedIds((prevIds) => {
const newIds = new Set(prevIds);
if (newIds.has(item.transactionID)) {
newIds.delete(item.transactionID);
} else {
newIds.add(item.transactionID);
if (errorMessage) {
setErrorMessage('');
}
}
return newIds;
});
},
[errorMessage],
);
}, [debouncedSearchValue, sections, translate]);

const hasSearchTerm = debouncedSearchValue.trim().length > 0;
const isShowingEmptyState = !hasSearchTerm && transactions.length === 0;
Expand Down Expand Up @@ -333,12 +298,30 @@ function AddUnreportedExpense({route}: AddUnreportedExpensePageType) {
onBackButtonPress={Navigation.goBack}
/>
<SelectionList<Transaction & ListItem>
data={unreportedExpenses}
ref={selectionListRef}
onSelectRow={onSelectRow}
textInputOptions={textInputOptions}
onSelectRow={(item) => {
setSelectedIds((prevIds) => {
const newIds = new Set(prevIds);
if (newIds.has(item.transactionID)) {
newIds.delete(item.transactionID);
} else {
newIds.add(item.transactionID);
if (errorMessage) {
setErrorMessage('');
}
}

return newIds;
});
}}
isSelected={(item) => selectedIds.has(item.transactionID)}
shouldShowTextInput={shouldShowTextInput}
textInputValue={searchValue}
textInputLabel={shouldShowTextInput ? translate('iou.findExpense') : undefined}
onChangeText={setSearchValue}
headerMessage={headerMessage}
canSelectMultiple
sections={sections}
ListItem={UnreportedExpenseListItem}
onEndReached={fetchMoreUnreportedTransactions}
onEndReachedThreshold={0.75}
Expand Down
Loading