[CP Staging] Fix "prevent self approval" showing too often by Beamanator · Pull Request #58129 · Expensify/App

Beamanator · 2025-03-10T23:32:55Z

Explanation of Change

In https://github.com/Expensify/App/pull/56944/files we started showing the "Prevent self approval" error too often, we need this to be hidden behind the below condition (see tests)

Fixed Issues

$ #58128

Tests

On a policy, enable workflows & approvals & rules
Next, in rules, set the "Prevent self approval" toggle on
Invite 1 more member
Log in as that other member in another tab, create an expense in the workspace chat
Verify that you do NOT see the "Oops! Looks like you’re submitting to yourself. Approving your own reports is forbidden by your policy. Please submit this report to someone else or contact your admin to change the person you submit to." message in the report header
As the policy creator, verify the same - that ^ is NOT shown in the report header

Next test:

Do the same, but as the invited member, make sure you DO submit to yourself (in the approval workflow)
Create an expense, and make sure you DO see the "Oops! Looks like you’re submitting to yourself. Approving your own reports is forbidden by your policy. Please submit this report to someone else or contact your admin to change the person you submit to." warning in the report header
Again, open the report as the policy owner and verify you do NOT see the ^ error message

Verify that no errors appear in the JS console

Offline tests

Same as above for submitter, but obviously not for the policy creator

QA Steps

Same as manual steps

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

#58129 (comment)

MacOS: Desktop

…self

melvin-bot · 2025-03-10T23:39:35Z

@akinwale @ One of you needs to 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]

Beamanator · 2025-03-10T23:39:53Z

as i mentioned in slack, i'll continue testing in the morning - but @allroundexperts if you could also test when you start tomorrow that would be great! 🙏

lakchote · 2025-03-11T06:38:31Z

Tests well 👍

Test 1

Screen.Recording.2025-03-11.at.07.34.08.mov

Test 2

Screen.Recording.2025-03-11.at.07.34.42.mov

lakchote

LGTM!

allroundexperts · 2025-03-11T06:57:58Z

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: 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 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
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.
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: Native

Unable to build android

Android: mWeb Chrome

Screen.Recording.2025-03-11.at.12.28.50.PM.mov

iOS: Native

Screen.Recording.2025-03-11.at.12.20.31.PM.mov

iOS: mWeb Safari

Screen.Recording.2025-03-11.at.12.17.27.PM.mov

Screen.Recording.2025-03-11.at.12.18.48.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2025-03-11.at.12.07.13.PM.mov

Screen.Recording.2025-03-11.at.12.09.18.PM.mov

MacOS: Desktop

Screen.Recording.2025-03-11.at.12.13.38.PM.mov

Screen.Recording.2025-03-11.at.12.15.24.PM.mov

allroundexperts

Tests well.

melvin-bot · 2025-03-11T07:31:01Z

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

lakchote · 2025-03-11T08:30:02Z

