[InternalQA] fix: always send feedType with the order number for custom feeds #55223

koko57 · 2025-01-14T16:29:14Z

Explanation of Change

Fixed Issues

$ #54891
$ #52002
PROPOSAL:

Tests

Prerequisites: Company Cards enabled

Go to company cards
Open feed selector, click add cards
Go through the flow, create new custom feed.
Observe that the request is sent with a consecutive number in the feedType (if you already have vcf1 feed it should be sent as vcf2), the feed is also saved in Onyx in sharedNVP_private_domain_member_

Verify that no errors appear in the JS console

Offline tests

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

Request a new feed setup through the company cards page (custom)
Go to supportal to the +@expensify-policy<policyID>.exfy account
Confirm that the account has vcf1 feed requested
Using the supportal tool to add commercial feed, add this account the vcf1 feed
Make sure that the account only has one feed
Try to setup another feed off the same type
Verify that the new feed is vcf2
Verify that when you add this feed in supportal, the customer has 2 feeds and they can rename it and work with it just fine

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 / Chrome
- iOS / native
- iOS / 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 the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- 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 verified the translation was requested/reviewed 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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- 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.js 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 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
- If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
  - 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(themeColors.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 form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label 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.
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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2025-01-14T16:29:21Z

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

github-actions · 2025-01-14T17:12:35Z

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

github-actions · 2025-01-14T17:36:27Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/55223/index.html	https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/55223/index.html

Desktop 💻	Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/55223/NewExpensify.dmg	https://55223.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

koko57 · 2025-01-15T09:56:54Z

@mountiny eslint fixed

mountiny

I am finding it a bit unintuitive that the feedType and cardFeed is same in this case

mountiny · 2025-01-15T11:30:15Z

src/libs/CardUtils.ts

@@ -451,6 +451,28 @@ const getDescriptionForPolicyDomainCard = (domainName: string): string => {
    return domainName;
 };

+const CUSTOM_FEEDS = [CONST.COMPANY_CARD.FEED_BANK_NAME.MASTER_CARD, CONST.COMPANY_CARD.FEED_BANK_NAME.VISA, CONST.COMPANY_CARD.FEED_BANK_NAME.AMEX];
+
+function getFeedType(cardFeed: CompanyCardFeed, cardFeeds: OnyxEntry<CardFeeds>): CompanyCardFeedWithNumber {


I find it confusing that the cardFeed is used here for the same that feedType represents.

@mountiny we were sending cardFeed as a feedType before, what name do you suggest?

Where do you mean? I think if the variable only contains the key vcf etc then it should be feedType and cardFeed would be the entire object maybe?

no, CompanyCardFeed type is a value of FEED_BANK_NAME, so it's only a name. I can rename this to feedName if you prefer

Yes please 🙌 or do you have any concerns? maybe I am reading it wrong

maybe one 😅 - we use feedName as the full name of the feed like here. TBH I can't come up with a better name - if we send feedType but pass a param of CompanyCardFeed type what better name can we think of here?

FeedKey maybe? as they are all mainly used as key in the settings object

mountiny · 2025-01-15T11:35:14Z

src/libs/CardUtils.ts

+            firstAvailableNumber++;
+        }
+
+        return `${cardFeed}${firstAvailableNumber}`;


Can you please add unit test for this? Thanks!

DylanDylann · 2025-01-15T14:25:59Z

src/libs/actions/CompanyCards.ts

    const optimisticData: OnyxUpdate[] = [
        {
            onyxMethod: Onyx.METHOD.MERGE,
            key: `${ONYXKEYS.COLLECTION.LAST_SELECTED_FEED}${policyID}`,
-            value: feedType,
+            value: cardFeed,


Suggested change

value: cardFeed,

value: feedType,

DylanDylann · 2025-01-15T14:30:25Z

If we haven't added any vcf card, I think the first vcf feed should be vcf (instead of vcf1). @koko57 Wdyt?

koko57 · 2025-01-15T14:50:41Z

@DylanDylann If you haven't added any that means that you had it from the backend earlier. We're not changing the existing values here

DylanDylann · 2025-01-16T06:43:37Z

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 the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- 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.js 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.
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

MacOS: Chrome / Safari

src/libs/CardUtils.ts

DylanDylann · 2025-01-16T06:54:49Z

@koko57 @mountiny With this change, users will see the same two feeds on the UI. Do we need to distinguish it?

DylanDylann · 2025-01-16T06:55:10Z

@koko57 Also please resolve conflict

koko57 · 2025-01-16T08:41:36Z

@DylanDylann

@koko57 @mountiny With this change, users will see the same two feeds on the UI. Do we need to distinguish it?

as per this discussion we're not doing it now

DylanDylann · 2025-01-16T09:40:23Z

The change looks fine. There is a minor thing that need to be confirmed

mountiny

Thanks!

OSBotify · 2025-01-16T14:09:18Z

✋ 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-01-17T13:55:38Z

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

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

joekaufmanexpensify · 2025-01-17T16:38:13Z

Tested and works great! I was able to add two Visa feeds and assign cards under both and everything works well. Checked the backend and everything looks good with the naming convention, eg: vcf1, vcf2.

github-actions · 2025-01-21T08:08:42Z

🚀 Deployed to production by https://github.com/Beamanator in version: 9.0.87-3 🚀

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

fix: always send feedType with the order number for custom feeds

5abc01a

koko57 requested a review from a team as a code owner January 14, 2025 16:29

melvin-bot bot requested review from alitoshmatov and removed request for a team January 14, 2025 16:29

koko57 mentioned this pull request Jan 14, 2025

[HOLD for payment 2025-01-28] Visa card feed is showing twice in New Expensify #54891

Open

8 tasks

fix: resolve conflicts

24912aa

mountiny assigned koko57 Jan 14, 2025

mountiny self-requested a review January 14, 2025 16:54

mountiny added the Ready To Build label Jan 14, 2025

fix: eslint

504e7a1

mountiny reviewed Jan 15, 2025

View reviewed changes

mountiny added the Internal Requires API changes or must be handled by Expensify staff label Jan 15, 2025

mountiny changed the title ~~[NoQA] fix: always send feedType with the order number for custom feeds~~ [InternalQA] fix: always send feedType with the order number for custom feeds Jan 15, 2025

mountiny added InternalQA This pull request required internal QA and removed Internal Requires API changes or must be handled by Expensify staff labels Jan 15, 2025

mountiny reviewed Jan 15, 2025

View reviewed changes

mountiny requested review from DylanDylann and removed request for alitoshmatov January 15, 2025 12:10

koko57 added 2 commits January 15, 2025 14:43

Merge branch 'main' into fix/54891-multiple-feeds

5e9da75

feat: add unit tests

a6f6202

DylanDylann reviewed Jan 15, 2025

View reviewed changes

koko57 added 3 commits January 15, 2025 15:52

fix: apply requested changes

406e76d

fix: eslint

792c76c

fix: apply requested changes

8f074e7

DylanDylann reviewed Jan 16, 2025

View reviewed changes

src/libs/CardUtils.ts Show resolved Hide resolved

fix: resolve conflicts

fa1610b

DylanDylann approved these changes Jan 16, 2025

View reviewed changes

melvin-bot bot requested a review from mountiny January 16, 2025 09:23

mountiny approved these changes Jan 16, 2025

View reviewed changes

mountiny merged commit 151c9d5 into Expensify:main Jan 16, 2025
20 checks passed

github-actions bot mentioned this pull request Jan 17, 2025

Deploy Checklist: New Expensify 2025-01-17 #55396

Closed

60 tasks

melvin-bot bot mentioned this pull request Jan 21, 2025

[HOLD for payment 2025-01-28] [Workspace Feeds] Adding additional custom feed overwrites the existing feed #52002

Closed

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[InternalQA] fix: always send feedType with the order number for custom feeds #55223

[InternalQA] fix: always send feedType with the order number for custom feeds #55223

koko57 commented Jan 14, 2025 •

edited by mountiny

Loading

melvin-bot bot commented Jan 14, 2025

github-actions bot commented Jan 14, 2025

github-actions bot commented Jan 14, 2025

koko57 commented Jan 15, 2025

mountiny left a comment

mountiny Jan 15, 2025

koko57 Jan 15, 2025

mountiny Jan 15, 2025

koko57 Jan 15, 2025

mountiny Jan 15, 2025

koko57 Jan 15, 2025

mountiny Jan 15, 2025

koko57 Jan 15, 2025

mountiny Jan 15, 2025

DylanDylann Jan 15, 2025

DylanDylann commented Jan 15, 2025 •

edited

Loading

koko57 commented Jan 15, 2025

DylanDylann commented Jan 16, 2025 •

edited

Loading

DylanDylann commented Jan 16, 2025

DylanDylann commented Jan 16, 2025

koko57 commented Jan 16, 2025

DylanDylann commented Jan 16, 2025

mountiny left a comment

OSBotify commented Jan 16, 2025

github-actions bot commented Jan 17, 2025

joekaufmanexpensify commented Jan 17, 2025

github-actions bot commented Jan 21, 2025

[InternalQA] fix: always send feedType with the order number for custom feeds #55223

[InternalQA] fix: always send feedType with the order number for custom feeds #55223

Conversation

koko57 commented Jan 14, 2025 • edited by mountiny Loading

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jan 14, 2025

github-actions bot commented Jan 14, 2025

github-actions bot commented Jan 14, 2025

koko57 commented Jan 15, 2025

mountiny left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

DylanDylann commented Jan 15, 2025 • edited Loading

koko57 commented Jan 15, 2025

DylanDylann commented Jan 16, 2025 • edited Loading

Reviewer Checklist

Screenshots/Videos

DylanDylann commented Jan 16, 2025

DylanDylann commented Jan 16, 2025

koko57 commented Jan 16, 2025

DylanDylann commented Jan 16, 2025

mountiny left a comment

Choose a reason for hiding this comment

OSBotify commented Jan 16, 2025

github-actions bot commented Jan 17, 2025

joekaufmanexpensify commented Jan 17, 2025

github-actions bot commented Jan 21, 2025

koko57 commented Jan 14, 2025 •

edited by mountiny

Loading

DylanDylann commented Jan 15, 2025 •

edited

Loading

DylanDylann commented Jan 16, 2025 •

edited

Loading