fix: rule approvers (category / tag) should be able to submit reports on workspaces with prevent self-approvals enabled by nkdengineer · Pull Request #58660 · Expensify/App

nkdengineer · 2025-03-18T17:27:22Z

Explanation of Change

Fixed Issues

$ #58254
PROPOSAL: #58254 (comment)

Tests

Invite two additional users to a workspace: Admin, Approver, Submitter.
Configure the workflow such that the submitter submits To the Approver forward to Submitter
Enable prevent self-approvals on the workspace
Enable delayed submission
Add the submitter user as the category approver for a category.
As the submitter create an expense and categorize it with that same category.
Verify that: The submit button should not be disabled.
Click on the submit button
It requires the approver to approve expense
Login to the approver account, approve the expense
Back to the submitter account, verify that It requires the admin to pay the expense

Verify that no errors appear in the JS console

Offline tests

Same as tests

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2025-03-19.at.21.41.01.mov

Android: mWeb Chrome

Screen.Recording.2025-03-19.at.21.42.48.mov

iOS: Native

Screen.Recording.2025-03-19.at.21.44.02.mov

iOS: mWeb Safari

Screen.Recording.2025-03-19.at.21.45.18.mov

MacOS: Chrome / Safari

Screen.Recording.2025-03-19.at.21.47.57.mov

MacOS: Desktop

Screen.Recording.2025-03-19.at.21.48.57.mov

melvin-bot · 2025-03-19T15:01:36Z

@DylanDylann 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]

nkdengineer · 2025-03-25T02:26:48Z

friendly bump @DylanDylann

DylanDylann · 2025-03-25T03:43:39Z

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 tests pass on all platforms & I tested again on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- 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 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 the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- 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.js 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
If 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.
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: Native

Screen.Recording.2025-04-03.at.15.28.18.mov

Android: mWeb Chrome

Screen.Recording.2025-04-03.at.15.30.05.mov

iOS: Native

Screen.Recording.2025-04-03.at.15.24.54.mov

iOS: mWeb Safari

Screen.Recording.2025-04-03.at.15.18.28.mov

MacOS: Chrome / Safari

Screen.Recording.2025-04-03.at.15.15.46.mov

MacOS: Desktop

Screen.Recording.2025-04-03.at.15.21.37.mov

DylanDylann · 2025-03-25T04:50:59Z

Bug (Out of scope): The optimistic action on the next step is wrong

Enable manual submission
Go offline
Create a request
The action on next step should be submit instead of fix the issue

Screen.Recording.2025-03-25.at.11.44.55.mov

Solution:

App/src/libs/actions/IOU.ts

Line 1671 in dc8eb79

    
           value: buildNextStep(iou.report, iou.report.statusNum ?? CONST.REPORT.STATE_NUM.OPEN, true),

            const shouldFixViolations = Array.isArray(violationsOnyxData.value) && violationsOnyxData.value.length > 0;
............
 value: buildNextStep(iou.report, iou.report.statusNum ?? CONST.REPORT.STATE_NUM.OPEN, shouldFixViolations),

@nkdengineer Let's address it here

DylanDylann · 2025-03-25T05:14:04Z

@nkdengineer Please update the test step to verfiy all changes here

Invite two additional users to a workspace: Admin, Approver, Submitter.
Configure the workflow such that the submitter submits To the Approver forward to Submitter
Enable prevent self-approvals on the workspace
Enable delayed submission
Add the submitter user as the category approver for a category.
As the submitter create an expense and categorize it with that same category.
Observe the disabled submit button on the open report.
Verify that: The submit button should not be disabled.
Click on the submit button
It requires the approver to approve expense
login to the approver account, approve the expense
Back to the submitter account, verify that It requires the admin to pay the expense

nkdengineer · 2025-03-26T09:31:41Z

Thanks for your review @DylanDylann. I updated and tested it well. Please check agian

Co-authored-by: DylanDylann <141406735+DylanDylann@users.noreply.github.com>

DylanDylann · 2025-04-02T11:08:49Z

@nkdengineer Failed test

nkdengineer · 2025-04-03T08:08:17Z

@DylanDylann It's fixed now.

DylanDylann

LGTM 💯

DylanDylann · 2025-04-07T18:59:57Z

@Beamanator Kindly bump

Beamanator · 2025-04-08T09:06:43Z

Looking!

Beamanator

Looking great! Thanks for the fix!

