Support domain and workspace feed with the same name under one workspace by VickyStash · Pull Request #75438 · Expensify/App

VickyStash · 2025-11-18T16:49:07Z

Explanation of Change

Second attempt of #74356

This PR updates the app logic to support displaying of domain and workspace feeds even if they have the same identification.
Example:

Workspace 1 has a feed oauth.chase.com.
Domain 1 has a feed oauth.chase.com that is associated with the Workspace 1.

With this PR the app should show both feeds (so two Chase feeds) under Workspace 1.

Slack discussion: https://expensify.slack.com/archives/C07NMDKEFMH/p1761930535694549?thread_ts=1761257642.552319&cid=C07NMDKEFMH

Fixed Issues

$ #73380
PROPOSAL: n/a

Previous deploy blockers:
#75246
#75295

Tests

Verify that no errors appear in the JS console

Common steps:

Open the app
Login with a new account
Go to workspaces and create a workspace
Go to Company cards
Tap Add cards to add feed (United States -> Direct feed -> Other -> Setup feed using Plaid)
When the setup is finished, check the Network logs in the console and make sure that the ImportPlaidAccounts API call succeeded (regression [RCA #74356] Feed passed to ImportPlaidAccounts sometimes has an extra #XXX #75295)
Assign a card
6.1 Open card details
6.2 Update card name
Tap Settings -> Card feed name -> update the name
Tap Settings -> Statement close date -> update it
Tap Setting -> Remove feed

Regression #75246

Create a workspace
Click on the Company card
Click on Add card
Click on Commercial feed
Select any bank and complete flow
Make sure the pending Commercial feed is displayed
Repeat steps 2-6 to add one more Commercial feed. Make sure it's not displayed as selected.

Internal QA:

Case 1
Precondition: have an account with a workspace that has:

workspace Chase feed
domain Chase feed linked to the workspace

Make sure both feeds are displayed.

Case 2

Open the app
Login with a new account
Go to workspaces and create a workspace
Go to Company cards
Tap Add cards to add feed (United States -> Direct feed -> Amex / Wells Fargo / any bank, but not the last option). Make sure feed setup works as expected.
Assign a card
6.1 Open card details
6.2 Update card name
Tap Settings -> Card feed name -> update the name
Tap Settings -> Statement close date -> update it
Tap Setting -> Remove feed

Offline tests

Same, as in Tests section

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

Verify that no errors appear in the JS console

Same, as in Tests section

PR Author Checklist

Screenshots/Videos

Android: Native

android.mp4

Android: mWeb Chrome

android_web.mp4

iOS: Native

ios.mp4

iOS: mWeb Safari

ios_web.mp4

MacOS: Chrome / Safari

web1.mp4

MacOS: Desktop

desktop.mp4

This reverts commit 06aea8a, reversing changes made to e3cfcaf.

codecov · 2025-11-18T17:00:29Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/CONST/index.ts	`85.84% <ø> (ø)`
src/ONYXKEYS.ts	`100.00% <ø> (ø)`
src/hooks/useCardsList.tsx	`100.00% <100.00%> (ø)`
src/hooks/useIsAllowedToIssueCompanyCard.ts	`100.00% <100.00%> (ø)`
src/hooks/useIsBlockedToAddFeed.ts	`100.00% <100.00%> (ø)`
src/hooks/useUpdateFeedBrokenConnection.ts	`0.00% <ø> (ø)`
src/libs/CardFeedUtils.ts	`89.32% <100.00%> (ø)`
...nyCards/WorkspaceCompanyCardsErrorConfirmation.tsx	`0.00% <ø> (ø)`
...space/companyCards/addNew/CardInstructionsStep.tsx	`0.00% <ø> (ø)`
...kspace/companyCards/addNew/PlaidConnectionStep.tsx	`2.63% <ø> (ø)`
... and 25 more
... and 7 files with indirect coverage changes

Julesssss

Looking good, please add test cases for the previous failures when the PR is ready

…kspace-cards-same-name-2

melvin-bot · 2025-11-19T13:22:22Z

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

joekaufmanexpensify

Good from a product perspective 👍

hungvu193 · 2025-11-20T03:22:04Z

Will review today

hungvu193 · 2025-11-21T03:06:09Z

@VickyStash Could you resolve the conflicts? Thanks

hungvu193 · 2025-11-21T03:10:53Z

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-21.at.10.26.03.mov

Android: mWeb Chrome

Screen.Recording.2025-11-13.at.11.24.22.mov

iOS: HybridApp

Screen.Recording.2025-11-21.at.10.19.32.mov

iOS: mWeb Safari

Screen.Recording.2025-11-21.at.10.15.38.mov

MacOS: Chrome / Safari

Screen.Recording.2025-11-21.at.09.56.54.mov

MacOS: Desktop

…kspace-cards-same-name-2 # Conflicts: # src/pages/workspace/companyCards/BankConnection/index.native.tsx # src/pages/workspace/companyCards/BankConnection/index.tsx # src/pages/workspace/companyCards/WorkspaceCompanyCardFeedSelectorPage.tsx # src/pages/workspace/companyCards/assignCard/AssigneeStep.tsx

VickyStash · 2025-11-24T06:40:09Z

@puneetlath can you please take a look at the PR and test the Internal QA steps 🙏

github-actions · 2025-11-24T19:51:51Z

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

github-actions · 2025-11-24T19:57:33Z

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

Android 🤖	iOS 🍎
⏩ SKIPPED ⏩	⏩ SKIPPED ⏩
The build for Android was skipped	The build for iOS was skipped

Desktop 💻	Web 🕸️
N/A	https://75438.pr-testing.expensify.com
N/A

👀 View the workflow run that generated this build 👀

puneetlath · 2025-11-24T20:39:28Z

Seems to work well in ad-hoc

puneetlath · 2025-11-24T20:42:34Z

Apologies @VickyStash. There are conflicts.

…kspace-cards-same-name-2 # Conflicts: # src/libs/CardFeedUtils.ts # src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx

…kspace-cards-same-name-2

OSBotify · 2025-11-25T15:41:00Z

✋ 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-26T03:53:52Z

🚀 Deployed to staging by https://github.com/puneetlath in version: 9.2.64-0 🚀

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

OSBotify · 2025-11-27T01:22:08Z

🚀 Deployed to production by https://github.com/marcaaron in version: 9.2.64-5 🚀

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

DylanDylann · 2026-01-09T09:41:28Z

+    const defaultFeed = Object.keys(getCompanyFeeds(cardFeeds, true)).at(0) as CompanyCardFeedWithDomainID | undefined;
+    if (!lastSelectedFeed?.includes(CONST.COMPANY_CARD.FEED_KEY_SEPARATOR)) {


Coming from #76359, The getSelectedFeed function in CardUtils.ts doesn't validate if the lastSelectedFeed is still available

VickyStash added 2 commits November 18, 2025 17:41

Revert "Merge pull request Expensify#75356 from Expensify/revert-74356"

a60674a

This reverts commit 06aea8a, reversing changes made to e3cfcaf.

Fix issue Expensify#75246

82ae3d4

melvin-bot Bot assigned VickyStash Nov 18, 2025

VickyStash added 2 commits November 18, 2025 18:08

Fix: show newly added feed right after adding

daae700

Fix issue Expensify#75295

c37f4ac

VickyStash mentioned this pull request Nov 18, 2025

[Due for payment 2025-12-04] [Due for payment 2025-11-26] Domain Cards Not Displayed in Workspace Company Cards Page Despite API Returning Them #73380

Closed

16 tasks

Julesssss reviewed Nov 18, 2025

View reviewed changes

VickyStash added 3 commits November 19, 2025 13:14

Improve the check

4079294

Merge branch 'main' into VickyStash/refactor/73380-support-domain-wor…

18cffd6

…kspace-cards-same-name-2

Merge branch 'main' into VickyStash/refactor/73380-support-domain-wor…

35d521a

…kspace-cards-same-name-2

VickyStash marked this pull request as ready for review November 19, 2025 13:22

VickyStash requested review from a team as code owners November 19, 2025 13:22

melvin-bot Bot requested review from hungvu193 and joekaufmanexpensify and removed request for a team November 19, 2025 13:22

melvin-bot Bot removed the request for review from a team November 19, 2025 13:22

joekaufmanexpensify previously approved these changes Nov 19, 2025

View reviewed changes

VickyStash added 2 commits November 21, 2025 10:00

Adjustments after merging main

f3941a3

VickyStash dismissed joekaufmanexpensify’s stale review via f3941a3 November 21, 2025 09:25

Fix tests

7512d57

hungvu193 reviewed Nov 21, 2025

View reviewed changes

Comment thread src/hooks/useCardFeeds.tsx Outdated

Lint fix

88aa206

VickyStash requested a review from hungvu193 November 21, 2025 12:41

hungvu193 approved these changes Nov 21, 2025

View reviewed changes

melvin-bot Bot requested a review from puneetlath November 21, 2025 13:17

Julesssss previously approved these changes Nov 21, 2025

View reviewed changes

puneetlath previously approved these changes Nov 24, 2025

View reviewed changes

VickyStash added 2 commits November 25, 2025 12:23

Merge branch 'main' into VickyStash/refactor/73380-support-domain-wor…

cb40561

…kspace-cards-same-name-2 # Conflicts: # src/libs/CardFeedUtils.ts # src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx

TS fix

d5548a6

VickyStash dismissed stale reviews from puneetlath and Julesssss via d5548a6 November 25, 2025 09:42

Merge branch 'main' into VickyStash/refactor/73380-support-domain-wor…

5ffe579

…kspace-cards-same-name-2

VickyStash requested review from Julesssss, hungvu193 and puneetlath November 25, 2025 13:23

puneetlath approved these changes Nov 25, 2025

View reviewed changes

puneetlath merged commit 1aee138 into Expensify:main Nov 25, 2025
30 checks passed

OSBotify mentioned this pull request Nov 26, 2025

Deploy Checklist: New Expensify 2025-11-26 #76071

Closed

70 tasks

mitarachim mentioned this pull request Nov 26, 2025

[Due for payment 2025-12-05] Web - Company card - Settings button is hidden when workspace name is long #76142

Closed

8 tasks

DylanDylann reviewed Jan 9, 2026

View reviewed changes

DylanDylann mentioned this pull request Jan 9, 2026

[Due for payment 2026-01-07] [$250] Company cards - CC page shows empty state when one of the feeds deleted on second device #76359

Closed

8 tasks

		const defaultFeed = Object.keys(getCompanyFeeds(cardFeeds, true)).at(0) as CompanyCardFeedWithDomainID \| undefined;
		if (!lastSelectedFeed?.includes(CONST.COMPANY_CARD.FEED_KEY_SEPARATOR)) {

Conversation

VickyStash commented Nov 18, 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 Nov 18, 2025 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Julesssss left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot Bot commented Nov 19, 2025

Uh oh!

joekaufmanexpensify left a comment

Choose a reason for hiding this comment

Uh oh!

hungvu193 commented Nov 20, 2025

Uh oh!

hungvu193 commented Nov 21, 2025

Uh oh!

hungvu193 commented Nov 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

VickyStash commented Nov 24, 2025

Uh oh!

github-actions Bot commented Nov 24, 2025

Uh oh!

github-actions Bot commented Nov 24, 2025

Uh oh!

puneetlath commented Nov 24, 2025

Uh oh!

puneetlath commented Nov 24, 2025

Uh oh!

Uh oh!

OSBotify commented Nov 25, 2025

Uh oh!

OSBotify commented Nov 26, 2025

Uh oh!

OSBotify commented Nov 27, 2025

Uh oh!

DylanDylann Jan 9, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

VickyStash commented Nov 18, 2025 •

edited

Loading

codecov Bot commented Nov 18, 2025 •

edited by github-actions Bot

Loading

hungvu193 commented Nov 21, 2025 •

edited

Loading