Skip to content

Refactor bulk reject function #88778

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
tgolen merged 3 commits into from
May 4, 2026
+22 −11
Merged

Refactor bulk reject function #88778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d896c1
Refactor bulk functions
parasharrajat Apr 25, 2026
28003f0
Merge branch 'main' of github.com:Expensify/App into onyx/session-11
parasharrajat May 1, 2026
61e55b4
Fixes
parasharrajat May 1, 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
9 changes: 5 additions & 4 deletions src/libs/actions/Search.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ import type {OnyxData} from '@src/types/onyx/Request';
import type Nullable from '@src/types/utils/Nullable';
import SafeString from '@src/utils/SafeString';
import {setPersonalBankAccountContinueKYCOnSuccess} from './BankAccounts';
import {getCurrentUserEmail} from './IOU';
import {deleteMoneyRequest} from './IOU/DeleteMoneyRequest';
import {prepareRejectMoneyRequestData, rejectMoneyRequest} from './IOU/RejectMoneyRequest';
import type {RejectMoneyRequestData} from './IOU/RejectMoneyRequest';
Expand Down Expand Up @@ -984,6 +983,7 @@ function rejectMoneyRequestInBulk(
policy: OnyxEntry<Policy>,
transactionIDs: string[],
currentUserAccountIDParam: number,
currentUserLogin: string,
betas: OnyxEntry<Beta[]>,
hash?: number,
) {
Expand All @@ -1004,7 +1004,7 @@ function rejectMoneyRequestInBulk(
}
> = {};
for (const transactionID of transactionIDs) {
const data = prepareRejectMoneyRequestData(transactionID, reportID, comment, policy, currentUserAccountIDParam, getCurrentUserEmail(), betas, undefined, true);
const data = prepareRejectMoneyRequestData(transactionID, reportID, comment, policy, currentUserAccountIDParam, currentUserLogin, betas, undefined, true);
if (data) {
optimisticData.push(...data.optimisticData);
successData.push(...data.successData);
Expand Down Expand Up @@ -1039,6 +1039,7 @@ function rejectMoneyRequestsOnSearch(
allPolicies: OnyxCollection<Policy>,
allReports: OnyxCollection<Report>,
currentUserAccountIDParam: number,
currentUserLogin: string,
betas: OnyxEntry<Beta[]>,
) {
const transactionIDs = Object.keys(selectedTransactions);
Expand Down Expand Up @@ -1072,12 +1073,12 @@ function rejectMoneyRequestsOnSearch(
const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`];
const isPolicyDelayedSubmissionEnabled = policy ? isDelayedSubmissionEnabled(policy) : false;
if (isPolicyDelayedSubmissionEnabled && areAllExpensesSelected) {
rejectMoneyRequestInBulk(reportID, comment, policy, selectedTransactionIDs, currentUserAccountIDParam, betas, hash);
rejectMoneyRequestInBulk(reportID, comment, policy, selectedTransactionIDs, currentUserAccountIDParam, currentUserLogin, betas, hash);
} else {
// Share a single destination ID across all rejections from the same source report
const sharedRejectedToReportID = generateReportID();
for (const transactionID of selectedTransactionIDs) {
rejectMoneyRequest(transactionID, reportID, comment, policy, currentUserAccountIDParam, getCurrentUserEmail(), betas, {sharedRejectedToReportID});
rejectMoneyRequest(transactionID, reportID, comment, policy, currentUserAccountIDParam, currentUserLogin, betas, {sharedRejectedToReportID});
}
}
if (isSingleReport && areAllExpensesSelected && !isPolicyDelayedSubmissionEnabled) {
Expand Down
24 changes: 17 additions & 7 deletions src/pages/Search/SearchRejectReasonPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ function SearchRejectReasonPage({route}: SearchRejectReasonPageProps) {
const {translate} = useLocalize();

const [betas] = useOnyx(ONYXKEYS.BETAS);
const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
const {accountID: currentUserAccountID, login: currentUserLogin} = useCurrentUserPersonalDetails();
// When coming from the report view, selectedTransactions is empty, build it from selectedTransactionIDs
const selectedTransactionsForReject = useMemo(() => {
if (route.name === SCREENS.SEARCH.MONEY_REQUEST_REPORT_REJECT_TRANSACTIONS && reportID) {
Expand All @@ -51,7 +51,16 @@ function SearchRejectReasonPage({route}: SearchRejectReasonPageProps) {
return;
}

const urlToNavigateBack = rejectMoneyRequestsOnSearch(currentSearchHash, selectedTransactionsForReject, comment, allPolicies, allReports, currentUserAccountID, betas);
const urlToNavigateBack = rejectMoneyRequestsOnSearch(
currentSearchHash,
selectedTransactionsForReject,
comment,
allPolicies,
allReports,
currentUserAccountID,
currentUserLogin ?? '',
betas,
);
if (route.name === SCREENS.SEARCH.MONEY_REQUEST_REPORT_REJECT_TRANSACTIONS) {
clearSelectedTransactions(true);
} else {
Expand All @@ -63,16 +72,17 @@ function SearchRejectReasonPage({route}: SearchRejectReasonPageProps) {
}
},
[
isDelegateAccessRestricted,
currentSearchHash,
clearSelectedTransactions,
selectedTransactionsForReject,
allPolicies,
allReports,
route.name,
selectedTransactionsForReject,
isDelegateAccessRestricted,
currentUserAccountID,
showDelegateNoAccessModal,
currentUserLogin,
betas,
route.name,
showDelegateNoAccessModal,
clearSelectedTransactions,
],
);

Expand Down
Loading