fix: use pattern B for unassigning cards #52357

koko57 · 2024-11-12T07:36:23Z

I also fixed the problem I mentioned here: #51876 (comment)
and was then posted in this thread https://callstack-hq.slack.com/archives/C049HHMV9SM/p1730983704782069

Explanation of Change

Fixed Issues

$ #51876
PROPOSAL: -

Tests

Go to a workspace with company cards feeds enabled
Assign a card to somebody if no cards assigned
Go offline
Go to card details
Unassign card
Verify that the card still on the card list but greyed out with the strikethrough
If you unassigned your card from yourself, go to Members page. (If you didn't unassign a card from yourself)
Go to your details - the card should also be crossed out and greyed, and the item should be disabled.

Avatar problem

Change your avatar for custom image.
Go to a workspace with company cards feeds enabled
Assign a card yourself.
The avatar in the cardList item should display the picture you've chosen in step 1.

Verify that no errors appear in the JS console

Offline tests

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

Verify that no errors appear in the JS console

PR Author Checklist

I linked the correct issue in the ### Fixed Issues section above
I wrote clear testing steps that cover the changes made in this PR
- I added steps for local testing in the Tests section
- I added steps for the expected offline behavior in the Offline steps section
- I added steps for Staging and/or Production testing in the QA steps section
- I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
I included screenshots or videos for tests on all platforms
I ran the tests on all platforms & verified they passed on:
- Android / native
- Android / Chrome
- iOS / native
- iOS / Safari
- MacOS / Chrome / Safari
- MacOS / Desktop
I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
I followed proper code patterns (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
  - If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
- 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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- 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 followed the guidelines as stated in the Review Guidelines
I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
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
I verified that if a function's arguments changed that all usages have also been updated correctly
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
- If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
  - 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(themeColors.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 form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2024-11-12T11:44:41Z

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

DylanDylann · 2024-11-12T12:45:04Z

src/libs/actions/CompanyCards.ts

@@ -244,14 +244,20 @@ function unassignWorkspaceCompanyCard(workspaceAccountID: number, bankName: stri
                onyxMethod: Onyx.METHOD.MERGE,
                key: `${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID}_${bankName}`,
                value: {
-                    [cardID]: null,
+                    [cardID]: {
+                        ...card,


Suggested change

...card,

DylanDylann · 2024-11-12T12:45:17Z

src/libs/actions/CompanyCards.ts

                },
            },
            {
                onyxMethod: Onyx.METHOD.MERGE,
                key: ONYXKEYS.CARD_LIST,
                value: {
-                    [cardID]: null,
+                    [cardID]: {
+                        ...card,


Suggested change

...card,

DylanDylann · 2024-11-12T12:49:27Z

src/libs/actions/CompanyCards.ts

@@ -263,6 +269,7 @@ function unassignWorkspaceCompanyCard(workspaceAccountID: number, bankName: stri
                value: {
                    [cardID]: {
                        ...card,


Suggested change

...card,

DylanDylann · 2024-11-12T12:49:39Z

src/libs/actions/CompanyCards.ts

@@ -273,6 +280,7 @@ function unassignWorkspaceCompanyCard(workspaceAccountID: number, bankName: stri
                value: {
                    [cardID]: {
                        ...card,


Suggested change

...card,

DylanDylann · 2024-11-12T12:50:30Z

@koko57 Please add [cardID]: null, to successData

koko57 · 2024-11-12T12:59:14Z

@DylanDylann changes applied.

DylanDylann · 2024-11-12T12:59:30Z

@koko57 There are no card display on member detail page on my account

It dues to this condition

App/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx

Line 222 in cd3f30f

    
           const shouldShowCardsSection = (!!policy?.areExpensifyCardsEnabled && !!paymentAccountID) ?? (!!policy?.areCompanyCardsEnabled && hasMultipleFeeds);

Please help to update to use || instead of ??

DylanDylann · 2024-11-12T13:03:53Z

src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx

+                                                            disabled={isCardDeleted}
+                                                            shouldShowRightIcon={!isCardDeleted}
+                                                            style={[isCardDeleted ? styles.offlineFeedback.deleted : {}]}
+                                                        />


Suggested change

disabled={isCardDeleted}

shouldShowRightIcon={!isCardDeleted}

style={[isCardDeleted ? styles.offlineFeedback.deleted : {}]}

/>

shouldShowRightIcon

I believe that we shouldn't prevent user from going to detail card page

#51876 (comment), #51876 (comment)

DylanDylann · 2024-11-12T13:05:19Z

src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx

+                                                            iconWidth={variables.iconSizeExtraLarge}
+                                                            iconHeight={variables.iconSizeExtraLarge}
+                                                            onPress={() => navigateToDetails(memberCard)}
+                                                            shouldRemoveHoverBackground={isCardDeleted}


Suggested change

shouldRemoveHoverBackground={isCardDeleted}

#51876 (comment), #51876 (comment)

DylanDylann · 2024-11-12T13:05:27Z

src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx

-                                                />
-                                            ))}
+                                            {(memberCards as MemberCard[]).map((memberCard) => {
+                                                const isCardDeleted = memberCard.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;


Suggested change

const isCardDeleted = memberCard.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;

#51876 (comment),
#51876 (comment)

@mountiny @koko57 It is consistency with the company card page. On the company card page, we still can access to detail card that is pending removed

Screen.Recording.2024-11-12.at.20.45.06.mov

I don't think you should be able to visit that page because the card was already removed

@mountiny @DylanDylann I've just added the check to disable going to details page after unassigning

koko57 · 2024-11-12T13:13:54Z

@DylanDylann done

DylanDylann · 2024-11-12T13:54:35Z

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-11-12.at.20.54.01.mov

Android: mWeb Chrome

Screen.Recording.2024-11-12.at.20.52.26.mov

iOS: Native

Screen.Recording.2024-11-12.at.20.51.51.mov

iOS: mWeb Safari

Screen.Recording.2024-11-12.at.20.50.58.mov

MacOS: Chrome / Safari

MacOS: Desktop

DylanDylann · 2024-11-12T13:54:52Z

Minor comment: #52357 (comment)

The rest looks fine

mountiny

Thanks, great job!

OSBotify · 2024-11-12T15:38:15Z

✋ 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 · 2024-11-13T01:09:37Z

🚀 Deployed to staging by https://github.com/mountiny in version: 9.0.61-0 🚀

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

joekaufmanexpensify · 2024-11-13T15:02:12Z

Go to a workspace with company cards feeds enabled
Assign a card to somebody if no cards assigned
Go offline
Go to card details
Unassign card
Verify that the card still on the card list but greyed out with the strikethrough
If you unassigned your card from yourself, go to Members page. (If you didn't unassign a card from yourself)
Go to your details - the card should also be crossed out and greyed, and the item should be disabled.

Confirmed both of these work as expected. @koko57 one thing I noticed is if you unassign your own card, we aren't optimistically removing it on the wallet page. Is that expected?

joekaufmanexpensify · 2024-11-13T15:02:33Z

Change your avatar for custom image.
Go to a workspace with company cards feeds enabled
Assign a card yourself.
The avatar in the cardList item should display the picture you've chosen in step 1.

Confirmed this is working now too!

koko57 · 2024-11-13T15:05:52Z

@joekaufmanexpensify good catch! I will check it tomorrow

joekaufmanexpensify · 2024-11-13T15:06:51Z

TY!

github-actions · 2024-11-14T00:40:55Z

🚀 Deployed to production by https://github.com/francoisl in version: 9.0.61-3 🚀

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

fix: use pattern B for unassigning cards

611d3fe

koko57 changed the title ~~fix: use pattern B for unassigning cards~~ [No QA] fix: use pattern B for unassigning cards Nov 12, 2024

koko57 added 2 commits November 12, 2024 16:08

fix: display a proper cardholder avatar

3ef15a0

fix: apply pattern B styles on a card item in member details page

cfb7a1c

koko57 marked this pull request as ready for review November 12, 2024 11:44

koko57 requested a review from a team as a code owner November 12, 2024 11:44

melvin-bot bot requested review from DylanDylann and removed request for a team November 12, 2024 11:44

koko57 mentioned this pull request Nov 12, 2024

[HOLD for payment 2024-11-26] [HOLD for payment 2024-11-21] [HOLD for payment 2024-11-20] [Workspace feeds] Unassigning a card offline seems to use pattern A, when the doc says it should be pattern B. #51876

Closed

8 tasks

mountiny assigned koko57 Nov 12, 2024

DylanDylann reviewed Nov 12, 2024

View reviewed changes

koko57 added 2 commits November 12, 2024 19:54

fix: apply requested changes

adcc441

fix: apply requested changes

9c8cda7

DylanDylann reviewed Nov 12, 2024

View reviewed changes

fix: minor change

7b79011

koko57 added 2 commits November 12, 2024 21:01

fix: disable navigating to card details page after unassigning

b4a4e34

fix: minor change

72861ec

DylanDylann approved these changes Nov 12, 2024

View reviewed changes

melvin-bot bot requested a review from mountiny November 12, 2024 14:12

mountiny approved these changes Nov 12, 2024

View reviewed changes

mountiny added the InternalQA This pull request required internal QA label Nov 12, 2024

mountiny changed the title ~~[No QA] fix: use pattern B for unassigning cards~~ fix: use pattern B for unassigning cards Nov 12, 2024

mountiny merged commit ad61376 into Expensify:main Nov 12, 2024
18 checks passed

github-actions bot mentioned this pull request Nov 13, 2024

Deploy Checklist: New Expensify 2024-11-13 #52440

Closed

41 tasks

This was referenced Nov 14, 2024

fix: apply pattern B for cards in wallet #52522

Merged

Default Avatar Displayed After Assigning Company Card Following Avatar Update #52648

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: use pattern B for unassigning cards #52357

fix: use pattern B for unassigning cards #52357

koko57 commented Nov 12, 2024 •

edited by github-actions bot

Loading

melvin-bot bot commented Nov 12, 2024

DylanDylann Nov 12, 2024

DylanDylann Nov 12, 2024

DylanDylann Nov 12, 2024

DylanDylann Nov 12, 2024

DylanDylann commented Nov 12, 2024

koko57 commented Nov 12, 2024

DylanDylann commented Nov 12, 2024 •

edited

Loading

DylanDylann Nov 12, 2024

koko57 Nov 12, 2024 •

edited

Loading

DylanDylann Nov 12, 2024

koko57 Nov 12, 2024 •

edited

Loading

DylanDylann Nov 12, 2024

koko57 Nov 12, 2024 •

edited

Loading

DylanDylann Nov 12, 2024

mountiny Nov 12, 2024

koko57 Nov 12, 2024

koko57 commented Nov 12, 2024

DylanDylann commented Nov 12, 2024

DylanDylann commented Nov 12, 2024

mountiny left a comment

OSBotify commented Nov 12, 2024

github-actions bot commented Nov 13, 2024

joekaufmanexpensify commented Nov 13, 2024

joekaufmanexpensify commented Nov 13, 2024

koko57 commented Nov 13, 2024

joekaufmanexpensify commented Nov 13, 2024

github-actions bot commented Nov 14, 2024

fix: use pattern B for unassigning cards #52357

fix: use pattern B for unassigning cards #52357

Conversation

koko57 commented Nov 12, 2024 • edited by github-actions bot Loading

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Nov 12, 2024

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

DylanDylann commented Nov 12, 2024

koko57 commented Nov 12, 2024

DylanDylann commented Nov 12, 2024 • edited Loading

Choose a reason for hiding this comment

koko57 Nov 12, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

koko57 Nov 12, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

koko57 Nov 12, 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

koko57 commented Nov 12, 2024

DylanDylann commented Nov 12, 2024

Reviewer Checklist

Screenshots/Videos

DylanDylann commented Nov 12, 2024

mountiny left a comment

Choose a reason for hiding this comment

OSBotify commented Nov 12, 2024

github-actions bot commented Nov 13, 2024

joekaufmanexpensify commented Nov 13, 2024

joekaufmanexpensify commented Nov 13, 2024

koko57 commented Nov 13, 2024

joekaufmanexpensify commented Nov 13, 2024

github-actions bot commented Nov 14, 2024

koko57 commented Nov 12, 2024 •

edited by github-actions bot

Loading

DylanDylann commented Nov 12, 2024 •

edited

Loading

koko57 Nov 12, 2024 •

edited

Loading

koko57 Nov 12, 2024 •

edited

Loading

koko57 Nov 12, 2024 •

edited

Loading