Rillet split default account at top by s77rt · Pull Request #96845 · Expensify/App

s77rt · 2026-07-23T04:45:40Z

Explanation of Change

Fixed Issues

$ #95950
PROPOSAL:

Tests

Have a workspace connected to Rillet
Have assigned Expensify or Company card

Go to Workspace > Accounting > Export
Go to Card program account > Any feed
Verify the default option is always at the top and there is a line separator under it
Go to Per-card account > Any feed > Any card
Verify the default option is always at the top and there is a line separator under it

Screen.Recording.2026-07-23.at.5.44.59.AM.mov

Verify that no errors appear in the JS console

Offline tests

Same as Tests

QA Steps

Same as Tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

codecov · 2026-07-23T04:49:04Z

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/libs/ListUtils.tsx	`100.00% <100.00%> (ø)`
...namicWorkspaceCompanyCardAccountSelectCardPage.tsx	`0.00% <0.00%> (ø)`
...nyCards/DynamicWorkspaceCompanyCardDetailsPage.tsx	`0.00% <0.00%> (ø)`
...rillet/export/RilletCardProgramAccountSelector.tsx	`0.00% <0.00%> (ø)`
...pace/accounting/rillet/export/RilletExportPage.tsx	`0.00% <0.00%> (ø)`
src/pages/workspace/companyCards/utils.tsx	`20.73% <0.00%> (-0.09%)`	⬇️
... and 19 files with indirect coverage changes

melvin-bot · 2026-07-23T04:50:44Z

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

s77rt · 2026-07-23T04:51:30Z

This is based on #96528 so most of the changes here are unrelated. It should be an easy PR to review / test

chatgpt-codex-connector

💡 Codex Review

App/src/pages/workspace/accounting/rillet/export/RilletCardProgramAccountSelector.tsx

Line 115 in 998ce7a

const value = item.value === creditCardAccountCode ? '' : item.value;

Clear explicit default program mappings

When a feed already has cardProgramAccounts[feedKey] set to the same code as the policy default (which the previous selector could store when a user picked that account), choosing the new “Default” row never reaches this clearing assignment because the guard above sees item.value === cardProgramAccountCode. The screen then just navigates back, leaving the stale custom mapping in place and continuing to treat the program as customized instead of default; please still send the empty value when the selected row is the default account and a custom mapping exists.

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

lakchote · 2026-07-23T13:15:15Z

@truph01 can you start your review please?

@s77rt there are some bot comments

truph01 · 2026-07-24T03:50:53Z

@codex review

chatgpt-codex-connector · 2026-07-24T03:57:21Z

Codex Review: Didn't find any major issues. Can't wait for the next one!

Reviewed commit: 265f374458

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

truph01 · 2026-07-24T04:33:16Z

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

Screen.Recording.2026-07-24.at.11.29.59.mov

truph01 · 2026-07-24T04:56:27Z

+            const filteredUnprocessedData =
+                rilletData?.accounts
+                    ?.filter(
+                        (accountItem) =>
+                            accountItem.type === CONST.RILLET_ACCOUNT_TYPE.LIABILITY &&
+                            accountItem.subtype === CONST.RILLET_ACCOUNT_SUBTYPE.CREDIT_CARD &&
+                            accountItem.status === CONST.RILLET_ACCOUNT_STATUS.ACTIVE,
+                    )
+                    .map((accountItem) => ({
+                        value: cardProgramAccount?.id === accountItem.id ? '' : accountItem.id,
+                        text: `${cardProgramAccount?.id === accountItem.id ? `${translate('common.default')} - ` : ''}${accountItem.code} ${accountItem.name}`,
+                        keyForList: accountItem.id,
+                        isSelected: cardAccountID === accountItem.id,
+                    })) ?? [];
+            const filteredData = sortDefaultToTop(filteredUnprocessedData, (accountItem) => cardProgramAccount?.id === accountItem.keyForList, styles);


It is dupe of:

App/src/pages/workspace/accounting/rillet/export/RilletCardProgramAccountSelector.tsx

Lines 65 to 78 in 4a7abbf

const data: AccountListItem[] =

rilletData?.accounts

?.filter(

(accountItem) =>

accountItem.type === CONST.RILLET_ACCOUNT_TYPE.LIABILITY &&

accountItem.subtype === CONST.RILLET_ACCOUNT_SUBTYPE.CREDIT_CARD &&

accountItem.status === CONST.RILLET_ACCOUNT_STATUS.ACTIVE,

)

.map((accountItem) => ({

value: accountItem.code,

text: `${creditCardAccountCode === accountItem.code ? `${translate('common.default')} - ` : ''}${accountItem.code} ${accountItem.name}`,

keyForList: accountItem.code,

isSelected: cardProgramAccountCode === accountItem.code,

})) ?? [];

It's similar indeed but let's not block on this

lakchote

LGTM

lakchote · 2026-07-24T08:12:13Z

Let's merge it to keep the momentum going

github-actions · 2026-07-24T08:36:13Z

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

github-actions · 2026-07-24T08:41:49Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #96845.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-e6ea035642f-d815402-3c26ec2d7cf51545790eb6ceeb73f28918db2907/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-e6ea035-d815402-542892bd4141ed3ce118a4e3d86fe47768ee8b54/index.html

Web 🕸️
https://96845.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

OSBotify · 2026-07-27T19:07:36Z

🚀 Deployed to staging by https://github.com/lakchote in version: 9.4.45-0 🚀

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

MelvinBot · 2026-07-27T19:09:40Z

Help site review — no docs changes required

I reviewed the changes in this PR against the help site articles under App/docs/articles, and no updates are required.

