Skip to content

Hide Hold option for submitters after first-level approval in multi-level workflows#85076

Draft
MelvinBot wants to merge 1 commit intomainfrom
claude-fixHoldOptionForApprovedExpense
Draft

Hide Hold option for submitters after first-level approval in multi-level workflows#85076
MelvinBot wants to merge 1 commit intomainfrom
claude-fixHoldOptionForApprovedExpense

Conversation

@MelvinBot
Copy link
Copy Markdown
Contributor

Explanation of Change

In multi-level approval workflows, after the first approver approves an expense and it is forwarded to the second approver, the submitter (action owner) could still see and use the Hold option when navigating via Reports > Expense > dropdown. The expense details view correctly hid Hold because isHoldActionForTransaction in ReportSecondaryActionUtils.ts includes an isAwaitingFirstLevelApproval guard. However, the Reports view goes through canHoldUnholdReportAction in ReportUtils.ts, which lacked this guard.

This adds an isAwaitingFirstLevelApproval check in canHoldUnholdReportAction so that when the action owner is viewing a submitted (processing) expense report that has been forwarded past the first approver, the Hold option is no longer available. IOU reports and non-submitter users (admins, approvers) are unaffected.

Fixed Issues

$ #83818
PROPOSAL: #83818 (comment)

Tests

  1. Create a control workspace with advanced approval set up with 2 approvers and an employee
  2. Login as the employee and submit an expense to Approver A (the first approver)
  3. Login as Approver A and approve the expense
  4. Login again as the employee
  5. Navigate to Reports > Expense > select the expense from step 2
  6. Click on the dropdown menu
  7. Verify that the Hold option is not available
  8. Verify that Hold still works correctly for expenses that have NOT been forwarded (only submitted to first approver)
  9. Verify that admins/approvers can still hold expenses in processing state
  • Verify that no errors appear in the JS console

Offline tests

N/A — Hold eligibility is determined from local Onyx state, no network dependency.

QA Steps

  1. Create a control workspace with advanced approval (2 approvers + employee)
  2. As the employee, submit an expense to Approver A
  3. As Approver A, approve the expense (it forwards to Approver B)
  4. As the employee, navigate to Reports > Expense > select the forwarded expense > click dropdown
  5. Verify Hold option is not shown
  6. Verify Hold option still appears for expenses awaiting first-level approval
  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (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
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • 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 followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • 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
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • 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 new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • 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.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user 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.

Screenshots/Videos

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari

In multi-level approval chains, once the report has been forwarded past
the first approver, the action owner (submitter) should no longer be
able to place expenses on hold. The expense details view already had
this guard via isHoldActionForTransaction, but the Reports view path
through canHoldUnholdReportAction was missing it.

Add isAwaitingFirstLevelApproval check in canHoldUnholdReportAction
so both code paths are consistent.

Co-authored-by: Chavda Sachin <ChavdaSachin@users.noreply.github.com>
@MelvinBot
Copy link
Copy Markdown
Contributor Author

The failing check is unrelated to this PR.

Analysis: The build (Debug, true) Android build failed due to a transient network timeout downloading a Gradle dependency (androidx.collection:collection-ktx:1.1.0) from Google's Maven repository. All 4 Gradle task failures (:react-native-plaid-link-sdk, :expo-video, :react-native-screens, :ua_react-native-airship) share the same root cause: Read timed out when fetching collection-ktx-1.1.0.jar.

Evidence: This PR only modifies TypeScript files in src/libs/ReportUtils.ts — it has no impact on Android native builds or Gradle dependency resolution. The error is a CI infrastructure networking issue.

Recommended action: Re-run the failed workflow. This should resolve itself on retry.

@ChavdaSachin
Copy link
Copy Markdown
Contributor

@MelvinBot please close this PR

@MelvinBot
Copy link
Copy Markdown
Contributor Author

I attempted to close this PR as requested, but I don't have permission to close PRs in this environment.

Please close it manually using the "Close pull request" button at the bottom of this page, or run:

gh pr close 85076 --repo Expensify/App

@ChavdaSachin
Copy link
Copy Markdown
Contributor

@MelvinBot please close the draft

@MelvinBot
Copy link
Copy Markdown
Contributor Author

🤖 I attempted to close this draft PR as requested, but I don't have the necessary permissions to close PRs in this environment.

ChavdaSachin — you can close this PR yourself by clicking the "Close pull request" button at the bottom of this page.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants