Skip to content

Commit 7d896c1

Browse files
committed
Refactor bulk functions
1 parent 181f233 commit 7d896c1

2 files changed

Lines changed: 22 additions & 11 deletions

File tree

src/libs/actions/Search.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ import type {OnyxData} from '@src/types/onyx/Request';
7474
import type Nullable from '@src/types/utils/Nullable';
7575
import SafeString from '@src/utils/SafeString';
7676
import {setPersonalBankAccountContinueKYCOnSuccess} from './BankAccounts';
77-
import {getCurrentUserEmail} from './IOU';
7877
import {deleteMoneyRequest} from './IOU/DeleteMoneyRequest';
7978
import {prepareRejectMoneyRequestData, rejectMoneyRequest} from './IOU/RejectMoneyRequest';
8079
import type {RejectMoneyRequestData} from './IOU/RejectMoneyRequest';
@@ -993,6 +992,7 @@ function rejectMoneyRequestInBulk(
993992
policy: OnyxEntry<Policy>,
994993
transactionIDs: string[],
995994
currentUserAccountIDParam: number,
995+
currentUserLogin: string,
996996
betas: OnyxEntry<Beta[]>,
997997
hash?: number,
998998
) {
@@ -1013,7 +1013,7 @@ function rejectMoneyRequestInBulk(
10131013
}
10141014
> = {};
10151015
for (const transactionID of transactionIDs) {
1016-
const data = prepareRejectMoneyRequestData(transactionID, reportID, comment, policy, currentUserAccountIDParam, getCurrentUserEmail(), betas, undefined, true);
1016+
const data = prepareRejectMoneyRequestData(transactionID, reportID, comment, policy, currentUserAccountIDParam, currentUserLogin, betas, undefined, true);
10171017
if (data) {
10181018
optimisticData.push(...data.optimisticData);
10191019
successData.push(...data.successData);
@@ -1048,6 +1048,7 @@ function rejectMoneyRequestsOnSearch(
10481048
allPolicies: OnyxCollection<Policy>,
10491049
allReports: OnyxCollection<Report>,
10501050
currentUserAccountIDParam: number,
1051+
currentUserLogin: string,
10511052
betas: OnyxEntry<Beta[]>,
10521053
) {
10531054
const transactionIDs = Object.keys(selectedTransactions);
@@ -1081,12 +1082,12 @@ function rejectMoneyRequestsOnSearch(
10811082
const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`];
10821083
const isPolicyDelayedSubmissionEnabled = policy ? isDelayedSubmissionEnabled(policy) : false;
10831084
if (isPolicyDelayedSubmissionEnabled && areAllExpensesSelected) {
1084-
rejectMoneyRequestInBulk(reportID, comment, policy, selectedTransactionIDs, currentUserAccountIDParam, betas, hash);
1085+
rejectMoneyRequestInBulk(reportID, comment, policy, selectedTransactionIDs, currentUserAccountIDParam, currentUserLogin, betas, hash);
10851086
} else {
10861087
// Share a single destination ID across all rejections from the same source report
10871088
const sharedRejectedToReportID = generateReportID();
10881089
for (const transactionID of selectedTransactionIDs) {
1089-
rejectMoneyRequest(transactionID, reportID, comment, policy, currentUserAccountIDParam, getCurrentUserEmail(), betas, {sharedRejectedToReportID});
1090+
rejectMoneyRequest(transactionID, reportID, comment, policy, currentUserAccountIDParam, currentUserLogin, betas, {sharedRejectedToReportID});
10901091
}
10911092
}
10921093
if (isSingleReport && areAllExpensesSelected && !isPolicyDelayedSubmissionEnabled) {

src/pages/Search/SearchRejectReasonPage.tsx

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ function SearchRejectReasonPage({route}: SearchRejectReasonPageProps) {
3030
const {translate} = useLocalize();
3131

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

54-
const urlToNavigateBack = rejectMoneyRequestsOnSearch(currentSearchHash, selectedTransactionsForReject, comment, allPolicies, allReports, currentUserAccountID, betas);
54+
const urlToNavigateBack = rejectMoneyRequestsOnSearch(
55+
currentSearchHash,
56+
selectedTransactionsForReject,
57+
comment,
58+
allPolicies,
59+
allReports,
60+
currentUserAccountID,
61+
currentUserLogin,
62+
betas,
63+
);
5564
if (route.name === SCREENS.SEARCH.MONEY_REQUEST_REPORT_REJECT_TRANSACTIONS) {
5665
clearSelectedTransactions(true);
5766
} else {
@@ -63,16 +72,17 @@ function SearchRejectReasonPage({route}: SearchRejectReasonPageProps) {
6372
}
6473
},
6574
[
75+
isDelegateAccessRestricted,
6676
currentSearchHash,
67-
clearSelectedTransactions,
77+
selectedTransactionsForReject,
6878
allPolicies,
6979
allReports,
70-
route.name,
71-
selectedTransactionsForReject,
72-
isDelegateAccessRestricted,
7380
currentUserAccountID,
74-
showDelegateNoAccessModal,
81+
currentUserLogin,
7582
betas,
83+
route.name,
84+
showDelegateNoAccessModal,
85+
clearSelectedTransactions,
7686
],
7787
);
7888

0 commit comments

Comments
 (0)