OSBotify · 2025-04-08T09:21:41Z

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

github-actions · 2025-04-09T04:40:12Z

🚀 Deployed to staging by https://github.com/Beamanator in version: 9.1.25-0 🚀

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

github-actions · 2025-04-10T00:56:01Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 9.1.25-4 🚀

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

ShridharGoel · 2026-01-29T19:53:23Z

+    if (ruleApprovers.length > 0 && ruleApprovers.at(0) === employeeLogin && policy?.preventSelfApproval) {
+        ruleApprovers.shift();
+    }


Coming from #78928, this logic did not work well when preventSelfApproval is false. In getApprovalChain , we always remove the rule approver if the approver is also the submitter and same had to be done here.

nkdengineer added 2 commits March 17, 2025 12:23

fix getSubmitToAccountID bug

c8595b0

Merge branch 'main' into fix/58254

4fa7e99

nkdengineer marked this pull request as ready for review March 19, 2025 15:01

nkdengineer requested a review from a team as a code owner March 19, 2025 15:01

melvin-bot Bot requested review from DylanDylann and removed request for a team March 19, 2025 15:01

Merge branch 'main' into fix/58254

c83ba2a

DylanDylann reviewed Mar 25, 2025

View reviewed changes

Comment thread src/libs/PolicyUtils.ts Outdated

nkdengineer added 2 commits March 26, 2025 14:56

Merge branch 'main' into fix/58254

821b6e3

remove useless code and add test

4b5a6ae

DylanDylann reviewed Mar 27, 2025

View reviewed changes

Comment thread src/libs/PolicyUtils.ts Outdated

Comment thread src/libs/actions/IOU.ts Outdated

nkdengineer and others added 5 commits March 27, 2025 11:36

Update src/libs/PolicyUtils.ts

f612136

Co-authored-by: DylanDylann <141406735+DylanDylann@users.noreply.github.com>

Update src/libs/actions/IOU.ts

7f3c83f

Co-authored-by: DylanDylann <141406735+DylanDylann@users.noreply.github.com>

Merge branch 'main' into fix/58254

426ba0c

fix prettier

b1cf8cd

Merge branch 'main' into fix/58254

e6e7579

nkdengineer added 2 commits April 2, 2025 18:09

Merge branch 'main' into fix/58254

0683f0c

Merge branch 'main' into fix/58254

6155d14

DylanDylann approved these changes Apr 3, 2025

View reviewed changes

melvin-bot Bot requested a review from Beamanator April 3, 2025 08:30

Beamanator approved these changes Apr 8, 2025

View reviewed changes

Beamanator merged commit 4a32417 into Expensify:main Apr 8, 2025

github-actions Bot mentioned this pull request Apr 9, 2025

Deploy Checklist: New Expensify 2025-04-09 #59866

Closed

66 tasks

IuliiaHerets mentioned this pull request Apr 9, 2025

Expense - Approve button appears even when Prevent Self Approval is enabled #59901

Closed

8 tasks

melvin-bot Bot mentioned this pull request Apr 10, 2025

[Due for payment 2025-04-17] Rule approvers (category / tag) should be able to submit reports on workspaces with prevent self-approvals enabled #58254

Closed

8 tasks

ShridharGoel reviewed Jan 29, 2026

View reviewed changes

Conversation

nkdengineer commented Mar 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Mar 19, 2025

Uh oh!

nkdengineer commented Mar 25, 2025

Uh oh!

DylanDylann commented Mar 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

DylanDylann commented Mar 25, 2025

Solution:

Uh oh!

DylanDylann commented Mar 25, 2025

Uh oh!

nkdengineer commented Mar 26, 2025

Uh oh!

Uh oh!

Uh oh!

DylanDylann commented Apr 2, 2025

Uh oh!

nkdengineer commented Apr 3, 2025

Uh oh!

DylanDylann left a comment

Choose a reason for hiding this comment

Uh oh!

DylanDylann commented Apr 7, 2025

Uh oh!

Beamanator commented Apr 8, 2025

Uh oh!

Beamanator left a comment

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Apr 8, 2025

Uh oh!

github-actions Bot commented Apr 9, 2025

Uh oh!

github-actions Bot commented Apr 10, 2025

Uh oh!

ShridharGoel Jan 29, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

nkdengineer commented Mar 18, 2025 •

edited

Loading

DylanDylann commented Mar 25, 2025 •

edited

Loading