Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
49807ef
fix(reports): revert split when split expense is deleted
marufsharifi Feb 4, 2026
95948cd
Merge branch 'main' into fix/reports-split-not-reverted-on-expense-de…
marufsharifi Feb 7, 2026
4eb6547
Merge branch 'main' into fix/reports-split-not-reverted-on-expense-de…
marufsharifi Feb 7, 2026
1cbde93
fixed test, and lint failures
marufsharifi Feb 7, 2026
e6d1db7
fixed prettier failure
marufsharifi Feb 7, 2026
70426f9
Merge branch 'main' into fix/reports-split-not-reverted-on-expense-de…
marufsharifi Feb 16, 2026
285ab74
fixed broken code
marufsharifi Feb 16, 2026
2b18167
applied ai feedback
marufsharifi Feb 16, 2026
2048a2c
added unit test for useSearchDeleteTransactions
marufsharifi Feb 16, 2026
ed6a9de
Merge branch 'main' into fix/reports-split-not-reverted-on-expense-de…
marufsharifi Feb 18, 2026
4eb3843
Merge branch 'main' into fix/reports-split-not-reverted-on-expense-de…
marufsharifi Feb 20, 2026
b295ae5
Fix optimistic restore when reverting split transaction deletions in …
marufsharifi Feb 20, 2026
111b8d6
fixed test failures.
marufsharifi Feb 20, 2026
d7e4f00
fixed failed test
marufsharifi Feb 24, 2026
d314e91
Fix remaining split amount fallback to use valid modifiedAmount only
marufsharifi Feb 24, 2026
3a7e9e6
fixed prettier failure
marufsharifi Feb 24, 2026
4efb02f
Merge branch 'main' into fix/reports-split-not-reverted-on-expense-de…
marufsharifi Feb 24, 2026
6617151
fixed type error.
marufsharifi Feb 24, 2026
3736e56
Merge branch 'main' into fix/reports-split-not-reverted-on-expense-de…
marufsharifi Feb 25, 2026
3cf7811
Merge branch 'main' into fix/reports-split-not-reverted-on-expense-de…
marufsharifi Mar 2, 2026
7eace4b
Merge branch 'main' into fix/reports-split-not-reverted-on-expense-de…
marufsharifi Mar 3, 2026
80e04da
fixed test failures.
marufsharifi Mar 3, 2026
69824d9
fixed type error
marufsharifi Mar 3, 2026
a37ef8a
fixed prettier
marufsharifi Mar 3, 2026
eed677f
Merge branch 'main' into fix/reports-split-not-reverted-on-expense-de…
marufsharifi Mar 9, 2026
a2ac43b
Merge branch 'main' into fix/reports-split-not-reverted-on-expense-de…
marufsharifi Mar 9, 2026
6624578
Fix optimistic reverse-split delete state in search
marufsharifi Mar 9, 2026
6aecc86
Merge branch 'main' into fix/reports-split-not-reverted-on-expense-de…
marufsharifi Mar 10, 2026
c39b2d4
Fix search split revert payload metadata
marufsharifi Mar 10, 2026
84a2118
Merge branch 'main' into fix/reports-split-not-reverted-on-expense-de…
marufsharifi Mar 11, 2026
22f720a
Fix split delete fallback and revert guards in search
marufsharifi Mar 11, 2026
7f48f3a
Merge branch 'main' into fix/reports-split-not-reverted-on-expense-de…
marufsharifi Mar 12, 2026
0eaba09
fixed test failure
marufsharifi Mar 12, 2026
328e1b5
refactored types.
marufsharifi Mar 12, 2026
03c0102
Merge branch 'main' into fix/reports-split-not-reverted-on-expense-de…
marufsharifi Mar 14, 2026
2d9330e
fix: avoid reverting split bills during bulk delete
marufsharifi Mar 14, 2026
c3c6185
fix: resolve split delete lint error
marufsharifi Mar 14, 2026
d80100d
Merge branch 'main' into fix/reports-split-not-reverted-on-expense-de…
marufsharifi Mar 15, 2026
03fa71e
fix: avoid reverting split with orphaned siblings
marufsharifi Mar 15, 2026
e6d54a0
fix: restore snapshot fallback for split delete
marufsharifi Mar 15, 2026
7fe4a01
test(search): update split revert expectations
marufsharifi Mar 15, 2026
7c029ab
Merge branch 'main' into fix/reports-split-not-reverted-on-expense-de…
marufsharifi Mar 16, 2026
edda518
fix(search): clean up report state on split revert
marufsharifi Mar 16, 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
4 changes: 3 additions & 1 deletion src/components/Search/SearchBulkActionsButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import useOnyx from '@hooks/useOnyx';
import usePolicy from '@hooks/usePolicy';
import useResponsiveLayout from '@hooks/useResponsiveLayout';
import useSearchBulkActions from '@hooks/useSearchBulkActions';
import useSearchDeleteTransactions from '@hooks/useSearchDeleteTransactions';
import useSortedActiveAdminPolicies from '@hooks/useSortedActiveAdminPolicies';
import useThemeStyles from '@hooks/useThemeStyles';
import {handleBulkPayItemSelected} from '@libs/actions/Search';
Expand Down Expand Up @@ -46,6 +47,7 @@ function SearchBulkActionsButton({queryJSON}: SearchBulkActionsButtonProps) {
const [userBillingGraceEndPeriods] = useOnyx(ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END);
const [isUserValidated] = useOnyx(ONYXKEYS.ACCOUNT, {selector: isUserValidatedSelector});
const activeAdminPolicies = useSortedActiveAdminPolicies();
const {deleteTransactionsOnSearch} = useSearchDeleteTransactions();
const [amountOwed] = useOnyx(ONYXKEYS.NVP_PRIVATE_AMOUNT_OWED);

const {
Expand All @@ -64,7 +66,7 @@ function SearchBulkActionsButton({queryJSON}: SearchBulkActionsButtonProps) {
handleDownloadErrorModalClose,
dismissModalAndUpdateUseHold,
dismissRejectModalBasedOnAction,
} = useSearchBulkActions({queryJSON});
} = useSearchBulkActions({queryJSON, deleteTransactionsOnSearch});

const currentSelectedPolicyID = selectedPolicyIDs?.at(0);
const currentSelectedReportID = selectedTransactionReportIDs?.at(0) ?? selectedReportIDs?.at(0);
Expand Down
5 changes: 4 additions & 1 deletion src/hooks/useSearchBulkActions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,14 @@ import useThemeStyles from './useThemeStyles';

type UseSearchBulkActionsParams = {
queryJSON: SearchQueryJSON | undefined;
deleteTransactionsOnSearch?: (hash: number, transactionIDs: string[], transactions?: OnyxCollection<Transaction>) => void;
};

function getRestrictedPolicyID(items: Array<{policyID?: string}>, billingGracePeriods: OnyxCollection<BillingGraceEndPeriod>): string | undefined {
return items.map((item) => item.policyID).find((policyID): policyID is string => !!policyID && shouldRestrictUserBillableActions(policyID, billingGracePeriods));
}

function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
function useSearchBulkActions({queryJSON, deleteTransactionsOnSearch}: UseSearchBulkActionsParams) {
const {translate, localeCompare, formatPhoneNumber, toLocaleDigit} = useLocalize();
const styles = useThemeStyles();
const theme = useTheme();
Expand Down Expand Up @@ -511,6 +512,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
translate,
toLocaleDigit,
transactions,
deleteTransactionsOnSearch,
});
}
clearSelectedTransactions();
Expand All @@ -537,6 +539,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
toLocaleDigit,
isExpenseReportType,
selectedReportIDs,
deleteTransactionsOnSearch,
]);

