Skip to content

Add travel billing feed selector - #99527

Merged
blimpich merged 20 commits into
Expensify:mainfrom
allgandalf:travel-billing-shared-feed
Sep 8, 2026
Merged

blimpich merged 20 commits into
Expensify:mainfrom
allgandalf:travel-billing-shared-feed

Conversation

@allgandalf

@allgandalf allgandalf commented Aug 26, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

Lets a workspace join an existing travel feed on the domain instead of provisioning its own, like Expensify Cards do.

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/662524
PROPOSAL:

Tests

  1. Open a workspace whose domain already has a Consolidated Travel Billing feed.
  2. Open the workspace Travel section and turn on Travel Billing.
  3. Verify a feed selector lists the domain's existing travel feed.
  4. Select that feed.
  5. Verify the workspace joins the existing feed instead of provisioning a new one.
  • Verify that no errors appear in the JS console

Offline tests

N/A

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 Aug 26, 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/ROUTES.ts 27.88% <ø> (ø)
src/SCREENS.ts 100.00% <ø> (ø)
src/hooks/useExpensifyCardFeedsForFeedSelector.ts 100.00% <100.00%> (ø)
src/libs/ExpensifyCardFeedSelectorUtils.ts 93.33% <100.00%> (+1.02%) ⬆️
...gation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts 100.00% <ø> (ø)
src/libs/Navigation/linkingConfig/config.ts 71.42% <ø> (ø)
...gation/AppNavigator/ModalStackNavigators/index.tsx 6.22% <0.00%> (-0.01%) ⬇️
...workspace/travel/WorkspaceTravelBillingSection.tsx 90.05% <33.33%> (-0.91%) ⬇️
src/hooks/useTravelBillingSetupFlow.ts 0.00% <0.00%> (ø)
.../travel/WorkspaceTravelBillingFeedSelectorPage.tsx 0.00% <0.00%> (ø)
... and 52 files with indirect coverage changes

@allgandalf
allgandalf requested review from blimpich and rlinoz August 27, 2026 12:07
@allgandalf
allgandalf marked this pull request as ready for review August 27, 2026 12:13
@allgandalf
allgandalf requested review from a team as code owners August 27, 2026 12:13
@melvin-bot
melvin-bot Bot requested review from JmillsExpensify and NicolasBonet and removed request for a team August 27, 2026 12:13
@melvin-bot

melvin-bot Bot commented Aug 27, 2026

Copy link
Copy Markdown

@NicolasBonet 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 removed the request for review from a team August 27, 2026 12:14

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

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

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

Code looks good, and is mostly the same as ECard right?

I feel like we need an explanation in the picker though, it is not clear what the user is about to do I think?

Image

Also, do we need a way for them to provision a different one? or if there is any we will use that?

Comment on lines +227 to +230
if (accessibleTravelFeeds.length > 0) {
Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.WORKSPACE_TRAVEL_BILLING_SELECT_FEED.path, ROUTES.WORKSPACE_TRAVEL.getRoute(policyID)));
return;
}

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.

Should we auto select if there is a single one?

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.

mirrored the card picker here, it always opens even for a single one so the admin still sees what they're joining. wdyt?

@blimpich

Copy link
Copy Markdown
Contributor

Agreed, the picker needs more explanation

@blimpich

blimpich commented Aug 28, 2026 •

Copy link
Copy Markdown
Contributor

Can we also get a video of the full flow of the picker? How the user goes from the travel settings page to initiating the travel billing feed selector command, and what it looks like after they've selected it?

@allgandalf

Copy link
Copy Markdown
Contributor Author

@blimpich

blimpich commented Sep 4, 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 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

NicolasBonet
NicolasBonet previously approved these changes Sep 7, 2026
rlinoz
rlinoz previously approved these changes Sep 7, 2026
@rlinoz

rlinoz commented Sep 7, 2026

Copy link
Copy Markdown
Contributor

Failing GH actions for some reason?

@blimpich

blimpich commented Sep 7, 2026

Copy link
Copy Markdown
Contributor

May need to merge main?

@blimpich

blimpich commented Sep 8, 2026

Copy link
Copy Markdown
Contributor

bump @allgandalf can you merge main?

@allgandalf

Copy link
Copy Markdown
Contributor Author

done, can you check now ?

@melvin-bot

melvin-bot Bot commented Sep 8, 2026

Copy link
Copy Markdown

I could not review this diff, so I did not approve the workflow runs. An Expensify employee will review it and approve them manually.

@allgandalf
allgandalf dismissed stale reviews from rlinoz and NicolasBonet via ec7fe2a September 8, 2026 18:47
@allgandalf
allgandalf requested a review from blimpich September 8, 2026 18:56
@blimpich
blimpich merged commit 5bde989 into Expensify:main Sep 8, 2026
36 of 37 checks passed
@github-actions

github-actions Bot commented Sep 8, 2026

Copy link
Copy Markdown
Contributor

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

@OSBotify

OSBotify commented Sep 8, 2026

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 OSBotify mentioned this pull request Sep 9, 2026
83 tasks done
@IuliiaHerets

Copy link
Copy Markdown

Hey @allgandalf. Is expensifail account a domain that already has a Consolidated Travel Billing feed?

cc @blimpich @rlinoz @NicolasBonet

@OSBotify

OSBotify commented Sep 9, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/blimpich in version: 9.4.75-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 Yes — a help site change is required. Draft PR: #100749

This PR adds a second path through Consolidated Travel Billing setup that the help site doesn't describe. docs/articles/travel/consolidated-travel-billing/Enable-Consolidated-Travel-Billing-in-a-Workspace.md documents only "If prompted, select or add a bank account for settlement." After WorkspaceTravelBillingSection.tsx, an admin who already administers a configured travel feed gets a feed list first — and joining a feed reuses that feed's settlement account, so no bank account is requested at all.

What the docs PR changes (one file, no other article mentions the setup flow):

  • Adds the feed-selection step to How to enable Consolidated Travel Billing in a Workspace and renumbers the steps after it.
  • Adds a How to join an existing Consolidated Travel Billing feed section covering both branches and the Set up a new travel feed option.
  • Adds two FAQ entries: sharing one feed across two Workspaces, and why no feeds appear in the list.
  • Updates keywords / internalScope and adds a <!-- SCREENSHOT: --> suggestion for the feed list.
UI label verification and guidelines applied

I drove the web app to check labels. Confirmed live: the workspace settings row Travel, and the Travel toggle under the Spend section of More features.

Not confirmed live: Consolidated Travel Billing and Set up a new travel feed. The Consolidated Travel Billing section only renders once the workspace clears Expensify Travel's business-verification step, which needs a verified work-email domain the test account doesn't have — it stops at the "Get started with Expensify Travel" card. Both strings came from src/languages/en.ts on this branch instead. Please sanity-check those two against your own workspace.

Applied docs/HELPSITE_NAMING_CONVENTIONS.md, docs/HELP_AUTHORING_GUIDELINES.md, and docs/TEMPLATE.md: single # title plus # FAQ, task-based ## headings starting with How/What/Who/Why, bolded UI labels in Sentence case with no quotation marks, relative cross-links only, and the HTML-comment screenshot placeholder format.

@allgandalf, please review the linked help site PR and confirm it reflects the current behavior. Then mark the linked help site PR Ready for review

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/mountiny in version: 9.4.75-3 🚀

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

Bundle Size Analysis (Sentry):

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/mountiny in version: 9.4.75-3 🚀

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

Bundle Size Analysis (Sentry):

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.

7 participants