Skip to content

fix: do not display approve button in more menu for unsubmitted reports#65057

Merged
aldo-expensify merged 2 commits into
Expensify:mainfrom
linhvovan29546:fix/63137-not-display-approve-button-for-non-submit-report
Jul 1, 2025
Merged

fix: do not display approve button in more menu for unsubmitted reports#65057
aldo-expensify merged 2 commits into
Expensify:mainfrom
linhvovan29546:fix/63137-not-display-approve-button-for-non-submit-report

Conversation

@linhvovan29546

@linhvovan29546 linhvovan29546 commented Jun 27, 2025

Copy link
Copy Markdown
Contributor

Explanation of Change

This PR updates isApproveAction in getSecondaryReportActions to:

  • Not display the Approve button in the "More" menu for unsubmitted reports.
  • Move the calculation function to the correct position to avoid unnecessary calculations.

Fixed Issues

$ #63137
PROPOSAL: #63137 (comment)

Tests

Test: 1

  1. Open ND
  2. Create a workspace with:
  • Delay Submission: Manual
  • Approval enable
  • Payment enable
  1. Create expense and catch transactionID
  2. Open Report preview
  3. Run this code in console
Onyx.set(`transactionViolations_transactionID1`, [{
   type: 'warning',
   name: 'rter',
   data: {pendingPattern: true},
}]);
  1. Click More menu
  2. Verify that the Approve button is not dipslay

Test:2

  1. Open ND
  2. Create a workspace with:
  • Delay Submission: Manual
  • Approval enable
  • Payment enable
  1. Create expense and catch transactionID
  2. Open Report preview
  3. Run this code in console
Onyx.set(`transactionViolations_transactionID2`, [{
   type: 'warning',
   name: 'rter',
   data: {rterType: 'brokenCardConnection'},
}]);
  1. Click More menu
  2. Verify that the Approve button is not dipslay
  • Verify that no errors appear in the JS console

Offline tests

Same as test above

QA Steps

Precondition

  • Ensure you have an expense with an RTER violation, such as “Awaiting merge with card transaction” or “Receipt pending due to broken bank connection. Please resolve in...” and the expense has not been submitted.
  1. Open the expense preview
  2. Click More menu
  3. Verify that the Approve button is not displayed
  • 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
    • MacOS: Desktop
  • 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 verified there are no new alerts related to the canBeMissing param for useOnyx
  • 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 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

N/A. My Android app crashes when opening the Report preview (this also happens on the main branch), so I am unable to record a screenshot. Since this works on other platforms, I have skipped that step.

Android: mWeb Chrome Screenshot 2025-06-27 at 10 02 54
iOS: Native
Screen.Recording.2025-06-27.at.09.35.28.mov
iOS: mWeb Safari
Screen.Recording.2025-06-27.at.09.38.23.mov
MacOS: Chrome / Safari
Screen.Recording.2025-06-27.at.09.11.47.mov
MacOS: Desktop
Screen.Recording.2025-06-27.at.09.20.52.mov

@linhvovan29546

Copy link
Copy Markdown
Contributor Author

Note for reviewer: Since the condition in isApproveAction is based on isProcessingReport, I changed the function to return early. This avoids unnecessary calculations.

@linhvovan29546 linhvovan29546 marked this pull request as ready for review June 27, 2025 03:44
@linhvovan29546 linhvovan29546 requested a review from a team as a code owner June 27, 2025 03:44
@melvin-bot melvin-bot Bot requested review from ahmedGaber93 and removed request for a team June 27, 2025 03:44
@melvin-bot

melvin-bot Bot commented Jun 27, 2025

Copy link
Copy Markdown

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

@ahmedGaber93

ahmedGaber93 commented Jul 1, 2025

Copy link
Copy Markdown
Contributor

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
20250701095937359.mp4
MacOS: Desktop

@ahmedGaber93

Copy link
Copy Markdown
Contributor

Repeat step 6 to run console 'brokenCardConnection'

@linhvovan29546 there is no step 6 on your test steps 🙌

Also, both ONYX actions are the same {pendingPattern: true}, I think handle the test steps case by case looks more clean.

@linhvovan29546

Copy link
Copy Markdown
Contributor Author

@ahmedGaber93 I’ve split the test into two separate tests.

@ahmedGaber93

Copy link
Copy Markdown
Contributor

@linhvovan29546 Why create 2 expense? Isn't one enough?

Create 2 expense and catch transactionID

@linhvovan29546

Copy link
Copy Markdown
Contributor Author

You can compare two expenses with one expense. The UI and logic differ in this case, and the issue seems to occur only on two expenses.

@ahmedGaber93

ahmedGaber93 commented Jul 1, 2025

Copy link
Copy Markdown
Contributor

You must follow the steps outlined in the #63137 (comment), and it is important that all transactions have the violation 'Awaiting merge with card transaction' and we also need to test the case where a transaction has the violation 'brokenCardConnection'.

I think the issue OP doesn't mention any steps to have that violation, Let's rewrite it as precondition step

Precondition

  • You have an expense with rter violation, e.g. 'Awaiting merge with card transaction' or brokenCardConnection

@ahmedGaber93

Copy link
Copy Markdown
Contributor

You can compare two expenses with one expense. The UI and logic differ in this case, and the issue seems to occur only on two expenses.

Hmm! I will check while testing.

@ahmedGaber93

Copy link
Copy Markdown
Contributor

You can compare two expenses with one expense. The UI and logic differ in this case, and the issue seems to occur only on two expenses.

The issue occur with one expense with me on latest staging

20250701093712974.mp4

@linhvovan29546

Copy link
Copy Markdown
Contributor Author

Ah, I might have remembered incorrectly. I just tested with one expense, and this PR also fixes that issue.

@linhvovan29546

linhvovan29546 commented Jul 1, 2025

Copy link
Copy Markdown
Contributor Author

Why create 2 expense? Isn't one enough?

For the issue with brokenCardConnection, we need to create two expenses.

@linhvovan29546

Copy link
Copy Markdown
Contributor Author

I've updated the test, one expense is enough.

@ahmedGaber93

Copy link
Copy Markdown
Contributor

Screenshot 2025-07-01 at 10 01 23 AM

@linhvovan29546 Last thing

instead of 'Follow the steps outlined ....'
Add steps for QA like

  1. Open the expense preview
  2. Click More menu
  3. Verify that the Approve button is not displayed

@melvin-bot melvin-bot Bot requested a review from aldo-expensify July 1, 2025 07:16
@linhvovan29546

Copy link
Copy Markdown
Contributor Author

Thank you! I’ve updated it. Does everything look good now?

@aldo-expensify aldo-expensify merged commit 8a20764 into Expensify:main Jul 1, 2025
28 checks passed
@OSBotify

OSBotify commented Jul 1, 2025

Copy link
Copy Markdown
Contributor

✋ 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

github-actions Bot commented Jul 2, 2025

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/aldo-expensify in version: 9.1.74-2 🚀

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

@github-actions

github-actions Bot commented Jul 3, 2025

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/puneetlath in version: 9.1.74-10 🚀

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

@linhvovan29546 linhvovan29546 deleted the fix/63137-not-display-approve-button-for-non-submit-report branch July 16, 2025 10:59
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.

4 participants