fix: Expensify card link navigates to wallet #50039

truph01 · 2024-10-02T08:00:25Z

Details

Fixed Issues

$ #49804
PROPOSAL: #49804 (comment)

Tests

Go to ND and log in
Create a workspace
Navigate to the workspace settings > More Features
Enable Expensify card option
Navigate to the Expensify card and click on Issue card
Select Connect online with plaid and add the VBA
Issue the virtual Expensify card to the current user
Navigate to the workspace chat
Click on the Expensify card link
Verify: User is navigated to the virtual Expensify card details

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

Screenshots/Videos

Android: Native

Screen.Recording.2024-10-05.at.07.01.06.mov

Android: mWeb Chrome

Screen.Recording.2024-10-02.at.15.24.19.mov

iOS: Native

Screen.Recording.2024-10-02.at.15.20.27.mov

iOS: mWeb Safari

Screen.Recording.2024-10-02.at.15.18.33.mov

MacOS: Chrome / Safari

Screen.Recording.2024-10-02.at.15.09.03.mov

MacOS: Desktop

Screen.Recording.2024-10-02.at.15.15.35.mov

melvin-bot · 2024-10-02T08:30:42Z

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

truph01 · 2024-10-02T08:31:45Z

I cannot run android native. Will update the video later.

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

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-02_14.57.27.mp4

Android: mWeb Chrome

android-chrome-2024-10-02_14.01.22.mp4

iOS: Native

ios-app-2024-10-02_14.48.17.mp4

iOS: mWeb Safari

ios-safari-2024-10-02_14.52.41.mp4

MacOS: Chrome / Safari

desktop-chrome-2024-10-02_13.53.47.mp4

MacOS: Desktop

desktop-app-2024-10-02_13.58.01.mp4

jjcoffee

A couple of bugs to sort out!

truph01 · 2024-10-03T09:50:59Z

BUG: If the user the card is issued to is not the admin, clicking the link from the workspace chat (as that non-admin user) they are navigated to a Not found page. The route in this case should be settings/wallet/card/${cardID}.

Fixed this bug.

Member:

Screen.Recording.2024-10-03.at.16.42.47.mov

Admin:

Screen.Recording.2024-10-03.at.16.43.16.mov

truph01 · 2024-10-03T09:54:35Z

BUG: On first sign-in, clicking the link loads the card details but the cards page behind the modal is blank and has a jittery render when dismissing the modal. This is because normally we'd call OpenPolicyExpensifyCardsPage first when this page is opened "normally".

When we are on the report page and then click on the card link, it will navigate to the card detail page in RHN. But in background, which screen should be displayed? There are two options:

Currently, in PR, it is:

Screen.Recording.2024-10-03.at.16.43.16.mov

In the background, the report is displayed.

@iwiznia @jjcoffee

jjcoffee · 2024-10-03T11:54:10Z

When we are on the report page and then click on the card link, it will navigate to the card detail page in RHN. But in background, which screen should be displayed?

I think it probably makes sense to have the report in the background (central pane), unless it adds unnecessary complexity. Let's do that for now, we can revert if @iwiznia feels strongly about it!

jjcoffee · 2024-10-03T11:55:25Z

@truph01 Could you also add the Android native video when you get a chance? Thanks!

iwiznia · 2024-10-03T11:57:37Z

It's probably a bit better to keep the report (or whatever page you were in) in the background, so when you close the RHP you are in the same place you were before

truph01 · 2024-10-04T08:48:48Z

I cannot receive magic code now. Did you encounter the same? @jjcoffee

jjcoffee · 2024-10-04T10:19:03Z

@truph01 Should be fixed now!

truph01 · 2024-10-04T23:39:52Z

It's probably a bit better to keep the report (or whatever page you were in) in the background, so when you close the RHP you are in the same place you were before

Updated. Below is result:

Admin:

Screen.Recording.2024-10-05.at.06.36.56.mov

Others:

Screen.Recording.2024-10-05.at.06.37.36.mov

truph01 · 2024-10-04T23:40:41Z

@iwiznia Also, please help confirm the @jjcoffee's thoughts:

BUG: If the user the card is issued to is not the admin, clicking the link from the workspace chat (as that non-admin user) they are navigated to a Not found page. The route in this case should be settings/wallet/card/${cardID}.

truph01 · 2024-10-05T00:04:06Z

@truph01 Could you also add the Android native video when you get a chance? Thanks!

@jjcoffee I updated android video

src/libs/ReportActionsUtils.ts

truph01 · 2024-10-07T09:09:31Z

Testing on Android native, when I tap the link as an admin (the card is assigned to someone else), the not found page shows up. This also happens for the user the card is assigned to. The route in the logs:

