Fix: App uses data from other workspace when assigning card in different workspace #55482

twilight2294 · 2025-01-20T16:52:54Z

Explanation of Change

Fixed Issues

$ #55125
PROPOSAL: #55125 (comment)

Tests

Same as QA test

Verify that no errors appear in the JS console

Offline tests

Same as QA test

QA Steps

Precondition:

Account has two workspaces.
Both workspaces have enabled Expensify Card.
Both workspaces have different members.

Open App > Go to workspace settings of the first workspace > Expensify Card.
Click Issue card. > Select the workspace member in the first step > Reach the confirmation page.
Exit the flow by clicking outside RHP.
Go to workspace settings of the second workspace > Expensify Card.
Click Issue card.

Verify that: The card assignment flow should start from the beginning because it is a different workspace.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen_recording_20250121_141244.mp4

Android: mWeb Chrome

Screen_recording_20250121_141821.mp4

iOS: Native

Simulator.Screen.Recording.-.Expensify.testing.-.2025-01-21.at.11.34.43.mp4

iOS: mWeb Safari

Simulator.Screen.Recording.-.Expensify.testing.-.2025-01-21.at.11.39.41.mp4

MacOS: Chrome / Safari

Screen.Recording.2025-01-21.at.11.20.58.AM.mov

MacOS: Desktop

Screen.Recording.2025-01-21.at.11.25.28.AM.mov

twilight2294 · 2025-01-20T18:42:42Z

@brunovjk sorry, these new tests took a lot of time to get sorted, The PR is ready you can continue testing, I will upload platform videos tomorrow morning as it is late for me right now, opening up for your 👀 , thanks for your patience

melvin-bot · 2025-01-20T18:43:07Z

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

brunovjk · 2025-01-21T17:33:50Z

src/pages/workspace/expensifyCard/issueNew/IssueNewCardPage.tsx


    const {currentStep} = issueNewCard ?? {};

-    const policyID = policy?.id ?? '-1';
+    const policyID = policy?.id;


NAB: But can we use the policyID declaration in useOnyx('${ONYXKEYS.COLLECTION.ISSUE_NEW_EXPENSIFY_CARD}${policy?.id}') above?

I honestly don't mind updating it like this, I followed the approach used at other places in the app, totally fine either ways 😄 , let me know if we still want to update this one

Can I check why we removed the fallback to -1? I would assume that it is more protective?

Updating to @brunovjk's suggestion sounds good 👍

@brunovjk I updated the code, please check when you're online

Can I check why we removed the fallback to -1? I would assume that it is more protective?
@Julesssss the new ESLint rules state that we must not fallback to a string for values like policyID hence i removed that the tests were failing

Great! Thank you. @twilight2294, what do you think about getting back the fallback? But instead of using the hardcoded -1 we can use the CONST.

policyID is a string right?, we fallback to CONST only when there is a number there, correct me if i am wrong here

We have a new policy to always provide a fallback to a const, regardless of type. So I thiiiink -1 makes sense here for policy.

Thanks for clarifying @Julesssss

brunovjk · 2025-01-21T17:38:57Z

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

Android: Native

Android: mWeb Chrome

55482_android_web.mov

iOS: Native

55482_ios_native.mov

iOS: mWeb Safari

55482_ios_web.mov

MacOS: Chrome / Safari

55482_web_chrome.mov

MacOS: Desktop

55482_web_desktop.mov

brunovjk

LGTM

brunovjk · 2025-01-22T15:47:24Z

src/pages/workspace/expensifyCard/issueNew/LimitTypeStep.tsx

