Skip to content

refactor: extract useMoneyRequestReportColumns and useMoneyRequestReportLayout - #100037

Draft
sosek108 wants to merge 8 commits into
Expensify:mainfrom
callstack-internal:decompose/money-request-report-transactions-b2
Draft

refactor: extract useMoneyRequestReportColumns and useMoneyRequestReportLayout#100037
sosek108 wants to merge 8 commits into
Expensify:mainfrom
callstack-internal:decompose/money-request-report-transactions-b2

Conversation

@sosek108

@sosek108 sosek108 commented Sep 1, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

This is PR 8 of a 10-PR stack decomposing the MoneyRequestReport list components (MoneyRequestReportActionsList / MoneyRequestReportTransactionList) into focused hooks and presentational sub-components (issue #99919, superseding drafts #99307 and #99417).

This slice extracts the transaction table's column derivation and the report-layout (group-by) selection into dedicated hooks:

  • New: src/components/MoneyRequestReportView/useMoneyRequestReportColumns.ts — derives which columns the transaction table shows and how wide they are: the getColumnsToShow call with its inputs (billable/comments/reimbursable column gates, tax enablement, saved column preferences), the wide/normal width buckets for the date/posted/amount/tax-amount columns, the table's minimum pixel width, and whether the table needs its own horizontal scroller.
  • New: src/components/MoneyRequestReportView/useMoneyRequestReportLayout.ts — owns the report-layout (group-by) selection: reads the two layout NVPs, exposes the effective selection and grouping mode, latches the user's most recent pick so the popover label never flicks through the default while the NVPs settle, and persists selections via setReportLayout.
  • Edit: src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx — consumes the two hooks in place of the inline column/layout blocks and drops the locals/imports that moved with them (layout NVP reads, column-size memo, latch state, ReportLayout action imports).

Pure refactor — no behavior change.

Stack note: this PR is stacked on #100036 (decompose/money-request-report-transactions-b1), which is stacked on #100035, #100033, #100030, #100025, #100024 and #100023. Until those PRs merge, the diff here also shows their commits. Only the "Extract useMoneyRequestReportColumns and useMoneyRequestReportLayout" commit belongs to this slice.

Fixed Issues

$ #99919
PROPOSAL:

Tests

  1. Open an expense report with transactions — verify the transaction table renders the same columns as before (amount, date, merchant, etc.)
  2. On a report with company-card (non-reimbursable) spend, verify the Reimbursable column shows; on a workspace with billable expenses enabled, verify the Billable column shows
  3. Add a transaction dated in a previous year — verify the date column widens to show the year
  4. Open the "Group by" dropdown — pick Category, Tag, and None — verify the grouping and the dropdown label update accordingly, with no flicker of the label through a default value
  5. Narrow the window until the table is wider than the viewport — verify the table gets its own horizontal scroller
  6. Open an IOU report — verify the "Columns" customization button is hidden
  7. Run npx jest tests/ui/MoneyRequestReportActionsListRejectModalTest.tsx and verify it passes
  • Verify that no errors appear in the JS console

Offline tests

  1. Go offline and change the "Group by" selection — verify the grouping applies immediately and survives going back online
  2. Go offline and add an expense — verify the table columns still derive correctly from the optimistic transaction

QA Steps

Same as Tests.

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

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

@codecov

codecov Bot commented Sep 1, 2026

Copy link
Copy Markdown

Codecov Report

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

Files with missing lines Coverage Δ
...estReportView/MoneyRequestReportEmptyStateView.tsx 100.00% <100.00%> (ø)
...oneyRequestReportView/useMoneyRequestReportData.ts 100.00% <100.00%> (ø)
src/hooks/useMarkAsRead.ts 95.94% <100.00%> (+0.05%) ⬆️
src/hooks/useUnreadMarker.ts 94.44% <100.00%> (+0.15%) ⬆️
...equestReportView/MoneyRequestReportActionsList.tsx 92.77% <91.17%> (+32.45%) ⬆️
...tReportView/useMoneyRequestReportVisibleActions.ts 52.63% <52.63%> (ø)
...stReportView/MoneyRequestReportTransactionList.tsx 0.42% <0.00%> (+0.12%) ⬆️
...questReportView/useMoneyRequestReportPagination.ts 69.04% <69.04%> (ø)
...eyRequestReportView/useMoneyRequestReportLayout.ts 0.00% <0.00%> (ø)
...yRequestReportView/useMoneyRequestReportColumns.ts 0.00% <0.00%> (ø)
... and 4 more
... and 31 files with indirect coverage changes

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant