Skip to content

Fix: unify optimistic managerID with API param in submitReport #84628

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
srikarparsi merged 8 commits into from
Apr 27, 2026
Merged

Fix: unify optimistic managerID with API param in submitReport #84628

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8b932f2
Fix: unify optimistic managerID with API param in submitReport
MelvinBot Mar 19, 2026
f09c3f5
Merge remote-tracking branch 'origin/main' into claude-unifySubmitRep…
MelvinBot Mar 23, 2026
6293d7d
Merge remote-tracking branch 'origin/main' into claude-unifySubmitRep…
MelvinBot Mar 30, 2026
ca0993b
Merge main and reapply managerID fix to ReportWorkflow.ts
MelvinBot Apr 17, 2026
eace1f6
Merge remote-tracking branch 'origin/main' into claude-unifySubmitRep…
MelvinBot Apr 20, 2026
e370fb2
Use explicit > 0 check instead of || for submitToAccountID fallback a…
MelvinBot Apr 23, 2026
205c488
Remove approval rules unit tests
MelvinBot Apr 23, 2026
b9feff0
Merge remote-tracking branch 'origin/main' into claude-unifySubmitRep…
MelvinBot Apr 26, 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
8 changes: 3 additions & 5 deletions src/libs/actions/IOU/ReportWorkflow.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import Navigation from '@libs/Navigation/Navigation';
import {getIsOffline} from '@libs/NetworkState';
// eslint-disable-next-line @typescript-eslint/no-deprecated
import {buildNextStepNew, buildOptimisticNextStep} from '@libs/NextStepUtils';
import {getAccountIDsByLogins} from '@libs/PersonalDetailsUtils';
import {arePaymentsEnabled, getSubmitToAccountID, hasDynamicExternalWorkflow, isPaidGroupPolicy, isPolicyAdmin, isSubmitAndClose} from '@libs/PolicyUtils';
import {getAllReportActions, getReportActionHtml, getReportActionText, hasPendingDEWApprove, isCreatedAction, isDeletedAction} from '@libs/ReportActionsUtils';
import {
Expand All @@ -30,7 +29,6 @@ import {
canBeAutoReimbursed,
canSubmitAndIsAwaitingForCurrentUser,
getAllHeldTransactions as getAllHeldTransactionsReportUtils,
getApprovalChain,
getMoneyRequestSpendBreakdown,
getNextApproverAccountID,
getReportOrDraftReport,
Expand Down Expand Up @@ -1298,8 +1296,8 @@ function submitReport({
isASAPSubmitBetaEnabled,
isUnapprove: true,
});
const approvalChain = getApprovalChain(policy, expenseReport);
const managerID = getAccountIDsByLogins(approvalChain).at(0);
const submitToAccountID = getSubmitToAccountID(policy, expenseReport);
const managerID = submitToAccountID > 0 ? submitToAccountID : expenseReport.managerID;

const optimisticData: Array<
OnyxUpdate<typeof ONYXKEYS.COLLECTION.REPORT_ACTIONS | typeof ONYXKEYS.COLLECTION.REPORT | typeof ONYXKEYS.COLLECTION.NEXT_STEP | typeof ONYXKEYS.COLLECTION.REPORT_METADATA>
Expand Down Expand Up @@ -1505,7 +1503,7 @@ function submitReport({

const parameters: SubmitReportParams = {
reportID: expenseReport.reportID,
managerAccountID: getSubmitToAccountID(policy, expenseReport) ?? expenseReport.managerID,
managerAccountID: managerID,
reportActionID: optimisticSubmittedReportAction.reportActionID,
};

Expand Down
Loading