Skip to content

Align expense payment submenu labels with report header - #106781

Merged
NicolasBonet merged 2 commits into
mainfrom
claude-consistentPaymentSubmenus
Nov 16, 2026
Merged

NicolasBonet merged 2 commits into
mainfrom
claude-consistentPaymentSubmenus

Conversation

@MelvinBot

@MelvinBot MelvinBot commented Nov 12, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

Align expense payment submenu labels with the report header by omitting the redundant amount from the business-account and mark-as-paid options. The parent Pay amount and invoice category amounts remain unchanged.

Add regression coverage comparing header and selection payment labels and preserving invoice amounts.

Fixed Issues

$ #102490
PROPOSAL: #102490 (comment)

Tests

// TODO: The human co-author must fill out the tests you ran before marking this PR as "ready for review"
// Please describe what tests you performed that validates your changed worked.

  • Verify that no errors appear in the JS console

Offline tests

// TODO: The human co-author must fill out the offline tests before marking this PR as "ready for review".

QA Steps

Precondition: Workspace with Approvals and Payments enabled. The report-header Pay menu shows "Pay with business account" and "Mark as paid".

  1. Open New Expensify on staging.
  2. In that workspace chat, create at least two manual expenses.
  3. Open their expense report, submit it, and approve it.
  4. Confirm the report-header Pay button shows the report total, for example "Pay $50.00".
  5. Click the report-header Pay button.
  6. Verify the submenu options are "Pay with business account" and "Mark as paid".
  7. Select the expenses on the report.
  8. Click Pay on the floating menu.
  9. Verify that Pay action shows the same report total, for example "Pay $50.00".
  10. Open its submenu and verify the options are "Pay with business account" and "Mark as paid", the same labels as the report header.
  • Verify that no errors appear in the JS console

AI Tests

Formatting-check follow-up (2026-11-12):

  • Passed: npm run fmt; a second run produced no additional changes.
  • Passed: targeted lint for both PR files, npm run typecheck, and all 13 tests in the payment-options and settlement-button suites.
  • Passed: staged code review against the original PR parent (shallow history prevented resolving the main merge-base).
  • Incomplete: full lint (5-minute timeout), full Jest suite (5-minute timeout; no test failures reported before timeout), and Storybook smoke test (2-minute timeout).
  • Blocked: lint-changed and spell-changed timed out fetching main history. The repository now uses Oxfmt (npm run fmt), replacing the older Prettier command in the test matrix.
  • No browser verification for this follow-up: only test formatting changed, with no runtime changes.

Original implementation validation:

  • Passed: 59 targeted Jest tests across payment options, report selection actions, and settlement buttons, including two new regression tests.
  • Passed: full lint, TypeScript checks, spelling checks, and Storybook smoke test.
  • Full Jest suite exceeded the 20-minute limit without reporting a failure before timeout; full-suite validation remains incomplete.
  • Remaining checks: the Prettier script is no longer present; standalone formatter execution was unavailable. React Compiler check could not resolve its base reference. Translation dry-run could not start with the available tooling.
  • Web verification was partial: app access and workspace chat succeeded, but expense creation was blocked by dialog-targeting errors. Neither payment submenu was reached; manual verification remains required.
  • Contributor fork is available but not writable by MelvinBot, so this draft uses an upstream branch.

Contributor branch ownership

To move the branch to your fork:

git remote add upstream https://github.com/Expensify/App.git
git fetch upstream claude-consistentPaymentSubmenus
git checkout -b claude-consistentPaymentSubmenus upstream/claude-consistentPaymentSubmenus
git push -u origin claude-consistentPaymentSubmenus

You can then close this draft and open a replacement from your fork.

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 verified any copy / text that was added to the app 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)
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • 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)
  • 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 the PR adds or modifies the UI:
    • I asked an AI agent to review the changes for accessibility issues and addressed its findings.
    • I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
    • I verified all new/changed elements have meaningful accessible names and roles.
    • I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
  • 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

Web test setup blocker (not evidence of the payment submenu fix):

Expense creation blocked at the location-access dialog

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

Co-authored-by: Manan <mananjadhav@users.noreply.github.com>
@MelvinBot

MelvinBot commented Nov 12, 2026 •

Copy link
Copy Markdown
Contributor Author

🤖 Android test steps verification results: ⚠️ partial

Verified steps 1–10 on standalone Android NewDot: both Pay submenus show amount-free options, while selection Pay retains $30.00. Console-error verification was blocked by log-access restrictions; no functional failures were demonstrated.

Amount-free selection options beneath Pay total

