Skip to content

[Internal QA] Show Consolidated Travel Billing as on when it's set up on the workspace account - #104447

Merged
blimpich merged 4 commits into
Expensify:mainfrom
allgandalf:travel-billing-workspace-fund
Oct 20, 2026
Merged

blimpich merged 4 commits into
Expensify:mainfrom
allgandalf:travel-billing-workspace-fund

Conversation

@allgandalf

@allgandalf allgandalf commented Oct 20, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

The Travel page read Consolidated Travel Billing from the fund useDefaultFundID returns, which is the domain when its card program is linked to the workspace. But when the domain already has a card program, CTB gets set up on the workspace account, so the toggle showed off.

Added useTravelBillingFundID, which falls back to the workspace account when only it has the TRAVEL_US program, and used it on the Travel page and its settlement account, frequency and monthly limit pages.

Fixed Issues

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

Tests

  1. As an admin of a private domain, provision the Expensify Card on the domain and link it to a workspace
  2. Enable Travel on that workspace and turn on Consolidated Travel Billing
  3. Go to Workspace > Travel
  4. Verify the Consolidated Travel Billing toggle is on and the limit, spend, settlement account and frequency show
  5. Change the settlement frequency and monthly limit and verify they save
  • Verify that no errors appear in the JS console

Offline tests

Same as tests, with saved settings showing while offline.

QA Steps

  1. go to staging supportal
  2. log in as travelandexpense@libertasfunding.com
  3. go to their newdot > workspace settings > travel
  4. confirm that CTB is toggled on
  • 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

ctb-workspace-account-after-fix.mp4

@allgandalf
allgandalf requested a review from blimpich October 20, 2026 05:51
@allgandalf allgandalf added the InternalQA This pull request required internal QA label Oct 20, 2026
@allgandalf allgandalf changed the title Show Consolidated Travel Billing as on when it's set up on the workspace account [Internal QA] Show Consolidated Travel Billing as on when it's set up on the workspace account Oct 20, 2026
@allgandalf
allgandalf marked this pull request as ready for review October 20, 2026 05:52
@allgandalf
allgandalf requested review from a team as code owners October 20, 2026 05:52
@melvin-bot
melvin-bot Bot requested review from suneox and removed request for a team October 20, 2026 05:52
@melvin-bot

melvin-bot Bot commented Oct 20, 2026

Copy link
Copy Markdown

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

@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 20, 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-20T06:09:45.966122Z 9ac0c92 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.

@melvin-bot
melvin-bot Bot requested review from trjExpensify and removed request for a team October 20, 2026 05:52
@allgandalf
allgandalf removed the request for review from suneox October 20, 2026 05:53
@allgandalf

Copy link
Copy Markdown
Contributor Author

@suneox ignore the ping, i'm not sure if you would be able to test this PR

@codecov

codecov Bot commented Oct 20, 2026 •

Copy link
Copy Markdown

Codecov Report

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

Files with missing lines Coverage Δ
src/hooks/useTravelBillingFundID.ts 100.00% <100.00%> (ø)
.../travel/WorkspaceTravelBillingMonthlyLimitPage.tsx 97.22% <100.00%> (ø)
...workspace/travel/WorkspaceTravelBillingSection.tsx 91.25% <77.77%> (ø)
...el/WorkspaceTravelBillingSettlementAccountPage.tsx 0.00% <0.00%> (ø)
.../WorkspaceTravelBillingSettlementFrequencyPage.tsx 0.00% <0.00%> (ø)
... and 13 files with indirect coverage changes

@suneox

suneox commented Oct 20, 2026

Copy link
Copy Markdown
Contributor

@suneox ignore the ping, i'm not sure if you would be able to test this PR

@allgandalf I also have admin access set up for a private domain and have been invited to Test Travel External as an admin. If a real Expensify Card isn't required, I can try to verify this PR

@allgandalf

Copy link
Copy Markdown
Contributor Author

@suneox ignore the ping, i'm not sure if you would be able to test this PR

@allgandalf I also have admin access set up for a private domain and have been invited to Test Travel External as an admin. If a real Expensify Card isn't required, I can try to verify this PR

Test Travel External as an admin

Does the travel settings page have CTB enabled ?

@blimpich not sure honestly, what do you think ? would @suneox be able to QA this PR ?

@blimpich

Copy link
Copy Markdown
Contributor

I think we don't need C+ review for this personally. I'm going to build an ad-hoc build and then just test this against the affected customer, and that should be enough.

@github-actions

Copy link
Copy Markdown
Contributor

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

@github-actions

This comment has been minimized.

@blimpich

Copy link
Copy Markdown
Contributor
Screenshot 2026-10-20 at 10 04 56 AM

confirmed this works for the affected customer

@blimpich

blimpich commented Oct 20, 2026 •

Copy link
Copy Markdown
Contributor

FYI @allgandalf I updated the QA steps to also test the customer's who had the specific problem that this PR fixes. Just easier that way.

@blimpich

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

@blimpich
blimpich merged commit 538d146 into Expensify:main Oct 20, 2026
46 of 48 checks passed
@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

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

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/blimpich in version: 9.5.15-1 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

No help site update needed. This PR fixes a bug where the Consolidated Travel Billing toggle showed as off for workspaces whose domain already had a card program, so the app now matches what users already expect and no existing article sentence becomes incorrect.


view run

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/grgia in version: 9.5.15-3 🚀

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

InternalQA This pull request required internal QA Ready To Build

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants