FIX: Assign same assigned cards to admin on different workspace#59862
FIX: Assign same assigned cards to admin on different workspace#59862thienlnam merged 1 commit intoExpensify:mainfrom
Conversation
|
@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 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. |
|
@ikevin127 can you please resolve conflicts here? |
|
@allgandalf Sure, I did ✅ Please note that the
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 👍 |
|
Testing this now |
Reviewer Checklist
Screenshots/VideosAndroid: NativeScreen.Recording.2025-04-10.at.11.57.42.PM.movAndroid: mWeb ChromeScreen.Recording.2025-04-10.at.11.59.09.PM.moviOS: NativeScreen.Recording.2025-04-10.at.11.36.25.PM.moviOS: mWeb SafariScreen.Recording.2025-04-10.at.11.38.34.PM.movMacOS: Chrome / SafariScreen.Recording.2025-04-10.at.11.33.57.PM.movMacOS: DesktopScreen.Recording.2025-04-10.at.11.37.30.PM.mov |
allgandalf
left a comment
There was a problem hiding this comment.
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
|
👍 Waiting for the removal of Mobile-Expensify in the PR |
0d75ed7 to
51cac96
Compare
51cac96 to
f7e0080
Compare
|
@thienlnam 🟢 Ready for merge! |
|
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
|
🚀 Deployed to staging by https://github.com/thienlnam in version: 9.1.27-0 🚀
|
|
@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? |
|
We should be okay if it passes on all other platforms 👍 |
|
This PR seemed to have cause regression #60143 |
|
@thienlnam Are we planning to deploy this one or we're still testing it ? |
|
Hmm this probably should have been deployed already, I'm guessing the automation failed? |
|
Makes sense, probably false flags from the reported regressions caused this to not be deployed. |
|
🚀 Deployed to production by https://github.com/marcaaron in version: 9.1.28-15 🚀
|

Explanation of Change
In
CardSelectionStepwe're using thegetFilteredCardListfunction 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
getFilteredCardListis 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.
Offline tests
N/A
QA Steps
Same as Tests.
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectiontoggleReportand notonIconClick)src/languages/*files and using the translation methodSTYLE.md) were followedAvatar, I verified the components usingAvatarare working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))Avataris modified, I verified thatAvataris working as expected in all cases)Designlabel and/or tagged@Expensify/designso the design team can review the changes.ScrollViewcomponent to make it scrollable when more elements are added to the page.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.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