[Change Approver] Add support to bypass approver on an expense report by parasharrajat · Pull Request #66899 · Expensify/App

parasharrajat · 2025-07-22T15:34:59Z

Explanation of Change

Desing doc: https://docs.google.com/document/d/1XKNwFO_-hDU9IUa9f8oWYpwMy5BltHSYDdmdvJigi40/edit?tab=t.0#heading=h.lf9ovssvs77q

Fixed Issues

$ #66193
PROPOSAL: As per design doc.

Tests

Prerequisites

Create a Control plan workspace.
Invite 3 non-admin members. A, B and C.
Enable workflows.
Assign one invited member as approver for the other two (not the owner).

Log in with both the member accounts (hereafter referred to as A and B) one by one and submit an expense report to the workspace.
Log in with the workspace Admin.
Go to each submitted expense Report.
Click More in the header button.
Verify that you see the Change Approver button.
Click the Change Approver button on the report from member A.
Verify that you are taken to the change approver screen and it shows Bypass Approver.
Select Bypass Approver and press save.
Verify that a new message stating Changed the approver @you is posted on the report by you.
Verify that you now see a button to approve the report on the header and can approve the report.

Verify that no errors appear in the JS console

Offline tests

Log in with both the member accounts (hereafter referred to as A and B) one by one and submit an expense report to the workspace.
Log in with the workspace Admin.
Go to each submitted expense Report.
Click More in the header button.
Verify that you see the Change Approver button.
Click the Change Approver button on the report from member A.
Verify that you are taken to the change approver screen and it shows Bypass Approver.
Go offline.
Select Bypass Approver and press save.
Verify that a new message stating Changed the approver @you is posted on the report by you.
Verify that you now see a button to approve the report on the header and can approve the report.
Go online.
Verify that changes in step 6 remain

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

12.08.2025_16.46.40_REC.mp4

Android: mWeb Chrome

12.08.2025_16.32.53_REC.mp4

iOS: Native

12.08.2025_16.43.01_REC.mp4

iOS: mWeb Safari

12.08.2025_16.35.53_REC.mp4

MacOS: Chrome / Safari

12.08.2025_16.20.34_REC.mp4

MacOS: Desktop

12.08.2025_16.25.09_REC.mp4

…ange-approver

melvin-bot · 2025-08-11T21:59:01Z

@shubham1206agra Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

parasharrajat · 2025-08-11T21:59:40Z

I will have the checklist completed tomorrow morning. Sorry about that.

src/pages/ReportChangeApproverPage.tsx

src/libs/actions/Report.ts

parasharrajat · 2025-08-12T08:36:18Z

Status is not updated immediately upon taking control. It requires refresh of report. @marcaaron

parasharrajat · 2025-08-12T09:42:33Z

@shubham1206agra What is the standard way to generate translations in all languages?

shubham1206agra · 2025-08-12T09:45:01Z

@shubham1206agra What is the standard way to generate translations in all languages?

I am using deepl.com to get reliable translations.

shubham1206agra · 2025-08-20T11:31:06Z

@parasharrajat Have you got this fixed #66899 (comment)?

parasharrajat · 2025-08-20T11:32:30Z

Yes, the issue was fixed. #66899 (comment) is an unrelated problem that I noticed in code so I raised on Slack.

shubham1206agra · 2025-08-20T11:38:29Z

src/libs/ReportSecondaryActionUtils.ts

