Skip to content

104416 workspace chat trip preview shows bookings and their status - #105648

Merged
stitesExpensify merged 12 commits into
Expensify:mainfrom
suneox:104416-trip-preview-bookings
Nov 13, 2026
Merged

stitesExpensify merged 12 commits into
Expensify:mainfrom
suneox:104416-trip-preview-bookings

Conversation

@suneox

@suneox suneox commented Nov 2, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

Behind the travelApproval beta, the workspace chat's trip preview now lists the trip's bookings instead of its flight legs, as described in the design doc (Release 3, steps 7 and 11). Bookings are what approvers decide on, so the preview shows the same units the trip room and approvals use.

Fixed Issues

$ #104416
PROPOSAL:

Tests

Setup: sign in as a user with Expensify Travel trips and turn on the travelApproval beta in Troubleshoot → Beta overrides (it's explicit-only). Until the backend sends approval data, set it on a trip room from the console: Onyx.merge('reportNameValuePairs_<tripRoomReportID>', {tripData: {bookingApprovalState: {'<pnrID>': {status: 'outstanding', approvalType: 'SOFT_APPROVAL', approvalID: '1', approverAccountIDs: [<accountID>]}}}}).

  1. Book a round-trip flight and a hotel on one trip that need approval.
  2. As the traveler, open the workspace chat. Verify the preview shows 2 bookings, each with an Outstanding badge, and a View button.
  3. As an approver in the workspace chat, verify the button says Review and opens the trip room.
  4. Set a booking to approved, rejected and canceled. Verify each badge (rejected uses the closed colour, canceled its new colour).
  5. Set a booking's approval type to PASSIVE_APPROVAL. Verify it has no badge.
  6. Turn the beta off. Verify the preview goes back to counting flight legs ("n trips") with one row per leg, and a View button.
  • Verify that no errors appear in the JS console

Offline tests

Same as tests. Review only opens the trip room, so it stays enabled offline, like View.

QA Steps

Enable the travelApproval beta for the account.

Test case 1

  1. Book a round-trip flight and a hotel on one trip that need approval.
  2. As the traveler, open the workspace chat.
  3. Verify the trip preview shows 2 bookings, each with an Outstanding badge, and a View button.

Test case 2

  1. As an approver of that trip, open the workspace chat.
  2. Verify the trip preview's button says Review.
  3. Click Review and verify the trip room opens.
  • 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_20261110-180154
Android: mWeb Chrome Screenshot_20261110-175941
iOS: Native Screenshot iPhone 17 Pro 10-11-2026 at 18 08 28
iOS: mWeb Safari Screenshot iPhone 17 Pro 10-11-2026 at 18 01 09
MacOS: Chrome / Safari

Approver

CleanShot 2026-11-10 at 16 34 48@2x

Member

CleanShot 2026-11-10 at 16 35 54@2x
Automation One booking, no approval data V1-1-beta-on-one-booking

Approver with an outstanding booking: badge and Review

V2-1-approver-outstanding-review

Someone else on the trip: badge and View

V3-1-not-approver-outstanding-view

Approved, rejected and canceled badges; no badge for passive
V4-1-approved-badge
V4-2-rejected-badge
V4-3-canceled-badge
V4-4-passive-no-badge

Four bookings

V5-1-beta-on-four-bookings

Beta off: unchanged preview

V6-1-beta-off-legacy-trips

@melvin-bot

melvin-bot Bot commented Nov 2, 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 Nov 4, 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/SENTRY_LABEL.ts 100.00% <ø> (ø)
...rc/components/ReportActionItem/TripDetailsView.tsx 83.14% <100.00%> (+14.67%) ⬆️
...rc/components/ReportActionItem/TripRoomPreview.tsx 97.70% <100.00%> (+36.08%) ⬆️
src/libs/TravelApprovalUtils.ts 98.21% <100.00%> (+0.06%) ⬆️
src/libs/TripReservationUtils.ts 82.50% <37.03%> (-3.28%) ⬇️
... and 10 files with indirect coverage changes

@suneox
suneox marked this pull request as ready for review November 9, 2026 10:39
@suneox
suneox requested review from a team as code owners November 9, 2026 10:39
@melvin-bot
melvin-bot Bot requested review from hoangzinh and removed request for a team November 9, 2026 10:39
@melvin-bot

melvin-bot Bot commented Nov 9, 2026

Copy link
Copy Markdown

@hoangzinh 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 November 9, 2026 10:39
@suneox
suneox requested review from a team and removed request for hoangzinh and joekaufmanexpensify November 9, 2026 10:39
@melvin-bot
melvin-bot Bot requested review from trjExpensify and removed request for a team November 9, 2026 10:40
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Nov 9, 2026 •

Copy link
Copy Markdown
Codex Review Summary: ✅ Completed

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

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-11-09T11:25:45.303695Z 9556826 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.

@suneox
suneox requested a review from allgandalf November 9, 2026 11:08
@allgandalf
allgandalf removed the request for review from trjExpensify November 9, 2026 11:18

@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: 9556826935

ℹ️ 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/languages/fr.ts Resolved
Comment thread src/libs/TripReservationUtils.ts Resolved
@allgandalf

Copy link
Copy Markdown
Contributor

@suneox can you merge main ? there are conflicts. also please fix the codex comments on sentryLabel and the fr/pt-BR plurals, the other two are fine to skip

…-bookings

# Conflicts:
#	src/CONST/index.ts
#	src/components/ReportActionItem/TripRoomPreview.tsx
@allgandalf

allgandalf commented Nov 11, 2026 •

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

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

@stitesExpensify
stitesExpensify merged commit bdecb6e into Expensify:main Nov 13, 2026
39 of 41 checks passed
@github-actions

Copy link
Copy Markdown
Contributor

🚧 stitesExpensify 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.

@github-actions

Copy link
Copy Markdown
Contributor

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/stitesExpensify in version: 9.5.40-0 🚀

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

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