[NoQA] [3rd Party Feeds] Workspace feeds clean up #49928

VickyStash · 2024-09-30T13:05:37Z

Details

Workspace feeds clean up, and API calls integration.

Fixed Issues

$ #49690
PROPOSAL: N/A

Tests

Verify that no errors appear in the JS console

Login the app with an account that has COMPANY_CARD_FEEDS beta enabled (❗ but not DIRECT_FEEDS beta).
Create a workspace and enable Company cards feature.
Go to Company cards page.
Tap Add company cards button and go through the new feed adding flow. After you finish you will see pending state of the feed.
Go to the feed setting and check that Card feed name update and Allow deleting transactions options work as expected. (❗ The Remove feed option won't work since API is in progress.)
To test more functionality you need an active feed, to get it please contact me or @robertjchen.
In the active feed go through Assign card flow and make sure the card is assigned.
Open card details and make sure it looks ok.
Try to Unassign card and make sure it works as expected. (❗ Update card is not working on the API side yet).
Assign another card to your user.
Go to the workspace members screen and open your member details. Make sure the assigned card is visible there.

Offline tests

Same as in the Tests section.

QA Steps

Verify that no errors appear in the JS console

Same as in the Tests section.

PR Author Checklist

Screenshots/Videos

Android: Native

android1.mp4

Android: mWeb Chrome

android_web1.mp4

iOS: Native

ios1.mp4

iOS: mWeb Safari

ios_web1.mp4

MacOS: Chrome / Safari

web1.mp4

MacOS: Desktop

desktop1.mp4

…an-up # Conflicts: # src/languages/en.ts # src/languages/es.ts

…an-up # Conflicts: # src/libs/ReportActionsUtils.ts # src/libs/actions/Policy/Policy.ts # src/pages/workspace/companyCards/WorkspaceCompanyCardFeedSelectorPage.tsx # src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx

…tup API call; add getCardFeedName function

…an-up

…an-up # Conflicts: # src/libs/ReportActionsUtils.ts

VickyStash · 2024-10-16T06:40:06Z

@allgandalf conflicts are resolved!

VickyStash · 2024-10-16T11:45:13Z

@allgandalf Any ETA on reviewing this one?

allgandalf · 2024-10-16T11:46:34Z

~ half hour, testing the broken conenction flow now, almost done

allgandalf · 2024-10-16T12:43:44Z

To test more functionality you need an active feed, to get it please contact me or @robertjchen.

@VickyStash I would need active feed ? are there credentials or something or do i need your account?

VickyStash · 2024-10-16T12:47:25Z

@allgandalf You can try to login in my account, just ping me in slack.
Or maybe @robertjchen can add a test setup to your account.

allgandalf · 2024-10-16T12:49:28Z

Or maybe @robertjchen can add a test setup to your account.

This option is better no? otherwise i have to ping you for magic code everytime I login on all platforms

allgandalf · 2024-10-17T09:45:10Z

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

Screen.Recording.2024-10-17.at.3.12.59.PM.mov

MacOS: Desktop

Screen.Recording.2024-10-17.at.3.23.08.PM.mov

Android: Native

Screen.Recording.2024-10-17.at.3.31.31.PM.mov

Android: mWeb Chrome

Screen.Recording.2024-10-17.at.3.27.09.PM.mov

iOS: Native

Screen.Recording.2024-10-17.at.3.39.22.PM.mov

iOS: mWeb Safari

Screen.Recording.2024-10-17.at.3.42.49.PM.mov

allgandalf · 2024-10-17T09:59:04Z

@VickyStash conflicts on the branch :))

…an-up # Conflicts: # src/languages/en.ts # src/languages/es.ts # src/pages/workspace/companyCards/addNew/AddNewCardPage.tsx # src/pages/workspace/companyCards/addNew/CardInstructionsStep.tsx # src/pages/workspace/companyCards/addNew/CardTypeStep.tsx # src/pages/workspace/companyCards/addNew/DetailsStep.tsx

VickyStash · 2024-10-17T13:52:30Z

Recording after conflict resolution:

1Monosnap.screencast.2024-10-17.16-50-26.mp4

allgandalf

Looks neat, Code changes look good to me, up for your review @mountiny

mountiny

Great job @VickyStash @allgandalf

mountiny · 2024-10-17T16:20:38Z

src/libs/actions/Policy/Policy.ts

@@ -4421,6 +4435,23 @@ function enablePolicyAutoReimbursementLimit(policyID: string, enabled: boolean)
    });
 }

