Skip to content

Commit 181f233

Browse files
committed
Pass currentUser data to rejectMoneyRequest
1 parent e4ce560 commit 181f233

3 files changed

Lines changed: 9 additions & 7 deletions

File tree

src/libs/actions/Search.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ 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';
7778
import {deleteMoneyRequest} from './IOU/DeleteMoneyRequest';
7879
import {prepareRejectMoneyRequestData, rejectMoneyRequest} from './IOU/RejectMoneyRequest';
7980
import type {RejectMoneyRequestData} from './IOU/RejectMoneyRequest';
@@ -1012,7 +1013,7 @@ function rejectMoneyRequestInBulk(
10121013
}
10131014
> = {};
10141015
for (const transactionID of transactionIDs) {
1015-
const data = prepareRejectMoneyRequestData(transactionID, reportID, comment, policy, currentUserAccountIDParam, betas, undefined, true);
1016+
const data = prepareRejectMoneyRequestData(transactionID, reportID, comment, policy, currentUserAccountIDParam, getCurrentUserEmail(), betas, undefined, true);
10161017
if (data) {
10171018
optimisticData.push(...data.optimisticData);
10181019
successData.push(...data.successData);
@@ -1085,7 +1086,7 @@ function rejectMoneyRequestsOnSearch(
10851086
// Share a single destination ID across all rejections from the same source report
10861087
const sharedRejectedToReportID = generateReportID();
10871088
for (const transactionID of selectedTransactionIDs) {
1088-
rejectMoneyRequest(transactionID, reportID, comment, policy, currentUserAccountIDParam, betas, {sharedRejectedToReportID});
1089+
rejectMoneyRequest(transactionID, reportID, comment, policy, currentUserAccountIDParam, getCurrentUserEmail(), betas, {sharedRejectedToReportID});
10891090
}
10901091
}
10911092
if (isSingleReport && areAllExpensesSelected && !isPolicyDelayedSubmissionEnabled) {

src/pages/iou/RejectReasonPage.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ function RejectReasonPage({route}: RejectReasonPageProps) {
3333
const [reportPolicyID] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(reportID)}`, {selector: getReportPolicyID});
3434
const policy = usePolicy(reportPolicyID);
3535
const {superWideRHPRouteKeys} = useWideRHPState();
36-
const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
36+
const {accountID: currentUserAccountID, email: currentUserLogin = ''} = useCurrentUserPersonalDetails();
3737
const [betas] = useOnyx(ONYXKEYS.BETAS);
3838
const {isDelegateAccessRestricted} = useDelegateNoAccessState();
3939
const {showDelegateNoAccessModal} = useDelegateNoAccessActions();
@@ -43,7 +43,7 @@ function RejectReasonPage({route}: RejectReasonPageProps) {
4343
return;
4444
}
4545

46-
const urlToNavigateBack = rejectMoneyRequest(transactionID, reportID, values.comment, policy, currentUserAccountID, betas);
46+
const urlToNavigateBack = rejectMoneyRequest(transactionID, reportID, values.comment, policy, currentUserAccountID, currentUserLogin, betas);
4747
removeTransaction(transactionID);
4848
// If the super wide rhp is not opened, dismiss the entire modal.
4949
if (superWideRHPRouteKeys.length > 0) {

tests/actions/IOUTest/RejectMoneyRequestTest.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ describe('actions/IOU/RejectMoneyRequest', () => {
8888
let transaction: OnyxEntry<Transaction>;
8989
let policy: OnyxEntry<Policy>;
9090
const TEST_USER_ACCOUNT_ID = 1;
91+
const TEST_USER_EMAIL = 'test@email.com';
9192
const MANAGER_ACCOUNT_ID = 2;
9293
const ADMIN_ACCOUNT_ID = 3;
9394

@@ -149,7 +150,7 @@ describe('actions/IOU/RejectMoneyRequest', () => {
149150
if (!transaction?.transactionID || !iouReport?.reportID) {
150151
throw new Error('Required transaction or report data is missing');
151152
}
152-
const result = rejectMoneyRequest(transaction.transactionID, iouReport.reportID, comment, policy, TEST_USER_ACCOUNT_ID, [CONST.BETAS.ALL]);
153+
const result = rejectMoneyRequest(transaction.transactionID, iouReport.reportID, comment, policy, TEST_USER_ACCOUNT_ID, TEST_USER_EMAIL, [CONST.BETAS.ALL]);
153154

154155
// Then: Should return navigation route to chat report
155156
expect(result).toBe(ROUTES.REPORT_WITH_ID.getRoute(iouReport.reportID));
@@ -165,7 +166,7 @@ describe('actions/IOU/RejectMoneyRequest', () => {
165166
if (!transaction?.transactionID || !iouReport?.reportID) {
166167
throw new Error('Required transaction or report data is missing');
167168
}
168-
rejectMoneyRequest(transaction.transactionID, iouReport.reportID, comment, policy, TEST_USER_ACCOUNT_ID, [CONST.BETAS.ALL]);
169+
rejectMoneyRequest(transaction.transactionID, iouReport.reportID, comment, policy, TEST_USER_ACCOUNT_ID, TEST_USER_EMAIL, [CONST.BETAS.ALL]);
169170
await waitForBatchedUpdates();
170171

171172
// Then: Verify violation is added
@@ -221,7 +222,7 @@ describe('actions/IOU/RejectMoneyRequest', () => {
221222
if (!transaction?.transactionID || !iouReport?.reportID) {
222223
throw new Error('Required transaction or report data is missing');
223224
}
224-
rejectMoneyRequest(transaction.transactionID, iouReport.reportID, comment, policy, TEST_USER_ACCOUNT_ID, [CONST.BETAS.ALL]);
225+
rejectMoneyRequest(transaction.transactionID, iouReport.reportID, comment, policy, TEST_USER_ACCOUNT_ID, TEST_USER_EMAIL, [CONST.BETAS.ALL]);
225226
await waitForBatchedUpdates();
226227

227228
// Then: createdIOUReportActionID shouldn't be undefined

0 commit comments

Comments
 (0)