Step Status
1. Open the Android appAuthenticated app screens confirmed.
✅
2. Navigate to workspace chatWorkspace expense chat opened successfully.
✅
3. Create two manual expensesCreated $12 and $18 expenses; both rows and $30 total confirmed.
Submitted report containing both manual expenses
✅
4. Open their reportOpened the report containing both expenses.
Submitted report containing both manual expenses
✅
5. Submit and approve expensesSubmission and approval confirmed; header displayed Pay $30.00.
Submitted report awaiting approval
Approved report with header payment options open
✅
6. Open header PayOpened the approved report’s Pay $30.00 menu.
Header Pay submenu
✅
7. Check header submenu labelsConfirmed “Pay with business account” and “Mark as paid”, without amounts.
Amount-free header payment options
✅
8. Select both expensesConfirmed “2 selected” and both checkboxes checked.
Both created expenses selected
✅
9. Open selection PayOpened Pay $30.00 through the native selection menu.
Native selection payment submenu
✅
10. Compare submenu labels and parent amountSelection options match the header without amounts; parent Pay retains $30.00.
Amount-free selection options beneath Pay total
✅
11. Verify no JS console errorsUnverified: captured application logs could not be inspected because of access restrictions.
⚠️

view run · view recording

Co-authored-by: Manan <mananjadhav@users.noreply.github.com>
@MelvinBot

Copy link
Copy Markdown
Contributor Author

Pushed 06471c3 to fix the Oxfmt failure—test formatting only, no runtime changes.

Passed locally: formatting, targeted lint, TypeScript, and 13 targeted tests. Broader checks timed out; limitations are recorded in the PR.

New CI results aren’t available yet. Independent approval still requires human review.


view run

@MelvinBot

MelvinBot commented Nov 12, 2026 •

Copy link
Copy Markdown
Contributor Author

🤖 Web test steps verification results: ⚠️ partial

Verified dev NewDot web and workspace-chat navigation, with approvals and payments configured. Expense creation was blocked by a location-access dialog whose controls the driver repeatedly reported as covered; payment-menu behavior remains unverified.

Location-access dialog blocking expense creation

Step Status
1. Open dev Web appAuthenticated app confirmed.
Authenticated dev Web workspace
✅
2. Navigate to workspace chatWorkspace expense chat and welcome message confirmed.
✅
3. Create at least two manual expensesBlocked before creation: the driver could not click “Not now” on the location-access dialog.
Location-access dialog blocking expense creation
❌
4. Open created expenses reportUnverified: expense creation blocked.
❌
5. Submit and approve expensesUnverified: expenses unavailable.
❌
6. Click report-header PayUnverified: approved report unavailable.
❌
7. Check header payment options omit amountsUnverified: header payment submenu not reached.
❌
8. Select created expensesUnverified: expenses unavailable.
❌
9. Click floating-menu PayUnverified: selection prerequisite unavailable.
❌
10. Compare submenu labels and parent amountUnverified: neither payment submenu was reached.
❌
11. Verify no JavaScript console errorsUnverified: console inspection was unavailable through the supported testing controls.
❌

view run · no recording available

@MelvinBot

Copy link
Copy Markdown
Contributor Author

⚠️ Something went wrong. This may be a transient issue. Try again. If it persists, check status.openai.com.

Run details

@mananjadhav

Copy link
Copy Markdown
Collaborator

@MelvinBot Rerun Web test steps verification

@MelvinBot

MelvinBot commented Nov 12, 2026 •

Copy link
Copy Markdown
Contributor Author

🤖 Web test steps verification results: ⚠️ partial

Verified the dev NewDot web app and opened the newly created workspace chat. Expense creation was blocked because the driver rejected clicks on the visible Create expense option as covered by a dialog; payment-menu behavior remains unverified.

Workspace expense chat with visible Create expense option rejected by driver coverage checks

Step Status
1. Open Web app on dev PR buildSigned-in dev app confirmed.
✅
2. Navigate to workspace chatWorkspace expense chat opened successfully.
✅
3. Create at least two manual expensesBlocked: selector and fresh-reference clicks on Create expense were rejected as covered by the dialog. No expenses were created.
Workspace expense chat with visible Create expense option rejected by driver coverage checks
❌
4. Open their reportNot reached because expense creation was blocked.
❌
5. Submit and approve expensesNot reached; expenses were unavailable, and Approvals and payments could not be confirmed enabled.
❌
6. Click report-header PayNot reached.
❌
7. Check header submenu labels omit amountsUnverified: no approved report was available.
❌
8. Select created expensesNot reached.
❌
9. Click floating-menu PayNot reached.
❌
10. Compare submenu labels and parent amountUnverified due to the expense-creation blocker.
❌
11. Verify no JS console errorsUnverified: console inspection was unavailable through the supported testing controls.
❌