+function addNewCompanyCardsFeed(policyID: string, feedType: string, feedDetails: string) {


Why are these in Policy.ts? I think we could have created something like CompanyCards.ts actions file for these actions

I can prepare a follow-up and move all of the company cards related methods there!

Follow uo PR is ready: #51080
cc @allgandalf

OSBotify · 2024-10-17T16:34: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.

mvtglobally · 2024-10-18T19:03:18Z

@mountiny Do we need to QA this PR? Can you pls help with more QA friendly steps? Seems like current is more backend heavy checks.
Also, Can we use Expensifail account for this?

github-actions · 2024-10-18T19:04:24Z

🚀 Deployed to staging by https://github.com/mountiny in version: 9.0.51-1 🚀

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

mountiny · 2024-10-22T04:12:54Z

@mvtglobally sorry yeah I agree the tests are more technical. I have marked this as NoQA as testing the custom feeds will be done internally soon in production

github-actions · 2024-10-22T04:37:40Z

🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.0.51-4 🚀

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

github-actions · 2024-10-22T17:20:04Z

🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.0.51-4 🚀

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

koko57 · 2024-10-24T06:15:55Z

src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx

@@ -61,8 +61,8 @@ function WorkspaceMemberDetailsPage({personalDetails, policy, route}: WorkspaceM
    const {translate} = useLocalize();
    const StyleUtils = useStyleUtils();
    const currentUserPersonalDetails = useCurrentUserPersonalDetails();
-    const [expensifyCardsList] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID}_${CONST.EXPENSIFY_CARD.BANK}`);
-    const [allCardsList] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}`);
+    const [allCardsList] = useOnyx(`${ONYXKEYS.CARD_LIST}`);


@VickyStash why was this change necessary?

- const [allCardsList] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}`); + const [allCardsList] = useOnyx(`${ONYXKEYS.CARD_LIST}`);

coming from #50441, more context here: #50441 (comment) and #50441 (comment)

@koko57 On the members details page, we need to show not only expensify cards, but also custom feeds/direct feeds cards.
They are not stored in the cards_ right away, we need to do API calls for every feed type to get the data, which can be a pretty big amount of calls.

So I've asked @robertjchen about the way I can get all user-related cards at once. And he suggested going with cardList_ key.

So that's the reason of the update.

DylanDylann · 2024-10-30T14:38:05Z

src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx

            return [];
        }
-        return Object.values(expensifyCardsList).filter((expensifyCard) => expensifyCard.accountID === accountID);
-    }, [expensifyCardsList, accountID]);
+        return Object.values(allCardsList ?? {}).filter((card) => card.accountID === accountID && workspaceAccountID.toString() === card.fundID);


@VickyStash Could you please explain why we add this condition workspaceAccountID.toString() === card.fundID ?

It caused this bug: #51467 (comment)

cc @allgandalf

I guess this condition ensures that we only see the cards assigned on this policy in the workspace member page, which is expected

@mountiny Could you ensure that the BE always returns fundID on cards_ fields (expensify cards)

Well the fundID is the id in the key so its (cards_fundID_Expensify Card so its kinda duplication

I just tried again with a new account and fundID has appeared. It seems this only happen with cards that is created long time ago

allgandalf · 2024-11-17T14:35:51Z

src/pages/workspace/companyCards/WorkspaceCompanyCardsListHeaderButtons.tsx

            canDismissError={false}
            errorRowStyles={styles.ph5}
        >
            <View style={[styles.w100, styles.ph5, !shouldChangeLayout ? [styles.pv2, styles.flexRow, styles.alignItemsCenter, styles.justifyContentBetween] : styles.pb2]}>
                <PressableWithFeedback
                    onPress={() => Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARDS_SELECT_FEED.getRoute(policyID))}
                    style={[styles.flexRow, styles.alignItemsCenter, styles.gap3, shouldChangeLayout && styles.mb3]}
-                    accessibilityLabel={cardFeeds?.companyCardNicknames?.[selectedFeed] ?? ''}
+                    accessibilityLabel={feedName}


We should had used a custom formatted feed name here, like for visa, it should had been: visa cards.

This caused #51558

VickyStash added 30 commits September 26, 2024 09:36

Implement AssignCard API call

3afbbdc

Resolve TODO

8cea638

Resolve TODOs

8ed4478

Support CARDASSIGNED report action display

b1dc483

Build optimistic CARDASSIGNED report action

252a900

Add RequestFeedSetup API call

1e96e1b

Merge branch 'refs/heads/main' into feature/49690-workspace-feeds-cle…

4db2573

…an-up # Conflicts: # src/languages/en.ts # src/languages/es.ts

Fix ts errors

ad79dbd

Lint fixes

93b819f

Update field names and values to pass the right data to RequestFeedSe…

44b4e46

…tup API call; add getCardFeedName function

Fixes

806b375

Merge branch 'refs/heads/main' into feature/49690-workspace-feeds-cle…

6d60d93

…an-up

Add CompanyCardFeed type, fix pending feed display

e28132e

Lint fix

294ef33

Fix feature check

81a0111

Fix card feed selector

f62c546

Add OpenPolicyCompanyCardsFeed API call

9c67f36

Minor fix

364301e

Update CardFeeds type to follow BE updates

d61b15e

Fix Empty view display

1bd714a

Fix assign card flow

90bd162

Filter out assigned card, fixes

610ef21

Lint fix

9897fab

Merge branch 'refs/heads/main' into feature/49690-workspace-feeds-cle…

2b606a5

…an-up # Conflicts: # src/libs/ReportActionsUtils.ts

Lint fixes

418b641

TS fix, pass optimistic CardAssigned report action

47d6963

Display all cards on the member details page

68883ee

Rename the domain member onyx key

79e5c2b

Add custom card name display

6c1d8d0

mountiny assigned VickyStash Oct 17, 2024

VickyStash added 2 commits October 17, 2024 15:43

Fixes after merging main

2782c1b

allgandalf approved these changes Oct 17, 2024

View reviewed changes

mountiny approved these changes Oct 17, 2024

View reviewed changes

mountiny merged commit 0d102b8 into Expensify:main Oct 17, 2024
18 checks passed

allgandalf mentioned this pull request Oct 18, 2024

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

Merged

50 tasks

github-actions bot mentioned this pull request Oct 18, 2024

Deploy Checklist: New Expensify 2024-10-18 #51106

Closed

59 tasks

mountiny changed the title ~~[3rd Party Feeds] Workspace feeds clean up~~ [NoQA] [3rd Party Feeds] Workspace feeds clean up Oct 22, 2024

koko57 reviewed Oct 24, 2024

View reviewed changes

koko57 mentioned this pull request Oct 24, 2024

[HOLD for payment 2024-11-13] [HOLD for payment 2024-10-30] A newly added card under the Members section does not appear in the Assigned Cards section. #50441

Closed

6 tasks

DylanDylann reviewed Oct 30, 2024

View reviewed changes

DylanDylann mentioned this pull request Oct 31, 2024

fix: show the cards assigned to members #51467

Merged

61 tasks

allgandalf reviewed Nov 17, 2024

View reviewed changes

allgandalf mentioned this pull request Nov 17, 2024

[HOLD for payment 2024-11-11] [Workspace Feeds] Default feedname should be %bank% cards #51558

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[NoQA] [3rd Party Feeds] Workspace feeds clean up #49928

[NoQA] [3rd Party Feeds] Workspace feeds clean up #49928

VickyStash commented Sep 30, 2024 •

edited

Loading

VickyStash commented Oct 16, 2024

VickyStash commented Oct 16, 2024

allgandalf commented Oct 16, 2024

allgandalf commented Oct 16, 2024

VickyStash commented Oct 16, 2024

allgandalf commented Oct 16, 2024

allgandalf commented Oct 17, 2024 •

edited

Loading

allgandalf commented Oct 17, 2024

VickyStash commented Oct 17, 2024

allgandalf left a comment

mountiny left a comment

mountiny Oct 17, 2024

VickyStash Oct 18, 2024

VickyStash Oct 18, 2024

OSBotify commented Oct 17, 2024

mvtglobally commented Oct 18, 2024

github-actions bot commented Oct 18, 2024

mountiny commented Oct 22, 2024

github-actions bot commented Oct 22, 2024

github-actions bot commented Oct 22, 2024

koko57 Oct 24, 2024 •

edited

Loading

VickyStash Oct 24, 2024

DylanDylann Oct 30, 2024

DylanDylann Oct 30, 2024

mountiny Oct 30, 2024

DylanDylann Oct 30, 2024

mountiny Oct 30, 2024

DylanDylann Oct 31, 2024

allgandalf Nov 17, 2024 •

edited

Loading

[NoQA] [3rd Party Feeds] Workspace feeds clean up #49928

[NoQA] [3rd Party Feeds] Workspace feeds clean up #49928

Conversation

VickyStash commented Sep 30, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

VickyStash commented Oct 16, 2024

VickyStash commented Oct 16, 2024

allgandalf commented Oct 16, 2024

allgandalf commented Oct 16, 2024

VickyStash commented Oct 16, 2024

allgandalf commented Oct 16, 2024

allgandalf commented Oct 17, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

allgandalf commented Oct 17, 2024

VickyStash commented Oct 17, 2024

allgandalf left a comment

Choose a reason for hiding this comment

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

OSBotify commented Oct 17, 2024

mvtglobally commented Oct 18, 2024

github-actions bot commented Oct 18, 2024

mountiny commented Oct 22, 2024

github-actions bot commented Oct 22, 2024

github-actions bot commented Oct 22, 2024

koko57 Oct 24, 2024 • edited Loading

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

allgandalf Nov 17, 2024 • edited Loading

Choose a reason for hiding this comment

VickyStash commented Sep 30, 2024 •

edited

Loading

allgandalf commented Oct 17, 2024 •

edited

Loading

koko57 Oct 24, 2024 •

edited

Loading

allgandalf Nov 17, 2024 •

edited

Loading