Disabling report fields for non admin when report is approved. by Tony-MK · Pull Request #61726 · Expensify/App

Tony-MK · 2025-05-08T18:50:50Z

Explanation of Change

Adding a condition to disable the report fields for non admins if the report is approved.

Fixed Issues

$ #57416
PROPOSAL: #57416 (comment)

Tests

[Admin] Create a workspace.
[Admin] Enable report fields and create any report field.
[Admin] Invite an employee to the workspace.
[Employee] Create and submit an expense.
[Employee] Open the expense report and verify that the report field is editable.
[Employee] Open the report details and verify that the report title is editable.
[Admin] Approve the expense.
[Admin] Verify that the report field is editable.
[Admin] Open the report details and verify that the report title is editable.
[Employee] Verify the report field is uneditable.
[Employee] Verify that the report title is uneditable.

Verify that no errors appear in the JS console

Offline tests

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

Same as tests

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

macOS.-.Chrome.mov

MacOS: Desktop

macOS.-.Desktop.mov

…t is approved and user is not the admin

melvin-bot · 2025-05-08T18:50:56Z

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

s77rt · 2025-05-09T01:18:19Z

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

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

s77rt · 2025-05-09T01:18:20Z

+    const isApproved = isReportApproved({report});
+    if (!isAdmin && isApproved) {
+        return true;
+    }
+
    return isTitleField ? !reportField?.deletable : !isAdmin && (isReportSettled || isReportClosed);


Can we rewrite this to include the title special case too? I'm not sure why we are solely relaying on reportField?.deletable. It may be helpful to check git blame to find what that condition is fixing

We need this condition because of this #35043 (comment).

@thienlnam (Assuming you are not an admin) If a report is approved, settled or closed. The title should not be modifiable regardless of its deletable field. Does that statement sound correct?

@Tony-MK Can you please update the PR based on the above statement being true? Something like:

if (!isAdmin && (isReportSettled || isReportClosed || isApproved)) { return true; } return isTitleField ? !reportField?.deletable : false;

Hey @s77rt, I was wondering if we should simplify it to:

return !isAdmin && (isReportSettled || isReportClosed || isApproved) || isTitleField && !reportField?.deletable;

Or Switch:

return isTitleField ? !reportField?.deletable : false;

For

return isTitleField && !reportField?.deletable

Making this in one line is often hard to read, let's actually make another if condition

if (!isAdmin && (isReportSettled || isReportClosed || isApproved)) { return true; } if (isTitleField) { return !reportField?.deletable; } return false;

Yeah that sounds correct

s77rt · 2025-05-12T17:52:37Z

@Tony-MK Can you please complete the checklist

trjExpensify · 2025-05-19T13:11:57Z

@Tony-MK, ETA on completing the checklist?

Tony-MK · 2025-05-19T13:19:47Z

Sorry for the delay. iOS: Native is the only platform I left with. I will be done in a few minutes.

…into fix/57416

Tony-MK · 2025-05-19T14:47:15Z

Apologies for the wait, @s77rt. I’ve completed the checklist, and I believe we're good to proceed.

OSBotify · 2025-05-22T11:06:54Z

✋ 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-05-23T19:30:25Z

🚀 Deployed to staging by https://github.com/inimaga in version: 9.1.51-0 🚀

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

github-actions · 2025-05-26T19:16:14Z

🚀 Deployed to production by https://github.com/arosiclair in version: 9.1.51-6 🚀

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

Tony-MK added 4 commits May 6, 2025 18:05

Disabling report field

9d99caa

updating isReportFieldDisabled function to disabled report when repor…

625fe4a

…t is approved and user is not the admin

Merge branch 'Expensify:main' into fix/57416

57b3e88

prettier...

ea8fc85

Tony-MK requested a review from a team as a code owner May 8, 2025 18:50

melvin-bot Bot requested review from s77rt and removed request for a team May 8, 2025 18:50

lint

3816b5b

s77rt reviewed May 9, 2025

View reviewed changes

Tony-MK added 3 commits May 11, 2025 10:13

Merge branch 'Expensify:main' into fix/57416

acccd4f

code readability

92a0970

lint

d5ced51

Merge branch 'Expensify:main' into fix/57416

a97213e

Tony-MK added 5 commits May 19, 2025 16:23

Merge branch 'Expensify:main' into fix/57416

4de6b95

removing deprecated function: getTransaction

f0bfcd2

removing unused import

bb413ba

Merge branch 'main' of https://github.com/Expensify/App into fix/57416

b0004a4

Merge branch 'fix/57416' of https://github.com/Tony-MK/Expensify-App …

ae3da8b

…into fix/57416

s77rt approved these changes May 19, 2025

View reviewed changes

melvin-bot Bot requested a review from inimaga May 19, 2025 15:12

inimaga approved these changes May 22, 2025

View reviewed changes

inimaga merged commit 8b762d3 into Expensify:main May 22, 2025

github-actions Bot mentioned this pull request May 23, 2025

Deploy Checklist: New Expensify 2025-05-23 #62662

Closed

BlameGPT mentioned this pull request May 25, 2025

Reports - Selecting the Approve filter, reports with pay action pending are shown #62750

Closed

3 of 8 tasks

melvin-bot Bot mentioned this pull request May 26, 2025

[Due for payment 2025-06-02] [$250] Members are able to edit the title of approved reports. #57416

Closed

3 of 8 tasks

Conversation

Tony-MK commented May 8, 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 May 8, 2025

Uh oh!

s77rt commented May 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

s77rt May 9, 2025

Choose a reason for hiding this comment

Uh oh!

Tony-MK May 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

Choose a reason for hiding this comment

Uh oh!

s77rt May 12, 2025

Choose a reason for hiding this comment

Uh oh!

Tony-MK May 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

Choose a reason for hiding this comment

Uh oh!

thienlnam May 12, 2025

Choose a reason for hiding this comment

Uh oh!

s77rt commented May 12, 2025

Uh oh!

trjExpensify commented May 19, 2025

Uh oh!

Tony-MK commented May 19, 2025

Uh oh!

Tony-MK commented May 19, 2025

Uh oh!

OSBotify commented May 22, 2025

Uh oh!

github-actions Bot commented May 23, 2025

Uh oh!

github-actions Bot commented May 26, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Tony-MK commented May 8, 2025 •

edited

Loading

s77rt commented May 9, 2025 •

edited

Loading

Tony-MK May 11, 2025 •

edited

Loading

s77rt May 11, 2025 •

edited

Loading

Tony-MK May 12, 2025 •

edited

Loading

s77rt May 12, 2025 •

edited

Loading