[No QA] Feat/47377 multiple card feeds by koko57 · Pull Request #49148 · Expensify/App

koko57 · 2024-09-13T07:39:27Z

Details

For now we're mocking the data - the user will have all the feeds in the feed selector displayed, Expensify Card will be shown when it's enabled for the workspace.

Fixed Issues

$ #47379
PROPOSAL:

Tests

PREREQUISITES: Company Cards enabled. You can have Expensify Card enabled too. For now showing multiple feeds, even if they are not enabled

Go to Workspace -> Members
Go to Member's details
Click New card
Verify that modal with feeds opens and you can select one of the feeds (and Expensify Card if enabled).
After selecting one feed verify that you're redirected to either assigning new card for a feed or issuing new expensify card.

Verify that no errors appear in the JS console

Offline tests

QA Steps

n/a

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

Simulator.Screen.Recording.-.iPhone.15.Pro.-.2024-09-16.at.16.46.40.mp4

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2024-09-13.at.15.44.01.mp4

MacOS: Desktop

…/47377-multiple-card-feeds

melvin-bot · 2024-09-16T09:47:29Z

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

dylanexpensify · 2024-09-16T12:19:25Z

@allroundexperts ready for you!

allroundexperts · 2024-09-18T07:52:21Z

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-09-18.at.1.21.55.PM.mov

Android: mWeb Chrome

Screen.Recording.2024-09-18.at.1.19.53.PM.mov

iOS: Native

Screen.Recording.2024-09-18.at.1.03.16.PM.mov

iOS: mWeb Safari

Screen.Recording.2024-09-18.at.1.02.19.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2024-09-18.at.12.53.58.PM.mov

MacOS: Desktop

Screen.Recording.2024-09-18.at.12.59.32.PM.mov

allroundexperts · 2024-09-18T08:30:05Z

BUG

The selected card option does not reset when assigning the card to a member again.

Screen.Recording.2024-09-18.at.1.28.16.PM.mov

allroundexperts · 2024-09-18T08:31:43Z

BUG

Animation is in a wrong direction when selecting the card, and the back button redirects to an incorrect place as well.

Screen.Recording.2024-09-18.at.1.28.30.PM.mov

koko57 · 2024-09-18T12:27:36Z

@allroundexperts thanks for the review! I guess I need to create a page instead of a modal for the selector. I'll let you know when I fix this

koko57 · 2024-09-19T14:31:58Z

@allroundexperts ready for re-review

Screen.Recording.2024-09-19.at.21.24.36.mp4

dubielzyk-expensify · 2024-09-20T00:20:33Z

Looks good to me. The card images are wrong, but I think we're replacing those in a different PR

koko57 · 2024-09-20T01:57:16Z

@dubielzyk-expensify yes, probably we will replace them later - but could you please elaborate more on what's not ok with them?

dubielzyk-expensify · 2024-09-20T03:55:59Z

We're looking to use these icons instead #48489 (comment)

allroundexperts

Looks good!

melvin-bot · 2024-09-22T21:03:56Z

We did not find an internal engineer to review this PR, trying to assign a random engineer to #47379 as well as to this PR... Please reach out for help on Slack if no one gets assigned!

aldo-expensify

Looks good to me, but will leave it to @robertjchen to approve/merge since he has more context about this feature

robertjchen

Looks good to me as well, we'll make more updates as we complete out the flows 💯

OSBotify · 2024-09-24T04:38:06Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

OSBotify · 2024-09-24T19:29:38Z

🚀 Deployed to staging by https://github.com/robertjchen in version: 9.0.40-0 🚀

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

github-actions · 2024-09-27T17:44:33Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 9.0.40-6 🚀

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

paultsimura · 2024-10-21T17:24:18Z

src/pages/workspace/members/WorkspaceMemberNewCardPage.tsx

+                },
+                isEditing: false,
+            });
+            Navigation.navigate(ROUTES.WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW.getRoute(policyID, activeRoute));


This caused #50243 – we've ended up navigating to WORKSPACE_MEMBER_DETAILS instead of the activeRoute.

allgandalf · 2024-11-20T10:43:34Z

src/pages/workspace/members/WorkspaceMemberNewCardPage.tsx

+    const feeds = workspaceAccountID
+        ? [
+              ...companyCardFeeds,


along with workspaceAccountID we should had also checked if the expensify cards toggle was enabled or not. This caused #52552 as we aren't supposed to show the expensify card in selector if it is not enabled

DylanDylann · 2025-03-11T13:18:12Z

src/pages/workspace/members/WorkspaceMemberNewCardPage.tsx

+        ),
+    }));
+
+    const feeds = workspaceAccountID


This caused this bug. We need to use paymentBankAccountID

koko57 added 9 commits September 4, 2024 15:52

Merge remote-tracking branch 'Nikolay/company-card-details' into feat…

37dba80

…/47377-multiple-card-feeds

fix: resolve conflicts

209d0bf

feat: create base feed selector modal

8cad10e

fix: resolve conflicts

df7c0db

fix: revert changes

b71b314

feat: show expensify card feed if enabled

3d1c4ea

fix: resolve conflicts

1d0b4c9

feat: navigate to a proper page

23b1bb2

fix: minor improvements

6f43d59

koko57 mentioned this pull request Sep 13, 2024

[$250] [3rd Party Feeds] Viewing cards on workspace member profile #47379

Closed

1 task

koko57 added 5 commits September 13, 2024 16:38

fix: minor change

bac1d58

fix: resolve conflicts

b10d89d

fix: resolve conflicts

ecadb89

fix: minor improvement

a1c84f4

fix: typecheck, routes order

e88721e

koko57 marked this pull request as ready for review September 16, 2024 09:47

koko57 requested a review from a team as a code owner September 16, 2024 09:47

melvin-bot bot requested a review from allroundexperts September 16, 2024 09:47

melvin-bot bot removed the request for review from a team September 16, 2024 09:47

fix: lint

16175c5

Merge branch 'main' into feat/47377-multiple-card-feeds

7dad3c5

koko57 added 3 commits September 18, 2024 20:17

fix: fix styles for Expensify Card icon

dadb39c

feat: setup route and types for new member card selector screen

ae185b1

fix: style change for transactionDate step in assign card flow

7836ac5

koko57 added 3 commits September 19, 2024 20:40

feat: create new card page, skip the assignee step for expensify card

04f1091

fix: skip assignee step for assign card flow

0e21365

fix: cleanup

6018fdc

koko57 requested a review from a team as a code owner September 19, 2024 14:24

fix: eslint

90e396b

allroundexperts approved these changes Sep 22, 2024

View reviewed changes

melvin-bot bot requested a review from aldo-expensify September 22, 2024 21:04

aldo-expensify approved these changes Sep 23, 2024

View reviewed changes

aldo-expensify requested a review from robertjchen September 23, 2024 17:49

robertjchen approved these changes Sep 24, 2024

View reviewed changes

robertjchen merged commit a7a408f into Expensify:main Sep 24, 2024

github-actions bot mentioned this pull request Sep 24, 2024

Deploy Checklist: New Expensify 2024-09-24 #49662

Closed

67 tasks

paultsimura reviewed Oct 21, 2024

View reviewed changes

paultsimura mentioned this pull request Oct 21, 2024

[HOLD for payment 2024-10-24] [$250] Expensify Card -App returns to card feed selection page after issuing card from member profile #50243

Closed

6 tasks

allgandalf reviewed Nov 20, 2024

View reviewed changes

DylanDylann reviewed Mar 11, 2025

View reviewed changes

DylanDylann mentioned this pull request Mar 11, 2025

[Due for payment 2025-03-11] [$250] Do not allow to enter issue expensify card flow unless the policy is provisioned #57391

Closed

8 tasks

Conversation

koko57 commented Sep 13, 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 Sep 16, 2024

Uh oh!

dylanexpensify commented Sep 16, 2024

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

allroundexperts commented Sep 18, 2024

Uh oh!

allroundexperts commented Sep 18, 2024

Uh oh!

koko57 commented Sep 18, 2024

Uh oh!

koko57 commented Sep 19, 2024

Uh oh!

dubielzyk-expensify commented Sep 20, 2024

Uh oh!

koko57 commented Sep 20, 2024

Uh oh!

dubielzyk-expensify commented Sep 20, 2024

Uh oh!

allroundexperts left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented Sep 22, 2024

Uh oh!

aldo-expensify left a comment

Choose a reason for hiding this comment

Uh oh!

robertjchen left a comment

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Sep 24, 2024

Uh oh!

OSBotify commented Sep 24, 2024

Uh oh!

github-actions bot commented Sep 27, 2024

Uh oh!

paultsimura Oct 21, 2024

Choose a reason for hiding this comment

Uh oh!

allgandalf Nov 20, 2024

Choose a reason for hiding this comment

Uh oh!

DylanDylann Mar 11, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

koko57 commented Sep 13, 2024 •

edited

Loading

allroundexperts commented Sep 18, 2024 •

edited

Loading