[No QA] [Direct Feeds] Update Feed switcher label by VickyStash · Pull Request #50972 · Expensify/App

VickyStash · 2024-10-17T07:17:02Z

Details

[Direct Feeds] Update Feed switcher label

Fixed Issues

$ #50452
PROPOSAL: N/A

Tests

Verify that no errors appear in the JS console

Login to the account where the companyCardFeeds and directFeeds betas are turned on.
Create a new workspace
Turn on company cards feature in the More features section.
Open Company cards page.
To test the correct feed label display, we need to set the data manually. To do that, insert the next code to WorkspaceCompanyCardPage:

 useEffect(() => {
        Onyx.set(`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER}${workspaceAccountID}`, {
            settings: {
                companyCards: {
                    [CONST.COMPANY_CARD.FEED_BANK_NAME.CHASE]: {
                        pending: true,
                    },
                },
                companyCardNicknames: {
                    [CONST.COMPANY_CARD.FEED_BANK_NAME.CHASE]: 'Chase Bank',
                },
            },
        });
    }, []);

Make sure that Direct feed label is displayed.

Offline tests

Same, as in the Tests section

QA Steps

Verify that no errors appear in the JS console

N/A

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

# Conflicts: # src/pages/workspace/companyCards/WorkspaceCompanyCardsListHeaderButtons.tsx

melvin-bot · 2024-10-18T09:29:30Z

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

allgandalf · 2024-10-18T09:45:50Z

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

Android: Native

Screen.Recording.2024-10-18.at.3.30.57.PM.mov

Android: mWeb Chrome

Screen.Recording.2024-10-18.at.3.34.13.PM.mov

iOS: Native

Screen.Recording.2024-10-18.at.3.24.41.PM.mov

iOS: mWeb Safari

Screen.Recording.2024-10-18.at.3.20.38.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2024-10-18.at.3.18.01.PM.mov

MacOS: Desktop

Screen.Recording.2024-10-18.at.3.21.19.PM.mov

allgandalf

Thanks! Looks neat!

Putting a note:

There is a onyx error on native devices this is because the BE returns [] instead of {} , we need to fix that 🚀 (details here)

mountiny

Small nab comment

mountiny · 2024-10-21T07:33:37Z

        [CONST.COMPANY_CARD.FEED_BANK_NAME.MASTER_CARD]: 'Mastercard',
        [CONST.COMPANY_CARD.FEED_BANK_NAME.AMEX]: 'American Express',
        [CONST.COMPANY_CARD.FEED_BANK_NAME.STRIPE]: 'Stripe',
+        [CONST.COMPANY_CARD.FEED_BANK_NAME.AMEX_DIRECT]: 'American Express',


Maybe we could use official consts for the names too

melvin-bot · 2024-10-21T09:25:18Z

@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 · 2024-10-21T09:25:59Z

This was not an emergency, probably the checklist check started to run again before i merged

OSBotify · 2024-10-21T09:35:12Z

✋ 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 · 2024-10-22T04:48:48Z

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

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

github-actions · 2024-10-23T16:26:15Z

🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.0.52-5 🚀

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

allgandalf · 2024-11-20T10:35:25Z

