Skip to content

104405 trips table - #104562

Open
suneox wants to merge 8 commits into
Expensify:mainfrom
suneox:104405-trips-table
Open

suneox wants to merge 8 commits into
Expensify:mainfrom
suneox:104405-trips-table

Conversation

@suneox

@suneox suneox commented Oct 21, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

Adds the Trips table in Spend (Travel → Trips), one row per trip room, as described in the design doc (Detailed Implementation → Release 1, step 3). Everything is behind the travelApproval beta.

Fixed Issues

$ #104405
PROPOSAL:

Tests

Setup: sign in as a user who has Expensify Travel trips, in a workspace set up for Expensify Travel. travelApproval is an explicit-only beta, so turn it on in Troubleshoot → Beta overrides even if the account has all.

  1. Open Spend → Travel → Trips.
  2. Verify each row shows the start date, end date, status badge, trip name, traveler avatar and name, and total.
  3. Verify the rows are sorted by start date, newest first, and each status badge reads Upcoming, Done or Canceled.
  4. Click the Status header. Verify the rows sort by status.
  5. Click View on a row. Verify the trip room opens. Go back, click the row itself, and verify the same trip room opens.
  6. Resize to a narrow layout. Verify each card shows the traveler, status, trip name, dates and total.
  7. Turn the travelApproval beta off in Beta overrides and open type:trip from the search bar. Verify it shows the expense search as before, with no Trips table.
  • Verify that no errors appear in the JS console

Offline tests

  1. Open Spend → Travel → Trips while online so the trips load.
  2. Go offline and reopen Trips. Verify the last loaded trips still show.

QA Steps

  1. Enable the travelApproval beta for an account with several Expensify Travel trips, in a workspace set up for Expensify Travel.
  2. Open Spend → Travel → Trips.
  3. Verify each row shows the start date, end date, status badge, trip name, traveler avatar and name, and total.
  4. Switch to a narrow layout (or use mobile) and verify the rows show the same data.
  5. Tap View and verify the trip room opens. Go back, tap the row itself, and verify the same.
  • 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 verified any copy / text that was added to the app 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 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 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.
  • 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).
  • 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 Screenshot_1792734767
Android: mWeb Chrome
iOS: Native Simulator Screenshot - iPhone 17 Pro - 2026-10-23 at 12 43 45
iOS: mWeb Safari Simulator Screenshot - iPhone 17 Pro - 2026-10-23 at 12 43 45
MacOS: Chrome / Safari
CleanShot.2026-10-23.at.12.54.05.1.mp4

@melvin-bot

melvin-bot Bot commented Oct 21, 2026

Copy link
Copy Markdown

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:

  1. Look at the code and make sure there are no malicious changes.
  2. 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

@codecov

codecov Bot commented Oct 21, 2026 •

Copy link
Copy Markdown

Codecov Report

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

Files with missing lines Coverage Δ
src/CONST/index.ts 95.90% <ø> (ø)
...nts/Search/SearchList/ListItem/TripListItemRow.tsx 100.00% <100.00%> (ø)
src/components/Search/SearchList/ListItem/types.ts 100.00% <ø> (ø)
src/components/Search/SearchSelectionFooter.tsx 86.15% <100.00%> (+0.04%) ⬆️
...c/components/Search/SearchWriteActionsProvider.tsx 95.31% <100.00%> (ø)
.../components/Search/hooks/useSearchColumnsToShow.ts 100.00% <100.00%> (ø)
src/components/Search/hooks/useSearchSnapshot.ts 94.56% <100.00%> (+0.05%) ⬆️
src/components/Search/selectionBuilders.ts 99.19% <100.00%> (+0.01%) ⬆️
src/hooks/useLifecycleActions.tsx 61.78% <100.00%> (+0.24%) ⬆️
src/hooks/useSearchBulkActions.ts 80.81% <100.00%> (+0.01%) ⬆️
... and 24 more
... and 9 files with indirect coverage changes

@allgandalf
allgandalf self-requested a review October 21, 2026 18:20

@allgandalf allgandalf left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

please merge main, there are conflicts. ESLint is also red on SearchUIUtilsTest.ts (reportID shadow and an unsafe cast), and checklist fails on the unticked boxes

on Trips, Display still has Group by (picking one just resets the sort) and Filters still has Amount, Merchant etc, which end in Something went wrong. ok to leave for #104406 ?

Group by on Trips
Merchant filter on Trips

Comment thread src/libs/SearchUIUtils.ts Outdated
CONST.SEARCH.TABLE_COLUMNS.IN,
CONST.SEARCH.TABLE_COLUMNS.AVATAR,
CONST.SEARCH.TABLE_COLUMNS.VIOLATIONS,
// The trip search doesn't sort by these yet

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

