fix: get all the cards from different feeds by koko57 · Pull Request #52612 · Expensify/App

koko57 · 2024-11-15T10:05:26Z

Explanation of Change

Fixed Issues

$ #51881
PROPOSAL: -

Tests

PREREQUISITES: An account with Company Cards enabled and some cards assigned to the Workspace Members

If you're logged in - log out first.
Log in to your account.
Go to Workspaces -> select workspace -> go to Members
Open the member's details (the member you're checking should have a company card assigned).
Verify that under the cards section, you see the assigned company card

Verify that no errors appear in the JS console

Offline tests

n/a

QA Steps

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

Same as tests

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-08T15:19:05Z

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

mountiny · 2025-01-08T19:03:14Z

@DylanDylann can you please test?

github-actions · 2025-01-08T19:03:39Z

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

mountiny

Changes look good to me!

mountiny · 2025-01-08T19:43:38Z

+    const cards = {};
+    for (const [key, values] of Object.entries(allWorkspaceCards ?? {})) {
+        if (key.includes(workspaceAccountID.toString()) && values) {
+            const {cardList, ...rest} = values;


Can you please add a comment that in case of direct feeds, the list of unassigned cards yet is returned in the cardList property in the collection?

mountiny · 2025-01-08T20:00:40Z

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

Screen.Recording.2025-01-08.at.20.57.50.mp4

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

mountiny

Tests well, just the comment would be helpful

DylanDylann · 2025-01-09T05:35:28Z

@koko57 Could you also fix the same problem on Expensify Card?

DylanDylann · 2025-01-09T05:37:20Z

The card isn't displayed on the member detail page if we haven't opened the Expensify Card

koko57 · 2025-01-09T07:27:39Z

@DylanDylann the code I implemented doesn't filter out Expensify Cards and both company and Expensify cards should be displayed if they are in the cardList object. I will check it today

koko57 · 2025-01-09T08:54:43Z

Codewise it's implemented properly - the only strange thing I see is that there is a lag with the Card appearing - @DylanDylann you must have closed the details before it appeared on the list. I've logged out and in again and the same problem appears for the company cards - for the very first user selected the lag is noticeable. For the subsequent users it doesn't occur. So it's not a problem with Expensify Card.

Screen.Recording.2025-01-09.at.09.46.46.mp4

Screen.Recording.2025-01-09.at.09.42.57.mp4

this is how the data looks - it includes Expensify Card

DylanDylann · 2025-01-09T10:29:45Z

@koko57 From my investigation, the card isn't displayed because shouldShowCardsSection is false <-- paymentAccountID = 0

koko57 · 2025-01-09T10:32:20Z

@DylanDylann ok, I will check it, but one question - the card haven't appeared for you after a while like in my case? I cannot repro the case that the card doesn't appear at all

DylanDylann · 2025-01-09T10:35:00Z

The card haven't appeared for you after a while like in my case

Yes, I need to open Expensify Card then the BE will return private_expensifyCardSettings_18600056 in OpenPolicyExpensifyCardsPage API. After that I can see the cards on the member detail

koko57 · 2025-01-09T11:05:59Z

ok, thanks, checking it in a sec

koko57 · 2025-01-09T11:08:19Z

@DylanDylann it happens always after you log in back? Did you test it on another account?

koko57 · 2025-01-09T11:18:34Z

@DylanDylann you were testing it on an account with Expensify Cards enabled only (company cards not enabled)? I think that if so that might be the problem that we still have some condition to look for either company cards being enabled or expensify cards settings and that may cause what you report.

I think that we should no longer watch for the cards being enabled or not but rather for the cards being issued or not.

Otherwise, we would also need to get these Expensify Card settings to be sent just after logging in.

I will check it and let you know.

cc @mountiny

koko57 · 2025-01-09T11:43:00Z

ok, so it does happen on workspaces with Exfy Card enabled only. I will test the ideas I mentioned above and if it's possible to fix it only on the FE I will add these changes to this PR

koko57 · 2025-01-09T13:59:06Z

@mountiny @DylanDylann now in the code we'll be checking if the cards are assigned to anyone in the workspace to display the card section. But I thought about one edge case that will still occur. Before the changes we were looking for paymentAccountID. As it's not available right after the login the card section for Expensify Cards was also not visible. Now as we don't look for paymentAccountID we only display the card section when some cards are already assigned (to anyone). So if there is no card assigned it won't be visible even if the bank account is added and verified (and the workspace has paymentAccountID).

We checked for paymentAccountID because we didn't want to show "New Card" button and the Card Section if the workspace doesn't have its paymentAccountID (aka bank account added and verified).

So to solve this, I'm afraid that we still need some more info to be sent on OpenApp request - in this case private_expensifyCardSettings

LMK WDYT

mountiny

Discussed in slack gonna move this ahead and we can sort the remainder edge cases in follow ups

OSBotify · 2025-01-12T18:33:09Z

✋ 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-14T13:59:32Z

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

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

github-actions · 2025-01-14T14:15:33Z

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

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

joekaufmanexpensify · 2025-01-14T14:28:25Z

Tested and confirmed it works with both commercial and direct feeds!

github-actions · 2025-01-14T14:40:55Z

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

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

github-actions · 2025-01-14T15:24:36Z

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

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

github-actions · 2025-01-14T15:48:47Z

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

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

github-actions · 2025-01-15T13:47:39Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.0.85-4 🚀

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

github-actions · 2025-01-15T15:48:35Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.0.85-4 🚀

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

s77rt · 2025-01-23T18:46:36Z

Hey, we are dealing with the missing cards section here #55571

DylanDylann · 2025-03-07T05:14:23Z

    }

-    const shouldShowCardsSection = (!!policy?.areExpensifyCardsEnabled && !!paymentAccountID) || (!!policy?.areCompanyCardsEnabled && hasMultipleFeeds);
+    const shouldShowCardsSection = hasWorkspaceCardsAssigned && (!!policy?.areExpensifyCardsEnabled || !!policy?.areCompanyCardsEnabled);


We should use the old condition here. this new change caused #56372

koko57 added 2 commits November 15, 2024 17:04

fix: get all the cards from different feeds

012840d

fix: remove unnecessary dep

eb859fc

koko57 mentioned this pull request Jan 8, 2025

[$250] [HOLD for payment 2025-01-22] [Workspace feeds] Assigned cards are not displayed on workspace member profile #51881

Closed

8 tasks

koko57 added 2 commits January 8, 2025 15:00

fix: resolve conflicts

c2d9921

fix: eslint

34bec4c

koko57 marked this pull request as ready for review January 8, 2025 15:18

koko57 requested a review from a team as a code owner January 8, 2025 15:19

melvin-bot Bot requested review from DylanDylann and removed request for a team January 8, 2025 15:19

mountiny assigned koko57 Jan 8, 2025

mountiny added the Ready To Build label Jan 8, 2025

This comment has been minimized.

Sign in to view

mountiny approved these changes Jan 8, 2025

View reviewed changes

Expensify deleted a comment from github-actions Bot Jan 8, 2025

mountiny removed the request for review from DylanDylann January 8, 2025 20:00

mountiny previously approved these changes Jan 8, 2025

View reviewed changes

mountiny added the InternalQA This pull request required internal QA label Jan 8, 2025

fix: check if there are cards assigned to display cards section

e0120b5

koko57 dismissed mountiny’s stale review via e0120b5 January 9, 2025 13:50

DylanDylann approved these changes Jan 12, 2025

View reviewed changes

melvin-bot Bot requested a review from mountiny January 12, 2025 10:00

mountiny approved these changes Jan 12, 2025

View reviewed changes

mountiny merged commit 0349d96 into Expensify:main Jan 12, 2025

github-actions Bot mentioned this pull request Jan 14, 2025

Deploy Checklist: New Expensify 2025-01-14 #55208

Closed

38 tasks

s77rt mentioned this pull request Jan 23, 2025

[Due for payment 2025-03-27] [$250] Expensify Card- "Assigned cards" section is missing in user profile when workspace has no card #55571

Closed

8 tasks

DylanDylann reviewed Mar 7, 2025

View reviewed changes

DylanDylann mentioned this pull request Mar 7, 2025

[Due for payment 2025-03-05] [$250] [not here] Company cards - After enabling company card, tapping new card directs to hmm not here page #56372

Closed

8 tasks

koko57 deleted the fix/51881-show-cards-from-all-feeds branch July 28, 2025 18:25

Uh oh!

Conversation

koko57 commented Nov 15, 2024 • edited by github-actions Bot 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 8, 2025

Uh oh!

mountiny commented Jan 8, 2025

Uh oh!

github-actions Bot commented Jan 8, 2025

Uh oh!

This comment has been minimized.

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

mountiny Jan 8, 2025

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

DylanDylann commented Jan 9, 2025

Uh oh!

DylanDylann commented Jan 9, 2025

Uh oh!

koko57 commented Jan 9, 2025

Uh oh!

koko57 commented Jan 9, 2025

Uh oh!

DylanDylann commented Jan 9, 2025

Uh oh!

koko57 commented Jan 9, 2025

Uh oh!

DylanDylann commented Jan 9, 2025

Uh oh!

koko57 commented Jan 9, 2025

Uh oh!

koko57 commented Jan 9, 2025

Uh oh!

koko57 commented Jan 9, 2025

Uh oh!

koko57 commented Jan 9, 2025

Uh oh!

koko57 commented Jan 9, 2025

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Jan 12, 2025

Uh oh!

github-actions Bot commented Jan 14, 2025

Uh oh!

github-actions Bot commented Jan 14, 2025

Uh oh!

joekaufmanexpensify commented Jan 14, 2025

Uh oh!

github-actions Bot commented Jan 14, 2025

Uh oh!

github-actions Bot commented Jan 14, 2025

Uh oh!

github-actions Bot commented Jan 14, 2025

Uh oh!

github-actions Bot commented Jan 15, 2025

Uh oh!

github-actions Bot commented Jan 15, 2025

Uh oh!

s77rt commented Jan 23, 2025

Uh oh!

koko57 commented Nov 15, 2024 •

edited by github-actions Bot

Loading

mountiny commented Jan 8, 2025 •

edited

Loading