Block any attempts to connect to feed with collect limitation by narefyev91 · Pull Request #74557 · Expensify/App

narefyev91 · 2025-11-07T10:48:07Z

Explanation of Change

if user's workspace is on Collect plan and they already has set feed - we should block any deeplinks to the direct feed flow, and redirect them to the upgrade modal in case they already have some feed connected to the Collect workspace

Fixed Issues

$ #72607, #74495, #74453
PROPOSAL:

Tests

Precondition - user should have workspace on collect plan with at least 1 feed.

Go to Feed selector - click on add new feed.
Verify that upgrade screen is shown
Try directly to access /company-cards/add-card-feed
Verify that upgrade screen is shown
Try to access directly bank connection page /company-cards/oauth.americanexpressfdx.com%201010/bank-connection
Verify that upgrade screen is shown

Verify that no errors appear in the JS console

Offline tests

No changes

QA Steps

Precondition - user should have workspace on collect plan with at least 1 feed.

Go to Feed selector - click on add new feed.
Verify that upgrade screen is shown
Try directly to access /company-cards/add-card-feed
Verify that upgrade screen is shown

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android.mov

Android: mWeb Chrome

android-web.mov

iOS: Native

ios.mov

iOS: mWeb Safari

ios-web.mov

MacOS: Chrome / Safari

web.mov

web2.mov

MacOS: Desktop

desktop.mov

…feed-with-collect-limitation # Conflicts: # src/hooks/useIsBlockedToAddFeed.ts # tests/unit/hooks/useIsBlockedToAddFeed.test.ts

melvin-bot · 2025-11-07T10:48:13Z

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

src/hooks/useIsBlockedToAddFeed.ts

src/pages/workspace/companyCards/BankConnection/index.native.tsx

src/pages/workspace/companyCards/BankConnection/index.tsx

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

src/hooks/useIsBlockedToAddFeed.ts

src/pages/workspace/companyCards/WorkspaceCompanyCardFeedSelectorPage.tsx

tests/unit/hooks/useIsBlockedToAddFeed.test.ts

src/hooks/useIsBlockedToAddFeed.ts

Co-authored-by: Dominic <165644294+dominictb@users.noreply.github.com>

…feed-with-collect-limitation # Conflicts: # src/pages/workspace/companyCards/BankConnection/index.native.tsx # src/pages/workspace/companyCards/WorkspaceCompanyCardFeedSelectorPage.tsx

…ollect-limitation # Conflicts: # src/pages/workspace/companyCards/BankConnection/index.native.tsx # src/pages/workspace/companyCards/BankConnection/index.tsx # src/pages/workspace/companyCards/WorkspaceCompanyCardFeedSelectorPage.tsx

narefyev91 · 2025-11-18T07:30:09Z

@dominictb i resolved everything and updated PR - could we move forward here?

dominictb · 2025-11-18T13:51:02Z

I'm on limited Internet access rn. Code changes are good. Will retest and complete checklist tomorrow.

dominictb · 2025-11-19T16:42:22Z

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-19.at.23.54.58.mov

Android: mWeb Chrome

Screen.Recording.2025-11-19.at.23.57.58.mov

iOS: HybridApp

Screen.Recording.2025-11-19.at.23.48.52.mov

iOS: mWeb Safari

Screen.Recording.2025-11-19.at.23.51.18.mov

MacOS: Chrome / Safari

MacOS: Desktop

dominictb

🎀

mountiny

Thank you!

melvin-bot · 2025-11-19T18:23:22Z

@mountiny looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

mountiny · 2025-11-20T12:24:43Z

This was not emergency, the AI reviewer job was stuck but no need to hold on that

OSBotify · 2025-11-21T12:26:24Z

🚀 Deployed to staging by https://github.com/mountiny in version: 9.2.62-0 🚀

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

joekaufmanexpensify · 2025-11-21T16:59:41Z

tested well 👍

OSBotify · 2025-11-24T20:01:26Z

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

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

hungvu193 · 2026-03-06T02:09:01Z

src/pages/workspace/companyCards/BankConnection/index.tsx

    }, [url]);

+    useEffect(() => {
+        if (!policyID || !isBlockedToAddNewFeeds) {


We should also add the check for direct feed to prevent showing the Upgrade page while reauthentication is required.

Context: #80799 (comment)

narefyev91 added 3 commits November 7, 2025 12:38

fix ts

17a397c

Merge branch 'refs/heads/main' into block-any-attempts-to-connect-to-…

2c7724d

…feed-with-collect-limitation # Conflicts: # src/hooks/useIsBlockedToAddFeed.ts # tests/unit/hooks/useIsBlockedToAddFeed.test.ts

cherry pick changes

36edfc8

narefyev91 requested review from a team as code owners November 7, 2025 10:48

melvin-bot bot assigned narefyev91 Nov 7, 2025

melvin-bot bot requested a review from dominictb November 7, 2025 10:48

melvin-bot bot requested review from joekaufmanexpensify and removed request for a team November 7, 2025 10:48