fix: Submit button is shown for second admin when "Prevent self-approval" is enabled #76887

nkdengineer · 2025-12-06T14:24:11Z

Explanation of Change

fix: Submit button is shown for second admin when "Prevent self-approval" is enabled

Fixed Issues

$ #75159
PROPOSAL: #75159 (comment)

Tests

Current user is the submitter

[Owner] Go to a Control workspace
[Owner] Create a draft report
[Owner] Go to Rules > Enable "Prevent self-approvals"
[Owner] Go to the draft report
[Owner] Verify that the Submit button is grayed out on money report header
[Owner] Disable prevent self-approvals
[Owner] Go back to the report, submit it
[Owner] Enable prevent self-approvals again
[Owner] Go back to the report
[Owner] Verify that the Approve button is grayed out on money report header

Admin is not the submitter

[Owner] Invite another admin to the workspace
[Owner] Create a draft report
[Admin] Go to the Reports page
[Admin] Verify that the Submit button doesn't appear on the owner's draft report
[Admin] Verify that the Approve button doesn't appear on the owner's outstanding report

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]."

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2025-12-06.at.21.26.40.mov

Android: mWeb Chrome

Screen.Recording.2025-12-06.at.21.27.11.mov

iOS: Native

Screen.Recording.2025-12-06.at.21.27.49.mov

iOS: mWeb Safari

Screen.Recording.2025-12-06.at.21.28.14.mov

MacOS: Chrome / Safari

Screen.Recording.2025-12-06.at.21.22.39.mov

Screen.Recording.2025-12-06.at.21.25.03.mov

Screen.Recording.2025-12-06.at.21.30.45.mov

codecov · 2025-12-06T14:31:58Z

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines	Coverage Δ
src/libs/ReportPrimaryActionUtils.ts	`90.64% <100.00%> (+0.30%)`	⬆️
src/libs/SearchUIUtils.ts	`73.17% <100.00%> (+0.02%)`	⬆️
src/components/MoneyReportHeader.tsx	`0.16% <0.00%> (-0.01%)`	⬇️
... and 6 files with indirect coverage changes

melvin-bot · 2025-12-06T18:08:50Z

@aimane-chnaif 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]

melvin-bot · 2025-12-06T18:08:55Z

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

aimane-chnaif · 2025-12-08T17:30:37Z

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

Screen.Recording.2025-12-08.at.8.45.42.pm.mov

Android: mWeb Chrome

iOS: HybridApp

Screen.Recording.2025-12-08.at.8.27.44.pm.mov

iOS: mWeb Safari

Screen.Recording.2025-12-08.at.8.45.42.pm.mov

MacOS: Chrome / Safari

Screen.Recording.2025-12-08.at.8.27.44.pm.mov

aimane-chnaif · 2025-12-08T17:31:09Z

@nkdengineer can we add unit test as per #76887 (comment)?

joekaufmanexpensify

Changes make sense to me

nkdengineer · 2025-12-08T17:58:29Z

src/components/MoneyReportHeader.tsx

Not sure why the test decreased on MoneyReportHeader?

aimane-chnaif · 2025-12-08T18:00:25Z

There's no test case added for MoneyReportHeader file yet. I think we can ignore that comment.

nkdengineer · 2025-12-08T18:02:33Z

If so no other change is needed.

aimane-chnaif · 2025-12-08T19:04:00Z

Tests fixed on main. Merge main

aimane-chnaif · 2025-12-08T19:50:15Z

I am seeing Pay button on submitted expense for second admin. This happens on staging so not blocker.

aimane-chnaif

Looks good except job 8 failure

cristipaval · 2025-12-09T12:11:02Z

Is job 8 failing in main as well?

nkdengineer · 2025-12-09T13:54:30Z

Yes

nkdengineer · 2025-12-09T15:08:32Z

@cristipaval Fixed now.

OSBotify · 2025-12-09T18:00:38Z

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

OSBotify · 2025-12-10T22:06:50Z

🚀 Deployed to staging by https://github.com/cristipaval in version: 9.2.75-0 🚀

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

OSBotify · 2025-12-11T00:00:04Z

🚀 Deployed to staging by https://github.com/cristipaval in version: 9.2.75-0 🚀

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

This reverts commit b864dca, reversing changes made to b13a18b.

Revert "fix: Submit button is shown for second admin when "Prevent self-approval" is enabled #76887"

Revert "fix: Submit button is shown for second admin when "Prevent self-approval" is enabled #76887" (cherry picked from commit 584c9ad) (cherry-picked to staging by yuwenmemon)

OSBotify · 2025-12-12T19:01:57Z

