Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove cards optimistically #51841

Merged
merged 5 commits into from
Nov 1, 2024
Merged

Conversation

DylanDylann
Copy link
Contributor

@DylanDylann DylanDylann commented Nov 1, 2024

Explanation of Change

Remove cards optimistically in both cardList and cards_{workspaceAccountID}_ExpensifyCard when users deactivate cards on all places: Wallet, Member Detail Page, Expensify Card

Fixed Issues

$ #51738
#51739

Tests

QA Steps

  • Verify that no errors appear in the JS console

Offline tests

QA Steps

Section 1:

  1. Go to workspace settings > Members.
  2. Click on your own profile.
  3. Click Add card.
  4. Assign a virtual card to yourself.
  5. Go to Wallet.
  6. Click on the card.
  7. Click Report virtual card fraud.
  8. Click Deactivate card.
  9. Go back to members and click on your own profile.
  10. Note that the deactivated card is removed.
  11. Go to Wallet.
  12. Note that the deactivated card is removed.

Section 2:

  1. Go to workspace settings > Expensify Card.
  2. Click on the card > Deactivate card.
  3. Deactivate the card.
  4. Go to Members.
  5. Click on the member whose card is deactivated.
  6. Note that the deactivated card is removed
  • 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: mWeb Chrome
    • iOS: Native
    • iOS: mWeb 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 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 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 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 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.

Screenshots/Videos

Android: Native
Screen.Recording.2024-11-01.at.15.34.09.mov
Android: mWeb Chrome
Screen.Recording.2024-11-01.at.15.32.41.mov
iOS: Native
Screen.Recording.2024-11-01.at.15.27.57.mov
iOS: mWeb Safari
Screen.Recording.2024-11-01.at.15.33.35.mov
MacOS: Chrome / Safari
Screen.Recording.2024-11-01.at.15.27.11.mov
MacOS: Desktop
Screen.Recording.2024-11-01.at.15.26.31.mov

@DylanDylann DylanDylann marked this pull request as ready for review November 1, 2024 05:13
@DylanDylann DylanDylann requested a review from a team as a code owner November 1, 2024 05:13
@melvin-bot melvin-bot bot requested review from ahmedGaber93 and removed request for a team November 1, 2024 05:13
Copy link

melvin-bot bot commented Nov 1, 2024

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

@jayeshmangwani
Copy link
Contributor

@DylanDylann Pressing 'Deactivate Card' on the 'Report Virtual Card Fraud' page briefly shows a 'Not Found' page.

not-found-page-shows-for-a-moment.mov

@jayeshmangwani
Copy link
Contributor

Also, please upload the videos to the checklist

@DylanDylann
Copy link
Contributor Author

@jayeshmangwani I see

@DylanDylann Pressing 'Deactivate Card' on the 'Report Virtual Card Fraud' page briefly shows a 'Not Found' page.

What do you think if we close RHP after clicking deactivate card

@DylanDylann
Copy link
Contributor Author

Also, please upload the videos to the checklist

Upload later. I hope it doesn't block your reviewing

@jayeshmangwani
Copy link
Contributor

What do you think if we close RHP after clicking deactivate card

@DylanDylann I didn't get that. Can you elaborate on what you're trying to say here?

@jayeshmangwani
Copy link
Contributor

Upload later. I hope it doesn't block your reviewing

No, it doesn’t. This is just a reminder to follow the checklist

@DylanDylann
Copy link
Contributor Author

@DylanDylann I didn't get that. Can you elaborate on what you're trying to say here?

@jayeshmangwani

RCA: The card is removed optimistically --> Not found Page

So I suggest we close Report virtual card fraud Page, when clicking on deactivate card

@DylanDylann
Copy link
Contributor Author

Or could you have any suggestion for this problem?

@jayeshmangwani
Copy link
Contributor

@DylanDylann Yes we can close the RHP, we are doing same under the Member -> Cards -> Deactivate Card

@jayeshmangwani
Copy link
Contributor

@mountiny What are your thoughts on this? We are getting a 'Not Found' page for the 'Deactivate Card' under 'Report Fraud.' Should we close the RHP on the 'Deactivate Card' button?

@jayeshmangwani
Copy link
Contributor

@DylanDylann This issue isn’t solved entirely; we can still see the 'Not Found' page when back navigation occurs

not-found-page-appear.mov

@DylanDylann
Copy link
Contributor Author

@jayeshmangwani Could you please check again?

@jayeshmangwani
Copy link
Contributor

@DylanDylann yes checked it solved after your latest commit

@jayeshmangwani
Copy link
Contributor

Code changes look good. I am testing a few things and found something strange happening while loading the wallet. I'm not sure if it’s related to this PR, but I will add the reproduction steps and the issue in a moment.

