Skip to content

[Internal QA] Don't count CSV uploads in Classic as a feed in ND#77117

Merged
MariaHCD merged 19 commits intoExpensify:mainfrom
allgandalf:allowAddingFeedForCollectCSV
Jan 8, 2026
Merged

[Internal QA] Don't count CSV uploads in Classic as a feed in ND#77117
MariaHCD merged 19 commits intoExpensify:mainfrom
allgandalf:allowAddingFeedForCollectCSV

Conversation

@allgandalf
Copy link
Contributor

@allgandalf allgandalf commented Dec 9, 2025

Explanation of Change

Plaid connects to international bank accounts that weren't allowed in Classic. So there's a high chance that an international customer in ND has a CSV upload in Classic.

Currently, Collect users are blocked from adding more than one feed in ND( CSV upload in Classic is counting as a feed in ND for Collect customers.) , so the CSV upload is blocking them from connecting cards in ND

We want to allow these users to connect through Plaid and abandon the CSV upload process.

With this PR, we allow creation of the feed for collect customers if their existing feed is a csv feed.

Deployment Plan:

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/569331
PROPOSAL: N/A

Tests

  • Verify that no errors appear in the JS console

Offline tests

QA Steps

Test 1:

  1. Login as a new collect user > create worksapce
  2. Go to OldDot > Go to supportal tool > supportal login as the ND user
  3. Go to Manage Commercial Card Setups > Set Commercial Card Feed
  4. Enter the policyID of the workspace of the user on ND and then select: Stripe Feed.
  5. Create the feed
  6. Now go to ND > workspace > company cards
  7. Click on feed selector and click add cards

Verify that you are not shown a upgrade workspace modal and are shown a RHP to select country

  1. Select United States > Select commercial feed > AMEX > enter any value and click submit

Verify that a feed is added successfully with the message We're reviewing your request....

  1. Open the feed selector again > click add cards

Verify that now a upgrade RHP appears

Test 2

  1. Login as a new collect user > Create workspace
  2. Add a pending comapny card feed > Try creating another feed

Verify that you are shown the upgrade modal

  • 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 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.
Screen.Recording.2025-12-23.at.3.02.03.PM.mov

@codecov
Copy link

codecov bot commented Dec 9, 2025

Codecov Report

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

Files with missing lines Coverage Δ
src/hooks/useIsBlockedToAddFeed.ts 100.00% <100.00%> (ø)
src/libs/CardUtils.ts 71.09% <100.00%> (+0.22%) ⬆️
...es/workspace/companyCards/BankConnection/index.tsx 0.00% <0.00%> (ø)
...s/workspace/companyCards/addNew/AddNewCardPage.tsx 0.00% <0.00%> (ø)
... and 12 files with indirect coverage changes

@allgandalf allgandalf requested a review from MariaHCD December 9, 2025 08:49
@allgandalf allgandalf changed the title [HOLD Auth 18630] Don't count CSV uploads in Classic as a feed in ND Don't count CSV uploads in Classic as a feed in ND Dec 23, 2025
@allgandalf allgandalf marked this pull request as ready for review December 23, 2025 08:35
@allgandalf allgandalf requested review from a team as code owners December 23, 2025 08:35
@allgandalf allgandalf changed the title Don't count CSV uploads in Classic as a feed in ND [Internal QA] Don't count CSV uploads in Classic as a feed in ND Dec 23, 2025
@allgandalf allgandalf added the InternalQA This pull request required internal QA label Dec 23, 2025
@allgandalf allgandalf marked this pull request as draft December 23, 2025 08:37
@allgandalf allgandalf marked this pull request as ready for review December 23, 2025 08:37
@allgandalf allgandalf requested review from a team and removed request for a team December 23, 2025 08:41
@melvin-bot melvin-bot bot requested review from alitoshmatov and removed request for a team December 23, 2025 08:42
@melvin-bot
Copy link

melvin-bot bot commented Dec 23, 2025

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

@melvin-bot melvin-bot bot requested review from heyjennahay and removed request for a team December 23, 2025 08:42
@allgandalf allgandalf requested a review from mountiny January 6, 2026 05:11
@allgandalf
Copy link
Contributor Author

All yours @mountiny

@github-actions
Copy link
Contributor

github-actions bot commented Jan 6, 2026

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

@mountiny
Copy link
Contributor

mountiny commented Jan 6, 2026

@mountiny
Copy link
Contributor

mountiny commented Jan 6, 2026

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
Android: mWeb Chrome
iOS: HybridApp
iOS: mWeb Safari
MacOS: Chrome / Safari
MacOS: Desktop

@github-actions
Copy link
Contributor

github-actions bot commented Jan 6, 2026

@heyjennahay
Copy link
Contributor

@allgandalf to clarify with the tests, neither of these seem to involve loading a CSV in Classic. Or is the Stripe Feed actually the equivalent to a CSV bank statement import?

@allgandalf
Copy link
Contributor Author

Or is the Stripe Feed actually the equivalent to a CSV bank statement import?

Yes!

@allgandalf
Copy link
Contributor Author

Alternatively, you can just add csv feed if you have and test this PR, it would work the same both ways

@heyjennahay
Copy link
Contributor

heyjennahay commented Jan 7, 2026

Testing completed without issue. Nice work!

jenna+collectv2downgradetestfinal@expensifail.com

Test 1:

2E2F3F3AB8F14FE2

  1. Login as a new collect user > create worksapce
  2. Go to OldDot > Go to supportal tool > supportal login as the ND user
  3. Go to Manage Commercial Card Setups > Set Commercial Card Feed
  4. Enter the policyID of the workspace of the user on ND and then select: Stripe Feed.
  5. Create the feed
  6. Now go to ND > workspace > company cards
  7. Click on feed selector and click add cards

Verify that you are not shown a upgrade workspace modal and are shown a RHP to select country ✅

  1. Select United States > Select commercial feed > AMEX > enter any value and click submit

Verify that a feed is added successfully with the message We're reviewing your request.... ✅
image

  1. Open the feed selector again > click add cards

Verify that now a upgrade RHP appears ✅
image

Test 2

5864F6ED08A2E61A

  1. Login as a new collect user > Create workspace
  2. Add a pending comapny card feed > Try creating another feed

Verify that you are shown the upgrade modal ✅
image

Copy link
Contributor

@heyjennahay heyjennahay left a comment

Choose a reason for hiding this comment

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

Changes to product LGTM

@allgandalf
Copy link
Contributor Author

Niceeee, thanks!

Copy link
Contributor

@mountiny mountiny left a comment

Choose a reason for hiding this comment

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

Thanks

@MariaHCD MariaHCD merged commit a0bb986 into Expensify:main Jan 8, 2026
30 checks passed
@OSBotify
Copy link
Contributor

OSBotify commented Jan 8, 2026

✋ 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
Contributor

OSBotify commented Jan 8, 2026

🚀 Deployed to staging by https://github.com/MariaHCD in version: 9.2.96-1 🚀

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

@nkuoch
Copy link
Contributor

nkuoch commented Jan 9, 2026

This created a regression: #79182

@allgandalf
Copy link
Contributor Author

Created a revert: #79206

@OSBotify
Copy link
Contributor

OSBotify commented Jan 9, 2026

🚀 Deployed to production by https://github.com/arosiclair in version: 9.2.96-6 🚀

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

@OSBotify
Copy link
Contributor

OSBotify commented Jan 9, 2026

🚀 Deployed to production by https://github.com/arosiclair in version: 9.2.96-6 🚀

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

@OSBotify
Copy link
Contributor

OSBotify commented Jan 9, 2026

🚀 Deployed to production by https://github.com/arosiclair in version: 9.2.96-6 🚀

platform result
🕸 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

InternalQA This pull request required internal QA

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants