fix: remove link if card is deactivated #50720

truph01 · 2024-10-14T11:36:22Z

Details

Fixed Issues

$ #50375
PROPOSAL:

Tests

Go to ND
[Admin] Asssign a virtual card to member.
[Admin] Go to Expensify Card.
[Admin] Click on the member with the virtual card in Step 2.
[Admin] Click Deactivate card.
[Admin] Deactivate the card.
[Admin] Go to workspace chat with the member in Step 2.
[Admin] Verify in the issue card message, there is no Expensify Card link.

Verify that no errors appear in the JS console

Offline tests

QA Steps

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

output.mp4

Android: mWeb Chrome

output.mp4

iOS: Native

output.mp4

iOS: mWeb Safari

output.mp4

MacOS: Chrome / Safari

output.mp4

MacOS: Desktop

output.mp4

melvin-bot · 2024-10-15T03:06:39Z

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

jjcoffee · 2024-10-15T11:14:52Z

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

android-app-2024-10-15_13.45.00.mp4

Android: mWeb Chrome

android-chrome-2024-10-15_13.49.32.mp4

iOS: Native

ios-app-2024-10-15_14.14.17.mp4

iOS: mWeb Safari

ios-safari-2024-10-15_14.15.29.mp4

MacOS: Chrome / Safari

desktop-chrome-2024-10-15_13.23.00.mp4

MacOS: Desktop

desktop-app-2024-10-15_13.26.05.mp4

jjcoffee · 2024-10-15T11:19:07Z

@truph01 Can you update the Fixed Issues link to go directly to the issue (without the comment), currently it's https://github.com/Expensify/App/issues/50375#issuecomment-2409930379? Thanks! 🙏

truph01 · 2024-10-15T11:27:43Z

@jjcoffee I updated

jjcoffee · 2024-10-15T11:30:15Z

BUG: On a fresh sign-in the card link doesn't show until you navigate to the Workspace cards and then back.

truph01 · 2024-10-15T11:32:45Z

BUG: On a fresh sign-in the card link doesn't show until you navigate to the Workspace cards and then back.

I think it is BE issue. With the fresh sign-in, the card data is not available for each workspace until we visit the workspace card page. cc @mountiny

jjcoffee · 2024-10-15T11:40:26Z

This is probably more of a polish issue but on refresh the card link initially doesn't show for a brief period:

desktop-chrome-polish-2024-10-15_13.39.44.mp4

jjcoffee · 2024-10-15T11:48:31Z

BUG?: Previously deactivated card (with chat previously opened before this PR) still shows with link if user hasn't signed out. I'm not sure how to repro this since it's only happening with the one message I have from testing the original PR 😅

Ah I see that this card shows up under Workspace->Expensify Cards, so it must be a BE issue.

jjcoffee

LGTM!

@mountiny There are a couple issues above, but I'm approving for now since they seem to be BE related (except maybe this polish-y one).

mountiny · 2024-10-21T10:20:36Z

@truph01, can you please resolve merge conflicts?

truph01 · 2024-10-21T15:13:03Z

@mountiny When copying the issue card action, should we:

Just copy a raw text, such as issued @truphd01@gmail.com a virtual Expensify Card! The card can be used right away.
Copy a html version, such as issued @truphd01@gmail.com a virtual [Expensify Card](https://dev.new.expensify.com:8082/settings/91F8E8F853D82654/expensify-card/21338953)! The card can be used right away.

Currently, we are using the 2nd option. But it can lead to the copy being different when the card is deactivated or not, so I prefer the 1st. What do you think? cc @jjcoffee

mountiny · 2024-10-22T03:27:13Z

@truph01 I think we should just do the same we do when there is a link in a normal message. So whatever we format it then

truph01 · 2024-10-22T07:05:03Z

I am working on fixing this part:

I think we should just do the same we do when there is a link in a normal message. So whatever we format it then

truph01 · 2024-10-22T07:56:15Z

@jjcoffee @mountiny PR is updated with the commit to address comment. Please help review

jjcoffee · 2024-10-22T12:05:18Z

The copy & paste behaviour tests well and the code changes make sense to me. The issues I mentioned here are still present. cc @mountiny

mountiny

Thanks!

mountiny · 2024-10-22T12:13:13Z

src/pages/home/report/ContextMenu/BaseReportActionContextMenu.tsx

@@ -124,6 +125,10 @@ function BaseReportActionContextMenu({
    const transactionID = ReportActionsUtils.getLinkedTransactionID(reportActionID, reportID);
    const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`);
    const [user] = useOnyx(ONYXKEYS.USER);
+    const policyID = ReportUtils.getReport(reportID)?.policyID;
+    const workspaceAccountID = PolicyUtils.getWorkspaceAccountID(policyID ?? '-1');
+    const [cardList = {}] = useOnyx(ONYXKEYS.CARD_LIST);


I think it might be cleaner to call this something like userCardList to dsitinguish it more clearly from the admin cards

melvin-bot · 2024-10-22T12:13:49Z

@mountiny looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

mountiny · 2024-10-22T12:14:28Z

Not an emergency, the tests were passing, some race condition

OSBotify · 2024-10-22T12:23:54Z

✋ 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-10-23T16:43:42Z

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

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

github-actions · 2024-10-23T17:45:10Z

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

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

github-actions · 2024-10-25T02:17:05Z

🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.0.53-1 🚀

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

github-actions · 2024-10-25T07:48:09Z

🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.0.53-1 🚀

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

fix: remove link if card is deactivated

c898e8b

truph01 mentioned this pull request Oct 14, 2024

[HOLD for payment 2024-11-01] Expensify Card - Expensify Card link opens editable details page when card is deactivated #50375

Closed

6 tasks

truph01 marked this pull request as ready for review October 15, 2024 03:06

truph01 requested a review from a team as a code owner October 15, 2024 03:06

melvin-bot bot requested review from jjcoffee and removed request for a team October 15, 2024 03:06

jjcoffee approved these changes Oct 15, 2024

View reviewed changes

melvin-bot bot requested a review from mountiny October 15, 2024 12:19

mountiny assigned truph01 Oct 21, 2024

fix: merge main and fix conflicts

ca9b639

fix: copy issue message issue

4904a8b

mountiny approved these changes Oct 22, 2024

View reviewed changes

mountiny merged commit ca942ca into Expensify:main Oct 22, 2024
17 checks passed

melvin-bot bot added the Emergency label Oct 22, 2024

mountiny removed the Emergency label Oct 22, 2024

github-actions bot mentioned this pull request Oct 23, 2024

Deploy Checklist: New Expensify 2024-10-23 #51344

Closed

42 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: remove link if card is deactivated #50720

fix: remove link if card is deactivated #50720

truph01 commented Oct 14, 2024 •

edited

Loading

melvin-bot bot commented Oct 15, 2024

jjcoffee commented Oct 15, 2024 •

edited

Loading

jjcoffee commented Oct 15, 2024

truph01 commented Oct 15, 2024

jjcoffee commented Oct 15, 2024

truph01 commented Oct 15, 2024

jjcoffee commented Oct 15, 2024 •

edited

Loading

jjcoffee commented Oct 15, 2024 •

edited

Loading

jjcoffee left a comment

mountiny commented Oct 21, 2024

truph01 commented Oct 21, 2024

mountiny commented Oct 22, 2024

truph01 commented Oct 22, 2024

truph01 commented Oct 22, 2024

jjcoffee commented Oct 22, 2024

mountiny left a comment

mountiny Oct 22, 2024

melvin-bot bot commented Oct 22, 2024

mountiny commented Oct 22, 2024

OSBotify commented Oct 22, 2024

github-actions bot commented Oct 23, 2024

github-actions bot commented Oct 23, 2024

github-actions bot commented Oct 25, 2024

github-actions bot commented Oct 25, 2024

fix: remove link if card is deactivated #50720

fix: remove link if card is deactivated #50720

Conversation

truph01 commented Oct 14, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Oct 15, 2024

jjcoffee commented Oct 15, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

jjcoffee commented Oct 15, 2024

truph01 commented Oct 15, 2024

jjcoffee commented Oct 15, 2024

truph01 commented Oct 15, 2024

jjcoffee commented Oct 15, 2024 • edited Loading

jjcoffee commented Oct 15, 2024 • edited Loading

jjcoffee left a comment

Choose a reason for hiding this comment

mountiny commented Oct 21, 2024

truph01 commented Oct 21, 2024

mountiny commented Oct 22, 2024

truph01 commented Oct 22, 2024

truph01 commented Oct 22, 2024

jjcoffee commented Oct 22, 2024

mountiny left a comment

Choose a reason for hiding this comment

mountiny Oct 22, 2024

Choose a reason for hiding this comment

melvin-bot bot commented Oct 22, 2024

mountiny commented Oct 22, 2024

OSBotify commented Oct 22, 2024

github-actions bot commented Oct 23, 2024

github-actions bot commented Oct 23, 2024

github-actions bot commented Oct 25, 2024

github-actions bot commented Oct 25, 2024

truph01 commented Oct 14, 2024 •

edited

Loading

jjcoffee commented Oct 15, 2024 •

edited

Loading

jjcoffee commented Oct 15, 2024 •

edited

Loading

jjcoffee commented Oct 15, 2024 •

edited

Loading