@@ -22,30 +22,32 @@ type LimitTypeStepProps = {
 function LimitTypeStep({policy}: LimitTypeStepProps) {
    const {translate} = useLocalize();
    const styles = useThemeStyles();
-    const [issueNewCard] = useOnyx(ONYXKEYS.ISSUE_NEW_EXPENSIFY_CARD);
+    const policyID = policy?.id;


And here as well? The policyID fallback.

same as here

brunovjk · 2025-01-22T20:30:12Z

I retested, and everything looks good to me. @Julesssss all yours 🚀

src/pages/workspace/expensifyCard/issueNew/IssueNewCardPage.tsx

Julesssss · 2025-01-23T22:09:57Z

Ah sorry @twilight2294 there's a conflict now

twilight2294 · 2025-01-24T04:53:43Z

@Julesssss thanks for the review, fixed the conflicts

OSBotify · 2025-01-24T17:29:30Z

✋ 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-28T02:16:22Z

🚀 Deployed to staging by https://github.com/Julesssss in version: 9.0.90-0 🚀

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

github-actions · 2025-01-29T06:24:11Z

🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.0.90-6 🚀

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

twilight2294 added 12 commits January 20, 2025 22:19

make ISSUE_NEW_EXPENSIFY_CARD as collection

3ad3396

use collection for ISSUE_NEW_EXPENSIFY_CARD

593388c

Update AssigneeStep.tsx

bc2cebb

Update CardNameStep.tsx

dd0d76e

Update CardTypeStep.tsx

0367b93

Update ConfirmationStep.tsx

092775a

Update IssueNewCardPage.tsx

567f5ee

Update LimitStep.tsx

04f7781

Update LimitTypeStep.tsx

6799878

fix lint

17f21df

fix lint

1a04911

fix eslint

7377c9c

twilight2294 marked this pull request as ready for review January 20, 2025 18:43

twilight2294 requested a review from a team as a code owner January 20, 2025 18:43

melvin-bot bot requested review from brunovjk and removed request for a team January 20, 2025 18:43

twilight2294 added 2 commits January 21, 2025 11:13

Merge branch 'Expensify:main' into patch-21

1fff70d

Merge branch 'Expensify:main' into patch-21

5b2fcf6

brunovjk reviewed Jan 21, 2025

View reviewed changes

brunovjk approved these changes Jan 21, 2025

View reviewed changes

melvin-bot bot requested a review from Julesssss January 21, 2025 17:54

update usage to policyID

2c6bbe5

brunovjk reviewed Jan 22, 2025

View reviewed changes

bring back fallback to -1

15bfb42

twilight2294 commented Jan 23, 2025

View reviewed changes

src/pages/workspace/expensifyCard/issueNew/IssueNewCardPage.tsx Outdated Show resolved Hide resolved

twilight2294 commented Jan 23, 2025

View reviewed changes

src/pages/workspace/expensifyCard/issueNew/IssueNewCardPage.tsx Outdated Show resolved Hide resolved

revert changes

2423314

Julesssss previously approved these changes Jan 23, 2025

View reviewed changes

Merge branch 'main' into patch-21

5a73fb1

twilight2294 dismissed Julesssss’s stale review via 5a73fb1 January 24, 2025 04:53

Julesssss approved these changes Jan 24, 2025

View reviewed changes

Julesssss merged commit 8046b17 into Expensify:main Jan 24, 2025
17 checks passed

github-actions bot mentioned this pull request Jan 28, 2025

Deploy Checklist: New Expensify 2025-01-28 #55824

Closed

82 tasks

melvin-bot bot mentioned this pull request Jan 29, 2025

[HOLD for payment 2025-02-05] [$250] Expensify Card - App uses data from other workspace when assigning card in different workspace #55125

Closed

8 tasks

thelullabyy mentioned this pull request Feb 8, 2025

[$250] Expensify Card - Limit input page shows error after incorrect magic code is entered #56363

Closed

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix: App uses data from other workspace when assigning card in different workspace #55482

Fix: App uses data from other workspace when assigning card in different workspace #55482

twilight2294 commented Jan 20, 2025 •

edited

Loading

twilight2294 commented Jan 20, 2025

melvin-bot bot commented Jan 20, 2025

brunovjk Jan 21, 2025

twilight2294 Jan 21, 2025

Julesssss Jan 22, 2025

twilight2294 Jan 22, 2025

brunovjk Jan 22, 2025

twilight2294 Jan 22, 2025 •

edited

Loading

Julesssss Jan 23, 2025

brunovjk Jan 23, 2025

brunovjk commented Jan 21, 2025 •

edited

Loading

brunovjk left a comment

brunovjk Jan 22, 2025

twilight2294 Jan 22, 2025

brunovjk commented Jan 22, 2025

Julesssss commented Jan 23, 2025

twilight2294 commented Jan 24, 2025

OSBotify commented Jan 24, 2025

github-actions bot commented Jan 28, 2025

github-actions bot commented Jan 29, 2025

Fix: App uses data from other workspace when assigning card in different workspace #55482

Fix: App uses data from other workspace when assigning card in different workspace #55482

Conversation

twilight2294 commented Jan 20, 2025 • edited Loading

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

twilight2294 commented Jan 20, 2025

melvin-bot bot commented Jan 20, 2025

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

twilight2294 Jan 22, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

brunovjk commented Jan 21, 2025 • edited Loading

Reviewer Checklist

Screenshots/Videos

brunovjk left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

brunovjk commented Jan 22, 2025

Julesssss commented Jan 23, 2025

twilight2294 commented Jan 24, 2025

OSBotify commented Jan 24, 2025

github-actions bot commented Jan 28, 2025

github-actions bot commented Jan 29, 2025

twilight2294 commented Jan 20, 2025 •

edited

Loading

twilight2294 Jan 22, 2025 •

edited

Loading

brunovjk commented Jan 21, 2025 •

edited

Loading