Skip to content

Conversation

@ikevin127
Copy link
Contributor

Explanation of Change

UX Flow

  • In the active state, the summary shows a “Settlement account” row with the current bank name / last 4.
  • When the admin taps the row:
    • We reuse the existing workspace card settlement account picker screen (the same one used when configuring the Expensify Card settlement account in WorkspaceCardPage.tsx). When the “Settlement account” row is tapped from WorkspaceTravelInvoicingSection, we navigate to that screen with an extra context flag (mode = 'travelInvoicing'), and on selection we call setTravelInvoicingSettlementAccount instead of the card‑specific action.
    • That screen shows:
      • Any existing bank accounts linked for this domain.
      • A “Connect a new bank” path (reusing the Expensify Card settlement flow).
  • When the admin selects an account:
    • We call the Travel Invoicing settlement account action.
    • On success, we return to the Travel page and show the updated account in the summary.

Data & Onyx

  • The settlement account is read from:
    • The same NVP structure used by Expensify Card in private_expensifyCardSettings, but for the PROGRAM_TRAVEL_US feed.
  • Our selector:
    • getTravelSettlementAccount(policy) returns a structure like {displayName, last4, bankAccountID} for use in UI.
  • After calling the backend to set a new settlement account:
    • The server updates the NVP, and policy in Onyx is refreshed.
    • getTravelSettlementAccount(policy) recomputes to the new bank, which updates the row.

Actions
New function in src/libs/actions/TravelInvoicing.ts:

  • setTravelInvoicingSettlementAccount({policyID, settlementAccountID}):
    • Wraps backend SetTravelInvoicingSettlementAccount.
    • On error, shows a localized error toast.

Components & reuse
Navigation:

  • When row is tapped, we route to the same screen used by card settlement account flows, e.g. WorkspaceBankAccountSelectorPage, with an extra param indicating this is for Travel Invoicing.

Settlement account screen:

  • Reuses existing bank connection list and “Connect bank” UI used for Expensify Card.
  • The only difference is which action we call on selection (setTravelInvoicingSettlementAccount vs the card’s action).

Testing
Component tests:

  • Tapping the “Settlement account” row triggers navigation with the correct params (policyID, context = 'travel').

Integration:

  • From a test user, select a different settlement account, verify the Travel Invoicing summary row updates after the mock backend updates the policy.

Fixed Issues

$ #78675
PROPOSAL:

Tests

Note

Right now in order to test the section locally - tester can edit / comment out two blocks of code to be able to see the new section in Workspace Settings > Travel, below is a diff:

DIFF
diff --git a/src/pages/workspace/travel/PolicyTravelPage.tsx b/src/pages/workspace/travel/PolicyTravelPage.tsx
index d40bc2682fd..f024973df16 100644
--- a/src/pages/workspace/travel/PolicyTravelPage.tsx
+++ b/src/pages/workspace/travel/PolicyTravelPage.tsx
@@ -46,17 +46,18 @@ function WorkspaceTravelPage({
     const step = getTravelStep(policy, travelSettings, isBetaEnabled(CONST.BETAS.IS_TRAVEL_VERIFIED), policies, currentUserLogin);
 
     const mainContent = (() => {
-        switch (step) {
-            case CONST.TRAVEL.STEPS.BOOK_OR_MANAGE_YOUR_TRIP:
-                if (isTravelInvoicingEnabled) {
-                    return <WorkspaceTravelInvoicingSection policyID={policyID} />;
-                }
-                return <BookOrManageYourTrip policyID={policyID} />;
-            case CONST.TRAVEL.STEPS.REVIEWING_REQUEST:
-                return <ReviewingRequest />;
-            default:
-                return <GetStartedTravel policyID={policyID} />;
-        }
+        return <WorkspaceTravelInvoicingSection policyID={policyID} />;
+        // switch (step) {
+        //     case CONST.TRAVEL.STEPS.BOOK_OR_MANAGE_YOUR_TRIP:
+        //         if (isTravelInvoicingEnabled) {
+        //             return <WorkspaceTravelInvoicingSection policyID={policyID} />;
+        //         }
+        //         return <BookOrManageYourTrip policyID={policyID} />;
+        //     case CONST.TRAVEL.STEPS.REVIEWING_REQUEST:
+        //         return <ReviewingRequest />;
+        //     default:
+        //         return <GetStartedTravel policyID={policyID} />;
+        // }
     })();
 
     return (
diff --git a/src/pages/workspace/travel/WorkspaceTravelInvoicingSection.tsx b/src/pages/workspace/travel/WorkspaceTravelInvoicingSection.tsx
index d0bb2ec87ca..8b65df8c5ff 100644
--- a/src/pages/workspace/travel/WorkspaceTravelInvoicingSection.tsx
+++ b/src/pages/workspace/travel/WorkspaceTravelInvoicingSection.tsx
@@ -167,9 +167,9 @@ function WorkspaceTravelInvoicingSection({policyID}: WorkspaceTravelInvoicingSec
 
     // If Travel Invoicing is not enabled or no settlement account is configured
     // show the BookOrManageYourTrip component as fallback
-    if (!isTravelInvoicingEnabled || !hasSettlementAccount) {
-        return <BookOrManageYourTrip policyID={policyID} />;
-    }
+    // if (!isTravelInvoicingEnabled || !hasSettlementAccount) {
+    //     return <BookOrManageYourTrip policyID={policyID} />;
+    // }
 
     return (
         <>

Test 1: Navigation Flow

  1. Go to Settings > Workspaces > [Workspace] > Travel.
  2. In the Travel Invoicing section, tap Settlement account row.
  3. Expected: RHP opens showing bank account list (if any exist).

Test 2: Account Selection

  1. From the Settlement account picker, select a bank account.
  2. Expected:
  • Selection updates immediately (optimistic)
  • RHP closes automatically
  • Settlement account row shows bank account's last four.

Test 3: Persistence

  1. After changing settlement account, navigate away from Travel page.
  2. Return to Travel page.
  3. Expected: The previously assigned settlement account is persisted.
  • 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 verified there are no new alerts related to the canBeMissing param for useOnyx
  • I followed proper code patterns (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 shown in the product is localized by adding it to src/languages/* files and using the translation method
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • 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)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • 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)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • 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 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 a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • 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

web.mov
ios-hybrid.mov
offline

@ikevin127 ikevin127 requested review from a team as code owners January 17, 2026 04:01
@melvin-bot
Copy link

melvin-bot bot commented Jan 17, 2026

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 ts-node ./scripts/generateTranslations.ts --help

Typically, you'd want to translate only what you changed by running npx ts-node ./scripts/generateTranslations.ts --compare-ref main

@melvin-bot melvin-bot bot requested review from joekaufmanexpensify and parasharrajat and removed request for a team January 17, 2026 04:01
@melvin-bot
Copy link

melvin-bot bot commented Jan 17, 2026

@parasharrajat 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 a team and blimpich and removed request for a team January 17, 2026 04:01
@melvin-bot
Copy link

melvin-bot bot commented Jan 17, 2026

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

@codecov
Copy link

codecov bot commented Jan 17, 2026

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/SCREENS.ts 100.00% <ø> (ø)
src/components/Icon/chunks/illustrations.chunk.ts 0.00% <ø> (ø)
src/components/MenuItem.tsx 87.12% <100.00%> (ø)
src/libs/API/types.ts 100.00% <ø> (ø)
...gation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts 100.00% <ø> (ø)
src/libs/Navigation/linkingConfig/config.ts 75.00% <ø> (ø)
src/libs/TravelInvoicingUtils.ts 100.00% <100.00%> (ø)
...rkspace/travel/CentralInvoicingSubtitleWrapper.tsx 100.00% <100.00%> (ø)
src/ROUTES.ts 12.82% <0.00%> (-0.02%) ⬇️
...gation/AppNavigator/ModalStackNavigators/index.tsx 8.09% <0.00%> (-0.02%) ⬇️
... and 5 more
... and 85 files with indirect coverage changes

Copy link

@chatgpt-codex-connector chatgpt-codex-connector bot left a comment

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: 47fc11416e

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

@ikevin127
Copy link
Contributor Author

🟢 Ready for review!

@parasharrajat
Copy link
Member

In progress.

@dubielzyk-expensify
Copy link
Contributor

Screenshots look good to me 👍

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.

3 participants