Allow NewDot collect customers to add one third-party card feed by narefyev91 · Pull Request #56144 · Expensify/App

narefyev91 · 2025-01-31T10:17:04Z

Explanation of Change

Allow NewDot collect customers to add one third-party feed before requiring them to upgrade. This simplifies the onboarding experience for smaller customers using company cards alongside otherwise simple use cases, hopefully increasing conversion in NewDot. It also recognizes that having multiple card programs is a more complex use case and a more natural point to require upgrading

MOBILE-EXPENSIFY:https://github.com/Expensify/Mobile-Expensify/pull/13403

Fixed Issues

$ #55898
PROPOSAL:

Tests

Create workspace or use existing one with Control Plan
Click on More features -> Enable company card
Verify that no Update screen is shown - and company card menu item is presented
Add first feed
Click on Feed selector and click on Add cards
Verify that screen with Upgrade will be shown
Click upgrade -> Verify that successfully upgrade screen is shown
Click Got it button
Verify that screen with select bank is shown

Verify that no errors appear in the JS console

Offline tests

No changes

QA Steps

Create workspace or use existing one with Control Plan
Click on More features -> Enable company card
Verify that no Update screen is shown - and company card menu item is presented
Add first feed
Click on Feed selector and click on Add cards
Verify that screen with Upgrade will be shown
Click upgrade -> Verify that successfully upgrade screen is shown
Click Got it button
Verify that screen with select bank 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

MacOS: Desktop

desktop.mov

melvin-bot · 2025-01-31T10:17:09Z

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

narefyev91 · 2025-01-31T10:18:26Z

@ZhenjaHorbach will continue review here

src/pages/workspace/WorkspaceMoreFeaturesPage.tsx

ZhenjaHorbach · 2025-01-31T11:18:52Z

Copy message from here since this is a separate issue

But actually We have another specific issue

When we upgrade our workspace plan to control and we have at least one card
And open More features:

CompanyCards will be enabled;
We will not be able to disable CompanyCards and after clicking we will open a warning modal window.

But when we downgrade our workspace plan
And open More features:

CompanyCards will be disabled and after clicking we will open the warning modal window in which we want to disable CompanyCards

I think in this case we should suggest upgrading to a control plan when we have two and more cards
And when we have one card we shouldn't disable CompanyCards when we downgrade our workspace plan

But in this case I think we need advice from @joekaufmanexpensify !

2025-01-31.11.39.53.mov

joekaufmanexpensify · 2025-01-31T15:28:01Z

Interesting. There seem to be a couple of different issues here. Here's my understanding:

If you have any card feed (pending or active) on a workspace, you can't toggle off Company cards on the more features page right now. We want to keep that as-is, even with this upgrade path change.
There seems to be a bug right now where if you downgrade a workspace from Control > Collect, we toggle off Company cards (even though there is a feed), and don't allow you to make any changes to the toggle. We probably shouldn't allow you to downgrade here OR should tell you downgrading will remove your card feed.
The circumstances of the downgrade bug from 2 change with the adjusted upgrade path. Going forward, we should:
- Allow you to downgrade from Control > Collect if you have only one card feed on your workspace (assuming all other relevant downgrade criteria are met). We should leave Company cards active in the workspace when you downgrade.
- Prevent you from downgrading if you have two or more card feeds, explaining that you can only have one card feed on collect.

Do we agree with that @mountiny @ZhenjaHorbach @narefyev91 ?

ZhenjaHorbach · 2025-01-31T16:38:25Z

@joekaufmanexpensify
Thanks for your feedback !
I like your suggestions !

And following the suggestions

I suppose we need a new warning screen or something like this that will not allow us to downgrade the plan if we have two or more card feeds, explaining that we can only have one card feed on collect instead this screen

And if we have one card feed everything is clear !

@Expensify/design
Maybe you have some ideas about this?

mountiny · 2025-01-31T16:53:25Z

Yeah I agree with the suggested path

dannymcclain · 2025-01-31T16:58:40Z

Yeah that sounds good to me. If they can't downgrade, could we just show our standard confirmation modal if they click that button and say some thing like

Can't downgrade work
This workspace has two or more external card feeds connected. Collect workspaces only allow up to 1 external card feed. Please fix it or whatever before downgrading.

Obviously we need real copy, but I'm mainly wondering if our regular confirmation dialog would be enough here. cc @Expensify/design

…in-control

narefyev91 · 2025-02-03T14:28:20Z

