Skip to content

Read Consolidated Travel Billing settings from the resolved fund - #96943

Merged
rlinoz merged 13 commits into
Expensify:mainfrom
allgandalf:ctb-domain-feed
Aug 20, 2026
Merged

rlinoz merged 13 commits into
Expensify:mainfrom
allgandalf:ctb-domain-feed

Conversation

@allgandalf

@allgandalf allgandalf commented Jul 24, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

App side of moving Consolidated Travel Billing onto the universal-feed rails. The workspace Travel settings now read the card settings from the resolved fund (via useDefaultFundID) instead of the workspace account, so a feed shared on the domain shows feed-wide travel spend and limit, and a workspace-scoped feed still works through the fallback. Draft, part of the multi-PR effort with Auth https://github.com/Expensify/Auth/pull/23192 and Web-E https://github.com/Expensify/Web-Expensify/pull/54821.

Fixed Issues

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

Tests

Testing needs an admin whose primary login is on a verified private domain that has a settlement (business) bank account.

  1. As that admin, open a workspace you own in NewDot, go to More features and enable Travel if it is off.
  2. Open the workspace Travel settings, enable Consolidated Travel Billing and finish the settlement account step so the travel feed provisions on your domain.
  3. Confirm Current travel spend and Current travel limit show the feed's values.
  4. Open Settlement account, switch to another eligible bank account, and confirm the section reflects the new account and it persists after a reload.
  5. Open Settlement frequency, change it, and confirm the section reflects the new frequency and it persists after a reload.
  6. Open Monthly limit, change it, and confirm Current travel limit shows the new value and it persists after a reload.
  7. Tap View on spend and confirm Search opens filtered to this feed's travel expenses.
  8. Toggle Consolidated Travel Billing off and confirm the feed is deactivated.
  9. If a provisioning error is shown, tap Retry and confirm the error clears for this feed.
  10. Regression: repeat steps 3-8 on a workspace whose feed is not on a domain and confirm everything still works through the workspaceAccountID fallback.
  • Verify that no errors appear in the JS console

Offline tests

With the network off, perform steps 4-6 and confirm each change is applied optimistically to the feed shown in the section, then re-enable the network and confirm it persists.

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

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

@allgandalf allgandalf changed the title Read Consolidated Travel Billing settings from the resolved fund [HOLD Web-E 54821] Read Consolidated Travel Billing settings from the resolved fund Aug 13, 2026
@allgandalf
allgandalf requested review from blimpich and rlinoz August 13, 2026 10:04
@allgandalf
allgandalf marked this pull request as ready for review August 13, 2026 10:04
@allgandalf
allgandalf requested review from a team as code owners August 13, 2026 10:04
@melvin-bot
melvin-bot Bot requested a review from dmkt9 August 13, 2026 10:04
@melvin-bot

melvin-bot Bot commented Aug 13, 2026

Copy link
Copy Markdown

@dmkt9 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 trjExpensify and removed request for a team August 13, 2026 10:04

@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: 5e27956618

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

@allgandalf

Copy link
Copy Markdown
Contributor Author

@rlinoz @blimpich I'm OoO tomorrow, in case we're able to deploy web-e PR please feel free review this PR as well , the jest test is failing on main https://expensify.slack.com/archives/C01GTK53T8Q/p1786615752269259, I'll try to be back online later tonight and merge main in case the fix gets pushed, thanks !

blimpich
blimpich previously approved these changes Aug 13, 2026
@codecov

codecov Bot commented Aug 14, 2026 •

Copy link
Copy Markdown

Codecov Report

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

Files with missing lines Coverage Δ
src/libs/actions/TravelBilling.ts 58.58% <0.00%> (ø)
.../travel/WorkspaceTravelBillingMonthlyLimitPage.tsx 0.00% <0.00%> (ø)
...workspace/travel/WorkspaceTravelBillingSection.tsx 90.95% <77.77%> (ø)
...el/WorkspaceTravelBillingSettlementAccountPage.tsx 0.00% <0.00%> (ø)
.../WorkspaceTravelBillingSettlementFrequencyPage.tsx 0.00% <0.00%> (ø)
... and 11 files with indirect coverage changes

blimpich
blimpich previously approved these changes Aug 14, 2026
@blimpich

Copy link
Copy Markdown
Contributor

Merge conflicts 😢. I think I caused these, so apologies!

@allgandalf

Copy link
Copy Markdown
Contributor Author

no worries 😄

@allgandalf

Copy link
Copy Markdown
Contributor Author

WIll wait for the Web-E PR to hit staging before removing hold from the title

# Conflicts:
#	src/libs/API/parameters/PayTravelInvoicingSpendParams.ts
#	src/libs/actions/TravelBilling.ts
#	src/pages/workspace/travel/WorkspaceTravelBillingMonthlyLimitPage.tsx
#	src/pages/workspace/travel/WorkspaceTravelBillingSection.tsx
#	src/pages/workspace/travel/WorkspaceTravelBillingSettlementAccountPage.tsx
#	src/pages/workspace/travel/WorkspaceTravelBillingSettlementFrequencyPage.tsx
@allgandalf allgandalf changed the title [HOLD Web-E 54821] Read Consolidated Travel Billing settings from the resolved fund Read Consolidated Travel Billing settings from the resolved fund Aug 20, 2026
@allgandalf

Copy link
Copy Markdown
Contributor Author

@rlinoz lets merge this 💪

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

Looks good, does this have to be internal QA @allgandalf ?

@rlinoz

rlinoz commented Aug 20, 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 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 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 and each prop has a /** comment above it */
    • The file is named correctly
    • 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
    • For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
    • Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
    • All JSX used for rendering exists in the render method
    • 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 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 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

@rlinoz
rlinoz merged commit c66214c into Expensify:main Aug 20, 2026
37 checks passed
@github-actions

Copy link
Copy Markdown
Contributor

🚧 rlinoz 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 OSBotify mentioned this pull request Aug 21, 2026
55 tasks done
@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/rlinoz in version: 9.4.58-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

No help site changes required

I reviewed this PR against the help articles under App/docs/articles and no changes to the help site are needed, so I did not open a draft docs PR.

Why: This is a purely internal data-source refactor. It swaps the Onyx key the workspace Travel settings read from — useWorkspaceAccountID → useDefaultFundID — so Consolidated Travel Billing reads settings from the resolved fund (a domain-shared feed shows feed-wide spend/limit; a workspace-scoped feed still works via the fallback). It also renames the payTravelBillingSpend param from domainAccountID to policyID.

None of this changes anything a customer sees or does:

  • No new or renamed features, tabs, settings labels, or buttons.
  • The enable/setup flow, Consolidated Travel Billing section, Settlement account, Settlement frequency, Monthly limit, and Current travel spend/limit all behave the same in the UI.

I checked the three existing CTB articles and confirmed none describe the underlying feed/account plumbing that this PR touches:

  • travel/consolidated-travel-billing/Enable-Consolidated-Travel-Billing-in-a-Workspace.md
  • travel/consolidated-travel-billing/Book-Travel-Using-Consolidated-Travel-Billing.md
  • travel/consolidated-travel-billing/Complete-a-Hotel-Stay-Using-Consolidated-Travel-Billing.md

@allgandalf, since there are no user-facing changes here, there's no help site PR to review. If you believe the shift to feed-wide (domain-shared) travel spend/limit is worth calling out for customers with domain-shared feeds, let me know and I'll draft the docs update.


view run

@m-natarajan

Copy link
Copy Markdown

@rlinoz @blimpich @allgandalf We can validate this PR with an Expensifail account up to Step 9. I’m not sure how we can validate Step 10 with our available accounts.
Is there a workaround or test account that can satisfy the requirement for Step 10?

@rlinoz

rlinoz commented Aug 21, 2026

Copy link
Copy Markdown
Contributor

Yeah, I don't think we can, we would need a private domain that doesn't have a domain yet.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/Beamanator in version: 9.4.58-4 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 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.

6 participants