Skip to content

[CP Staging] Revert "Reapply "Add a More menu option to switch single-expense reports between expense view and table view"" - #104661

Merged
mountiny merged 1 commit into
mainfrom
claude-revertSingleExpenseReportViewToggle
Oct 22, 2026
Merged

mountiny merged 1 commit into
mainfrom
claude-revertSingleExpenseReportViewToggle

Conversation

@MelvinBot

@MelvinBot MelvinBot commented Oct 21, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

Reverts Reapply "Add a More menu option to switch single-expense reports between expense view and table view" because QA found new deploy blockers, listed under Fixed Issues.

I made this with git revert -m 1 7cb9aa2eaa61481ca71789877b95a36265e0d49d on top of the latest main.

Conflicts

There was one conflict, in the import block of src/libs/ReportSecondaryActionUtils.ts:

I removed the isSingleTransactionReport import, which only the reverted feature used. I kept the getLoginByAccountID import, which code from that later PR still uses. Every other file reverted cleanly.

Checks after the revert

  • No references to the feature remain in src/ or tests/, for example useSingleExpenseReportView, TOGGLE_SINGLE_EXPENSE_VIEW, NVP_SINGLE_EXPENSE_REPORT_VIEW, or switchToTableView.
  • Each import the revert removed is either unused now or replaced by the import that existed before the PR.
  • I couldn't run npm run typecheck, lint, or Jest in my environment, so CI needs to confirm them.

Fixed Issues

$ #104645
$ #104649
$ #104651
$ #104653
$ #104654
$ #104657
$ #104676
$ #104678
$ #104681
$ #104682
PROPOSAL:

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

QA Steps

// TODO: The human co-author must fill out the QA tests you ran before marking this PR as "ready for review".
// Please describe what QA needs to do to validate your changes and what areas do they need to test for regressions.

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

Android: Native

Not yet tested — needs manual QA.

Android: mWeb Chrome

Not yet tested — needs manual QA.

iOS: Native

Not yet tested — needs manual QA.

iOS: mWeb Safari

Not yet tested — needs manual QA.

MacOS: Chrome / Safari

Not yet tested — needs manual QA.

…eExpenseReportViewToggle"

This reverts commit 7cb9aa2, reversing
changes made to 7255f7a.

Co-authored-by: Vit Horacek <[email protected]>
@MelvinBot
MelvinBot requested a review from a team October 21, 2026 22:20
@melvin-bot melvin-bot Bot added Melvin-Test-Android Melvin-Test-Web Triggers Melvin to run the testing steps of the PR on web labels Oct 21, 2026
@mountiny
mountiny marked this pull request as ready for review October 21, 2026 22:23
@mountiny
mountiny requested a review from a team as a code owner October 21, 2026 22:23
@melvin-bot
melvin-bot Bot requested review from daledah and removed request for a team October 21, 2026 22:23
@mountiny
mountiny requested review from Beamanator and removed request for daledah October 21, 2026 22:23
@melvin-bot

melvin-bot Bot commented Oct 21, 2026

Copy link
Copy Markdown

@daledah 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 Oct 21, 2026 •

Copy link
Copy Markdown

Codex Review Summary

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

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-21T22:28:05.650183Z 3249384 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.

@melvin-bot
melvin-bot Bot removed the request for review from a team October 21, 2026 22:23
@mountiny mountiny changed the title Revert "Reapply "Add a More menu option to switch single-expense reports between expense view and table view"" [CP Staging] Revert "Reapply "Add a More menu option to switch single-expense reports between expense view and table view"" Oct 21, 2026
@codecov

codecov Bot commented Oct 21, 2026 •

Copy link
Copy Markdown

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines Coverage Δ
src/CONST/index.ts 95.90% <ø> (ø)
src/ONYXKEYS.ts 100.00% <ø> (ø)
src/components/MoneyReportHeader.tsx 100.00% <100.00%> (ø)
...equestReportView/MoneyRequestReportActionsList.tsx 96.90% <ø> (-0.07%) ⬇️
.../MoneyRequestReportView/MoneyRequestReportView.tsx 75.00% <100.00%> (-0.29%) ⬇️
...rtView/SelectionToolbar/SelectionBulkActionBar.tsx 0.00% <ø> (ø)
.../MoneyRequestReportView/SelectionToolbar/index.tsx 73.25% <100.00%> (-0.31%) ⬇️
src/components/ReportSubmitToPopoverAnchor.tsx 61.53% <ø> (+0.66%) ⬆️
src/components/Search/index.tsx 70.82% <100.00%> (-0.11%) ⬇️
src/hooks/useExpenseActions.ts 66.81% <100.00%> (-2.56%) ⬇️
... and 20 more
... and 10 files with indirect coverage changes

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 3249384825

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