@ZhenjaHorbach added modal to prevent downgrade, updated all videos

ZhenjaHorbach · 2025-02-03T14:38:09Z

@narefyev91
Thanks !

And I suppose we need confirmation from @Expensify/design

And I think that when we click on Got it
We should completely close RHP
Since we have nothing else to do in the current flow

ZhenjaHorbach · 2025-02-03T15:01:32Z

@mountiny
And we need update BE part

To fix this issue (When we create a workspace we need return areCompanyCardsEnabled as true for CreateWorkspace )

2025-02-03.15.57.12.mov

And to fix this issue (When we have one card and when we downgrade our workspace, CompanyCards should still be enabled. For this we also need return areCompanyCardsEnabled as true for Policy_DowngradeToTeam )

2025-02-03.15.58.21.mov

shawnborton · 2025-02-03T18:30:27Z

If we are going to throw an error like this:

I feel like we could show it earlier when the user clicks on Collect from this screen here:

But at the same time, I think I like actually having the user go to the Downgrade screen so they can see the standard downgrade text we show people. So maybe ignore that feedback above but cc @Expensify/design for a gut check.

Otherwise I think the modal you have looks good to me.

dannymcclain · 2025-02-03T18:33:47Z

Hmm yeah I see what you're saying. I'm a bit torn about that! @dubielzyk-expensify any additional thoughts?

dubielzyk-expensify · 2025-02-03T19:00:05Z

Yeah, I quite like them seeing the downgrade screen then showing the error once they click downgrade. So basically leaving it how it currently is 👍

shawnborton · 2025-02-03T19:49:56Z

Cool, let's leave it as it is then. All good from a design perspective then I think!

ZhenjaHorbach · 2025-02-20T16:51:44Z

Found one more bug
When we re-login
And when we try to downgrade a plan we can do this provided that we have more than one card

looks like we get up-to-date information about cards only when we open company-cards page
But we have at least two places where we use this information( downgrade and more-features screens )

2025-02-20.17.49.03.mov

ZhenjaHorbach · 2025-02-20T16:52:54Z

Otherwise everything looks good !

narefyev91 · 2025-02-21T08:28:10Z

Found one more bug When we re-login And when we try to downgrade a plan we can do this provided that we have more than one card

looks like we get up-to-date information about cards only when we open company-cards page But we have at least two places where we use this information( downgrade and more-features screens )

2025-02-20.17.49.03.mov

@ZhenjaHorbach good point - seems like we need to get this information from API when we open workspace we call "api/OpenPolicyProfilePage?" - and there are no information about company cards inside response. I think we need to extend API to receive that info or we can add direct API call here in WorkspaceProfilePage:

ZhenjaHorbach · 2025-02-21T08:34:58Z

@ZhenjaHorbach good point - seems like we need to get this information from API when we open workspace we call "api/OpenPolicyProfilePage?" - and there are no information about company cards inside response. I think we need to extend API to receive that info or we can add direct API call here in WorkspaceProfilePage

As for me, both options are valid !
But let's find out @mountiny opinion
Should we fix and wait until this part of the BE is updated or can we simply make an additional request

mountiny · 2025-02-21T10:00:19Z

I can add that to the Profile page API, but I dont think we have to block on that, the API should block the downgrade when they have more than one feed. That change is in staging, @ZhenjaHorbach can you test please?

ZhenjaHorbach · 2025-02-21T10:06:01Z

I can add that to the Profile page API, but I dont think we have to block on that, the API should block the downgrade when they have more than one feed. That change is in staging, @ZhenjaHorbach can you test please?

I will check soon !

ZhenjaHorbach · 2025-02-21T11:09:29Z

Now it looks something like this in staging

But if it is okay
We can move on !

2025-02-21.12.07.41.mov

And we also have a similar problem with more-features selector
The fact that we can safely disable this feature without error when we have some cards

2025-02-21.12.09.59.mov

mountiny · 2025-02-21T15:14:44Z

And we also have a similar problem with more-features selector
The fact that we can safely disable this feature without error when we have some cards

This we should fix @narefyev91

the error is fine I think - because normally user wont be able to get to the downgrade option if they have more than one feed

ZhenjaHorbach · 2025-02-21T15:18:05Z

And we also have a similar problem with more-features selector
The fact that we can safely disable this feature without error when we have some cards

This we should fix @narefyev91

I think it's the same issue that we don't have enough data which we get only when we open company-cards screen

