Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from

Conversation

narefyev91
Copy link
Contributor

@narefyev91 narefyev91 commented Jan 31, 2025

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

Fixed Issues

$ #55898
PROPOSAL:

Tests

  1. Create workspace or use existing one with Control Plan
  2. Click on More features -> Enable company card
  3. Verify that no Update screen is shown - and company card menu item is presented
  4. Add first feed
  5. Click on Feed selector and click on Add cards
  6. Verify that screen with Upgrade will be shown
  7. Click upgrade -> Verify that successfully upgrade screen is shown
  8. Click Got it button
  9. Verify that screen with select bank is shown
  • Verify that no errors appear in the JS console

Offline tests

No changes

QA Steps

  1. Create workspace or use existing one with Control Plan
  2. Click on More features -> Enable company card
  3. Verify that no Update screen is shown - and company card menu item is presented
  4. Add first feed
  5. Click on Feed selector and click on Add cards
  6. Verify that screen with Upgrade will be shown
  7. Click upgrade -> Verify that successfully upgrade screen is shown
  8. Click Got it button
  9. Verify that screen with select bank is shown
  • 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
    • 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 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 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.mov
Android: mWeb Chrome
android-web.mov
iOS: Native
ios.mov
iOS: mWeb Safari
ios-web.mov
MacOS: Chrome / Safari
ios-web.mov
MacOS: Desktop
desktop.mov

@narefyev91 narefyev91 requested a review from a team as a code owner January 31, 2025 10:17
@melvin-bot melvin-bot bot requested a review from DylanDylann January 31, 2025 10:17
Copy link

melvin-bot bot commented Jan 31, 2025

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

@melvin-bot melvin-bot bot removed the request for review from a team January 31, 2025 10:17
@narefyev91
Copy link
Contributor Author

@ZhenjaHorbach will continue review here

@ZhenjaHorbach
Copy link
Contributor

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-01-31.11.08.41.mov
Android: mWeb Chrome
android.mov
iOS: Native
ios.mov
iOS: mWeb Safari
ios-web.mov
MacOS: Chrome / Safari
2025-01-30.22.13.31.mov
MacOS: Desktop
2025-01-31.10.58.57.mov

@ZhenjaHorbach
Copy link
Contributor

ZhenjaHorbach commented Jan 31, 2025

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

@mountiny mountiny self-requested a review January 31, 2025 11:49
@joekaufmanexpensify
Copy link
Contributor

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

  1. 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.
  2. 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.
  3. 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
Copy link
Contributor

ZhenjaHorbach commented Jan 31, 2025

@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

Снимок экрана 2025-01-31 в 17 29 13

And if we have one card feed everything is clear !

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

@mountiny
Copy link
Contributor

Yeah I agree with the suggested path

@dannymcclain
Copy link
Contributor

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

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.

5 participants