diff --git a/src/libs/actions/Search.ts b/src/libs/actions/Search.ts index 6bddb52fa82a..98b340de2c2e 100644 --- a/src/libs/actions/Search.ts +++ b/src/libs/actions/Search.ts @@ -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'; @@ -984,6 +983,7 @@ function rejectMoneyRequestInBulk( policy: OnyxEntry, transactionIDs: string[], currentUserAccountIDParam: number, + currentUserLogin: string, betas: OnyxEntry, hash?: number, ) { @@ -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); @@ -1039,6 +1039,7 @@ function rejectMoneyRequestsOnSearch( allPolicies: OnyxCollection, allReports: OnyxCollection, currentUserAccountIDParam: number, + currentUserLogin: string, betas: OnyxEntry, ) { const transactionIDs = Object.keys(selectedTransactions); @@ -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) { diff --git a/src/pages/Search/SearchRejectReasonPage.tsx b/src/pages/Search/SearchRejectReasonPage.tsx index 34a05cdfb2da..ae747afe80fe 100644 --- a/src/pages/Search/SearchRejectReasonPage.tsx +++ b/src/pages/Search/SearchRejectReasonPage.tsx @@ -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) { @@ -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 { @@ -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, ], );