mountiny · 2025-02-21T15:20:46Z

src/pages/workspace/companyCards/WorkspaceCompanyCardFeedSelectorPage.tsx


+    const onAddCardsPress = () => {
+        clearAddNewCardFlow();
+        if (isCollect && feeds.length === 1) {


What if the user has Expensify Cards set up? that is also a feed

We exclude any expensify feeds - it's only return company card feeds

mountiny · 2025-02-21T15:23:35Z

src/pages/workspace/downgrade/WorkspaceDowngradePage.tsx


-    const downgradeToTeam = () => {
+    const onDowngradeToTeam = () => {
        if (!canPerformDowngrade || !policy) {


kind of feels like this condition should be added to the canModifyPlan too as now its not capturing this fact about multiple feeds

not really getting you - which condition should be moved...
i think we can remove || !policy - because canPerformDowngrade will be false if policy not exists

Ah I just meant if this logic should be in canModifyPlan but that only checks if you are admin so its ok here

mountiny · 2025-02-21T15:26:01Z

@ZhenjaHorbach what is the logic for the lock there?

ZhenjaHorbach · 2025-02-21T15:29:31Z

@ZhenjaHorbach what is the logic for the lock there?

Checking for object with cards from onyx

App/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx

Line 147 in a154669

disabled: !isEmptyObject(getCompanyFeeds(cardFeeds)),

But this bug also reproduces in staging

So I think when we update BE
It will also be fixed !

ZhenjaHorbach · 2025-02-21T16:39:31Z

@ZhenjaHorbach what is the logic for the lock there?

Checking for object with cards from onyx

App/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx

Line 147 in a154669

disabled: !isEmptyObject(getCompanyFeeds(cardFeeds)),

But this bug also reproduces in staging

So I think when we update BE It will also be fixed !

Actually we already have an issue for this bug 😅

mountiny · 2025-02-21T18:46:03Z

@ZhenjaHorbach can you please do a final check and testing on the PR? thanks! (checklist too)

ZhenjaHorbach · 2025-02-21T18:47:30Z

@ZhenjaHorbach can you please do a final check and testing on the PR? thanks! (checklist too)

@mountiny
All found bugs related to BE are ignored for the time being?

mountiny · 2025-02-21T19:04:13Z

All found bugs related to BE are ignored for the time being?

They are only happening when you sign out and sign back in and navigate to this page without visiting the Company cards page first, right?

I think that is fine as its uncommon

ZhenjaHorbach · 2025-02-21T19:20:55Z

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 tests pass on all platforms & I tested again on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- 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 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: Native

2025-02-21.20.42.50.mov

Android: mWeb Chrome

2025-02-21.20.16.14.mov

iOS: Native

ios.mov

iOS: mWeb Safari

ios-web.mov

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

desktop.mov

ZhenjaHorbach · 2025-02-21T19:22:53Z

They are only happening when you sign out and sign back in and navigate to this page without visiting the Company cards page first, right?

Yes
I can reproduce when re-login and when open pages ignoring company cards page

I think that is fine as its uncommon

And it makes sense 😅

ZhenjaHorbach · 2025-02-21T19:23:26Z

LGTM !

mountiny

Thanks!

mountiny · 2025-02-21T20:04:00Z

src/pages/workspace/downgrade/WorkspaceDowngradePage.tsx


-    const downgradeToTeam = () => {
+    const onDowngradeToTeam = () => {
        if (!canPerformDowngrade || !policy) {


Ah I just meant if this logic should be in canModifyPlan but that only checks if you are admin so its ok here

OSBotify · 2025-02-21T20:18:45Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

github-actions · 2025-02-21T23:10:50Z

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

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

mountiny · 2025-02-24T16:30:06Z

Auth PR for this is in review https://github.com/Expensify/Auth/pull/14267

github-actions · 2025-02-24T19:42:26Z

🚀 Deployed to production by https://github.com/chiragsalian in version: 9.1.4-4 🚀

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

narefyev91 added 2 commits January 31, 2025 12:06

Allow NewDot collect customers to add one third-party card feed

60f88ce

fix eslint

9bac798

narefyev91 requested a review from a team as a code owner January 31, 2025 10:17

melvin-bot bot requested a review from DylanDylann January 31, 2025 10:17

melvin-bot bot removed the request for review from a team January 31, 2025 10:17

narefyev91 mentioned this pull request Jan 31, 2025

Allow NewDot collect customers to add one third-party card feed #56091

Closed

50 tasks

ZhenjaHorbach reviewed Jan 31, 2025

View reviewed changes

src/pages/workspace/WorkspaceMoreFeaturesPage.tsx Show resolved Hide resolved

move back disabled

941a8e9

mountiny self-requested a review January 31, 2025 11:49

mountiny assigned narefyev91 Jan 31, 2025

narefyev91 added 3 commits February 3, 2025 13:23

updated copy

82df4aa

add warning modal to prevent downgrade

32685ad

Merge branch 'refs/heads/main' into block-second-attempt-to-add-feed-…

387d0f8

…in-control

narefyev91 requested a review from ZhenjaHorbach February 3, 2025 14:28

close rhp

53163e0

mountiny added the Ready To Build label Feb 3, 2025

mountiny reviewed Feb 21, 2025

View reviewed changes

ZhenjaHorbach mentioned this pull request Feb 21, 2025

Company cards - No lock on the toggle switch for company cards #57250

Closed

8 tasks

ZhenjaHorbach approved these changes Feb 21, 2025

View reviewed changes

melvin-bot bot requested a review from mountiny February 21, 2025 19:23

mountiny approved these changes Feb 21, 2025

View reviewed changes

mountiny merged commit c283c7f into Expensify:main Feb 21, 2025
21 checks passed

github-actions bot mentioned this pull request Feb 21, 2025

Deploy Checklist: New Expensify 2025-02-21 #57263

Closed

29 tasks

melvin-bot bot mentioned this pull request Feb 24, 2025

[Due for payment 2025-04-10] Allow NewDot collect customers to add one third-party card feed #55898

Closed

Conversation

narefyev91 commented Jan 31, 2025 • edited by mountiny 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!

melvin-bot bot commented Jan 31, 2025

Uh oh!

narefyev91 commented Jan 31, 2025

Uh oh!

Uh oh!

ZhenjaHorbach commented Jan 31, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

joekaufmanexpensify commented Jan 31, 2025

Uh oh!

ZhenjaHorbach commented Jan 31, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mountiny commented Jan 31, 2025

Uh oh!

dannymcclain commented Jan 31, 2025

Uh oh!

narefyev91 commented Feb 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ZhenjaHorbach commented Feb 3, 2025

Uh oh!

ZhenjaHorbach commented Feb 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

shawnborton commented Feb 3, 2025

Uh oh!

dannymcclain commented Feb 3, 2025

Uh oh!

dubielzyk-expensify commented Feb 3, 2025

Uh oh!

shawnborton commented Feb 3, 2025

Uh oh!

ZhenjaHorbach commented Feb 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ZhenjaHorbach commented Feb 20, 2025

Uh oh!

narefyev91 commented Feb 21, 2025

Uh oh!

ZhenjaHorbach commented Feb 21, 2025

Uh oh!

mountiny commented Feb 21, 2025

Uh oh!

ZhenjaHorbach commented Feb 21, 2025

Uh oh!

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

Uh oh!

Uh oh!

mountiny commented Feb 21, 2025

Uh oh!

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

Uh oh!

Uh oh!

mountiny Feb 21, 2025

Choose a reason for hiding this comment

Uh oh!

narefyev91 Feb 21, 2025

Choose a reason for hiding this comment

Uh oh!

mountiny Feb 21, 2025

Choose a reason for hiding this comment

Uh oh!

narefyev91 Feb 21, 2025

Choose a reason for hiding this comment

Uh oh!

mountiny Feb 21, 2025

Choose a reason for hiding this comment

Uh oh!

narefyev91 commented Jan 31, 2025 •

edited by mountiny

Loading

ZhenjaHorbach commented Jan 31, 2025 •

edited

Loading

ZhenjaHorbach commented Jan 31, 2025 •

edited

Loading

narefyev91 commented Feb 3, 2025 •

edited

Loading

ZhenjaHorbach commented Feb 3, 2025 •

edited

Loading

ZhenjaHorbach commented Feb 20, 2025 •

edited

Loading

ZhenjaHorbach commented Feb 21, 2025 •

edited

Loading

ZhenjaHorbach commented Feb 21, 2025 •

edited

Loading

ZhenjaHorbach commented Feb 21, 2025 •

edited

Loading

ZhenjaHorbach commented Feb 21, 2025 •

edited

Loading

ZhenjaHorbach commented Feb 21, 2025 •

edited

Loading

ZhenjaHorbach commented Feb 21, 2025 •

edited

Loading