🍒 Cherry pick PR #98346 to staging 🍒

[os-botify]

🍒 Cherry pick [cp staging] Revert #97005 to staging 🍒

Explanation of Change

Manual cherry-pick of [cp staging] Revert #97005 to staging.

The automated CP failed because staging doesn't have the follow-up work that landed on main on top of #97005, so the revert diff didn't apply cleanly. Three files needed manual conflict resolution:

1. src/components/MoneyRequestReportView/MoneyRequestReportTransactionsNavigation.tsx — took the reverted (pre-#97005) version, then dropped the personalDetails argument threaded into getReportIDToOpenForExpense and createTransactionThreadReport. That parameter only exists on main; the signatures on staging don't accept it.
2. src/languages/el.ts — removed currentOfTotal along with the @context comment that staging carries for it. The revert removes the key from en.ts and nothing references it anymore.
3. tests/unit/components/MoneyRequestReportTransactionsNavigation.test.tsx — deleted, as the revert does. The only change staging had in this file was removing a usePersonalDetails mock.

One further deviation from the revert, in a file git merged cleanly but which then failed to compile:

4. tests/unit/ExportActionsTest.ts — left at staging's version, so this file is untouched by the CP. The revert drops an as MockFetch cast that is only safe against main's newer TestHelper, where getGlobalFetchMock() returns MockFetch; on staging it still returns typeof fetch, so removing the cast is a type error. Everything else the revert changed in this file is formatting.

Fixed Issues

$ #98200
$ #98196
$ #98193
$ #98192

Tests

N/A — this is a revert. Verified on this branch after resolving the conflicts:

• npm run typecheck-tsgo — clean

• npm run lint-changed — clean

• npx oxfmt --check on all changed files — clean

• npm run react-compiler-compliance-check check-changed — passed (50 changed React files, both Babel and OXC)

• Jest across the affected areas — 189 tests passed: MoneyReportHeaderMoreContentTest, ExportActionsTest, TransactionThreadNavigationUtilsTest, MoneyRequestReportTransactionListActiveTransactionIDsTest, useSearchShouldCalculateTotals, searchTotalsLoadingDataTest, MoneyRequestReportNavigation, ExportOnyxStateTest, PopoverMenu, PopoverMenuV2Test, ExpenseFlatSearchViewTest

• No remaining references to any symbol the revert deletes (useMoneyReportHeaderMoreContentVisibility, TRANSACTION_THREAD_NAVIGATION_SNAPSHOT_HASH, anchorTransactionID)

• Verify that no errors appear in the JS console

Offline tests

N/A — this is a revert.

QA Steps

N/A — this is a revert.

• Verify that no errors appear in the JS console

Important

This PR should ideally be merged by a member of the mobile-deployers team. If it is merged by someone who is not a deployer, the staging deploy triggered by the merge will fail and will need to be manually re-triggered (not just retried) via the deploy workflow.

PR Author Checklist

Completed on the same basis as the original revert, [cp staging] Revert #97005: this restores behavior already shipped to production, so there is no new behavior to test on each platform. The verification actually run on this branch is listed under Tests above.

• 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 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 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)
• 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.
• 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

N/A — this is a revert of #97005, which restores the behavior currently in production. See the screenshots on the original revert, [cp staging] Revert #97005.

[melvin-bot]

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 53766385b6

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

[marcaaron]

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 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
  • 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 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

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

[OSBotify]

🚀 Cherry-picked to staging by https://github.com/roryabraham in version: 9.4.52-7 🚀

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

[MelvinBot]

🤖 No help site changes required.

This PR is a cherry-pick to staging of a revert of #97005 ("Standardize Expense Report and Expense header with predictable button placement and carousel counter"). It restores the pre-#97005 behavior that is already live in production.

Why no docs update is needed

• The changes are purely internal UI layout — expense report/expense header button placement, the transaction-navigation carousel counter, PopoverMenu structure, and related navigation utils. None of this is documented in App/docs/articles, which covers workflows and settings rather than exact header button placement or a navigation carousel.
• Because this is a revert restoring production behavior, the help site already reflects the correct (current) state — there is nothing to bring in sync.
• I searched App/docs/articles for terms like carousel, counter, expense report header, and expense-navigation phrasing. The only matches were false positives (NetSuite/QuickBooks error names and unrelated uses of "counter"), none referencing the reverted UI.

Since no changes are required, I did not open a draft help site PR.

[OSBotify]

🚀 Cherry-picked to staging by https://github.com/roryabraham in version: 9.4.52-10 🚀

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

[MelvinBot]

Help site review — no docs changes required ✅

This PR is a cherry-pick to staging of the revert of #97005 ("Standardize Expense Report and Expense header with predictable button placement and carousel counter"). It's UI/interaction-only — it removes the standardized header button placement and the in-header transaction-navigation counter, restoring the pre-#97005 production behavior — plus internal component/hook refactors and localization-key cleanup (currentOfTotal).

I reviewed App/docs/articles and no help site article documents the reverted feature, so nothing needs to change.

What I checked

The only help article that comes close is Getting-Started-with-the-Spend-Page.md, which has two references that might look related but are independent of #97005:

• Carousel navigation (L26) is under Report Previews → Preview Details — the report-preview card carousel shown in workspace chat. Introduced by PR #61128 (original doc creation), not #97005.
• The header-button line (L87) — "the Submit button appears in the header (replacing Add expense, which moves to the More menu)" — describes long-standing behavior added by PR #90535, not #97005.

Neither describes #97005's specific additions (the "X of Y" style in-header counter / predictable button placement standardization), so removing that feature leaves both descriptions accurate. A wider scan of docs/articles for header transaction-navigation counters turned up no matching content.

Note: I couldn't verify against the live UI this run (the test session was signed out), so this conclusion is based on the diff and the help-site content. The reverted feature was never documented either way.

@roryabraham — since no help site changes are required, I did not create a docs PR. Please confirm you agree the reverted feature isn't covered by any help article; if you'd like a doc added or updated regardless, let me know and I'll open one.

[OSBotify]

🚀 Deployed to production by https://github.com/roryabraham in version: 9.4.52-11 🚀

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

Bundle Size Analysis (Sentry):

• Android