Comment on lines 355 to +359
return (
<ReportSubmitToPopoverRoot reportID={reportID}>
<SelectionToolbar
reportID={reportID}
transactions={transactions}
reportActions={reportActions}
/>
</ReportSubmitToPopoverRoot>
<SelectionToolbar
reportID={reportID}
transactions={transactions}
reportActions={reportActions}

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2 Badge Restore the submit-popover provider around the toolbar

When a Submit-policy report has multiple rows but only one selectable row (for example, another row is disabled by a reject error), isEveryReportTransactionSelected() deliberately exposes the report-level Submit action and the one selected transaction does not trigger the multi-selection submit block. useSelectionModeReportActions() calls useLifecycleActions() while rendering SelectionToolbar, so after this wrapper is removed it reads the default no-op useOpenReportSubmitToPopover() value; the ReportSubmitToPopoverAnchor rendered later around the narrow dropdown cannot provide context to its parent hook, and the wide toolbar has no provider at all. Consequently, pressing the offered Submit action does nothing instead of opening the submit-to picker.

Useful? React with 👍 / 👎.

@MelvinBot

MelvinBot commented Oct 21, 2026 •

Copy link
Copy Markdown
Contributor Author

🤖 Android test steps verification results: ✅ pass

On Android, the single-expense report's More menu no longer has the table view option. Tapping the expense preview opens the transaction thread. Deleting the expense returns straight to the workspace chat. No errors appeared during the run. The PR's only documented step is "no console errors," so I also tested the flows from the linked deploy blockers.
Workspace chat after delete

Step Status
Open the single-expense report and tap More: there is no "Switch to table view" or "Switch to expense view" optionThe menu shows Add expense, Hold, Split, Merge, Duplicate expense, Move to report, Duplicate report, Export, Download report, Share, View details, and Delete. It has no view toggle.
More menu without table view optionMore menu lower half
✅
Tap the expense preview in the workspace chat: the transaction thread opens, not a table viewThe single expense opens with Receipt, Amount, Description, Merchant, Date, and Category rows.
Expense preview opens transaction thread
✅
Tap More > Delete > Delete on the expense: the app returns to the workspace chat with no empty report screen in betweenThe app went straight back to the workspace chat. No blank report screen appeared.
Workspace chat after delete
✅
No red-box error, crash, or error toast appears during the stepsNo red box, crash, or error toast appeared. The app stayed in the foreground for the whole run.
✅

view run · view recording

@MelvinBot

MelvinBot commented Oct 21, 2026 •

Copy link
Copy Markdown
Contributor Author

🤖 Web test steps verification results: ⚠️ partial

On web, the "Switch to table view" option is gone from the More menu. The expense preview opens the transaction thread, and deleting the expense returns straight to the workspace chat. I couldn't check the JS console because the web test tool can't read console logs, so the PR's one documented step is unverified.
Workspace chat after deleting the expense

Step Status
Open the single-expense report and click More: there is no "Switch to table view" or "Switch to expense view" optionThe menu shows Add expense, Hold, Split, Merge, Duplicate expense, Move to report, Duplicate report, Export, Download report, Share, View details, and Delete. It has no view toggle.
More menu without table view option
✅
Close the report and click the expense preview in the workspace chat: the transaction thread opens, not a table viewThe expense opens with editable Amount, Merchant, Date, and Category rows. This is the transaction thread layout, not a table.
Expense preview opens the transaction thread
✅
Click More > Delete > Delete on the expense: the app returns to the workspace chat with no empty report in betweenThe app went straight to the workspace chat. No empty report appeared.
Workspace chat after deleting the expense
✅
No errors appear in the JS console during the steps aboveNot checked. The web test tool can't read browser console logs. No error banner or toast appeared in the app, but that doesn't prove the console was clean.
⚠️

view run · view recording

@mountiny

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
  • 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.
  • 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: mWeb Chrome
iOS: HybridApp
iOS: mWeb Safari
MacOS: Chrome / Safari

@mountiny
mountiny merged commit ebf3e87 into main Oct 22, 2026
57 of 58 checks passed
@mountiny
mountiny deleted the claude-revertSingleExpenseReportViewToggle branch October 22, 2026 12:02
@github-actions

Copy link
Copy Markdown
Contributor

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

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

OSBotify pushed a commit that referenced this pull request Oct 22, 2026
…eportViewToggle

[CP Staging] Revert "Reapply "Add a More menu option to switch single-expense reports between expense view and table view""

(cherry picked from commit ebf3e87)

(cherry-picked to staging by mountiny)
@OSBotify OSBotify added the CP Staging marks PRs that have been CP'd to staging label Oct 22, 2026
@os-botify

os-botify Bot commented Oct 22, 2026

Copy link
Copy Markdown

🔁 Filed a Staging retest request for deploy blockers #104645, #104649, #104651, #104653, #104654, #104657, #104676, #104678, #104681, #104682 after this PR was cherry-picked to staging.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.5.16-1 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor Author

No help site update is needed. This PR reverts the Switch to table view / Switch to expense view More menu option, and no article on main describes that option, so nothing in docs/articles becomes incorrect.

Note: the open draft Docs updates for E/A#103703 Add single-expense view switch to More menu table documents this feature. It should not be merged while the feature is reverted.


view run

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.5.18-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor Author

No help site update is needed. This PR reverts the single-expense view switch, and no published article under docs/articles mentions that option, so nothing on the help site is now wrong.

One follow-up: the open draft docs PR Docs updates for E/A#103703 Add single-expense view switch to More menu table adds a Switch to table view or Switch to expense view row to Expense-and-Report-Actions.md. Because the feature was reverted, that PR should be closed or put on hold until the feature ships again.


view run

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/grgia in version: 9.5.18-1 🚀

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

Bundle Size Analysis (Sentry):

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.5.20-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor Author

No help site update is needed. This PR reverts the Switch to table view / Switch to expense view option, and no merged article on main mentions it.

One open draft docs PR still adds that option to the More menu table: Docs updates for E/A#103703 Add single-expense view switch to More menu table. Don't merge it while the feature is reverted. Hold or close it until the feature ships again.


view run

@IuliiaHerets

Copy link
Copy Markdown

Do we need QA this?

cc @Beamanator @lakchote @joekaufmanexpensify @mountiny

@Beamanator

Copy link
Copy Markdown
Contributor

@IuliiaHerets straight revert so no thanks, thanks for asking!

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

Labels

CP Staging marks PRs that have been CP'd to staging 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.

6 participants