FIX: Assign same assigned cards to admin on different workspace #59862

ikevin127 · 2025-04-09T00:09:26Z

Explanation of Change

In CardSelectionStep we're using the getFilteredCardList function to get the assignable cards list but we're doing that only for the current workspace.

When the 2 cards are already assigned to Admin in WS1, and we navigate to WS2 and we're trying to assign the cards again, we still show already assigned cards list because the getFilteredCardList is not checking whether the cards are already assigned in other workspaces (WS1), which leads to the BE showing 'card can't be assigned' error on confirmation page.

Fixed Issues

$ #58949
PROPOSAL: #58949 (comment)

Tests

Precondition: Create 2 workspaces on a new account.

Note : Use only default user admin to verify the fix.

Go to workspace settings > Company cards.
Add cards > add American Express > Personal Cards direct feed and assign card.
Assign 2 cards selecting default user (admin).
Try to assign a card a third time.
Note that the "no active cards on this feed" screen is displayed.
Now open the second workspace settings > Company cards and repeat step 2.
Verify that trying to assign any of the already assigned cards will display the "no active cards on this feed" screen.

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Same as Tests.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android.mp4

Android: mWeb Chrome

android-mweb.mp4

iOS: Native

ios.mov

iOS: mWeb Safari

ios-mweb.mov

MacOS: Chrome / Safari

pp-web.mov

MacOS: Desktop

desktop.mov

melvin-bot · 2025-04-09T00:09:31Z

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

ikevin127 · 2025-04-09T00:12:18Z

@allgandalf You'll need a real AMEX account with cards in order to test this (find more info in the issue), if you don't have that, let us know because we'll find somebody that has the requirements to test this PR so we can merge it promptly.

allgandalf · 2025-04-09T18:29:32Z

@ikevin127 can you please resolve conflicts here?

ikevin127 · 2025-04-09T19:20:46Z

@allgandalf Sure, I did ✅ Please note that the Mobile-Expensify conflict doesn't have anything to do with this E/App PR changes, does not deter from testing in any way and even after the conflict is resolved it's expected that it will be back as Mobile-Expensify gets frequent updates.

You'll need a real AMEX account with cards in order to test this (find more info in the issue), if you don't have that, let us know because we'll find somebody that has the requirements to test this PR so we can merge it promptly.

Regarding my previous message, do you mind letting us know whether you have access to a real AMEX account with cards and are able to test this promptly ? Otherwise we're going to look for somebody that has and can - I'd like this PR to not be delayed for days with back-n-forth conflict resolves 👍

allgandalf · 2025-04-10T17:39:14Z

Testing this now

allgandalf · 2025-04-10T18:04:19Z

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 that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
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

Android: Native

Screen.Recording.2025-04-10.at.11.57.42.PM.mov

Android: mWeb Chrome

Screen.Recording.2025-04-10.at.11.59.09.PM.mov

iOS: Native

Screen.Recording.2025-04-10.at.11.36.25.PM.mov

iOS: mWeb Safari

Screen.Recording.2025-04-10.at.11.38.34.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2025-04-10.at.11.33.57.PM.mov

MacOS: Desktop

Screen.Recording.2025-04-10.at.11.37.30.PM.mov

allgandalf

This tests well and LGTM:

Screen.Recording.2025-04-11.at.12.01.01.AM.mov

@ikevin127 I think we should not update Mobile-Expensify during the PR, I think there were previous instances where we reverted those changes and only updated the content in App repo, please check once on open-source channel

thienlnam · 2025-04-10T20:12:42Z

👍 Waiting for the removal of Mobile-Expensify in the PR

ikevin127 · 2025-04-10T21:04:35Z

@thienlnam 🟢 Ready for merge!

OSBotify · 2025-04-10T21:39:46Z

✋ 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-04-11T00:52:11Z

🚀 Deployed to staging by https://github.com/thienlnam in version: 9.1.27-0 🚀

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

m-natarajan · 2025-04-11T16:08:47Z

@ikevin127 @thienlnam @jasperhuangg Unable to validate this in mWeb and Android as our team is facing Account locked message when trying to login for the Amex card feed. The rest of the platforms are a pass. Could this please be verified internally?

thienlnam · 2025-04-11T16:17:46Z

We should be okay if it passes on all other platforms 👍

MonilBhavsar · 2025-04-11T19:59:21Z

This PR seemed to have cause regression #60143
If anyone of you can please take a look @ikevin127 @allgandalf

ikevin127 · 2025-04-16T19:25:20Z

@thienlnam Are we planning to deploy this one or we're still testing it ?

thienlnam · 2025-04-16T20:53:43Z

Hmm this probably should have been deployed already, I'm guessing the automation failed?

ikevin127 · 2025-04-16T20:55:14Z

Makes sense, probably false flags from the reported regressions caused this to not be deployed.

github-actions · 2025-04-16T22:13:43Z

🚀 Deployed to production by https://github.com/marcaaron in version: 9.1.28-15 🚀

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

ikevin127 requested a review from a team as a code owner April 9, 2025 00:09

melvin-bot bot requested review from allgandalf and removed request for a team April 9, 2025 00:09

ikevin127 mentioned this pull request Apr 9, 2025

[Due for payment 2025-04-23] [$250] Cards - Trying to assign same assigned cards to admin on different workspace showing card list #58949

Closed

8 tasks

allgandalf approved these changes Apr 10, 2025

View reviewed changes

melvin-bot bot requested a review from thienlnam April 10, 2025 18:34

ikevin127 force-pushed the ikevin127-amexFeedAssignedCards branch from 0d75ed7 to 51cac96 Compare April 10, 2025 20:55

removed Mobile-Expensify submodule change

f7e0080

ikevin127 force-pushed the ikevin127-amexFeedAssignedCards branch from 51cac96 to f7e0080 Compare April 10, 2025 21:03

thienlnam approved these changes Apr 10, 2025

View reviewed changes

thienlnam merged commit f47aa60 into Expensify:main Apr 10, 2025
16 checks passed

github-actions bot mentioned this pull request Apr 11, 2025

Deploy Checklist: New Expensify 2025-04-11 #60076

Closed

33 tasks

nlemma mentioned this pull request Apr 11, 2025

Account locked message on the AMEX page when trying to add the feed #60132

Closed

8 tasks

vincdargento mentioned this pull request Apr 11, 2025

Company cards - Back button leads to wrong page instead of the Company cards page #60143

Closed

8 tasks

VickyStash mentioned this pull request Apr 29, 2025

[Due for payment 2025-04-28] Update Company Cards page to potentially show domain feeds #59837

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

FIX: Assign same assigned cards to admin on different workspace #59862

FIX: Assign same assigned cards to admin on different workspace #59862

ikevin127 commented Apr 9, 2025

melvin-bot bot commented Apr 9, 2025

ikevin127 commented Apr 9, 2025

allgandalf commented Apr 9, 2025

ikevin127 commented Apr 9, 2025

allgandalf commented Apr 10, 2025

allgandalf commented Apr 10, 2025 •

edited

Loading

allgandalf left a comment

thienlnam commented Apr 10, 2025

ikevin127 commented Apr 10, 2025

OSBotify commented Apr 10, 2025

github-actions bot commented Apr 11, 2025

m-natarajan commented Apr 11, 2025

thienlnam commented Apr 11, 2025

MonilBhavsar commented Apr 11, 2025

ikevin127 commented Apr 16, 2025

thienlnam commented Apr 16, 2025

ikevin127 commented Apr 16, 2025

github-actions bot commented Apr 16, 2025

FIX: Assign same assigned cards to admin on different workspace #59862

FIX: Assign same assigned cards to admin on different workspace #59862

Conversation

ikevin127 commented Apr 9, 2025

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Apr 9, 2025

ikevin127 commented Apr 9, 2025

allgandalf commented Apr 9, 2025

ikevin127 commented Apr 9, 2025

allgandalf commented Apr 10, 2025

allgandalf commented Apr 10, 2025 • edited Loading

Reviewer Checklist

Screenshots/Videos

allgandalf left a comment

Choose a reason for hiding this comment

thienlnam commented Apr 10, 2025

ikevin127 commented Apr 10, 2025

OSBotify commented Apr 10, 2025

github-actions bot commented Apr 11, 2025

m-natarajan commented Apr 11, 2025

thienlnam commented Apr 11, 2025

MonilBhavsar commented Apr 11, 2025

ikevin127 commented Apr 16, 2025

thienlnam commented Apr 16, 2025

ikevin127 commented Apr 16, 2025

github-actions bot commented Apr 16, 2025

allgandalf commented Apr 10, 2025 •

edited

Loading