view run · no recording available

@mananjadhav

Copy link
Copy Markdown
Collaborator

@MelvinBot Mark it ready for review.

@MelvinBot
MelvinBot marked this pull request as ready for review November 15, 2026 17:28
@MelvinBot
MelvinBot requested a review from a team as a code owner November 15, 2026 17:28
@MelvinBot

Copy link
Copy Markdown
Contributor Author

Marked Align expense payment submenu labels with report header ready for review.


view run

@expensify-chore-bot
expensify-chore-bot Bot requested review from mananjadhav and twisterdotcom and removed request for a team November 15, 2026 17:28
@expensify-chore-bot

Copy link
Copy Markdown

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

@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Nov 15, 2026 •

Copy link
Copy Markdown
Codex Review Summary: ✅ Completed

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-11-15T17:30:47.443148Z 06471c3 Draft marked ready
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@mananjadhav

Copy link
Copy Markdown
Collaborator

Code changes look fine. Working on the checklist now.

@mananjadhav

mananjadhav commented Nov 15, 2026 •

Copy link
Copy Markdown
Collaborator

QA Steps

Precondition: Workspace with Approvals and Payments enabled. The report-header Pay menu shows "Pay with business account" and "Mark as paid".

  1. Open New Expensify on staging.
  2. In that workspace chat, create at least two manual expenses.
  3. Open their expense report, submit it, and approve it.
  4. Confirm the report-header Pay button shows the report total, for example "Pay $50.00".
  5. Click the report-header Pay button.
  6. Verify the submenu options are "Pay with business account" and "Mark as paid".
  7. Select the expenses on the report.
  8. Click Pay on the floating menu.
  9. Verify that Pay action shows the same report total, for example "Pay $50.00".
  10. Open its submenu and verify the options are "Pay with business account" and "Mark as paid", the same labels as the report header.

Offline Steps

Same as the QA Steps.

@mananjadhav

Copy link
Copy Markdown
Collaborator

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
  • 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 any copy / text that was added to the app 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)
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • 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)
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately
    • 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
    • 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 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 the PR adds or modifies the UI:
    • I asked an AI agent to review the changes for accessibility issues and addressed its findings.
    • I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
    • I verified all new/changed elements have meaningful accessible names and roles.
    • I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
  • 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-pay-button.mov
Android: mWeb Chrome mweb-chrome-pay-button
iOS: HybridApp
ios-pay-button.mov
iOS: mWeb Safari
mweb-safari-pay-button.mov
MacOS: Chrome / Safari
web-pay-button.mov

@melvin-bot

melvin-bot Bot commented Nov 15, 2026

Copy link
Copy Markdown

We did not find an internal engineer to review this PR, trying to assign a random engineer to #102490 as well as to this PR... Please reach out for help on Slack if no one gets assigned!

@mananjadhav

Copy link
Copy Markdown
Collaborator

@NicolasBonet Can you help update the QA steps in the PR body.

@NicolasBonet NicolasBonet left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mananjadhav we need to fill the other parts of the pr description like offline tests

@mananjadhav

Copy link
Copy Markdown
Collaborator

@NicolasBonet The QA steps and Offline steps are the same. I've marked the comment to reflect that.

@NicolasBonet

Copy link
Copy Markdown
Contributor

@NicolasBonet The QA steps and Offline steps are the same. I've marked the comment to reflect that.

Let's mark the checkboxes accordingly to know what's missing, please

@mananjadhav

mananjadhav commented Nov 16, 2026 •

Copy link
Copy Markdown
Collaborator

@NicolasBonet This PR is from MelvinBot and we (C+ members) don't have the access to update the author checklist. Generally hence as C+ members we post our Reviewer Checklist and add the QA steps in a comment.

@NicolasBonet
NicolasBonet merged commit e1b3e30 into main Nov 16, 2026
47 of 50 checks passed
@NicolasBonet
NicolasBonet deleted the claude-consistentPaymentSubmenus branch November 16, 2026 18:45
@OSBotify

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

Copy link
Copy Markdown
Contributor

🚧 NicolasBonet has triggered a test Expensify/App build. You can view the workflow run here.

@github-actions

Copy link
Copy Markdown
Contributor

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/NicolasBonet in version: 9.5.40-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor Author

No help site update needed — this PR only removes redundant amounts from payment submenu labels, without changing the payment workflow or making any existing article sentence incorrect.


view run

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

Labels

Melvin-Test-Android Melvin-Test-Web Triggers Melvin to run the testing steps of the PR on web

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants