fix: prevent self approvals by lakchote · Pull Request #56944 · Expensify/App

lakchote · 2025-02-17T14:29:58Z

Explanation of Change

In #55740, we've implemented a mechanism for "Prevent Self Approvals" (locking the toggle for this setting based on conditions, showing a modal) that we need to remove.

Since by default, the initial workflow has Everyone that submits to an approver, we won't be able to prevent self approvals by locking the toggle.
We should keep the existing mechanism in place in NewDot that prevents self approvals.

Video test

Screen.Recording.2025-02-28.at.11.51.09.mov

Fixed Issues

$ #56645

Tests

Verify that no errors appear in the JS console

Prerequisites:

Control workspace with two members( admin and employee), we'll call them User A and User B respectively
Workflow and Rules are enabled
A report where you self-approve

Test

Sign in as the workspace owner
Go to Workspace > Rules
Toggle "Prevent Self Approvals" ON.
No modal should show
Go to a report you've submitted
You should not be able to approve your own report, the Submit action should be disabled

QA Steps

Verify that no errors appear in the JS console

Same as in tests

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2025-02-28.at.11.51.09.mov

MacOS: Desktop

melvin-bot · 2025-02-28T11:10:39Z

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

allroundexperts · 2025-03-03T14:02:52Z

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 on Android

Android: mWeb Chrome

Screen.Recording.2025-03-04.at.1.25.04.PM.mov

iOS: Native

Screen.Recording.2025-03-04.at.1.21.14.PM.mov

iOS: mWeb Safari

Screen.Recording.2025-03-04.at.1.18.18.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2025-03-04.at.1.02.30.PM.mov

MacOS: Desktop

Screen.Recording.2025-03-04.at.1.14.37.PM.mov

allroundexperts · 2025-03-04T08:29:30Z

BUG

When offline, although the submit button is disabled, the message below the button does not update optimistically.

Screen.Recording.2025-03-04.at.1.28.42.PM.mov

lakchote · 2025-03-06T10:32:50Z

@allroundexperts ready for another round of review.

This bug you've reported is preexisting from the Prevent Self Approval feature that was done in #47468.

I've formulated a solution to it, if you can think of any better way of doing it, feel free to le met know. Thanks!

allroundexperts

Works good!

melvin-bot · 2025-03-07T07:05:38Z

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

amyevans

Code looks good so I'll approve! Just 2 nitpicks on the QA/tests:

Control workspace with three members( admin and employee), we'll call them User A and User B respectively

~~three~~ two

Go to a report where you

Let's finish the sentence 😄

Feel free to self-merge once they're updated!

lakchote · 2025-03-10T07:37:15Z

Code looks good so I'll approve! Just 2 nitpicks on the QA/tests:

Control workspace with three members( admin and employee), we'll call them User A and User B respectively

~~three~~ two

Go to a report where you

Let's finish the sentence 😄

Feel free to self-merge once they're updated!

Oops, I've updated the QA steps and forgot some things along the way 😅 Thanks for noticing! I've modified it

OSBotify · 2025-03-10T14:10:40Z

✋ 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-03-10T21:35:22Z

🚀 Deployed to staging by https://github.com/lakchote in version: 9.1.11-1 🚀

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

Beamanator · 2025-03-10T22:43:45Z

src/components/MoneyReportHeader.tsx

+    const optimisticNextStep = policy?.preventSelfApproval ? buildOptimisticNextStepForPreventSelfApprovalsEnabled() : nextStep;
+
+    const shouldShowNextStep = transactions?.length !== 0 && isFromPaidPolicy && !!optimisticNextStep?.message?.length && !shouldShowStatusBar;


Hmm shouldn't we only be doing buildOptimisticNextStepForPreventSelfApprovalsEnabled if policy?.preventSelfApproval AND if the submitter is the next receiver?

More investigation in https://expensify.slack.com/archives/C06ML6X0W9L/p1741645160823569 - but yeah OldDot is correctly showing the next steps as "Waiting for to approve expenses" b/c I'm not submitting to myself 😬 I thinkkkkk i can put up a quick fix

created #58128 to fix

github-actions · 2025-03-14T01:06:11Z

🚀 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 ❌

lakchote added 2 commits February 17, 2025 15:23

fix logic

6196ec2

fix logic in case of default approval workflow

e87f5c8

lakchote self-assigned this Feb 17, 2025

lakchote added 2 commits February 17, 2025 15:30

fix style

fadca21

fix lint

3678a1e

lakchote mentioned this pull request Feb 17, 2025

[SIBTAIN - WAITING ON CHECKLIST][Due for payment 2025-03-21] A modal is not triggered when a member is their Own Approver #56645

Closed

8 tasks

lakchote added 21 commits February 19, 2025 16:01

improve wording

6135637

improve logic for self approvals

ec34253

update logic for self approvals

22453bc

fix style

49eac2d

Merge branch 'main' into lucien/fix-prevent-self-approvals

e9b7d25

fix lint

2453425

fix lint

120d6e0

fix prettier

8ed72e6

fix lint

4505667

Merge branch 'main' into lucien/fix-prevent-self-approvals

5fdfdd6

handle prevent self approvals

acca957

add keys for workflows prevent self approvals

1d4c2a1

fix style

c68f19f

fix lint

32a9de8

update error for self approvals in workflows

bb38640

fix edge case

646267d

fix prettier

c925640

remove unneeded method

fa56af6

revert changes related to prevent self approvals

80049d2

remove unneeded translations

972e5a5

remove new logic to keep previous logic

31f24c7

lakchote marked this pull request as ready for review February 28, 2025 11:10

lakchote requested a review from a team as a code owner February 28, 2025 11:10

melvin-bot bot requested a review from allroundexperts February 28, 2025 11:10

melvin-bot bot removed the request for review from a team February 28, 2025 11:10

lakchote added 7 commits March 6, 2025 09:26

create buildOptimisticNextStepForPreventSelfApprovalsEnabled()

a9c2023

use buildOptimisticNextStepForPreventSelfApprovalsEnabled()

2a0e776

fix style

3a92739

Merge branch 'main' into lucien/fix-prevent-self-approvals

d47518f

fix

8bc65f2

fix

f6adc07

fix style

7346dd3

Merge branch 'main' into lucien/fix-prevent-self-approvals

920eb3d

allroundexperts approved these changes Mar 7, 2025

View reviewed changes

melvin-bot bot requested a review from amyevans March 7, 2025 07:05

amyevans approved these changes Mar 7, 2025

View reviewed changes

lakchote merged commit 7bebd6b into main Mar 10, 2025
18 checks passed

lakchote deleted the lucien/fix-prevent-self-approvals branch March 10, 2025 07:37

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

Investigate workflow job failing on main: test / test (job 2) #58095

Closed

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

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

Closed

Beamanator reviewed Mar 10, 2025

View reviewed changes

		const optimisticNextStep = policy?.preventSelfApproval ? buildOptimisticNextStepForPreventSelfApprovalsEnabled() : nextStep;

		const shouldShowNextStep = transactions?.length !== 0 && isFromPaidPolicy && !!optimisticNextStep?.message?.length && !shouldShowStatusBar;

Conversation

lakchote commented Feb 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Feb 28, 2025

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

allroundexperts commented Mar 4, 2025

Uh oh!

lakchote commented Mar 6, 2025

Uh oh!

allroundexperts left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented Mar 7, 2025

Uh oh!

amyevans left a comment

Choose a reason for hiding this comment

Uh oh!

lakchote commented Mar 10, 2025

Uh oh!

Uh oh!

OSBotify commented Mar 10, 2025

Uh oh!

github-actions bot commented Mar 10, 2025

Uh oh!

Beamanator Mar 10, 2025

Choose a reason for hiding this comment

Uh oh!

Beamanator Mar 10, 2025

Choose a reason for hiding this comment

Uh oh!

Beamanator Mar 10, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Mar 14, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

lakchote commented Feb 17, 2025 •

edited

Loading

allroundexperts commented Mar 3, 2025 •

edited

Loading