@DylanDylann
Copy link
Contributor Author

All yours

@jayeshmangwani
Copy link
Contributor

jayeshmangwani commented Nov 1, 2024

Hey @DylanDylann , can you please check if this works fine for you, or if something is messed up on my account? I am getting constant loading for the "Report Virtual Card Fraud" page's button.

button-loading.mov

@jayeshmangwani
Copy link
Contributor

Thanks for making the changes @DylanDylann . I just have a question, if you have context on it: why are we not showing a confirmation modal on Wallet -> Report Fraud -> Deactivate before deactivating the card? We are showing it on the other two pages, so I just wanted to know if you have any context on this.

@DylanDylann
Copy link
Contributor Author

Hey @DylanDylann , can you please check if this works fine for you, or if something is messed up on my account? I am getting constant loading for the "Report Virtual Card Fraud" page's button.

@jayeshmangwani Why it is loading? I don't get this problem

@DylanDylann
Copy link
Contributor Author

Thanks for making the changes @DylanDylann . I just have a question, if you have context on it: why are we not showing a confirmation modal on Wallet -> Report Fraud -> Deactivate before deactivating the card? We are showing it on the other two pages, so I just wanted to know if you have any context on this.

It maybe our implementation before. Not sure

@jayeshmangwani
Copy link
Contributor

jayeshmangwani commented Nov 1, 2024

I'm not sure if it’s related to this PR, but I will add the reproduction steps and the issue in a moment.

Finally, I was able to reproduce this on a new account.

Repro Steps:

  1. Create a card and assign it to yourself.
  2. Go to Wallet -> Assigned Cards -> Press on the card -> Report Virtual Card Fraud -> Deactivate Card.
  3. You will be navigated to Wallet and receive an error for that card indicating that something went wrong while deactivating it.
  4. Refresh the page, and the card disappears.

So, if we encounter an error, why does the card disappear? This may not be related to this PR, but I found it while testing, so I'm pasting it here for visibility.

on-refrsh-error-card-dispaaear.mov

@jayeshmangwani
Copy link
Contributor

Why it is loading? I don't get this problem

@DylanDylann Please ignore this, as I am unable to reproduce it on another account. If I find the exact repro steps, I will post them; otherwise, we can ignore it for this PR.

@DylanDylann
Copy link
Contributor Author

@jayeshmangwani BE removed data after reloading page, right?

@jayeshmangwani
Copy link
Contributor

@DylanDylann But if we encounter an error when deactivating, then why is the backend removing the data that I wondering?

@jayeshmangwani
Copy link
Contributor

As I said before, this is not from this PR, but I noticed it and wanted to mention it here.

@DylanDylann
Copy link
Contributor Author

@jayeshmangwani Is this ready for checklist?>

@jayeshmangwani
Copy link
Contributor

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.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
Android.mov
Android: mWeb Chrome
mweb-chrome.mov
iOS: Native
ios.mov
iOS: mWeb Safari
mweb-safari.mov
MacOS: Chrome / Safari
web-2.mov
web.mov
MacOS: Desktop
desktop.mov

Copy link
Contributor

@mountiny mountiny left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes look good to me

@@ -37,7 +37,8 @@ type IssueNewCardFlowData = {
data?: Partial<IssueNewCardData>;
};

function reportVirtualExpensifyCardFraud(cardID: number) {
function reportVirtualExpensifyCardFraud(card?: Card) {
const cardID = card?.cardID ?? -1;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I m still not sure what is the best way to handle these. I feel like that if the cardID is not available we should cut this earlier, but not sure about the best practice here

},
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${card?.fundID ?? '-1'}_${CONST.EXPENSIFY_CARD.BANK}`,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here, if the fundID is not available, this is kinda useless

Comment on lines +39 to +44
const submit = useCallback(() => {
Navigation.dismissModal();
InteractionManager.runAfterInteractions(() => {
Card.reportVirtualExpensifyCardFraud(virtualCard);
});
}, [virtualCard]);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did we need this callback here and not in some other pages?

@mountiny
Copy link
Contributor

mountiny commented Nov 1, 2024

Thank you for thorough testing @jayeshmangwani

@mountiny mountiny merged commit b6cd83b into Expensify:main Nov 1, 2024
19 checks passed
@OSBotify
Copy link
Contributor

OSBotify commented Nov 1, 2024

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

Copy link
Contributor

github-actions bot commented Nov 4, 2024

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

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

Copy link
Contributor

github-actions bot commented Nov 6, 2024

🚀 Deployed to production by https://github.com/luacmartins in version: 9.0.57-10 🚀

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants