Display company cards #29718

luacmartins · 2023-10-16T21:44:19Z

Details

Displays assigned company cards in the Payments page

Fixed Issues

$ #27417

Tests

Pre-requisites: requires an account with an imported company card and a card with an import error too

Navigate to Settings > Payments
Verify that you can see the imported cards in the Assigned cards section of the page
Verify that the card with an import error shows the error message below it.
Verify that the right caret doesn't show and that there's no hover style

Note: for dev you can enter the following code in the browser console to insert test cards:

Onyx.merge('cardList', {
    1: {
        availableSpend: 0,
        bank: "discover.com",
        cardID: 420,
        cardName: "AA Miles - 1979",
        cardholderFirstName: "",
        cardholderLastName: "",
        domainName: "expensifail.com",
        fraud: "none",
        isVirtual: false,
        lastFourPAN: "",
        maskedPan: "AA Miles - 1979",
        state: 3
    },
    2: {
        availableSpend: 0,
        bank: "discover.com",
        cardID: 420,
        cardName: "Alfred Tu - 3937",
        cardholderFirstName: "",
        cardholderLastName: "",
        domainName: "expensifail.com",
        errors: {
            1697491941020387: "There's an issue with this card's connection, which may result in you not seeing transactions. Please contact your administrator to resolve."
        },
        fraud: "none",
        isVirtual: false,
        lastFourPAN: "",
        maskedPan: "Alfred Tu - 3937",
        state: 3
    }
});

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2023-10-16T22:03:00Z

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

cloudflare-workers-and-pages · 2023-10-16T22:04:08Z

Deploying with Cloudflare Pages

Latest commit:	`40b308f`
Status:	✅ Deploy successful!
Preview URL:	https://0b266a89.helpdot.pages.dev
Branch Preview URL:	https://cmartins-displaycompanycards.helpdot.pages.dev

View logs

src/pages/settings/Wallet/PaymentMethodList.js

s77rt · 2023-10-16T22:56:48Z

Unrelated bug:

s77rt · 2023-10-16T22:59:19Z

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

Web

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

luacmartins · 2023-10-16T23:00:29Z

Yea, I saw the VirtualizedList error too, but that already exists on main so we should fix it in another PR

s77rt · 2023-10-16T23:01:31Z

Added screenshots for Web, Desktop and iOS. On Android having problems with Flipper to apply Onyx merge. Approving the PR as I don't see that as a blocker.

melvin-bot · 2023-10-16T23:02:26Z

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

youssef-lr · 2023-10-17T07:36:06Z

src/pages/settings/Wallet/PaymentMethodList.js

                    description: card.domainName,
-                    onPress: () => Navigation.navigate(ROUTES.SETTINGS_WALLET_DOMAINCARDS.getRoute(card.domainName)),
+                    onPress: isExpensifyCard ? () => Navigation.navigate(ROUTES.SETTINGS_WALLET_DOMAINCARDS.getRoute(card.domainName)) : () => {},


I think we can keep the onPress as is because interactive being false should prevent the onPress from being triggered, no?

youssef-lr

LGTM! Left a small NAB.

OSBotify · 2023-10-17T14:42:43Z

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

OSBotify · 2023-10-17T23:57:18Z

🚀 Deployed to staging by https://github.com/luacmartins in version: 1.3.86-0 🚀

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

kavimuru · 2023-10-18T09:12:28Z

@luacmartins For this PR, we don't meet the prerequisite
a card with an import error too how can we trigger this error?

luacmartins · 2023-10-18T15:56:39Z

It's been validated!

kavimuru · 2023-10-18T16:13:41Z

Thanks!

OSBotify · 2023-10-18T23:54:48Z

🚀 Deployed to production by https://github.com/francoisl in version: 1.3.86-5 🚀

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

luacmartins added 6 commits October 16, 2023 14:19

create isCompanyCard, update name and onPress

84c9ff8

hide caret

eac3f43

handle dismiss error callback

2808c16

use isExpensifyCard instead

6178ff3

rm unused import

4787d5b

fix console error, display errors

d959267

luacmartins self-assigned this Oct 16, 2023

luacmartins marked this pull request as ready for review October 16, 2023 22:02

luacmartins requested a review from a team as a code owner October 16, 2023 22:02

melvin-bot bot requested review from s77rt and removed request for a team October 16, 2023 22:02

rm jsbundle.map

9579482

s77rt reviewed Oct 16, 2023

View reviewed changes

src/pages/settings/Wallet/PaymentMethodList.js Outdated Show resolved Hide resolved

rm unnecessary check

40b308f

luacmartins requested a review from s77rt October 16, 2023 22:55

s77rt approved these changes Oct 16, 2023

View reviewed changes

melvin-bot bot requested a review from youssef-lr October 16, 2023 23:02

youssef-lr reviewed Oct 17, 2023

View reviewed changes

youssef-lr approved these changes Oct 17, 2023

View reviewed changes

luacmartins merged commit 79ade92 into main Oct 17, 2023
15 checks passed

luacmartins deleted the cmartins-displayCompanyCards branch October 17, 2023 14:37

OSBotify mentioned this pull request Oct 17, 2023

Deploy Checklist: New Expensify 2023-10-17 #29837

Closed

melvin-bot bot mentioned this pull request Oct 18, 2023

[HOLD for payment 2023-10-30] [HOLD for payment 2023-10-25] Display company cards in Wallet #27417

Closed

neil-marcellini mentioned this pull request Oct 25, 2023

Show info about workspace members added by secondary logins #23702

Merged

59 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Display company cards #29718

Display company cards #29718

luacmartins commented Oct 16, 2023 •

edited

Loading

melvin-bot bot commented Oct 16, 2023

cloudflare-workers-and-pages bot commented Oct 16, 2023 •

edited

Loading

s77rt commented Oct 16, 2023

s77rt commented Oct 16, 2023

luacmartins commented Oct 16, 2023

s77rt commented Oct 16, 2023

melvin-bot bot commented Oct 16, 2023

youssef-lr Oct 17, 2023

youssef-lr left a comment

OSBotify commented Oct 17, 2023

OSBotify commented Oct 17, 2023

kavimuru commented Oct 18, 2023 •

edited

Loading

luacmartins commented Oct 18, 2023

kavimuru commented Oct 18, 2023

OSBotify commented Oct 18, 2023

Display company cards #29718

Display company cards #29718

Conversation

luacmartins commented Oct 16, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Oct 16, 2023

cloudflare-workers-and-pages bot commented Oct 16, 2023 • edited Loading

Deploying with Cloudflare Pages

s77rt commented Oct 16, 2023

s77rt commented Oct 16, 2023

Reviewer Checklist

Screenshots/Videos

luacmartins commented Oct 16, 2023

s77rt commented Oct 16, 2023

melvin-bot bot commented Oct 16, 2023

youssef-lr Oct 17, 2023

Choose a reason for hiding this comment

youssef-lr left a comment

Choose a reason for hiding this comment

OSBotify commented Oct 17, 2023

OSBotify commented Oct 17, 2023

kavimuru commented Oct 18, 2023 • edited Loading

luacmartins commented Oct 18, 2023

kavimuru commented Oct 18, 2023

OSBotify commented Oct 18, 2023

luacmartins commented Oct 16, 2023 •

edited

Loading

cloudflare-workers-and-pages bot commented Oct 16, 2023 •

edited

Loading

kavimuru commented Oct 18, 2023 •

edited

Loading