const onBulkPaySelected = useCallback(
Expand Down
180 changes: 180 additions & 0 deletions src/hooks/useSearchDeleteTransactions.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,180 @@
import {useCallback} from 'react';
import type {OnyxCollection} from 'react-native-onyx';
import {useSearchStateContext} from '@components/Search/SearchContext';
import {deleteMoneyRequestOnSearch, revertSplitTransactionOnSearch} from '@libs/actions/Search';
import type {RevertSplitTransactionParams} from '@libs/API/parameters';
import {getChildTransactions, getOriginalTransactionWithSplitInfo, hasValidModifiedAmount} from '@libs/TransactionUtils';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import type {Transaction} from '@src/types/onyx';
import useOnyx from './useOnyx';

type TransactionMap = Record<string, Transaction | undefined>;

function hasTransactions(transactions?: TransactionMap | null): transactions is TransactionMap {
return !!transactions && Object.keys(transactions).length > 0;
}

function mergeTransactions(searchTransactions?: TransactionMap, fullTransactionCollection?: TransactionMap): TransactionMap | undefined {
if (!hasTransactions(searchTransactions) && !hasTransactions(fullTransactionCollection)) {
return undefined;
}

return {
...(searchTransactions ?? {}),
...(fullTransactionCollection ?? {}),
};
}

function getSearchTransactions(searchResultsRecord?: Record<string, unknown>): TransactionMap | undefined {
if (!searchResultsRecord) {
return undefined;
}

const searchTransactions: TransactionMap = {};

for (const [key, value] of Object.entries(searchResultsRecord)) {
if (!key.startsWith(ONYXKEYS.COLLECTION.TRANSACTION) || !value) {
continue;
}

searchTransactions[key] = value as Transaction;
}

return Object.keys(searchTransactions).length > 0 ? searchTransactions : undefined;
}

function useSearchDeleteTransactions() {
const {currentSearchResults} = useSearchStateContext();
const searchResultsRecord = currentSearchResults?.data as Record<string, unknown> | undefined;
const [allReports] = useOnyx(ONYXKEYS.COLLECTION.REPORT);

const deleteTransactionsOnSearch = useCallback(
(hash: number, transactionIDs: string[], transactions?: OnyxCollection<Transaction>) => {
if (!transactionIDs.length) {
return;
}

const searchTransactions = getSearchTransactions(searchResultsRecord);
const fullTransactionCollection = hasTransactions(transactions as TransactionMap | null | undefined) ? (transactions as TransactionMap) : undefined;
const mergedTransactions = mergeTransactions(searchTransactions, fullTransactionCollection);

if (!hasTransactions(mergedTransactions)) {
deleteMoneyRequestOnSearch(hash, transactionIDs, transactions);
return;
}

const splitsByOriginalID: Record<string, string[]> = {};
const nonSplitIDs: string[] = [];

for (const transactionID of transactionIDs) {
const transactionKey = `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`;
const transaction = searchTransactions?.[transactionKey] ?? mergedTransactions[transactionKey];
const originalTransactionID = transaction?.comment?.originalTransactionID;
const originalTransaction = originalTransactionID ? mergedTransactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${originalTransactionID}`] : undefined;
const {isExpenseSplit} = getOriginalTransactionWithSplitInfo(transaction, originalTransaction);

if (isExpenseSplit && originalTransactionID) {
(splitsByOriginalID[originalTransactionID] ??= []).push(transactionID);
} else {
nonSplitIDs.push(transactionID);
}
}

for (const [originalTransactionID, splitTransactionIDs] of Object.entries(splitsByOriginalID)) {
const deletingIDs = new Set(splitTransactionIDs);
const childTransactions = getChildTransactions(mergedTransactions as OnyxCollection<Transaction>, allReports, originalTransactionID, true).filter(
(transaction) => transaction?.transactionID === undefined || !deletingIDs.has(transaction.transactionID),
);
const reportedChildTransactions = childTransactions.filter((transaction) => transaction?.reportID !== CONST.REPORT.UNREPORTED_REPORT_ID);

if (reportedChildTransactions.length === 0) {
nonSplitIDs.push(...splitTransactionIDs);
continue;
}

if (reportedChildTransactions.length === 1 && childTransactions.length === reportedChildTransactions.length) {
const remaining = reportedChildTransactions.at(0);
if (!remaining) {
continue;
}

const remainingReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${remaining.reportID}`];
if ((remainingReport?.statusNum ?? 0) >= CONST.REPORT.STATUS_NUM.SUBMITTED) {
nonSplitIDs.push(...splitTransactionIDs);
continue;
}

const remainingPortion = Math.abs(hasValidModifiedAmount(remaining) ? Number(remaining.modifiedAmount) : Number(remaining.amount ?? 0));
const splitTransactionIDList = [...splitTransactionIDs];
if (remaining.transactionID !== originalTransactionID) {
splitTransactionIDList.push(remaining.transactionID);
}
const optimisticDeletedSplitTransactions: Record<string, Transaction> = {};
for (const transactionID of splitTransactionIDList) {
const transactionKey = `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`;
const splitTransaction = mergedTransactions[transactionKey];

if (splitTransaction) {
optimisticDeletedSplitTransactions[transactionKey] = splitTransaction;
}
}
const originalTransactionKey = `${ONYXKEYS.COLLECTION.TRANSACTION}${originalTransactionID}`;
const optimisticOriginalTransaction = mergedTransactions[originalTransactionKey];
const previousSnapshotOriginalTransaction = searchTransactions?.[originalTransactionKey];
const remainingModifiedAmount = hasValidModifiedAmount(remaining) ? remaining.modifiedAmount : '';
const optimisticRestoredTransaction: Transaction = {
...remaining,
transactionID: originalTransactionID,
amount: remaining.amount,
modifiedAmount: remainingModifiedAmount,
pendingAction: null,
comment: {
...(remaining.comment ?? {}),
source: undefined,
originalTransactionID: undefined,
},
};
const revertSplitTransactionParams = {
transactionID: remaining.transactionID,
amount: remainingPortion,
created: remaining.created ?? '',
category: remaining.category ?? '',
tag: remaining.tag ?? '',
merchant: remaining.modifiedMerchant ?? remaining.merchant ?? '',
comment: remaining.comment?.comment ?? '',
reimbursable: remaining.reimbursable,
billable: remaining.billable,
reportID: remaining.reportID,
quantity: remaining.comment?.customUnit?.quantity ?? undefined,
customUnitRateID: remaining.comment?.customUnit?.customUnitRateID,
odometerStart: remaining.comment?.odometerStart,
odometerEnd: remaining.comment?.odometerEnd,
waypoints: remaining.comment?.waypoints ? JSON.stringify(remaining.comment.waypoints) : undefined,
} as RevertSplitTransactionParams;
revertSplitTransactionOnSearch(
hash,
originalTransactionID,
revertSplitTransactionParams,
optimisticDeletedSplitTransactions,
optimisticRestoredTransaction,
optimisticOriginalTransaction,
previousSnapshotOriginalTransaction,
);
continue;
}

nonSplitIDs.push(...splitTransactionIDs);
}

if (nonSplitIDs.length > 0) {
deleteMoneyRequestOnSearch(hash, nonSplitIDs, mergedTransactions as OnyxCollection<Transaction>);
}
},
[allReports, searchResultsRecord],
);

return {deleteTransactionsOnSearch};
}

export default useSearchDeleteTransactions;
3 changes: 2 additions & 1 deletion src/libs/API/parameters/SplitTransactionParams.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import type {Comment, WaypointCollection} from '@src/types/onyx/Transaction';

type SplitTransactionSplitParam = {
transactionID: string;
amount: number;
category?: string;
tag?: string;
created: string;
Expand All @@ -25,7 +26,7 @@ type SplitTransactionSplitsParam = SplitTransactionSplitParam[];

type SplitTransactionParams = {
transactionID: string;
[key: string]: string | boolean;
[key: string]: string | number | boolean;
};

type RevertSplitTransactionParams = Omit<SplitTransactionSplitParam, 'comment'> & {comment?: string};
Expand Down
Loading
Loading