Pushed 1807c6f
to have the proper styling (see https://expensify.slack.com/archives/C06ML6X0W9L/p1741678664818709?thread_ts=1741645160.823569&cid=C06ML6X0W9L).

…tSelfApproval

OSBotify · 2025-03-11T09:26:44Z

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

[CP Staging] Fix "prevent self approval" showing too often (cherry picked from commit aef2182) (CP triggered by Beamanator)

github-actions · 2025-03-11T11:11:19Z

🚀 Cherry-picked to staging by https://github.com/Beamanator in version: 9.1.11-2 🚀

platform	result
🤖 android 🤖	cancelled 🔪
🖥 desktop 🖥	cancelled 🔪
🍎 iOS 🍎	cancelled 🔪
🕸 web 🕸	success ✅
🤖🔄 android HybridApp 🤖🔄	cancelled 🔪
🍎🔄 iOS HybridApp 🍎🔄	cancelled 🔪

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

Beamanator · 2025-03-11T11:53:08Z

Got successfully CP'd everywhere in 9.1.11-3 - #58171 (comment) 👍

github-actions · 2025-03-14T01:10:38Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.1.12-7 🚀

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

Beamanator added 2 commits March 11, 2025 01:27

Only show prevent self approval if next approver is submitter who is …

e8a1f9c

…self

Add new condition to change

d1a6ef7

Beamanator self-assigned this Mar 10, 2025

Beamanator requested a review from allroundexperts March 10, 2025 23:35

prettify

27768d1

Beamanator marked this pull request as ready for review March 10, 2025 23:39

Beamanator requested a review from a team as a code owner March 10, 2025 23:39

melvin-bot bot requested review from akinwale and removed request for a team March 10, 2025 23:39

lakchote self-requested a review March 11, 2025 06:11

lakchote changed the title ~~Fix "prevent self approval" showing too often~~ [CP Staging] Fix "prevent self approval" showing too often Mar 11, 2025

lakchote previously approved these changes Mar 11, 2025

View reviewed changes

MariaHCD mentioned this pull request Mar 11, 2025

android-expense-Expense details page shows header message in misalignment & cut off. #58166

Closed

8 tasks

allroundexperts approved these changes Mar 11, 2025

View reviewed changes

melvin-bot bot requested a review from MarioExpensify March 11, 2025 07:31

fix styling for prevent self approval

1807c6f

lakchote dismissed their stale review via 1807c6f March 11, 2025 08:28

Beamanator removed the request for review from akinwale March 11, 2025 09:00

Merge branch 'main' of github.com:Expensify/App into beaman-fixPreven…

a485521

…tSelfApproval

robertjchen approved these changes Mar 11, 2025

View reviewed changes

robertjchen merged commit aef2182 into main Mar 11, 2025
16 checks passed

robertjchen deleted the beaman-fixPreventSelfApproval branch March 11, 2025 09:18

OSBotify pushed a commit that referenced this pull request Mar 11, 2025

Merge pull request #58129 from Expensify/beaman-fixPreventSelfApproval

63f6242

[CP Staging] Fix "prevent self approval" showing too often (cherry picked from commit aef2182) (CP triggered by Beamanator)

github-actions bot added the CP Staging marks PRs that have been CP'd to staging label Mar 11, 2025

github-actions bot mentioned this pull request Mar 11, 2025

Deploy Checklist: New Expensify 2025-03-10 #58124

Closed

melvin-bot bot mentioned this pull request Mar 14, 2025

[Due for payment 2025-03-21] "Oops! Looks like you're submitting to yourself."... ALWAYS showing for reports on policies with policy?.preventSelfApproval === true #58128

Closed

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CP Staging] Fix "prevent self approval" showing too often#58129

[CP Staging] Fix "prevent self approval" showing too often#58129
robertjchen merged 5 commits intomainfrom
beaman-fixPreventSelfApproval

Beamanator commented Mar 10, 2025 •

edited

Loading

Uh oh!

melvin-bot bot commented Mar 10, 2025

Uh oh!

Beamanator commented Mar 10, 2025

Uh oh!

lakchote commented Mar 11, 2025

Uh oh!

lakchote left a comment

Uh oh!

allroundexperts commented Mar 11, 2025 •

edited

Loading

Uh oh!

allroundexperts left a comment

Uh oh!

melvin-bot bot commented Mar 11, 2025

Uh oh!

lakchote commented Mar 11, 2025

Uh oh!

Uh oh!

OSBotify commented Mar 11, 2025

Uh oh!

github-actions bot commented Mar 11, 2025

Uh oh!

Beamanator commented Mar 11, 2025

Uh oh!

github-actions bot commented Mar 14, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

Beamanator commented Mar 10, 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 10, 2025

Uh oh!

Beamanator commented Mar 10, 2025

Uh oh!

lakchote commented Mar 11, 2025

Uh oh!

lakchote left a comment

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

allroundexperts left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented Mar 11, 2025

Uh oh!

lakchote commented Mar 11, 2025

Uh oh!

Uh oh!

OSBotify commented Mar 11, 2025

Uh oh!

github-actions bot commented Mar 11, 2025

Uh oh!

Beamanator commented Mar 11, 2025

Uh oh!

github-actions bot commented Mar 14, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Beamanator commented Mar 10, 2025 •

edited

Loading

allroundexperts commented Mar 11, 2025 •

edited

Loading