Fix: Card name in card list and card name field are blank on admin side by nyomanjyotisa · Pull Request #93554 · Expensify/App

nyomanjyotisa · 2026-06-15T01:29:37Z

Explanation of Change

Reads company card names from the shared workspace NVP (NVP_EXPENSIFY_COMPANY_CARDS_CUSTOM_NAMES), so admins see the same custom card names as the card owner (vice versa)

Fixed Issues

$ #78832
PROPOSAL: #78832 (comment)

Tests

Same as QA Steps

Verify that no errors appear in the JS console

Offline tests

Same as QA Steps

QA Steps

Precondition:

Owner invited a member as admin to the workspace.

[Owner] Go to workspace settings > Company cards.
[Owner] Assign a card to owner.
[Admin] Go to workspace settings > Company cards.
[Admin] Click on owner's card.
[Admin] Click Card name field.
Verify that admin can see the owner's card name in card list (Step 3) and card name field (Step 5).

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android-Native.mp4

Android: mWeb Chrome

Android-mWeb.Chrome.mp4

iOS: Native

iOS-Native.mp4

iOS: mWeb Safari

iOS-mWeb.Safari.mp4

MacOS: Chrome / Safari

MacOS-Chrome.mp4

codecov · 2026-06-15T01:32:51Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/libs/CardUtils.ts	`82.63% <100.00%> (+0.08%)`	⬆️
src/selectors/Card.ts	`89.74% <100.00%> (+0.26%)`	⬆️
...onents/Tables/WorkspaceCompanyCardsTable/index.tsx	`0.00% <0.00%> (ø)`
...e/companyCards/WorkspaceCompanyCardDetailsPage.tsx	`0.00% <0.00%> (ø)`
src/libs/actions/CompanyCards.ts	`0.00% <0.00%> (ø)`
...panyCards/WorkspaceCompanyCardEditCardNamePage.tsx	`0.00% <0.00%> (ø)`
... and 10 files with indirect coverage changes

melvin-bot · 2026-06-15T03:19:33Z

@aimane-chnaif 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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 4134c87666

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

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

nyomanjyotisa · 2026-06-15T03:48:09Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 520b30f75d

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

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

nyomanjyotisa · 2026-06-15T05:00:48Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 335d9cf331

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

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

nyomanjyotisa · 2026-06-15T05:42:01Z

@codex review

chatgpt-codex-connector · 2026-06-15T05:55:20Z

Codex Review: Didn't find any major issues. More of your lovely PRs please.

Reviewed commit: 9ef43f8261

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

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

JmillsExpensify

LGTM

aimane-chnaif · 2026-06-23T08:47:11Z

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

Android: mWeb Chrome

iOS: HybridApp

ios.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

web.mov

aimane-chnaif · 2026-06-23T08:47:36Z

@nyomanjyotisa please pull main

MelvinBot · 2026-06-23T08:53:04Z

🤖 Code review — the App-side changes are clean and consistent, but there are two things worth confirming before this merges.

1. This relies on a backend change that isn't linked here

The approved proposal took the front-end-only route — fall back to getDefaultCardName(...) when the user-specific NVP_EXPENSIFY_COMPANY_CARDS_CUSTOM_NAMES isn't populated for the admin — and explicitly noted that "the proper fix should be implemented on the backend side."

This PR instead implements that proper, shared approach: it reads/writes a new settings.companyCardCustomNames field on the shared domain-member NVP so admins see the owner's real custom name. That's the better fix, but it only adds an optimistic Onyx write (CompanyCards.ts:711-715) — nothing in this PR makes the server persist or return companyCardCustomNames. For the feature to actually work as described:

UPDATE_COMPANY_CARD_NAME must write the name into the shared domain-member NVP, and
the company-cards page response must return settings.companyCardCustomNames to all admins.

If the backend doesn't do this, the new name survives only in the editor's local Onyx until reload and never reaches other admins. There's no MOBILE-EXPENSIFY: / backend PR linked in the description — please confirm the backend already populates this field (or link the companion PR). This also means the approach diverges from what was approved on the issue, so it's worth a quick sign-off that the new direction is agreed.

2. Failure-rollback inconsistency

The two rollbacks for the same edit use different removal semantics:

CompanyCards.ts:752-756 restores NVP_EXPENSIFY_COMPANY_CARDS_CUSTOM_NAMES with {[cardID]: oldCardTitle} — when oldCardTitle is undefined (card had no prior custom name), the MERGE is a no-op and the optimistic value stays.
CompanyCards.ts:757-761 restores the shared NVP with {[cardID]: oldCardTitle ?? null} — correctly removing the key.

On a failed save for a card that never had a custom name, the personal NVP would keep showing the failed value while the shared NVP rolls back. Use oldCardTitle ?? null in both for consistency.

Minor nits (non-blocking)

