Make WorkspaceSettlementAccountPage use new SelectionList by GCyganek · Pull Request #72989 · Expensify/App

GCyganek · 2025-10-20T13:34:08Z

Explanation of Change

data variable is refactored to allow auto-memoization by React Compiler

Fixed Issues

$ #72969 (parent: #65655)
PROPOSAL: N/A

Tests

Go to the Workspaces tab
Choose a workspace where you're an admin
Enable Expensify Card feature
Navigate to the Expensify Card tab > Add Expensify card to the workspace
Add at least two business bank accounts (they have to allow debit) from the Workflows screen.
Go back to Expensify Card tab in your workspace
Click on More > Settings
Click on Settlement account to open the list
Verify that the list is working correctly

Verify that no errors appear in the JS console

Offline tests

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2025-10-20.at.14.27.18.mov

Android: mWeb Chrome

Screen.Recording.2025-10-20.at.14.28.53.mov

iOS: Native

Screen.Recording.2025-10-20.at.14.47.06.online-video-cutter.com.mp4

iOS: mWeb Safari

Screen.Recording.2025-10-20.at.14.38.39.mov

MacOS: Chrome / Safari

Screen.Recording.2025-10-20.at.14.21.38.mov

MacOS: Desktop

Screen.Recording.2025-10-20.at.14.23.56.mov

codecov · 2025-10-20T13:45:56Z

Codecov Report

❌ Patch coverage is 0% with 18 lines in your changes missing coverage. Please review.

Files with missing lines	Patch %	Lines
...e/expensifyCard/WorkspaceSettlementAccountPage.tsx	0.00%	18 Missing ⚠️

Files with missing lines	Coverage Δ
...e/expensifyCard/WorkspaceSettlementAccountPage.tsx	`0.00% <0.00%> (ø)`

... and 1654 files with indirect coverage changes

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

zfurtak · 2025-10-21T11:48:29Z

src/pages/workspace/expensifyCard/WorkspaceSettlementAccountPage.tsx

                ),
                alternateText: `${translate('workspace.expensifyCard.accountEndingIn')} ${getLastFourDigits(bankAccountNumber)}`,
-                keyForList: bankAccountID?.toString(),
+                keyForList: bankAccountID?.toString() ?? '',


Are you sure in both cases that keyForList won't be an empty string?

In this case I think it's hard to find a better candidate for keyForList other than bankAccountID which can be undefined looking at the type. I could filter out eligibleBankAccounts which do not have bankAccountID (which looks like something that would be sensible), but it would change the logic that was before the migration, so instead I decided to keep it as it was.

I can't say that I'm 100% sure these won't fall back to empty strings of course, I was thinking that this is a type problem rather than data problem while making these changes - types are not narrowed down, but data should be there.

LMK what you think.

For the fallback in if (options.length === 0) I think this problem doesn't really matter

Ahh okay I see, let's leave it like this then 👍

zfurtak · 2025-10-21T11:48:44Z

src/pages/workspace/expensifyCard/WorkspaceSettlementAccountPage.tsx

