Fix wrong next action message, missing Pay button after bypassing approver & approving offline #72892
+565
−183
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Explanation of Change
This PR fixes an issue where admins who bypassed approvers using "Change approver" → "Bypass approvers" would see incorrect next step messages and missing Pay buttons when approving expense reports offline.
The root cause was that the
getApprovalChain
function inReportUtils.ts
calculated approval chains based on policy workflows, ignoring the current report state where an admin had become the manager by bypassing approvers. This causedisLastApprover
to returnfalse
instead oftrue
, leading to incorrect status predictions.The fix adds a check at the beginning of
getApprovalChain
to detect when the current user is the manager (indicating they bypassed approvers) and returns an approval chain containing only them, ensuring correct approval flow logic.Fixed Issues
$ #69249
#72726
#72742
PROPOSAL: #69249 (comment)
Tests
managerID
should match admin'saccountID
)Offline tests
QA Steps
Same as tests above. Additional QA considerations:
Test with multiple approvers in the chain before bypassing
Verify that no errors appear in the JS console
PR Author Checklist
### Fixed Issues
section aboveTests
sectionOffline steps
sectionQA steps
sectioncanBeMissing
param foruseOnyx
toggleReport
and notonIconClick
)src/languages/*
files and using the translation methodSTYLE.md
) were followedAvatar
, I verified the components usingAvatar
are working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
)npm run compress-svg
)Avatar
is modified, I verified thatAvatar
is working as expected in all cases)Design
label and/or tagged@Expensify/design
so the design team can review the changes.ScrollView
component to make it scrollable when more elements are added to the page.main
branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTest
steps.Screenshots/Videos
Android: Native
android-fix.mov
Android: mWeb Chrome
android-web.mp4
iOS: Native
ios.mov
iOS: mWeb Safari
ios.mov
MacOS: Chrome / Safari
after-web.mp4
MacOS: Desktop
desktop.mp4