backend sorts trips by date, title and from too, can we map Start date, Trip name and Traveler instead of disabling them ?

Display shows Date sort
Sort by has no Date

* A trip row in search results. Tapping the row or its View action opens the trip room.
*/
function TripListItem<TItem extends ListItem>({item, columns = [], isFocused, showTooltip, isDisabled, onSelectRow, onFocus, shouldSyncFocus, isLastItem}: TripListItemProps<TItem>) {
const tripItem = item as unknown as TripListItemType;

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

ESLint fails on this cast, can we use isTripListItemType here ?

Comment thread src/libs/SearchUIUtils.ts Outdated
function getTripSections(data: OnyxTypes.SearchResults['data'], formatPhoneNumber: LocaleContextProps['formatPhoneNumber'], translate: LocalizedTranslate): [TripListItemType[], number] {
const trips = Object.keys(data)
.filter(isReportEntry)
.map((key) => data[key] as SearchTrip)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

this and the cast in getSortedTripData push the file over its seatbelt limit, that's the ESLint failure

Comment thread src/pages/Search/SearchPage.tsx Outdated
}, []);
const {isBetaEnabled} = usePermissions();
const isTravelApprovalEnabled = isBetaEnabled(CONST.BETAS.TRAVEL_APPROVAL);
const handleSearchAction = useCallback(

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

this file compiles with React Compiler, can we drop the useCallback while we're here ? same in SearchPageNarrow CLEAN-REACT-PATTERNS-0

);

const columnConfig = useMemo(() => getSearchColumns(type, icons, groupBy, isExpenseReportView), [type, groupBy, icons, isExpenseReportView]);
const columnConfig = useMemo(

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

same here, file compiles so no need for this useMemo CLEAN-REACT-PATTERNS-0

shouldShowSorting
groupBy={validGroupBy}
isExpenseReportView={isExpenseReportType}
isExpenseReportView={isExpenseReportType || shouldReturnTripRooms}

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

why do trips pass isExpenseReportView ? a short comment would help CONSISTENCY-18

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Trip rows use the same layout as the expense report view: a fixed-width Total column followed by the Action column, with no flex on Total. I've added short comment to explain

Comment thread src/libs/SearchUIUtils.ts Outdated
* Do not use directly, use only via `getSections()` facade.
*/
/**
* @private

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

this went in below getTaskSections' JSDoc, so getTaskSections has none now. can we move it up ? also CONSISTENCY-10 bans @private

/** Columns to show on wide screens */
columns: SearchColumnType[];

/** Whether to show tooltips */

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

NAB: these just repeat the prop names, same for status in TripStatusCell. fine to drop them CONSISTENCY-10

@suneox

suneox commented Oct 22, 2026

Copy link
Copy Markdown
Contributor Author

@allgandalf All review comments have been resolved. Since this PR is built on top of #104536, I'll update pr status once #104536 is merged

on Trips, Display still has Group by (picking one just resets the sort) and Filters still has Amount, Merchant etc, which end in Something went wrong. ok to leave for #104406 ?

Yes, we should handle this in #104406

Group-by. Remove group-by for trips (SearchAutocompleteUtils).

based on the scope of that issue. It should also cover the use case of manually typing group-by: in the search bar.

@suneox
suneox marked this pull request as ready for review October 23, 2026 06:00
@suneox
suneox requested review from a team as code owners October 23, 2026 06:00
@melvin-bot
melvin-bot Bot requested review from thelullabyy and removed request for a team October 23, 2026 06:00
@melvin-bot

melvin-bot Bot commented Oct 23, 2026

Copy link
Copy Markdown

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

@melvin-bot
melvin-bot Bot requested review from joekaufmanexpensify and removed request for a team October 23, 2026 06:00
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 23, 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-23T07:03:43.141701Z 055bb2b Manual request
ℹ️ 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.

@suneox
suneox removed the request for review from thelullabyy October 23, 2026 06:05
@suneox

suneox commented Oct 23, 2026

Copy link
Copy Markdown
Contributor Author

@thelullabyy The auto-assignment is incorrect. @allgandalf will be review the travel approval feature

@allgandalf

Copy link
Copy Markdown
Contributor

@codex review

@allgandalf

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 any copy / text that was added to the app 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 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 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

Trips table on web

@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: 055bb2b8a8

ℹ️ 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 thread src/libs/actions/Search.ts
Comment thread src/libs/actions/Search.ts
Comment thread src/components/Search/FilterDropdowns/DisplayPopup.tsx
Comment thread src/libs/SearchUIUtils.ts
@shawnborton

Copy link
Copy Markdown
Contributor

cc @Krishna2323 - it seems like the table above is not using auto-sizing cells?

@joekaufmanexpensify joekaufmanexpensify left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

core design doc change

This branch has not been deployed

No deployments
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.

4 participants