[Wave 8- Card Settings] CLEAN UP - Filter out personal cards, fix route to card page, fix card icons #29834

grgia · 2023-10-17T21:34:09Z

Details

Filters out any cards not associated with a domain (for now, we will later add those in)
Adds Card Versions for All Bank Icons

Fixed Issues

$ #27417
$ https://github.com/Expensify/Expensify/issues/326981
$ #29586
$ #29275

Tests

Verify that no errors appear in the JS console
Open Settings/Wallet Page
Merge the following Data via console:


Onyx.merge('cardList',
{
  2: {
    "availableSpend": 10000000,
    "bank": "Expensify Card",
    "cardID": 2,
    "cardName": "485932XXXXXX0255",
    "domainName": "expensify.com",
    "fraud": "none",
    "isVirtual": false,
    "lastFourPAN": "0255",
    "state": 3
  },
  3: {
    "availableSpend": 0,
    "bank": "chase",
    "cardID": 3,
    "cardName": "CREDIT CARD - 4093",
    "domainName": "yourmom.com",
    "fraud": "none",
    "isVirtual": false,
    "lastFourPAN": "",
    "state": 3
  },
  4: {
    "availableSpend": 0,
    "bank": "discover",
    "cardID": 4,
    "cardName": "CREDIT CARD - 0672",
    "domainName": "godzilla.com",
    "fraud": "none",
    "isVirtual": false,
    "lastFourPAN": "",
    "state": 3
  },
  5: {
    "availableSpend": 0,
    "bank": "bank of america",
    "cardID": 5,
    "cardName": "CREDIT CARD - 5365",
    "cardholderFirstName": "Puneet",
    "cardholderLastName": "Lath",
    "domainName": "beets.com",
    "fraud": "none",
    "isVirtual": false,
    "lastFourPAN": "",
    "state": 3
  },
  6: {
    "availableSpend": 10000000,
    "bank": "Expensify Card",
    "cardID": 6,
    "cardName": "v10:85A5DB35CBD7B35470838535C9E4A7CA",
    "domainName": "expensify.com",
    "fraud": "none",
    "isVirtual": false,
    "lastFourPAN": "0811",
    "state": 3
  },
}
);

Verify these cards show:

Merge the following Data via console:


Onyx.merge('cardList',
{
  2: {
    "availableSpend": 10000000,
    "bank": "Expensify Card",
    "cardID": 2,
    "cardName": "485932XXXXXX0255",
    "domainName": "expensify.com",
    "fraud": "none",
    "isVirtual": false,
    "lastFourPAN": "0255",
    "state": 3
  },
  3: {
    "availableSpend": 0,
    "bank": "chase",
    "cardID": 3,
    "cardName": "CREDIT CARD - 4093",
    "domainName": "",
    "fraud": "none",
    "isVirtual": false,
    "lastFourPAN": "",
    "state": 3
  },
  4: {
    "availableSpend": 0,
    "bank": "discover",
    "cardID": 4,
    "cardName": "CREDIT CARD - 0672",
    "domainName": "",
    "fraud": "none",
    "isVirtual": false,
    "lastFourPAN": "",
    "state": 3
  },
  5: {
    "availableSpend": 0,
    "bank": "bank of america",
    "cardID": 5,
    "cardName": "CREDIT CARD - 5365",
    "domainName": "",
    "fraud": "none",
    "isVirtual": false,
    "lastFourPAN": "",
    "state": 3
  },
  6: {
    "availableSpend": 10000000,
    "bank": "Expensify Card",
    "cardID": 6,
    "cardName": "v10:85A5DB35CBD7B35470838535C9E4A7CA",
    "domainName": "expensify.com",
    "fraud": "none",
    "isVirtual": false,
    "lastFourPAN": "0811",
    "state": 3
  },
}
);

Verify only Expensify Cards show

Testing every icon:


let banks = [
    'generic', 'americanexpress', 'bank of america', 'bbt', 'capital one', 
    'chase', 'charlesschwab', 'citibank', 'citizens bank', 'discover', 
    'fidelity', 'huntington bank', 'navy federal credit union', 'pnc', 
    'regionsbank', 'suntrust', 'tdbank', 'usbank', 'usaa'
];

let key = 1;

banks.forEach((bankName) => {
    let bankData = {
        [key]:  {
    "title": `${bankName} Checking`,
    "description": "Account ending in 5087",
    "methodID": key,
    "key": `bankAccount-${key}`,
    "accountType": "bankAccount",
    "accountData": {
        "accountNumber": "XXXXX5087",
        "additionalData": {
            "bankName": `${bankName}`,
        },
        "state": "OPEN",
        "type": "BUSINESS"
    },
    "isDefault": false
}
    };

    Onyx.merge("bankAccountList", bankData);

    key += 1;
});

banks.unshift('Expensify Card');

banks.forEach((bankName) => {
    let cardData = {
        [key]:  {
            "availableSpend": 0,
            "bank": `${bankName}`,
            "cardID": key,
            "cardName": `${bankName} Card - 1234`,
            "domainName": "beets.com",
            "fraud": "none",
            "isVirtual": false,
            "lastFourPAN": "",
            "state": 3,
        }
    };

    Onyx.merge("cardList", cardData);

    key += 1;
});

Offline tests

QA Steps

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

Screen.Recording.2023-10-18.at.9.19.39.PM.mov

iOS: mWeb Safari

Screen.Recording.2023-10-18.at.9.31.44.PM.mov

MacOS: Chrome / Safari

MacOS: Desktop

…here user has multiple cards

cloudflare-workers-and-pages · 2023-10-18T12:15:43Z

Deploying with Cloudflare Pages

Latest commit:	`6332887`
Status:	✅ Deploy successful!
Preview URL:	https://39c168f1.helpdot.pages.dev
Branch Preview URL:	https://georgia-cardlist-fixes.helpdot.pages.dev

View logs

melvin-bot · 2023-10-18T14:01:20Z

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

src/pages/settings/Wallet/PaymentMethodList.js

grgia · 2023-10-18T17:37:35Z

Lotta assets, but ready to go!

luacmartins · 2023-10-18T17:41:21Z

@grgia lint is failing

grgia · 2023-10-18T20:34:18Z

fixed lint

s77rt · 2023-10-19T01:53:11Z

src/pages/settings/Wallet/PaymentMethodList.js

+                    iconHeight={item.iconHeight || item.iconSize}
+                    iconWidth={item.iconWidth || item.iconSize}
+                    iconStyles={item.iconStyles}


NAB. Shouldn't we apply same styles here

App/src/pages/ReimbursementAccount/EnableStep.js

Lines 86 to 87 in 1bfd5f1

iconWidth={iconSize}

iconHeight={iconSize}

App/src/components/AddPlaidBankAccount.js

Lines 236 to 237 in 1bfd5f1

height={iconSize}

width={iconSize}

s77rt · 2023-10-19T02:04: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 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

melvin-bot · 2023-10-19T02:05:31Z

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

luacmartins

LGTM

OSBotify · 2023-10-19T02:46:41Z

✋ 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-20T21:39:21Z

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

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

OSBotify · 2023-10-23T04:51:33Z

🚀 Deployed to production by https://github.com/chiragsalian in version: 1.3.88-11 🚀

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

Filter out personal cards, fix route to card page. Handle edge case w…

61b2d70

…here user has multiple cards

grgia self-assigned this Oct 17, 2023

grgia requested a review from luacmartins October 17, 2023 21:34

Add Card Assets, fix missing card status

44c17a4

Merge branch 'main' into georgia-cardList-fixes

f74d6d5

grgia changed the title ~~Filter out personal cards, fix route to card page.~~ [Wave 8- Card Settings] CLEAN UP - Filter out personal cards, fix route to card page, fix card icons Oct 18, 2023

lint

62b73b1

grgia marked this pull request as ready for review October 18, 2023 14:01

grgia requested a review from a team as a code owner October 18, 2023 14:01

melvin-bot bot requested review from s77rt and removed request for a team October 18, 2023 14:01

luacmartins reviewed Oct 18, 2023

View reviewed changes

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

grgia added 2 commits October 18, 2023 18:28

minor clean up

6bd9f75

I should probably upload the cardIcons shouldn't I?

903e982

grgia requested a review from luacmartins October 18, 2023 17:37

remove unused import for lint

6332887

s77rt reviewed Oct 19, 2023

View reviewed changes

s77rt approved these changes Oct 19, 2023

View reviewed changes

melvin-bot bot requested a review from amyevans October 19, 2023 02:05

luacmartins approved these changes Oct 19, 2023

View reviewed changes

luacmartins merged commit b38171d into main Oct 19, 2023
14 of 15 checks passed

luacmartins deleted the georgia-cardList-fixes branch October 19, 2023 02:39

hungvu193 mentioned this pull request Oct 19, 2023

[$500] Web - Card list shows the same label repeated for every card #29912

Closed

6 tasks

OSBotify mentioned this pull request Oct 20, 2023

Deploy Checklist: New Expensify 2023-10-20 #30108

Closed

bernhardoj mentioned this pull request Oct 24, 2023

[HOLD for payment 2023-11-09] [$500] Bank account - BA icon broken, it is square instead of round #30215

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Wave 8- Card Settings] CLEAN UP - Filter out personal cards, fix route to card page, fix card icons #29834

[Wave 8- Card Settings] CLEAN UP - Filter out personal cards, fix route to card page, fix card icons #29834

grgia commented Oct 17, 2023 •

edited

Loading

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

edited

Loading

melvin-bot bot commented Oct 18, 2023

grgia commented Oct 18, 2023

luacmartins commented Oct 18, 2023

grgia commented Oct 18, 2023

s77rt Oct 19, 2023

s77rt commented Oct 19, 2023

melvin-bot bot commented Oct 19, 2023

luacmartins left a comment

OSBotify commented Oct 19, 2023

OSBotify commented Oct 20, 2023

OSBotify commented Oct 23, 2023

[Wave 8- Card Settings] CLEAN UP - Filter out personal cards, fix route to card page, fix card icons #29834

[Wave 8- Card Settings] CLEAN UP - Filter out personal cards, fix route to card page, fix card icons #29834

Conversation

grgia commented Oct 17, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

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

Deploying with Cloudflare Pages

melvin-bot bot commented Oct 18, 2023

grgia commented Oct 18, 2023

luacmartins commented Oct 18, 2023

grgia commented Oct 18, 2023

s77rt Oct 19, 2023

Choose a reason for hiding this comment

s77rt commented Oct 19, 2023

Reviewer Checklist

Screenshots/Videos

melvin-bot bot commented Oct 19, 2023

luacmartins left a comment

Choose a reason for hiding this comment

OSBotify commented Oct 19, 2023

OSBotify commented Oct 20, 2023

OSBotify commented Oct 23, 2023

grgia commented Oct 17, 2023 •

edited

Loading

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

edited

Loading