I encountered the same when I tested on Android. I try to call "npm run android" and start metro "npx react-native start :8081" again, then it works properly. Can you try it?

src/libs/ReportActionsUtils.ts

-function getCardIssuedMessage(reportAction: OnyxEntry<ReportAction>, shouldRenderHTML = false) {
-    const assigneeAccountID = (getOriginalMessage(reportAction) as IssueNewCardOriginalMessage)?.assigneeAccountID;
+function getCardIssuedMessage(reportAction: OnyxEntry<ReportAction>, shouldRenderHTML = false, policyID = '-1') {
+    const assigneeAccountID = isActionOfType(


jjcoffee

LGTM!

iwiznia · 2024-10-07T18:48:04Z

src/libs/ReportActionsUtils.ts

@@ -1728,13 +1729,24 @@ function isCardIssuedAction(reportAction: OnyxEntry<ReportAction>) {
    return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.CARD_ISSUED, CONST.REPORT.ACTIONS.TYPE.CARD_ISSUED_VIRTUAL, CONST.REPORT.ACTIONS.TYPE.CARD_MISSING_ADDRESS);
 }

-function getCardIssuedMessage(reportAction: OnyxEntry<ReportAction>, shouldRenderHTML = false) {
-    const assigneeAccountID = (getOriginalMessage(reportAction) as IssueNewCardOriginalMessage)?.assigneeAccountID;
+function getCardIssuedMessage(reportAction: OnyxEntry<ReportAction>, shouldRenderHTML = false, policyID = '-1') {


Why -1 and not 0 or null? (same in all the ones below)

Because the policyID prop of the report is policyID?: string, so I need to add the fallback value as '-1' to fix the type error based on the docs: https://github.com/Expensify/App/blob/main/contributingGuides/STYLE.md#default-value-for-inexistent-ids

Posted about this here https://expensify.slack.com/archives/C01GTK53T8Q/p1728329641957179 and we will be undoing this, but I'll go ahead and merge this

iwiznia · 2024-10-07T18:49:35Z

src/libs/ReportActionsUtils.ts

    const assigneeDetails = PersonalDetailsUtils.getPersonalDetailsByIDs([assigneeAccountID], currentUserAccountID ?? -1).at(0);
-
+    const isPolicyAdmin = PolicyUtils.isPolicyAdmin(PolicyUtils.getPolicy(policyID));


I think this is wrong if policyID is -1, no?

Yep, isPolicyAdmin will be false if policyID is -1

This sounds wrong, because -1 is not checked here

App/src/libs/PolicyUtils.ts

Line 579 in 9e1f21a

if (!allPolicies || !policyID) {

😕
But also checking with the team about the -1 recommendation you linked above

This sounds wrong, because -1 is not checked here

If policyID = -1, then condition:

App/src/libs/PolicyUtils.ts

Line 579 in 9e1f21a

if (!allPolicies || !policyID) {

is false

so undefined will be returned because of:

App/src/libs/PolicyUtils.ts

Line 582 in 9e1f21a

return allPolicies[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`];

I think getPolicy(-1) = undefined makes sense.

But also checking with the team about the -1 recommendation you linked above

Waiting for the final decision

github-actions · 2024-10-07T22:29:00Z

🚀 Deployed to staging by https://github.com/iwiznia in version: 9.0.46-0 🚀

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

github-actions · 2024-10-09T20:28:49Z

🚀 Deployed to production by https://github.com/thienlnam in version: 9.0.46-5 🚀

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

jjcoffee · 2024-11-05T08:48:09Z

Coming from #50375, we missed handling cases where the card is no longer active/available. More details here.

truph01 added 2 commits October 2, 2024 14:56

fix: Expensify card link navigates to wallet

f1ef836

fix: lint

dafc2b7

truph01 marked this pull request as ready for review October 2, 2024 08:30

truph01 requested a review from a team as a code owner October 2, 2024 08:30

melvin-bot bot requested review from jjcoffee and removed request for a team October 2, 2024 08:30

truph01 mentioned this pull request Oct 2, 2024

[HOLD for payment 2024-10-16] [$250] Expensify card - Expensify card link navigates to wallet instead of virtual card details #49804

Closed

6 tasks

This comment was marked as resolved.

Sign in to view

jjcoffee suggested changes Oct 2, 2024

View reviewed changes

truph01 added 2 commits October 3, 2024 16:17

merge main

a668f6a

fix: handle case user is not admin

c9457fc

fix: lint

abbd04e

merge main

9e8dfb1

fix: create new expensify card and domain card modal navigator

484486b

merge main

793afd8

truph01 mentioned this pull request Oct 6, 2024

[HOLD for payment 2024-12-07] [$250] Pay Someone - Wallet page opens when refreshing in "Validate your account" page #50285

Closed

6 tasks

jjcoffee reviewed Oct 7, 2024

View reviewed changes

src/libs/ReportActionsUtils.ts Outdated Show resolved Hide resolved

merge main

abb9687

This comment was marked as resolved.

Sign in to view

fix: remove type cast

7f19976

jjcoffee reviewed Oct 7, 2024

View reviewed changes

fix: remove duplicate logic

015e07d

jjcoffee approved these changes Oct 7, 2024

View reviewed changes

melvin-bot bot requested a review from iwiznia October 7, 2024 11:09

iwiznia reviewed Oct 7, 2024

View reviewed changes

iwiznia approved these changes Oct 7, 2024

View reviewed changes

iwiznia merged commit 1fb0d01 into Expensify:main Oct 7, 2024
23 checks passed

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

Deploy Checklist: New Expensify 2024-10-07 #50366

Closed

50 tasks

DylanDylann mentioned this pull request Oct 8, 2024

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

Closed

6 tasks

lanitochka17 mentioned this pull request Oct 8, 2024

mWeb - Card - PR50039-No virtual card is created when issuing it from the members page #50467

Closed

6 tasks

allgandalf mentioned this pull request Oct 8, 2024

Expensify Card - Member cannot see card details from link in workspace chat unless Wallet is opened #50471

Closed

6 tasks

thienlnam mentioned this pull request Oct 8, 2024

Revert "fix: Expensify card link navigates to wallet" #50476

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Expensify card link navigates to wallet #50039

fix: Expensify card link navigates to wallet #50039

truph01 commented Oct 2, 2024 •

edited

Loading

melvin-bot bot commented Oct 2, 2024

truph01 commented Oct 2, 2024

jjcoffee commented Oct 2, 2024 •

edited

Loading

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

jjcoffee left a comment

truph01 commented Oct 3, 2024

truph01 commented Oct 3, 2024

jjcoffee commented Oct 3, 2024

jjcoffee commented Oct 3, 2024

iwiznia commented Oct 3, 2024

truph01 commented Oct 4, 2024

jjcoffee commented Oct 4, 2024

truph01 commented Oct 4, 2024

truph01 commented Oct 4, 2024

truph01 commented Oct 5, 2024

This comment was marked as resolved.

truph01 commented Oct 7, 2024

This comment was marked as resolved.

jjcoffee left a comment

iwiznia Oct 7, 2024

truph01 Oct 7, 2024

iwiznia Oct 7, 2024

iwiznia Oct 7, 2024

truph01 Oct 7, 2024

iwiznia Oct 7, 2024 •

edited

Loading

truph01 Oct 7, 2024

github-actions bot commented Oct 7, 2024

github-actions bot commented Oct 9, 2024

jjcoffee commented Nov 5, 2024

		const assigneeDetails = PersonalDetailsUtils.getPersonalDetailsByIDs([assigneeAccountID], currentUserAccountID ?? -1).at(0);

		const isPolicyAdmin = PolicyUtils.isPolicyAdmin(PolicyUtils.getPolicy(policyID));

fix: Expensify card link navigates to wallet #50039

fix: Expensify card link navigates to wallet #50039

Conversation

truph01 commented Oct 2, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Oct 2, 2024

truph01 commented Oct 2, 2024

jjcoffee commented Oct 2, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

jjcoffee left a comment

Choose a reason for hiding this comment

truph01 commented Oct 3, 2024

truph01 commented Oct 3, 2024

jjcoffee commented Oct 3, 2024

jjcoffee commented Oct 3, 2024

iwiznia commented Oct 3, 2024

truph01 commented Oct 4, 2024

jjcoffee commented Oct 4, 2024

truph01 commented Oct 4, 2024

Admin:

Others:

truph01 commented Oct 4, 2024

truph01 commented Oct 5, 2024

This comment was marked as resolved.

truph01 commented Oct 7, 2024

This comment was marked as resolved.

jjcoffee left a comment

Choose a reason for hiding this comment

iwiznia Oct 7, 2024

Choose a reason for hiding this comment

truph01 Oct 7, 2024

Choose a reason for hiding this comment

iwiznia Oct 7, 2024

Choose a reason for hiding this comment

iwiznia Oct 7, 2024

Choose a reason for hiding this comment

truph01 Oct 7, 2024

Choose a reason for hiding this comment

iwiznia Oct 7, 2024 • edited Loading

Choose a reason for hiding this comment

truph01 Oct 7, 2024

Choose a reason for hiding this comment

github-actions bot commented Oct 7, 2024

github-actions bot commented Oct 9, 2024

jjcoffee commented Nov 5, 2024

truph01 commented Oct 2, 2024 •

edited

Loading

jjcoffee commented Oct 2, 2024 •

edited

Loading

iwiznia Oct 7, 2024 •

edited

Loading