Standardize Expense Report and Expense header with predictable button placement and carousel counter by thelullabyy · Pull Request #98611 · Expensify/App

thelullabyy · 2026-08-13T17:54:17Z

Explanation of Change

Fixed Issues

$ #90366
PROPOSAL: N/A

Tests

Setup
Log in with a test account that has access to a paid workspace with multiple expense reports and expenses
Have these in your test workspace:

At least 3 expense reports (mix of submitted/approved/paid states)
At least one expense report containing 3+ expenses

Go to Spend --> Report/Expenses
Verify that the expense/report header looks like this figure below for scenarios
Verify that navigate using the carousel and ensure that all the expenses/reports from the list are available

Verify that no errors appear in the JS console

Offline tests

QA Steps

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2026-05-17.at.23.29.29.mov

Bug: #96563

Android: mWeb Chrome

Screen.Recording.2026-05-17.at.23.25.25.mov

iOS: Native

iOS: mWeb Safari

Screen.Recording.2026-05-17.at.23.21.16.mov

MacOS: Chrome / Safari

Screen.Recording.2026-05-17.at.23.15.10.mov

Bug: #96545

Screen.Recording.2026-07-27.at.20.19.00.mov

Bug: #96548

Bug: #96566

Screen.Recording.2026-07-27.at.21.06.31.mov

Bug: #96575

… placement and carousel counter

melvin-bot · 2026-08-13T17:54:23Z

Hey, I noticed you changed src/languages/en.ts in a PR from a fork. For security reasons, translations are not generated automatically for PRs from forks.

If you want to automatically generate translations for other locales, an Expensify employee will have to:

Look at the code and make sure there are no malicious changes.
Run the Generate static translations GitHub workflow. If you have write access and the K2 extension, you can simply click: [this button]

Alternatively, if you are an external contributor, you can run the translation script locally with your own OpenAI API key. To learn more, try running:

npx ts-node ./scripts/generateTranslations.ts --help

Typically, you'd want to translate only what you changed by running npx ts-node ./scripts/generateTranslations.ts --compare-ref main

melvin-bot · 2026-08-13T17:54:30Z

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

thelullabyy · 2026-08-13T17:54:47Z

@codex review

thelullabyy · 2026-08-13T17:55:38Z

@ShridharGoel Will be reviewer of this PR

codecov · 2026-08-13T17:59:24Z

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines	Coverage Δ
src/ONYXKEYS.ts	`100.00% <ø> (ø)`
src/components/MoneyReportHeader.tsx	`89.83% <100.00%> (+89.83%)`	⬆️
...archList/ListItem/TransactionGroupListExpanded.tsx	`68.18% <ø> (ø)`
...hooks/useMoneyReportHeaderMoreContentVisibility.ts	`100.00% <100.00%> (ø)`
src/hooks/useNavigateToTransactionThread.ts	`78.94% <100.00%> (+34.50%)`	⬆️
src/libs/ExportOnyxState/common.ts	`80.95% <ø> (ø)`
src/libs/actions/TransactionThreadNavigation.ts	`89.79% <100.00%> (+18.82%)`	⬆️
src/pages/home/RecentlyAddedSection/index.tsx	`100.00% <ø> (ø)`
src/pages/inbox/ReportNavigateAwayHandler.tsx	`70.51% <100.00%> (+0.38%)`	⬆️
...tView/MoneyRequestReportTransactionsNavigation.tsx	`96.96% <98.88%> (+96.96%)`	⬆️
... and 6 more
... and 11 files with indirect coverage changes

chatgpt-codex-connector · 2026-08-13T18:04:58Z

Codex Review: Didn't find any major issues. 🚀

Reviewed commit: 5cac92596a

ℹ️ 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".

JmillsExpensify

This PR is still good for me. We're mostly working through polish and deploy blockers.

ShridharGoel · 2026-08-14T09:36:53Z

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 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 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)
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)
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.
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.2026-07-14.at.11.14.54.PM.mov

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-08-14.at.3.06.13.PM.mov

ShridharGoel · 2026-08-14T09:44:06Z

@JmillsExpensify Do we need to show the carousel for grouped expenses as well? For example, when grouped by categories, and an expense is opened, then it doesn't show the carousel currently.

JmillsExpensify · 2026-08-16T21:41:54Z

Ah, that's a good question. I think we should, though I'm also fine tackling this separately given that getting this PR to production has been quite involved.

thelullabyy · 2026-08-19T05:20:17Z

@JS00001 Somehow it doesn't auto assign to you. Kindly help do final review. Thanks

JS00001 · 2026-08-19T16:04:38Z

+        const parentActions: Record<string, OnyxTypes.ReportAction> = {};
+        if (snapshotData) {
+            for (const [key, reportActionsForReport] of Object.entries(snapshotData)) {
+                if (key.startsWith(ONYXKEYS.COLLECTION.REPORT_ACTIONS)) {


Can you please explain why we need to subscribe to the snapshot separately? We automatically use either onyx data, or snapshot data, based on the page the user is on. So do we need to subscribe to the snapshot and fetch all of the report actions? Or can we just subscribe to report actions (which will use the snapshot when needed)

When the carousel is opened from a search (e.g. the Spend page), the sibling transactions may only exist in the search snapshot and not in the live collection yet. We use the snapshot

And also fixed this issue #90403 (comment)

melvin-bot · 2026-08-21T00:25:26Z

Hey, I noticed you changed src/languages/en.ts in a PR from a fork. For security reasons, translations are not generated automatically for PRs from forks.

If you want to automatically generate translations for other locales, an Expensify employee will have to:

Look at the code and make sure there are no malicious changes.
Run the Generate static translations GitHub workflow. If you have write access and the K2 extension, you can simply click: [this button]

Alternatively, if you are an external contributor, you can run the translation script locally with your own OpenAI API key. To learn more, try running:

npx bun ./scripts/generateTranslations.ts --help

Typically, you'd want to translate only what you changed by running npx bun ./scripts/generateTranslations.ts --compare-ref main

mitarachim · 2026-08-26T23:02:06Z

Deploy Blocker #99612 was identified to be related to this PR.

mitarachim · 2026-08-26T23:32:18Z

Deploy Blocker #99614 was identified to be related to this PR.

mitarachim · 2026-08-27T00:02:00Z

Deploy Blocker #99616 was identified to be related to this PR.

mitarachim · 2026-08-27T00:02:08Z

Deploy Blocker #99617 was identified to be related to this PR.

mitarachim · 2026-08-27T00:45:24Z

Deploy Blocker #99619 was identified to be related to this PR.

mitarachim · 2026-08-27T01:21:19Z

Deploy Blocker #99621 was identified to be related to this PR.

jponikarchuk · 2026-08-27T04:09:36Z

Deploy Blocker #99627 was identified to be related to this PR.

jponikarchuk · 2026-08-27T04:35:51Z

The Deploy Blocker issue #99630 is repro on all PRs. Could you please double check if it's not introduced by #98611

mitarachim · 2026-08-27T06:18:59Z

Deploy Blocker #99636 was identified to be related to this PR.

jponikarchuk · 2026-08-27T07:25:20Z

Deploy Blocker #99641 was identified to be related to this PR.

[cp staging] Revert "Merge pull request #98611 from thelullabyy/fix-03/90366"

…366" This reverts commit a29eb30, reversing changes made to e49e547.

[cp staging] Revert "Merge pull request #98611 from thelullabyy/fix-03/90366" (cherry picked from commit 9ab8216) (cherry-picked to staging by AndrewGable)

OSBotify · 2026-08-27T21:57:19Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 9.4.62-4 🚀

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

Bundle Size Analysis (Sentry):

Android

OSBotify · 2026-08-27T22:15:54Z

🚀 Deployed to staging by https://github.com/JS00001 in version: 9.4.63-0 🚀

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

MelvinBot · 2026-08-27T22:20:18Z

🤖 Help site review: no changes required.

I reviewed the changes in this PR against the help articles under App/docs/articles and no help-site updates are needed.

Why: This PR is a UI layout standardization — it moves the report action buttons down to the report next-steps line, always places the carousel navigation in the top right, always shows the carousel for expenses opened from the Spend page, and standardizes the carousel counter to a currentOfTotal ("X of X") format. These are navigation/placement refinements that don't add, remove, or change any documented feature, workflow, or capability.

The help articles describe what buttons do and how to accomplish tasks, not the exact vertical placement of action buttons or the presence/format of a navigation carousel counter — so nothing in them becomes inaccurate:

Getting Started with the Spend Page — its one "Carousel navigation" mention refers to the report preview cards on the Spend page, not the in-report/expense header carousel this PR changes, so it's unaffected.
Understanding Report Statuses and Actions — describes the green primary button and grey More button by role/status. The grey More button "is always visible in the report header" remains true after this change.

No draft PR was created since there is nothing to update.

@thelullabyy, if you believe any help article should document the standardized header layout or carousel counter, let me know which article and behavior and I'll draft the update.

view run

OSBotify · 2026-08-28T21:15:25Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 9.4.63-1 🚀

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

Bundle Size Analysis (Sentry):

Android

Standardize Expense Report and Expense header with predictable button…

5cac925

… placement and carousel counter

melvin-bot Bot assigned thelullabyy Aug 13, 2026

thelullabyy marked this pull request as ready for review August 13, 2026 17:54

thelullabyy requested review from a team as code owners August 13, 2026 17:54

melvin-bot Bot requested review from JmillsExpensify and ahmedGaber93 August 13, 2026 17:54

melvin-bot Bot removed request for a team August 13, 2026 17:54

github-actions Bot reviewed Aug 13, 2026

View reviewed changes

Comment thread src/components/MoneyRequestReportView/MoneyRequestReportTransactionsNavigation.tsx Outdated

github-actions Bot reviewed Aug 13, 2026

View reviewed changes

Comment thread src/components/MoneyReportHeaderMoreContent.tsx

JmillsExpensify previously approved these changes Aug 14, 2026

View reviewed changes

ShridharGoel self-requested a review August 14, 2026 09:08

ShridharGoel approved these changes Aug 17, 2026

View reviewed changes

ShridharGoel requested a review from JS00001 August 19, 2026 05:34

JS00001 requested changes Aug 19, 2026

View reviewed changes

resolve comments

727f769

thelullabyy dismissed JmillsExpensify’s stale review via 727f769 August 21, 2026 00:25

applause-bot Bot mentioned this pull request Aug 26, 2026

[Due for payment 2026-09-03] Spend - Self DM opens when navigating to offline created expense via arrow #99612

Closed

1 of 7 tasks

applause-bot Bot mentioned this pull request Aug 26, 2026

[Due for payment 2026-09-03] Spend - After deleting expense, arrow button is shown and it opens not here page #99614

Closed

1 of 7 tasks

This was referenced Aug 26, 2026

[Due for payment 2026-09-03] Spend - x of 2 appears on the expense thread RHP after returning from expense report #99616

Closed

[Due for payment 2026-09-03] Expense - x of 3 is shown after deleting the third expense #99617

Closed

applause-bot Bot mentioned this pull request Aug 27, 2026

[Due for payment 2026-09-03] Spend - "No expenses yet" displayed on report with expenses after returning to it via arrow. #99619

Closed

3 of 7 tasks

applause-bot Bot mentioned this pull request Aug 27, 2026

[Due for payment 2026-09-03] Report changes from expense details thread to expense report after navigating via arrows #99621

Closed

1 of 7 tasks

jponikarchuk mentioned this pull request Aug 27, 2026

[Due for payment 2026-09-03] Spend - Unreported expense shown on arrow navigation on "Reports" as an empty report. #99627

Closed

2 of 7 tasks

applause-bot Bot mentioned this pull request Aug 27, 2026

[Due for payment 2026-09-03] Spend - Arrow carousel disappears after duplicating expense. #99630

Closed

2 of 7 tasks

applause-bot Bot mentioned this pull request Aug 27, 2026

[Due for payment 2026-09-03] Spend - Navigation arrows disappear after opening invoice sent from OD #99636

Closed

3 of 7 tasks

applause-bot Bot mentioned this pull request Aug 27, 2026

[Due for payment 2026-09-03] Spend - Navigation arrows are missing on expense RHP after reset app #99641

Closed

4 of 7 tasks

JS00001 added a commit that referenced this pull request Aug 27, 2026

Merge pull request #99675 from Expensify/jsenyitko-big-revert

9ab8216

[cp staging] Revert "Merge pull request #98611 from thelullabyy/fix-03/90366"

fedirjh pushed a commit to fedirjh/ExpensiApp that referenced this pull request Aug 27, 2026

Revert "Merge pull request Expensify#98611 from thelullabyy/fix-03/90…

bac6c8a

…366" This reverts commit a29eb30, reversing changes made to e49e547.

MelvinBot mentioned this pull request Aug 27, 2026

[cp staging] Revert "Merge pull request #98611 from thelullabyy/fix-03/90366" #99675

Merged

55 tasks done

MelvinBot mentioned this pull request Aug 29, 2026

Fix: open expense report (not pay message thread) for paid expenses in Recently added #99668

Merged

39 of 45 tasks

KJ21-ENG mentioned this pull request Sep 22, 2026

Auto -Spend - "Next" arrow is disabled when user reaches 50 of 50 report #101453

Open

3 of 7 tasks

Conversation

thelullabyy commented Aug 13, 2026

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Aug 13, 2026

Uh oh!

melvin-bot Bot commented Aug 13, 2026

Uh oh!

thelullabyy commented Aug 13, 2026

Uh oh!

thelullabyy commented Aug 13, 2026

Uh oh!

codecov Bot commented Aug 13, 2026 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

Uh oh!

chatgpt-codex-connector Bot commented Aug 13, 2026

Uh oh!

JmillsExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

ShridharGoel commented Aug 14, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

ShridharGoel commented Aug 14, 2026

Uh oh!

JmillsExpensify commented Aug 16, 2026

Uh oh!

thelullabyy commented Aug 19, 2026

Uh oh!

Uh oh!

Uh oh!

JS00001 Aug 19, 2026

Choose a reason for hiding this comment

Uh oh!

thelullabyy Aug 23, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

melvin-bot Bot commented Aug 21, 2026

Uh oh!

mitarachim commented Aug 26, 2026

Uh oh!

mitarachim commented Aug 26, 2026

Uh oh!

mitarachim commented Aug 27, 2026

Uh oh!

mitarachim commented Aug 27, 2026

Uh oh!

mitarachim commented Aug 27, 2026

Uh oh!

mitarachim commented Aug 27, 2026

Uh oh!

jponikarchuk commented Aug 27, 2026

Uh oh!

jponikarchuk commented Aug 27, 2026

Uh oh!

mitarachim commented Aug 27, 2026

Uh oh!

jponikarchuk commented Aug 27, 2026

Uh oh!

OSBotify commented Aug 27, 2026

Uh oh!

OSBotify commented Aug 27, 2026

Uh oh!

MelvinBot commented Aug 27, 2026

Uh oh!

OSBotify commented Aug 28, 2026

Uh oh!

Reviewers

codecov Bot commented Aug 13, 2026 •

edited by github-actions Bot

Loading