+    // @todo we will remove checking whether current manager is admin in PR #68353
+    // When report manager is not the policy admin and current user is policy admin, allow changing the approver
+    if (
+        !isMemberPolicyAdmin(policy, getLoginByAccountID(report.managerID ?? CONST.DEFAULT_NUMBER_ID)) &&


@marcaaron @parasharrajat What should happen here if the self-approval is disabled and we try to switch approver to ourselves for my own expense report?

Totally fine to take control as long as you are admin.

Self approval prevention I think maybe does not apply to "Take Control" case. In any case, it's the admin who has control over this feature and can turn it off so I think that's maybe why we allow it. Not entirely sure, but that's how it works on OD today so we can keep it that way for ND.

Ideally, we'd limit the list of eligible approvers to remove the submitter if self-approvals is disabled.

@garrettmknight So what should we do here?

I don't think we have to do anything here on this PR for this. Bypass option is only applicable to admins who is not the manager themselves so self-approval concept does not apply in this case.

I don't think we have to do anything here on this PR for this. Bypass option is only applicable to admins who is not the manager themselves so self-approval concept does not apply in this case.

Self-approval will apply if the report we are approving is ours only. Logically, we should not allow them to change approver to self here. But we can leave it here for now.

I think we should follow up on this as a polish item. Let's get the core flow out.

shubham1206agra · 2025-08-20T11:54:38Z

src/types/onyx/OriginalMessage.ts

+ */
+type OriginalMessageTakeControl = {
+    /**  Whether the action was taken on newDot or oldDot */
+    isNewDot: boolean;


@parasharrajat Is this property really in use anywhere?

If not, @marcaaron can we stop sending this in payload?

It is coming from the backend, so I matched the data structure.

Good callout. I may have sent this unintentionally. I think if we are not referencing it in the App code (not sure why we would). Then it's fine to remove this.

I will remove that in the next PR.

marcaaron · 2025-08-20T21:58:40Z

Let's pull out the stops @shubham1206agra those last comments are not blockers so let's get this tested and merged!

parasharrajat · 2025-08-21T16:49:47Z

@shubham1206agra, please let me know if you have noticed any issues. Thanks.

shubham1206agra · 2025-08-21T16:52:21Z

@shubham1206agra, please let me know if you have noticed any issues. Thanks.

Yes

marcaaron · 2025-08-21T19:37:59Z

@shubham1206agra what's your ETA on the checklist?

shubham1206agra · 2025-08-22T15:41:26Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
I verified tests pass on all platforms & I tested again on:
- Android: HybridApp
- Android: mWeb Chrome
- iOS: HybridApp
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified there are no new alerts related to the canBeMissing param for useOnyx
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
xIf a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp

Screen.Recording.2025-08-22.at.9.07.20.PM.mov

Android: mWeb Chrome

Screen.Recording.2025-08-22.at.8.41.33.PM.mov

iOS: HybridApp

Screen.Recording.2025-08-22.at.9.01.07.PM.mov

iOS: mWeb Safari

Screen.Recording.2025-08-22.at.8.33.50.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2025-08-22.at.6.46.47.PM.mov

Screen.Recording.2025-08-22.at.6.56.46.PM.mov

MacOS: Desktop

Screen.Recording.2025-08-22.at.8.49.38.PM.mov

marcaaron · 2025-08-22T17:14:28Z

@parasharrajat can you fix the conflicts?

parasharrajat · 2025-08-22T17:21:22Z

On it.

shubham1206agra · 2025-08-22T17:24:13Z

@marcaaron I updated the manual test sheet to add some additional tests.

…ange-approver

parasharrajat · 2025-08-22T17:42:59Z

All set @marcaaron

OSBotify · 2025-08-22T18:44:42Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

OSBotify · 2025-08-26T11:19:20Z

🚀 Deployed to staging by https://github.com/marcaaron in version: 9.1.99-0 🚀

platform	result
🖥 desktop 🖥	success ✅
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

OSBotify · 2025-08-28T01:17:05Z

🚀 Deployed to production by https://github.com/thienlnam in version: 9.1.99-11 🚀

platform	result
🖥 desktop 🖥	success ✅
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

Pujan92 · 2025-11-25T13:35:54Z

src/pages/ReportChangeApproverPage.tsx

+                onSelectRow={(option) => setSelectedApproverType(option.keyForList)}
+                showConfirmButton
+                confirmButtonText={translate('iou.changeApprover.title')}
+                onConfirm={changeApprover}


We forgot to pass prop shouldUpdateFocusedIndex here which caused an issue

bernhardoj · 2025-12-17T03:30:49Z

src/libs/ReportSecondaryActionUtils.ts

+        !isMemberPolicyAdmin(policy, getLoginByAccountID(report.managerID ?? CONST.DEFAULT_NUMBER_ID)) &&
+        isExpenseReportUtils(report) &&
+        isProcessingReportUtils(report) &&
+        isPolicyAdmin(policy)


We forgot to check if the approval is enabled or not #76655.

parasharrajat added 11 commits June 14, 2025 01:00

Basic setup

c044bf6

Change approver main page

04c182b

Add change approver secondary action

4f00e01

App approver page and basic action

d1f20d6

Add add Approver page.

53f4c72

Update not found page logic

4b900d4

Revert Add approver changes for next PR

899f341

Merge branch 'main' of github.com:Expensify/App into parasharrajat/ch…

1780b3d

…ange-approver

Revert Add approver changes

5cd6f09

Fix issues

f0068aa

Remove Extra screen

07b222e

parasharrajat mentioned this pull request Jul 22, 2025

[Due for payment 2025-09-04] [Change Approver] Add support to bypass approver on an expense report #66193

Closed

parasharrajat added 5 commits August 12, 2025 01:55

Merge branch 'main' of github.com:Expensify/App into parasharrajat/ch…

0e5720b

…ange-approver

Navigation fixes

520b0e9

Enable bypass approver option only when manager is not admin

9418aca

Add Assign Report to me action

bfd9699

Add assignCurrentUserAsApprover action

42d3383

parasharrajat marked this pull request as ready for review August 11, 2025 21:58

parasharrajat requested a review from a team as a code owner August 11, 2025 21:58

melvin-bot bot requested a review from shubham1206agra August 11, 2025 21:59

melvin-bot bot removed the request for review from a team August 11, 2025 21:59

shubham1206agra reviewed Aug 12, 2025

View reviewed changes

src/pages/ReportChangeApproverPage.tsx Outdated Show resolved Hide resolved

parasharrajat commented Aug 12, 2025

View reviewed changes

src/libs/actions/Report.ts Outdated Show resolved Hide resolved

Update the Action preview

ff8538f

Fix spellings

cdb2188

shubham1206agra reviewed Aug 20, 2025

View reviewed changes

shubham1206agra approved these changes Aug 22, 2025

View reviewed changes

Merge branch 'main' of github.com:Expensify/App into parasharrajat/ch…

e5757a2

…ange-approver

marcaaron approved these changes Aug 22, 2025

View reviewed changes

marcaaron merged commit 91f5892 into Expensify:main Aug 22, 2025
20 checks passed

marcaaron mentioned this pull request Aug 23, 2025

[Due for payment 2025-09-19] [Change Approver] Add support to Assign approver to an expense report #66194

Closed

OSBotify mentioned this pull request Aug 26, 2025

Deploy Checklist: New Expensify 2025-08-26 #69233

Closed

mitarachim mentioned this pull request Aug 26, 2025

[Due for payment 2025-09-17] [Change Approver] Expense - No error above Change approver button when Bypass approvers is not selected #69247

Closed

8 tasks

jponikarchuk mentioned this pull request Aug 26, 2025

[Due for payment 2025-11-13] [Due for payment 2025-10-23] [$125] [Change Approver] Wrong next action message, missing Pay button after bypassing approver & approving offline #69249

Closed

8 tasks

vincdargento mentioned this pull request Aug 26, 2025

[No payment / project work] [Change Approver] Incorrect error message & system message remains after dismissing error #69277

Closed

8 tasks

mitarachim mentioned this pull request Aug 27, 2025

[$250] Expense-After changing approver, Hold option is missing in expense report but shown in Reports #69313

Closed

8 tasks

Pujan92 reviewed Nov 25, 2025

View reviewed changes

bernhardoj reviewed Dec 17, 2025

View reviewed changes

jponikarchuk mentioned this pull request Jan 5, 2026

[Due for payment 2026-01-29] [$250] Search - Email in system message is displayed as <mention-user accountID="x"/> #78840

Closed

7 tasks

alitoshmatov mentioned this pull request Feb 13, 2026

[Due for payment 2026-01-29] [$250] Change Approver dialog - make options explicit & skip when single option #77306

Closed

Conversation

parasharrajat commented Jul 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Prerequisites

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Aug 11, 2025

Uh oh!

parasharrajat commented Aug 11, 2025

Uh oh!

Uh oh!

Uh oh!

parasharrajat commented Aug 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

parasharrajat commented Aug 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

shubham1206agra commented Aug 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

shubham1206agra commented Aug 20, 2025

Uh oh!

parasharrajat commented Aug 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

marcaaron commented Aug 20, 2025

Uh oh!

parasharrajat commented Aug 21, 2025

Uh oh!

shubham1206agra commented Aug 21, 2025

Uh oh!

marcaaron commented Aug 21, 2025

Uh oh!

shubham1206agra commented Aug 22, 2025

Reviewer Checklist

Screenshots/Videos

Uh oh!

marcaaron commented Aug 22, 2025

Uh oh!

parasharrajat commented Aug 22, 2025

Uh oh!

shubham1206agra commented Aug 22, 2025

Uh oh!

parasharrajat commented Aug 22, 2025

Uh oh!

Uh oh!

OSBotify commented Aug 22, 2025

parasharrajat commented Jul 22, 2025 •

edited

Loading

parasharrajat commented Aug 12, 2025 •

edited

Loading

parasharrajat commented Aug 12, 2025 •

edited

Loading

shubham1206agra commented Aug 12, 2025 •

edited

Loading

parasharrajat commented Aug 20, 2025 •

edited

Loading