What this PR changes: It sorts the default account to the top of the Rillet export account-selection lists (Card program account and Per-card account) and adds a separator line beneath it — plus a related fix to how card programs using custom accounts are counted. This is a purely cosmetic ordering/presentation change within an existing selector; it introduces no new feature, setting, label, or workflow step that a user-facing article would document.

Why no article needs updating:

The only help-site file that mentions Rillet is docs/articles/Unlisted/Upcoming-Integrations-And-Accounting.md, which is an internal AgentZero roadmap reference (noindex: true, not user-facing) listing Rillet as an in-development integration. It doesn't document the export account selector or list ordering, so nothing there changes.
There is no public-facing Rillet help article, and the existing accounting-export articles (QuickBooks, Xero, NetSuite, Certinia, etc.) don't describe the visual ordering of accounts within a selection dropdown — so this change doesn't contradict any documented behavior.

Since no documentation changes are needed, I did not create a draft help site PR.

@s77rt, please confirm you agree that this presentation-only change doesn't warrant a help site update. If you believe a Rillet export article should exist or be updated, let me know and I'll draft one.

OSBotify · 2026-07-29T20:20:03Z

🚀 Deployed to production by https://github.com/marcaaron in version: 9.4.45-14 🚀

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

Bundle Size Analysis (Sentry):

Android

s77rt added 2 commits July 23, 2026 05:22

push default value at top

abcf662

push default value at top - per card account

998ce7a

melvin-bot Bot assigned s77rt Jul 23, 2026

s77rt marked this pull request as ready for review July 23, 2026 04:50

s77rt requested review from a team as code owners July 23, 2026 04:50

melvin-bot Bot requested review from truph01 and removed request for a team July 23, 2026 04:50

melvin-bot Bot requested review from heyjennahay and removed request for a team July 23, 2026 04:50

s77rt mentioned this pull request Jul 23, 2026

[Due for payment 2026-08-05] Split default account in account selection list #95950

Closed

github-actions Bot reviewed Jul 23, 2026

View reviewed changes

Comment thread src/hooks/useSelectionListSearch.ts

github-actions Bot reviewed Jul 23, 2026

View reviewed changes

Comment thread src/pages/workspace/companyCards/utils.tsx

github-actions Bot reviewed Jul 23, 2026

View reviewed changes

Comment thread src/pages/workspace/accounting/rillet/export/RilletCardProgramAccountSelector.tsx Outdated

chatgpt-codex-connector Bot reviewed Jul 23, 2026

View reviewed changes

lakchote self-requested a review July 23, 2026 05:36

truph01 reviewed Jul 23, 2026

View reviewed changes

Comment thread src/pages/workspace/companyCards/utils.tsx Outdated

Comment thread src/pages/workspace/companyCards/utils.tsx Outdated

s77rt added 8 commits July 24, 2026 02:28

Merge branch 'main' into rillet-split-default-account

3e4bca6

add ListUtils

2c361dc

use sortDefaultToTop

762df5e

use sortDefaultToTop - per-cerd account

15d15fa

only count cards programs that have cards

deb9acc

lint

4a7993d

lint

e36945d

lint

265f374

s77rt requested a review from truph01 July 24, 2026 03:04

truph01 reviewed Jul 24, 2026

View reviewed changes

Comment thread src/libs/ListUtils.tsx

truph01 reviewed Jul 24, 2026

View reviewed changes

add ListUtilsTest

d84f2c3

s77rt mentioned this pull request Jul 24, 2026

Add Accounting option to Expensify Card details + Update design #96923

Merged

40 tasks

truph01 approved these changes Jul 24, 2026

View reviewed changes

lakchote approved these changes Jul 24, 2026

View reviewed changes

lakchote merged commit e6ea035 into Expensify:main Jul 24, 2026
37 checks passed

OSBotify mentioned this pull request Jul 27, 2026

Deploy Checklist: New Expensify 2026-07-27 #97134

Closed

	const data: AccountListItem[] =
	rilletData?.accounts
	?.filter(
	(accountItem) =>
	accountItem.type === CONST.RILLET_ACCOUNT_TYPE.LIABILITY &&
	accountItem.subtype === CONST.RILLET_ACCOUNT_SUBTYPE.CREDIT_CARD &&
	accountItem.status === CONST.RILLET_ACCOUNT_STATUS.ACTIVE,
	)
	.map((accountItem) => ({
	value: accountItem.code,
	text: `${creditCardAccountCode === accountItem.code ? `${translate('common.default')} - ` : ''}${accountItem.code} ${accountItem.name}`,
	keyForList: accountItem.code,
	isSelected: cardProgramAccountCode === accountItem.code,
	})) ?? [];

Uh oh!

Conversation

s77rt commented Jul 23, 2026

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

codecov Bot commented Jul 23, 2026 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

melvin-bot Bot commented Jul 23, 2026

Uh oh!

s77rt commented Jul 23, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

lakchote commented Jul 23, 2026

Uh oh!

Uh oh!

Uh oh!

truph01 commented Jul 24, 2026

Uh oh!

chatgpt-codex-connector Bot commented Jul 24, 2026

Uh oh!

truph01 commented Jul 24, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

truph01 Jul 24, 2026

Choose a reason for hiding this comment

Uh oh!

s77rt Jul 24, 2026

Choose a reason for hiding this comment

Uh oh!

lakchote left a comment

Choose a reason for hiding this comment

Uh oh!

lakchote commented Jul 24, 2026

Uh oh!

Uh oh!

github-actions Bot commented Jul 24, 2026

Uh oh!

github-actions Bot commented Jul 24, 2026

Uh oh!

OSBotify commented Jul 27, 2026

Uh oh!

MelvinBot commented Jul 27, 2026

Help site review — no docs changes required

Uh oh!

OSBotify commented Jul 29, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

codecov Bot commented Jul 23, 2026 •

edited by github-actions Bot

Loading