Repository navigation
Clarify Approval Options When Held Expenses Exist On Spend Page - #100930
Conversation
|
Test fail is unrelated |
|
@mkzie2 Please ping me when this is ready. |
|
@parasharrajat 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] |
|
@parasharrajat PR is ready. Note that the approve button on spend page only shows on large screens so mobile screenshots is not applicable |
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
| currentUserDetails.login ?? '', | ||
| currentUserDetails.accountID, | ||
| // `undefined` (not the row's transactions) matches ApprovePrimaryAction, so Spend and the report header | ||
| // derive shouldShowPayButton — and therefore the displayed approval amounts — identically. |
There was a problem hiding this comment.
❌ CONSISTENCY-15 (docs)
This newly added comment uses em dashes in its own prose, which the plain-comment-style rule flags. Comments should read like plain, natural sentences without em/en dashes.
Rewrite without the em dashes, e.g.:
// derive shouldShowPayButton (and therefore the displayed approval amounts) identically.or split into two sentences that avoid the dashes entirely.
Reviewed at: be270a8 | Please rate this suggestion with 👍 or 👎 to help us improve! Reactions are used to monitor reviewer efficiency.
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: be270a8def
ℹ️ About Codex in GitHub
Codex has been enabled to automatically 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".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
|
Friendly bump @parasharrajat |
|
@parasharrajat Friendly bump for review, let's get this PR merged soon 💪 |
|
Thanks for waiting. I was not working last week. I will get on it soon. |
|
@MelvinBot review this PR. |
|
@mkzie2 Can you please respond to all bot review comments? |
PR reviewThe approach works: Search now uses the same approve dropdown as the report header, and the hold-menu amount fix is safe. I found one regression to fix before merge, plus a few smaller cleanups. I reviewed the code only and did not run the app. Should fix1. Single-expense rows can approve a held expense in full with no prompt. A related case: when only some of a report's transactions are in live Onyx (for example, the user opened one expense earlier), the hook uses the partial live list instead of the snapshot. That can also hide a held expense. Worth addressing2. Approval now uses the snapshot policy, not the live policy. 3. The APPROVE branch in Cleanup
What checks out
|
|
Other than this it looks good. |
|
@parasharrajat I updated 👍 |
|
@parasharrajat Friendly bump |
|
I was on leave last week. Will check tomorrow. |
parasharrajat
left a comment
parasharrajat
left a comment
There was a problem hiding this comment.
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 Issuessection 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
Testssection - I verified the steps for Staging and/or Production testing are in the
QA stepssection - 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 verified the steps for local testing are in the
- 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 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.
toggleReportand notonIconClick). - 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 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 that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e.
- 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 usingAvatarhave 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 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
thisproperly so there are no scoping issues (i.e. foronClick={this.submit}the methodthis.submitshould be bound tothisin the constructor) - Any internal methods bound to
thisare necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);ifthis.submitis never passed to a component event handler likeonClick) - 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
Avataris modified, I verified thatAvataris 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
Designlabel and/or tagged@Expensify/designso the design team can review the changes.
- 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
mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps. - I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.
Screenshots
🔲 iOS / native
16.10.2026_23.43.14_REC.mp4
🔲 iOS / Safari
16.10.2026_23.47.47_REC.mp4
🔲 MacOS / Chrome
16.10.2026_23.27.39_REC.mp4
🔲 Android / native
16.10.2026_23.50.24_REC.mp4
🎀 👀 🎀 C+ reviewed
|
@mkzie2 After pulling main, run npm i and then build the actions again to fix gh actions. |
|
@parasharrajat Done |
|
What's with Performance issues? |
|
@parasharrajat This PR doesn't touce |
|
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
|
🚧 marcochavezf has triggered a test Expensify/App build. You can view the workflow run here. |
|
🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
|
|
🚀 Deployed to staging by https://github.com/marcochavezf in version: 9.5.25-0 🚀
|
|
A help site update is needed. I opened a draft PR: Docs updates for E/A#100930 Describe the Approve menu for held expenses. This PR made one sentence in Approve Expenses wrong:
On Spend > Reports, Approve now opens a menu with the two options instead of a confirmation modal. The docs PR changes only that sentence. GitHub wouldn't let me assign you to the docs PR because you don't have write access. Comment on it once and someone can assign you. @mkzie2, please review the linked help site PR and confirm it reflects the current behavior. Then mark the linked help site PR |
|
🚀 Deployed to production by https://github.com/jasperhuangg in version: 9.5.25-2 🚀
Bundle Size Analysis (Sentry): |
Explanation of Change
Fixed Issues
$ #70383
$ #100639
PROPOSAL: #70383 (comment)
Tests
Precondition:
Steps:
Offline tests
QA Steps
// TODO: These must be filled out, or the issue title must include "[No QA]."
Precondition:
Steps:
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectionAvatar, I verified the components usingAvatarare working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))npm run compress-svg)Avataris modified, I verified thatAvataris working as expected in all cases)Designlabel and/or tagged@Expensify/designso the design team can review the changes.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
Screen.Recording.2026-09-14.at.19.45.22.mp4