Allow selfApproval when the rule feature is disabled #55386

mkzie2 · 2025-01-17T07:24:07Z

Explanation of Change

Allow selfApproval when the rule feature is disabled

Fixed Issues

$ #54206
PROPOSAL: #54206 (comment)

Tests

Enable the workflow, approval
Enable rule feature and enable prevent selfApproval
Disable the rule feature
Go to the WS chat and create an expense
Verify that the admin can submit/approve the self-expense

Verify that no errors appear in the JS console

Offline tests

Same

QA Steps

Enable the workflow, approval
Enable rule feature and enable prevent selfApproval
Disable the rule feature
Go to the WS chat and create an expense
Verify that the admin can submit/approve the self expense

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2025-01-17.at.13.53.06.mov

Android: mWeb Chrome

Screen.Recording.2025-01-17.at.13.48.56.mov

iOS: Native

Screen.Recording.2025-01-17.at.14.16.02.mov

iOS: mWeb Safari

Screen.Recording.2025-01-17.at.13.50.48.mov

MacOS: Chrome / Safari

Screen.Recording.2025-01-17.at.13.41.40.mov

MacOS: Desktop

Screen.Recording.2025-01-17.at.14.19.07.mov

mkzie2 · 2025-01-17T07:30:09Z

@mountiny In this PR, FE allows the user to self-approve if the rule feature is disabled and policy.preventSelfApproval is true. But the backend still prevents it now; it returns the error You cannot approve your own report in this case. We need a small backend change to allow self-approval when the policy? areRulesEnabledisfalseevenpolicy.preventSelfApprovalistrue`.

melvin-bot · 2025-01-17T07:30:21Z

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

mountiny

Thanks! I am making change in the BE https://github.com/Expensify/Web-Expensify/pull/45169 that will make sure the preventSelfApproval value is reset to false when the rules feature is turned off.

Could you please make sure to update the optimisticData for the action that toggles the rules feature to reflect that. Can you please add unit tests for the action and for the isAllowedToApproveExpenseReport too?

mountiny · 2025-01-17T10:48:47Z

src/libs/ReportUtils.ts

+    if (!policy?.areRulesEnabled) {
+        return true;
+    }


I have made some backend changes where this will not be needed, actually this could lead to some older reports that never enabled or disabled the feature to skip this call because the default is false but they could have set the prevent self approval to true in OldDot

Suggested change

if (!policy?.areRulesEnabled) {

return true;

}

if (!policy?.areRulesEnabled) {

return true;

}

Oops, if we do that, doesn't that we should select TonyMK proposal?

Yeah we could have, we can give TonyMK partial reward for their proposal

Hey @mountiny, if there is no issue, could I raise a PR since my proposal initially addressed solving the root cause and @hungvu193 talked about this in his previous comment?

@Tony-MK I dont think that is needed, @mkzie2 already did 95% of the job

Ok, let me retest it 🤔

Let me test in staging.

@mountiny Tested in staging and it works well. cc @hungvu193 You can complete now.

@mountiny Still the same, preventSelfApproval is still true, we still need to keep this block of code

@hungvu193 Did you test with the staging server? I tested and it works well.

Screen.Recording.2025-01-22.at.22.28.23.mov

mkzie2 · 2025-01-19T13:52:42Z

Could you please make sure to update the optimisticData for the action that toggles the rules feature to reflect that. Can you please add unit tests for the action and for the isAllowedToApproveExpenseReport too?

Sure will give an update soon.

mkzie2 · 2025-01-20T04:59:31Z

@mountiny I updated the unit test.

mountiny

Thank you!

mountiny · 2025-01-21T22:52:26Z

src/libs/ReportUtils.ts

+    if (!policy?.areRulesEnabled) {
+        return true;
+    }


@Tony-MK I dont think that is needed, @mkzie2 already did 95% of the job

mountiny · 2025-01-21T23:01:49Z

@hungvu193 can you pleasse complete the testing and checklist?

hungvu193 · 2025-01-21T23:58:53Z

Sure. I'll do it today

tests/unit/ReportUtilsTest.ts

mountiny · 2025-01-22T18:59:20Z

@hungvu193 lets please complete the checklist now, thanks!

hungvu193 · 2025-01-22T23:51:15Z

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

ntandr.mov

Android: mWeb Chrome

mChrome.mov

iOS: Native

Screen.Recording.2025-01-22.at.15.23.51.mov

iOS: mWeb Safari

mSafari.mov

MacOS: Chrome / Safari

Chrome.mov

MacOS: Desktop

Desktop.mov

mountiny

Thank you!

mountiny · 2025-01-23T15:58:52Z

@mkzie2 sorry there are conflicts

mkzie2 · 2025-01-24T04:42:27Z

@mountiny The fix is done.

mountiny

Thanks!

OSBotify · 2025-01-24T22:04:25Z

✋ 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-01-28T02:16:13Z

🚀 Deployed to staging by https://github.com/mountiny in version: 9.0.90-0 🚀

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

github-actions · 2025-01-29T06:24:02Z

🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.0.90-6 🚀

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

allow selfApproval when the rule feature is disabled

9985f2e

mkzie2 marked this pull request as ready for review January 17, 2025 07:30

mkzie2 requested a review from a team as a code owner January 17, 2025 07:30

melvin-bot bot requested a review from hungvu193 January 17, 2025 07:30

melvin-bot bot removed the request for review from a team January 17, 2025 07:30

mountiny assigned mkzie2 Jan 17, 2025

mountiny requested changes Jan 17, 2025

View reviewed changes

mkzie2 added 4 commits January 20, 2025 11:14

Merge branch 'main' into mkzie2-issue/54206

44af4a3

add unit test

6163863

update the test

a127458

add test case when preventSelfApproval is false

8dd098b

mountiny previously approved these changes Jan 21, 2025

View reviewed changes

hungvu193 reviewed Jan 22, 2025

View reviewed changes

tests/unit/ReportUtilsTest.ts Outdated Show resolved Hide resolved

mkzie2 added 2 commits January 22, 2025 21:59

merge main

b7eadf1

remove change

ef61966

mkzie2 dismissed mountiny’s stale review via ef61966 January 22, 2025 15:00

hungvu193 approved these changes Jan 22, 2025

View reviewed changes

melvin-bot bot requested a review from mountiny January 22, 2025 23:51

mountiny previously approved these changes Jan 23, 2025

View reviewed changes

resolve conflict

191f844

mkzie2 dismissed mountiny’s stale review via 191f844 January 24, 2025 04:39

mountiny approved these changes Jan 24, 2025

View reviewed changes

mountiny merged commit 761d299 into Expensify:main Jan 24, 2025
17 checks passed

github-actions bot mentioned this pull request Jan 28, 2025

Deploy Checklist: New Expensify 2025-01-28 #55824

Closed

82 tasks

melvin-bot bot mentioned this pull request Jan 29, 2025

[HOLD for payment 2025-02-05] [$250] Rules - Disabling rules doesn't disable the prevent self approvals feature #54206

Closed

8 tasks

Tony-MK mentioned this pull request Mar 11, 2025

[$250] Reports - Expense can be submitted and approved when "Prevent self-approvals" is enabled #58210

Open

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow selfApproval when the rule feature is disabled #55386

Allow selfApproval when the rule feature is disabled #55386

mkzie2 commented Jan 17, 2025

mkzie2 commented Jan 17, 2025

melvin-bot bot commented Jan 17, 2025

mountiny left a comment

mountiny Jan 17, 2025

hungvu193 Jan 17, 2025 •

edited

Loading

mountiny Jan 17, 2025

Tony-MK Jan 19, 2025

mountiny Jan 21, 2025

hungvu193 Jan 22, 2025

mkzie2 Jan 22, 2025

mkzie2 Jan 22, 2025

hungvu193 Jan 22, 2025

mkzie2 Jan 22, 2025

mkzie2 commented Jan 19, 2025

mkzie2 commented Jan 20, 2025

mountiny left a comment

mountiny Jan 21, 2025

mountiny commented Jan 21, 2025

hungvu193 commented Jan 21, 2025

mountiny commented Jan 22, 2025

hungvu193 commented Jan 22, 2025

mountiny left a comment

mountiny commented Jan 23, 2025

mkzie2 commented Jan 24, 2025 •

edited

Loading

mountiny left a comment

OSBotify commented Jan 24, 2025

github-actions bot commented Jan 28, 2025

github-actions bot commented Jan 29, 2025

Allow selfApproval when the rule feature is disabled #55386

Allow selfApproval when the rule feature is disabled #55386

Conversation

mkzie2 commented Jan 17, 2025

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

mkzie2 commented Jan 17, 2025

melvin-bot bot commented Jan 17, 2025

mountiny left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hungvu193 Jan 17, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mkzie2 commented Jan 19, 2025

mkzie2 commented Jan 20, 2025

mountiny left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mountiny commented Jan 21, 2025

hungvu193 commented Jan 21, 2025

mountiny commented Jan 22, 2025

hungvu193 commented Jan 22, 2025

Reviewer Checklist

Screenshots/Videos

mountiny left a comment

Choose a reason for hiding this comment

mountiny commented Jan 23, 2025

mkzie2 commented Jan 24, 2025 • edited Loading

mountiny left a comment

Choose a reason for hiding this comment

OSBotify commented Jan 24, 2025

github-actions bot commented Jan 28, 2025

github-actions bot commented Jan 29, 2025

hungvu193 Jan 17, 2025 •

edited

Loading

mkzie2 commented Jan 24, 2025 •

edited

Loading