-                    initiallyFocusedOptionKey={paymentBankAccountID?.toString()}
-                    listHeaderContent={
+                    initiallyFocusedItemKey={paymentBankAccountID?.toString()}
+                    customListHeaderContent={


I would extract this one, it's quite big

melvin-bot · 2025-10-28T10:12:40Z

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

dukenv0307 · 2025-10-30T15:58:32Z

There are many duplicate hooks in WorkspaceSettlementAccountSelectionListHeader and WorkspaceSettlementAccountPage. Why don't we define the header inside WorkspaceSettlementAccountPage? Or maybe we can pass these data from WorkspaceSettlementAccountPage to WorkspaceSettlementAccountSelectionListHeader

GCyganek · 2025-11-03T11:21:13Z

There are many duplicate hooks in WorkspaceSettlementAccountSelectionListHeader and WorkspaceSettlementAccountPage. Why don't we define the header inside WorkspaceSettlementAccountPage? Or maybe we can pass these data from WorkspaceSettlementAccountPage to WorkspaceSettlementAccountSelectionListHeader

After giving it some more thought I agree that what I did may have been an overkill. I moved the header to the main component and wrapped it into useMemo instead

dukenv0307 · 2025-11-03T15:40:44Z

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
- MacOS: Desktop
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 there are no new alerts related to the canBeMissing param for useOnyx
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 shown in the product is localized by adding it to src/languages/* files and using the translation method
- 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 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)
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
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.
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.
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

Screen.Recording.2025-11-03.at.22.36.49.mov

Android: mWeb Chrome

Screen.Recording.2025-11-03.at.22.33.27.mov

iOS: HybridApp

Screen.Recording.2025-11-03.at.22.37.41.mov

iOS: mWeb Safari

Screen.Recording.2025-11-03.at.22.34.07.mov

MacOS: Chrome / Safari

Screen.Recording.2025-11-03.at.22.30.30.mov

MacOS: Desktop

Screen.Recording.2025-11-03.at.22.40.22.mov

OSBotify · 2025-11-03T16:14:59Z

✋ 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 · 2025-11-03T23:02:03Z

🚀 Deployed to staging by https://github.com/grgia in version: 9.2.43-0 🚀

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

nlemma · 2025-11-04T09:58:11Z

@GCyganek testers were not able to see the bank accounts inside the settlement settings page if they add personal bank accounts via the wallet page, but business bank accounts (added from the workflow page) are seen, is this what's expected?

mountiny · 2025-11-04T20:27:19Z

I think that is expected cc @joekaufmanexpensify

OSBotify · 2025-11-04T20:49:36Z

🚀 Deployed to production by https://github.com/luacmartins in version: 9.2.43-2 🚀

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

joekaufmanexpensify · 2025-11-04T21:07:47Z

I think that is expected cc @joekaufmanexpensify

Yeah that is expected. The test step in OP should have directed to add two business bank accounts from workspaces, because it's not possible to add them on the wallet page in NewDot yet (will be soon). It's only possible to add personal bank accounts there right now.

GCyganek · 2025-11-05T09:28:22Z

Yeah, my bad, sorry for confusion, I'm updating the description now

Make WorkspaceSettlementAccountPage use new SelectionList

3cfa7e3

melvin-bot bot assigned GCyganek Oct 20, 2025

Use type import for ListItem

d9095c8

zfurtak mentioned this pull request Oct 21, 2025

[Due for payment 2026-01-23] [SelectionList Improvements][Phase 2] Migrate all usages (~100) #65655

Closed

zfurtak reviewed Oct 21, 2025

View reviewed changes

Extract SelectionList header

e76e1a6

zfurtak approved these changes Oct 21, 2025

View reviewed changes

GCyganek added 3 commits October 21, 2025 15:39

WorkspaceSettlementAccountPage auto-memoized by React Compiler

df46ef5

Delete unused useMemo import

43986df

Extract fallbackBankAccountOption variable

eea775a

GCyganek marked this pull request as ready for review October 28, 2025 10:12

GCyganek requested a review from a team as a code owner October 28, 2025 10:12

melvin-bot bot requested a review from dukenv0307 October 28, 2025 10:12

melvin-bot bot removed the request for review from a team October 28, 2025 10:12

Move selection list header to WorkspaceSettlementAccountPage

ded17c8

dukenv0307 approved these changes Nov 3, 2025

View reviewed changes

melvin-bot bot requested a review from grgia November 3, 2025 15:40

grgia approved these changes Nov 3, 2025

View reviewed changes

grgia merged commit 746549d into Expensify:main Nov 3, 2025
26 checks passed

OSBotify mentioned this pull request Nov 3, 2025

Deploy Checklist: New Expensify 2025-11-03 #74140

Closed

54 tasks

melvin-bot bot mentioned this pull request Nov 4, 2025

[Due for payment 2025-11-11] [Due for payment 2025-11-06] [Due for payment 2025-11-04] Migrate Wave 3 #72969

Closed

Conversation

GCyganek commented Oct 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

codecov bot commented Oct 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

zfurtak Oct 21, 2025

Choose a reason for hiding this comment

Uh oh!

GCyganek Oct 21, 2025

Choose a reason for hiding this comment

Uh oh!

zfurtak Oct 21, 2025

Choose a reason for hiding this comment

Uh oh!

zfurtak Oct 21, 2025

Choose a reason for hiding this comment

Uh oh!

GCyganek Oct 21, 2025

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented Oct 28, 2025

Uh oh!

dukenv0307 commented Oct 30, 2025

Uh oh!

GCyganek commented Nov 3, 2025

Uh oh!

dukenv0307 commented Nov 3, 2025

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

OSBotify commented Nov 3, 2025

Uh oh!

OSBotify commented Nov 3, 2025

Uh oh!

nlemma commented Nov 4, 2025

Uh oh!

mountiny commented Nov 4, 2025

Uh oh!

OSBotify commented Nov 4, 2025

Uh oh!

joekaufmanexpensify commented Nov 4, 2025

Uh oh!

GCyganek commented Nov 5, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

GCyganek commented Oct 20, 2025 •

edited

Loading

codecov bot commented Oct 20, 2025 •

edited

Loading