🚀 Deployed to staging by https://github.com/cristipaval in version: 9.2.77-0 🚀

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

OSBotify · 2025-12-12T22:07:11Z

🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.2.77-1 🚀

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

OSBotify · 2025-12-12T22:28:35Z

🚀 Deployed to staging by https://github.com/cristipaval in version: 9.2.78-0 🚀

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

nkdengineer added 2 commits November 24, 2025 23:55

disable primary action button

d96d654

resolve conflict

09e065f

melvin-bot bot assigned nkdengineer Dec 6, 2025

nkdengineer changed the title ~~Fix/75159~~ fix: Submit button is shown for second admin when "Prevent self-approval" is enabled Dec 6, 2025

nkdengineer marked this pull request as ready for review December 6, 2025 18:08

nkdengineer requested review from a team as code owners December 6, 2025 18:08

melvin-bot bot requested review from aimane-chnaif and joekaufmanexpensify December 6, 2025 18:08

melvin-bot bot requested review from a team and cristipaval and removed request for a team December 6, 2025 18:08

melvin-bot bot removed the request for review from a team December 6, 2025 18:08

joekaufmanexpensify approved these changes Dec 8, 2025

View reviewed changes

Merge branch 'main' into fix/75159

0e90504

aimane-chnaif approved these changes Dec 8, 2025

View reviewed changes

cristipaval approved these changes Dec 9, 2025

View reviewed changes

Merge branch 'main' into fix/75159

674cf2b

cristipaval merged commit b864dca into Expensify:main Dec 9, 2025
29 checks passed

OSBotify mentioned this pull request Dec 10, 2025

Deploy Checklist: New Expensify 2025-12-10 #77285

Closed

94 tasks

jponikarchuk mentioned this pull request Dec 11, 2025

Expense - Approve button is not hidden or disabled when "Prevent self-approvals" is enabled #77367

Closed

8 tasks

yuwenmemon added a commit that referenced this pull request Dec 11, 2025

Revert "Merge pull request #76887 from nkdengineer/fix/75159"

e4f298d

This reverts commit b864dca, reversing changes made to b13a18b.

yuwenmemon mentioned this pull request Dec 11, 2025

Revert "fix: Submit button is shown for second admin when "Prevent self-approval" is enabled #76887" #77433

Merged

madmax330 added a commit that referenced this pull request Dec 11, 2025

Merge pull request #77433 from Expensify/revert-pr-76887

584c9ad

Revert "fix: Submit button is shown for second admin when "Prevent self-approval" is enabled #76887"

melvin-bot bot mentioned this pull request Dec 12, 2025

[Due for payment 2025-12-19] [$250] Reports - Submit button is shown for second admin when "Prevent self-approval" is enabled #75159

Open

8 tasks

fix: Submit button is shown for second admin when "Prevent self-approval" is enabled #76887

fix: Submit button is shown for second admin when "Prevent self-approval" is enabled #76887

Uh oh!

Conversation

nkdengineer commented Dec 6, 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!

codecov bot commented Dec 6, 2025 • edited by github-actions bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

melvin-bot bot commented Dec 6, 2025

Uh oh!

melvin-bot bot commented Dec 6, 2025

Uh oh!

aimane-chnaif commented Dec 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

aimane-chnaif commented Dec 8, 2025

Uh oh!

joekaufmanexpensify left a comment

Choose a reason for hiding this comment

Uh oh!

nkdengineer commented Dec 8, 2025

Uh oh!

aimane-chnaif commented Dec 8, 2025

Uh oh!

nkdengineer commented Dec 8, 2025

Uh oh!

aimane-chnaif commented Dec 8, 2025

Uh oh!

aimane-chnaif commented Dec 8, 2025

Uh oh!

aimane-chnaif left a comment • 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!

cristipaval commented Dec 9, 2025

Uh oh!

nkdengineer commented Dec 9, 2025

Uh oh!

nkdengineer commented Dec 9, 2025

Uh oh!

Uh oh!

OSBotify commented Dec 9, 2025

Uh oh!

OSBotify commented Dec 10, 2025

Uh oh!

OSBotify commented Dec 11, 2025

Uh oh!

OSBotify commented Dec 12, 2025

Uh oh!

OSBotify commented Dec 12, 2025

Uh oh!

OSBotify commented Dec 12, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

nkdengineer commented Dec 6, 2025 •

edited

Loading

codecov bot commented Dec 6, 2025 •

edited by github-actions bot

Loading

aimane-chnaif commented Dec 8, 2025 •

edited

Loading

aimane-chnaif left a comment •

edited

Loading