-        return Illustrations.MasterCardCompanyCards;
+function getCardFeedIcon(cardFeed: CompanyCardFeed | typeof CONST.EXPENSIFY_CARD.BANK): IconAsset {
+    const feedIcons = {
+        [CONST.COMPANY_CARD.FEED_BANK_NAME.VISA]: Illustrations.VisaCompanyCardDetail,


In the design doc, these images were large in size for card details page, we used the same small size images everywhere, this caused #51910

ikevin127 · 2025-03-09T18:25:34Z

+        return feedIcons[feedKey];
    }

    return Illustrations.AmexCompanyCards;


When the new feedIcons map logic was added, the fact that return Illustrations.AmexCompanyCards wasn't updated led to the following issue:

[Due for payment 2025-03-10] [HOLD][$250] AmEx icon is smaller than other card icons in the Filters #56567

because there were OD edge cases in which none of the getCardFeedIcon if's were returning an illustration which defaulted to Illustrations.AmexCompanyCards even though the edge cases had nothing to do with AMEX.

We fixed the issue by identifying the edge case card feeds and adding 2 new illustrations for generic (no specific match) and CSV imported feeds.

VickyStash added 4 commits October 17, 2024 10:10

Add direct feed label

a7fed62

Merge branch 'refs/heads/main' into feature/50452-direct-feed-label

0f19747

# Conflicts: # src/pages/workspace/companyCards/WorkspaceCompanyCardsListHeaderButtons.tsx

Type fixes

8ae045b

Fix

0b0fd81

VickyStash changed the title ~~[Direct Feeds] Update Feed switcher label~~ [No QA] [Direct Feeds] Update Feed switcher label Oct 18, 2024

VickyStash marked this pull request as ready for review October 18, 2024 09:29

VickyStash requested a review from a team as a code owner October 18, 2024 09:29

melvin-bot Bot requested a review from allgandalf October 18, 2024 09:29

melvin-bot Bot removed the request for review from a team October 18, 2024 09:29

VickyStash mentioned this pull request Oct 18, 2024

[HOLD for payment 2024-10-30] [Direct Feeds] [App] Update existing custom feed flow #50452

Closed

allgandalf reviewed Oct 18, 2024

View reviewed changes

Comment thread src/pages/workspace/companyCards/WorkspaceCompanyCardDetailsPage.tsx Resolved

Add loading check

e7f75b3

allgandalf approved these changes Oct 18, 2024

View reviewed changes

melvin-bot Bot requested a review from mountiny October 18, 2024 10:17

mountiny assigned VickyStash Oct 21, 2024

mountiny approved these changes Oct 21, 2024

View reviewed changes

mountiny merged commit 8ca4576 into Expensify:main Oct 21, 2024

melvin-bot Bot added the Emergency label Oct 21, 2024

mountiny removed the Emergency label Oct 21, 2024

github-actions Bot mentioned this pull request Oct 22, 2024

Deploy Checklist: New Expensify 2024-10-22 #51219

Closed

74 tasks done

allgandalf reviewed Nov 20, 2024

View reviewed changes

ikevin127 mentioned this pull request Feb 10, 2025

[Due for payment 2025-03-10] [HOLD][$250] AmEx icon is smaller than other card icons in the Filters #56567

Closed

1 of 8 tasks

ikevin127 reviewed Mar 9, 2025

View reviewed changes

paulnjs mentioned this pull request Dec 23, 2025

[Due for payment 2026-01-21] Company card - RHP shows not here page briefly after Unassign card #78319

Closed

1 of 7 tasks

Navigation Menu

Repository navigation

[No QA] [Direct Feeds] Update Feed switcher label - #50972

[No QA] [Direct Feeds] Update Feed switcher label#50972
mountiny merged 5 commits into
Expensify:mainfrom
VickyStash:feature/50452-direct-feed-label

VickyStash commented Oct 17, 2024 •

edited

Loading

Uh oh!

melvin-bot Bot commented Oct 18, 2024

Uh oh!

Uh oh!

allgandalf commented Oct 18, 2024 •

edited

Loading

Uh oh!

allgandalf left a comment

Uh oh!

mountiny left a comment

Uh oh!

mountiny Oct 21, 2024

Uh oh!

melvin-bot Bot commented Oct 21, 2024

Uh oh!

mountiny commented Oct 21, 2024

Uh oh!

OSBotify commented Oct 21, 2024

Uh oh!

github-actions Bot commented Oct 22, 2024

Uh oh!

github-actions Bot commented Oct 23, 2024

Uh oh!

allgandalf Nov 20, 2024

Uh oh!

ikevin127 Mar 9, 2025

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

VickyStash commented Oct 17, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Oct 18, 2024

Uh oh!

Uh oh!

allgandalf commented Oct 18, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

allgandalf left a comment

Choose a reason for hiding this comment

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

mountiny Oct 21, 2024

Choose a reason for hiding this comment

Uh oh!

melvin-bot Bot commented Oct 21, 2024

Uh oh!

mountiny commented Oct 21, 2024

Uh oh!

OSBotify commented Oct 21, 2024

Uh oh!

github-actions Bot commented Oct 22, 2024

Uh oh!

github-actions Bot commented Oct 23, 2024

Uh oh!

allgandalf Nov 20, 2024

Choose a reason for hiding this comment

Uh oh!

ikevin127 Mar 9, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

VickyStash commented Oct 17, 2024 •

edited

Loading

allgandalf commented Oct 18, 2024 •

edited

Loading