[HOLD E/E issue 594594 and App PR 85759] fix: navigation issue after adding Plaid feed in Collect workspace

[dominictb]

cc @joekaufmanexpensify, coming from #81286 (comment)

Explanation of Change

Cross-posting my proposal from the private repo here for visibility:

Problem

• The Collect workspace is initially connected to a domain-level feed in OldDot (CSV feed).
• We connect it to another new feed in NewDot

⇒ We'd be prompted to upgrade to Control because we've reach the company cards limit (1 feed) on Collect plan ❌

It shouldn't work that way. CSV feed is a special feed that shouldn't count towards the limit. So even after connecting to a new feed in NewDot, the count should only be 1 feed (excluding CSV feed). We should have not reached the limit yet!

See bug recording here #81286 (comment).

Root cause

1. domainOrWorkspaceAccountID is initially the domainID which refers to a domain-level feed (CSV feed):

App/src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx

Line 46 in 6f04f02

const domainOrWorkspaceAccountID = getDomainOrWorkspaceAccountID(workspaceAccountID, selectedFeed);

2. After adding the new Plaid feed, we set the lastSelectedFeed to be that Plaid feed:

App/src/pages/workspace/companyCards/addNew/AddNewCardPage.tsx

Lines 81 to 83 in a844d6b

	if (newFeed) {
	updateSelectedFeed(newFeed, policyID);
	}

3. That recomputes the domainOrWorkspaceAccountID and changes it to workspaceActorID - workspace-level feed (Plaid feed) in the background. That change triggers the effect to call OpenCompanyCardsPage API:

App/src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx

Lines 62 to 63 in 6f04f02

	openPolicyCompanyCardsPage(policyID, domainOrWorkspaceAccountID, emailList, translate);
	}, [domainOrWorkspaceAccountID, policyID, translate]);

4. That action sets the feed isLoading from true to false to indicate API response loading. That makes useIsBlockedToAddNewFeed misunderstand as adding another new feed:

App/src/hooks/useIsBlockedToAddFeed.ts

Lines 28 to 37 in ae2f783

	const isLoading = !cardFeeds || !!defaultFeed?.isLoading;
	useEffect(() => {
	if (isLoading) {
	return;
	}
	const connectedFeeds = Object.keys(companyFeeds).filter((feedKey) => !isCSVFeedOrExpensifyCard(feedKey)).length;
	setPrevCompanyFeedsLength(connectedFeeds);
	// eslint-disable-next-line react-hooks/exhaustive-deps -- we don't want this effect to run again
	}, [isLoading]);

5. So we're blocked and prompted to upgrade the workspace.

So the breaking point here is (2) because we set the lastSelectedFeed too early when the AddNewCardPage is still open and useIsBlockedToAddNewFeed is still checking.

Solution

Only set lastSelectedFeed after AddNewCardPage RHP completely closes.

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/602453
PROPOSAL:

Tests

Preconditions:

• Admin owns a private domain
• Admin uploads a CSV card feed in OldDot
• Admin assigns a card from that CSV feed to any member in OldDot
• Admin sets the CSV feed's preferred workspace to a Collect workspace

1. Go to NewDot
2. Go to that Collect workspace settings > Company cards
3. Verify the CSV feed shows
4. Try to import a new card feed from Plaid
5. Verify the Plaid feed is imported successfully and workspace upgrade page doesn't show

• Verify that no errors appear in the JS console

Offline tests

NA

QA Steps

Same as Tests

• Verify that no errors appear in the JS console

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
• 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 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: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-03-19.at.02.32.51.mov

[codecov]

Codecov Report

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

Files with missing lines	Coverage Δ
...s/workspace/companyCards/addNew/AddNewCardPage.tsx	0.00% <ø> (ø)
... and 95 files with indirect coverage changes

[melvin-bot]

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

[dominictb]

@ahmedGaber93 This is complicated to reproduce so let me know if you had questions/need support.

[dominictb]

PRs to add afterTranstion option #83899 and to refactor add new card flow #85717 were all reverted. So we're not clear of the best solution to move forward. Let's hold this for those two.