Skip to content
Merged
Show file tree
Hide file tree
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
3 changes: 3 additions & 0 deletions src/components/MoneyRequestHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ import LoadingBar from './LoadingBar';
import type {MoneyRequestHeaderStatusBarProps} from './MoneyRequestHeaderStatusBar';
import MoneyRequestHeaderStatusBar from './MoneyRequestHeaderStatusBar';
import MoneyRequestReportTransactionsNavigation from './MoneyRequestReportView/MoneyRequestReportTransactionsNavigation';
import {useSearchContext} from './Search/SearchContext';

type MoneyRequestHeaderProps = {
/** The report currently being looked at */
Expand Down Expand Up @@ -91,6 +92,7 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre
const isDuplicate = isDuplicateTransactionUtils(transaction?.transactionID);
const reportID = report?.reportID;
const {isBetaEnabled} = usePermissions();
const {removeTransaction} = useSearchContext();

const isReportInRHP = route.name === SCREENS.SEARCH.REPORT_RHP;
const shouldDisplayTransactionNavigation = !!(reportID && isReportInRHP);
Expand Down Expand Up @@ -330,6 +332,7 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre
deleteTrackExpense(report?.chatReportID, transaction.transactionID, parentReportAction, true);
} else {
deleteMoneyRequest(transaction.transactionID, parentReportAction, true);
removeTransaction(transaction.transactionID);
}
onBackButtonPress();
}}
Expand Down
17 changes: 17 additions & 0 deletions src/components/Search/SearchContext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ const defaultSearchContext: SearchContext = {
setLastSearchType: () => {},
setCurrentSearchHash: () => {},
setSelectedTransactions: () => {},
removeTransaction: () => {},
clearSelectedTransactions: () => {},
setShouldShowFiltersBarLoading: () => {},
setShouldShowExportModeOption: () => {},
Expand Down Expand Up @@ -104,9 +105,24 @@ function SearchContextProvider({children}: ChildrenProps) {
[searchContextData.currentSearchHash, setSelectedTransactions],
);

const removeTransaction: SearchContext['removeTransaction'] = useCallback(
(transactionID) => {
const selectedTransactionIDs = searchContextData.selectedTransactionIDs;
if (!transactionID || !selectedTransactionIDs.length) {
return;
}
setSearchContextData((prevState) => ({
...prevState,
selectedTransactionIDs: selectedTransactionIDs.filter((ID) => transactionID !== ID),
}));
},
[searchContextData.selectedTransactionIDs],
);

const searchContext = useMemo<SearchContext>(
() => ({
...searchContextData,
removeTransaction,
setCurrentSearchHash,
setSelectedTransactions,
clearSelectedTransactions,
Expand All @@ -130,6 +146,7 @@ function SearchContextProvider({children}: ChildrenProps) {
setShouldShowExportModeOption,
isExportMode,
setExportMode,
removeTransaction,
],
);

Expand Down
1 change: 1 addition & 0 deletions src/components/Search/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ type SearchContext = SearchContextData & {
(hash?: number, shouldTurnOffSelectionMode?: boolean): void;
(clearIDs: true, unused?: undefined): void;
};
removeTransaction: (transactionID: string | undefined) => void;
shouldShowFiltersBarLoading: boolean;
setShouldShowFiltersBarLoading: (shouldShow: boolean) => void;
setLastSearchType: (type: string | undefined) => void;
Expand Down
9 changes: 1 addition & 8 deletions src/pages/ReportDetailsPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -157,14 +157,7 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta

const {reportActions} = usePaginatedReportActions(report.reportID);

const {setSelectedTransactions, selectedTransactionIDs} = useSearchContext();

const removeTransaction = useCallback(
(transactionID?: string) => {
setSelectedTransactions(selectedTransactionIDs.filter((t) => t !== transactionID));
},
[setSelectedTransactions, selectedTransactionIDs],
);
const {removeTransaction} = useSearchContext();

const transactionThreadReportID = useMemo(() => getOneTransactionThreadReportID(report.reportID, reportActions ?? [], isOffline), [report.reportID, reportActions, isOffline]);

Expand Down