WorkspaceCompanyCardsTable/index.tsx:187-191: both ternary branches end in getDefaultCardName(cardholder?.displayName ?? ''). Could read more simply as a single fallback expression, but the current form is fine.
Good catch adding cardFeedsMetadata + workspaceCardFeedsMetadata to the loading gate in WorkspaceCompanyCardEditCardNamePage.tsx:64 — domainOrWorkspaceAccountID is derived from cardFeeds, so gating on it prevents reading the wrong NVP key while feeds load.

The strongest follow-up is confirming the backend persists settings.companyCardCustomNames — without it the cross-admin behavior in the QA steps won't hold after a reload.

aimane-chnaif · 2026-06-23T09:05:54Z

    const [countryByIp] = useOnyx(ONYXKEYS.COUNTRY);
    const [personalDetails, personalDetailsMetadata] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
    const [customCardNames] = useOnyx(ONYXKEYS.NVP_EXPENSIFY_COMPANY_CARDS_CUSTOM_NAMES);
+    const [workspaceCardFeeds] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER}${domainOrWorkspaceAccountID}`);


Use Onyx selector. No need to subscribe to the entire CardFeeds object

nyomanjyotisa · 2026-06-25T16:58:42Z

@aimane-chnaif PR updated

MelvinBot · 2026-06-25T17:04:48Z

🤖 Code review (commit 87abcff) — re-checked against my earlier review. The edit-page loading gate was cleaned up (now gates on cardFeedsMetadata/sharedCardCustomNamesMetadata, which is correct), but one issue I raised is still unaddressed:

Failure-rollback inconsistency (still present)

The two NVP rollbacks for the same failed edit use different removal semantics:

CompanyCards.ts:768-769 — personal NVP restores with {[cardID]: oldCardTitle}
CompanyCards.ts:773-774 — shared NVP restores with {[cardID]: oldCardTitle ?? null}

When a card had no prior custom name, oldCardTitle is undefined. The shared NVP correctly drops the key (?? null), but the personal NVP's MERGE of undefined is a no-op, so it keeps the failed value. Since getCompanyCardCustomName falls through from the (now-removed) shared name to the personal name, the display still shows the failed title after a failed save instead of reverting.

Fix: use oldCardTitle ?? null on line 769 as well, matching the shared NVP.

Backend persistence — please confirm

Still no MOBILE-EXPENSIFY: / backend PR linked. This PR only writes settings.companyCardCustomNames optimistically (CompanyCards.ts:725-728). The cross-admin QA steps only hold after a reload if the server actually persists this field on UPDATE_COMPANY_CARD_NAME and returns it in the company-cards response. Please confirm the backend already does this (or link the companion PR) — otherwise the rename survives only in the editor's local Onyx and never reaches other admins.

Verified safe

Display fallback order (shared → personal → default) in the table and details page preserves existing card-owner behavior.
The companyCardCustomNamesSelector avoids subscribing to the whole CardFeeds object, and the optimistic deep MERGE doesn't clobber the sibling companyCardNicknames.
updateCompanyCardName's signature is unchanged, so existing callers/tests aren't affected.

chatgpt-codex-connector · 2026-06-25T17:06:39Z

Codex Review: Didn't find any major issues. Breezy!

Reviewed commit: 87abcff2a6

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

Beamanator · 2026-06-26T15:20:07Z

#93554 (comment) - can we get some tests for this PR? 🙏

nyomanjyotisa · 2026-06-29T14:08:48Z

Added a test case 👍 the failing test is unrelated to these changes

Beamanator · 2026-06-29T15:12:22Z

looks like those being fixed in #94864 👍

Beamanator · 2026-06-29T15:15:01Z

@nyomanjyotisa please pull main again as that fix has just been merged 😬

nyomanjyotisa · 2026-06-30T01:43:38Z

@Beamanator Merged with main! ~~But another check failed 😅 Could you please help re-trigger it if possible?~~

Beamanator

LGTM!

github-actions · 2026-06-30T22:37:25Z

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

OSBotify · 2026-06-30T22:43:54Z

✋ 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 · 2026-06-30T22:52:51Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-252374e0474-6f1f532-4f36d37ea9b6f37ac083b0685edef53199c23b0a/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-252374e-6f1f532-43c372be8880d1bbdb4c92b4a45e99b0d48ca70a/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-07-01T20:12:22Z

🚀 Deployed to staging by https://github.com/Beamanator in version: 9.4.26-0 🚀

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

MelvinBot · 2026-07-01T20:15:41Z

🤖 I reviewed the changes in this PR against the help site files under docs/articles.

No help site changes are required.

This PR is a bug fix: it makes a company card's custom name display consistently for both the card owner and workspace admins (previously the card name was blank on the admin side) by reading the name from the shared workspace NVP. It doesn't add a new feature, change a documented workflow, or rename any UI labels.

I checked the company card help articles, and the individual assigned-card Card name (rename) feature isn't documented on the help site:

connect-credit-cards/Assign-Company-Cards.md — covers assigning cards
connect-credit-cards/Configure-Company-Card-Settings.md — covers the card feed name and per-card export accounts, but not renaming an individual card

Since this fix restores the intended behavior of a feature that isn't described on the help site, there's nothing to update. No draft PR was created.

@nyomanjyotisa, please review the linked help site PR and confirm it reflects the current behavior. Then mark the linked help site PR Ready for review

OSBotify · 2026-07-06T15:28:22Z

🚀 Deployed to production by https://github.com/grgia in version: 9.4.27-2 🚀

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

Bundle Size Analysis (Sentry):

Android

Fix: Card name in card list and card name field are blank on admin side

a372874

melvin-bot Bot assigned nyomanjyotisa Jun 15, 2026

lint fix

4134c87

nyomanjyotisa marked this pull request as ready for review June 15, 2026 03:19

nyomanjyotisa requested review from a team as code owners June 15, 2026 03:19

melvin-bot Bot requested review from JmillsExpensify and aimane-chnaif and removed request for a team June 15, 2026 03:19

melvin-bot Bot removed the request for review from a team June 15, 2026 03:19

chatgpt-codex-connector Bot reviewed Jun 15, 2026

View reviewed changes

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

fix: read shared NVP using domainOrWorkspaceAccountID

520b30f

chatgpt-codex-connector Bot reviewed Jun 15, 2026

View reviewed changes

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

fix: gate card name form on shared NVP loading state

335d9cf

chatgpt-codex-connector Bot reviewed Jun 15, 2026

View reviewed changes

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

Comment thread src/components/Tables/WorkspaceCompanyCardsTable/index.tsx Outdated

minor change

9ef43f8

nyomanjyotisa mentioned this pull request Jun 15, 2026

[Due for payment 2026-07-13] [$250] Company card - Card name in card list and card name field are blank on admin's side #78832

Closed

7 tasks

JmillsExpensify previously approved these changes Jun 15, 2026

View reviewed changes

nyomanjyotisa mentioned this pull request Jun 16, 2026

Company card - Name field is empty when opened as card admin #93598

Closed

7 tasks

flodnv requested review from aimane-chnaif and removed request for aimane-chnaif June 16, 2026 13:52

aimane-chnaif reviewed Jun 23, 2026

View reviewed changes

nyomanjyotisa added 2 commits June 26, 2026 00:33

refactor: extract company card custom name lookup and use onyx selector

a2834e1

Merge branch 'main' into issue-78832

87abcff

nyomanjyotisa dismissed JmillsExpensify’s stale review via 87abcff June 25, 2026 16:48

aimane-chnaif approved these changes Jun 25, 2026

View reviewed changes

melvin-bot Bot requested a review from Beamanator June 25, 2026 17:00

nyomanjyotisa added 3 commits June 29, 2026 21:48

test: add unit tests for getCompanyCardCustomName

77b8426

Merge branch 'main' into issue-78832

58f8fa0

Merge branch 'main' into issue-78832

6475ecf

Merge branch 'main' into issue-78832

04343d8

nyomanjyotisa added 3 commits June 30, 2026 12:06

Merge branch 'main' into issue-78832

7917cce

Merge branch 'main' into issue-78832

1835917

Merge branch 'main' into issue-78832

f33900a

Beamanator approved these changes Jun 30, 2026

View reviewed changes

Beamanator merged commit 252374e into Expensify:main Jun 30, 2026
33 checks passed

OSBotify mentioned this pull request Jul 1, 2026

Deploy Checklist: New Expensify 2026-07-01 #95081

Closed

97 tasks

Uh oh!

Conversation

nyomanjyotisa commented Jun 15, 2026 • 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 Jun 15, 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 Jun 15, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

nyomanjyotisa commented Jun 15, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

nyomanjyotisa commented Jun 15, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

nyomanjyotisa commented Jun 15, 2026

Uh oh!

chatgpt-codex-connector Bot commented Jun 15, 2026

Uh oh!

JmillsExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

aimane-chnaif commented Jun 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

aimane-chnaif commented Jun 23, 2026

Uh oh!

MelvinBot commented Jun 23, 2026

1. This relies on a backend change that isn't linked here

2. Failure-rollback inconsistency

Uh oh!

aimane-chnaif Jun 23, 2026

Choose a reason for hiding this comment

Uh oh!

nyomanjyotisa commented Jun 25, 2026

Uh oh!

MelvinBot commented Jun 25, 2026

Failure-rollback inconsistency (still present)

Backend persistence — please confirm

Uh oh!

chatgpt-codex-connector Bot commented Jun 25, 2026

Uh oh!

Beamanator commented Jun 26, 2026

Uh oh!

nyomanjyotisa commented Jun 29, 2026

Uh oh!

Beamanator commented Jun 29, 2026

Uh oh!

Beamanator commented Jun 29, 2026

Uh oh!

nyomanjyotisa commented Jun 30, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Beamanator left a comment

Choose a reason for hiding this comment

nyomanjyotisa commented Jun 15, 2026 •

edited

Loading

codecov Bot commented Jun 15, 2026 •

edited by github-actions Bot

Loading

aimane-chnaif commented Jun 23, 2026 •

edited

Loading

nyomanjyotisa commented Jun 30, 2026 •

edited

Loading