Skip to content

Support domain and workspace feed with the same name under one workspace#74356

Merged
puneetlath merged 27 commits into
Expensify:mainfrom
callstack-internal:VickyStash/refactor/73380-support-domain-workspace-cards-same-name
Nov 14, 2025
Merged

Support domain and workspace feed with the same name under one workspace#74356
puneetlath merged 27 commits into
Expensify:mainfrom
callstack-internal:VickyStash/refactor/73380-support-domain-workspace-cards-same-name

Conversation

@VickyStash

@VickyStash VickyStash commented Nov 5, 2025

Copy link
Copy Markdown
Contributor

Explanation of Change

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

Tests

  • Verify that no errors appear in the JS console

Common steps:

  1. Open the app
  2. Login with a new account
  3. Go to workspaces and create a workspace
  4. Go to Company cards
  5. Tap Add cards to add feed (United States -> Direct feed -> Other -> Setup feed using Plaid)
  6. Assign a card
    6.1 Open card details
    6.2 Update card name
  7. Tap Settings -> Card feed name -> update the name
  8. Tap Settings -> Statement close date -> update it
  9. Tap Setting -> Remove feed

Internal QA:
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.

Offline tests

Same, as in the 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 the Tests section

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
    • MacOS: Desktop
  • 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

Android: Native
android.mp4
Android: mWeb Chrome
android_web.mp4
iOS: Native
ios.mp4
iOS: mWeb Safari
ios_web.mp4
MacOS: Chrome / Safari
web.mp4
MacOS: Desktop
desktop.mp4

…kspace-cards-same-name

# Conflicts:
#	src/pages/workspace/companyCards/BankConnection/index.native.tsx
#	src/pages/workspace/companyCards/WorkspaceCompanyCardFeedSelectorPage.tsx
#	src/pages/workspace/companyCards/assignCard/AssigneeStep.tsx
#	src/pages/workspace/companyCards/assignCard/InviteNewMemberStep.tsx
#	src/pages/workspace/companyCards/assignCard/TransactionStartDateStep.tsx
@codecov

codecov Bot commented Nov 5, 2025

Copy link
Copy Markdown

Codecov Report

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

Files with missing lines Coverage Δ
src/CONST/index.ts 85.71% <ø> (ø)
src/ONYXKEYS.ts 100.00% <ø> (ø)
src/hooks/useCardsList.tsx 100.00% <100.00%> (ø)
src/hooks/useIsAllowedToIssueCompanyCard.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.70% <ø> (ø)
...ace/companyCards/assignCard/AssignCardFeedPage.tsx 58.82% <ø> (ø)
... and 22 more
... and 134 files with indirect coverage changes

@VickyStash VickyStash changed the title [WIP] Support domain and workspace feed with the same name under one workspace Support domain and workspace feed with the same name under one workspace Nov 7, 2025
@VickyStash VickyStash marked this pull request as ready for review November 7, 2025 15:15
@VickyStash VickyStash requested review from a team as code owners November 7, 2025 15:15
@melvin-bot melvin-bot Bot requested review from hungvu193 and removed request for a team November 7, 2025 15:15
@hungvu193

hungvu193 commented Nov 12, 2025

Copy link
Copy Markdown
Contributor

@VickyStash How did you test it btw?

@hungvu193 I've used mocked data

Could you share it 😅 ? A snippet of mock onyx data would be really helpful

…kspace-cards-same-name

# Conflicts:
#	src/libs/CardUtils.ts
#	src/pages/workspace/companyCards/WorkspaceCompanyCardsErrorConfirmation.tsx
#	src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx
@puneetlath

Copy link
Copy Markdown
Contributor

Alright. I finally managed to test this and it looks like it's working!

Here's production:
image

And here's the adhoc build:
image

@hungvu193

Copy link
Copy Markdown
Contributor

Chatted with @VickyStash about the test steps. I'll complete the checklist today.

@VickyStash Could you resolve the conflict in the meantime? Ty

…kspace-cards-same-name

# Conflicts:
#	src/pages/workspace/companyCards/WorkspaceCompanyCardsListHeaderButtons.tsx

@puneetlath puneetlath left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems to generally make sense to me but I find the terms combinedFeed and originalFeed kind of confusing. It's not super obvious to me what either of those mean.

Can you describe them to me and maybe we can workshop some potential alternative terms?

import type {CompanyCardFeed} from '@src/types/onyx';

type CardFeedListItem = ListItem & {
/** Combined feed key */

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we explain what this is a bit more. I don't think it's obvious what "combined feed" means.

@VickyStash VickyStash Nov 13, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you describe them to me and maybe we can workshop some potential alternative terms?

Sure!
It's a key that combined fromfeed + domainID/workspaceAccountID depending on the feed source.

Example:
original feed: oauth.chase.com
combined feed: oauth.chase.com#123456

@puneetlath What do you think?

@puneetlath puneetlath merged commit f62e324 into Expensify:main Nov 14, 2025
26 checks passed
@OSBotify

Copy link
Copy Markdown
Contributor

✋ 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

Copy link
Copy Markdown
Contributor

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

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

@mvtglobally

mvtglobally commented Nov 14, 2025

Copy link
Copy Markdown

@VickyStash @puneetlath this is ready for Internal QA

puneetlath added a commit that referenced this pull request Nov 17, 2025
…refactor/73380-support-domain-workspace-cards-same-name"

This reverts commit f62e324, reversing
changes made to 8bf8f0a.
puneetlath added a commit that referenced this pull request Nov 17, 2025
Revert "Merge pull request #74356 from callstack-internal/VickyStash/…
puneetlath added a commit that referenced this pull request Nov 17, 2025
Revert "Merge pull request #74356 from callstack-internal/VickyStash/…

(cherry picked from commit 06aea8a)

(cherry-picked to staging by puneetlath)
@OSBotify

Copy link
Copy Markdown
Contributor

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

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

@OSBotify

Copy link
Copy Markdown
Contributor

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

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

@OSBotify

Copy link
Copy Markdown
Contributor

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

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

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/grgia in version: 9.2.59-5 🚀

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

@OSBotify

Copy link
Copy Markdown
Contributor

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

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

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.

6 participants