[No QA] Fix/52558 fix card name and images by koko57 · Pull Request #52735 · Expensify/App

koko57 · 2024-11-19T03:29:49Z

Explanation of Change

Fixed Issues

$ #52558
PROPOSAL:

Tests

IMAGES
Check if the card icon sizing is appropriate on:

Card List page (feed selector),
Feed Selector page,
Members -> Member Details -> New Card page (accessed after clicking New Card)
Wallet main page (cards section)

CARD NAME

verify that the "[FirstName]'s card" is displayed as a fallback for the cards that had no name displayed after issuing
verify that the newly created Expensify Cards will have the "card" lowercased
Verify that no errors appear in the JS console

Offline tests

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

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 / Chrome
- iOS / native
- iOS / 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 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 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 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
- If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
  - 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 the PR modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

…ow large icons

melvin-bot · 2024-11-20T13:58:45Z

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

shawnborton · 2024-11-20T18:47:15Z

Should the card have rounded edges?

I would think yes - not sure if that's something we should do on the svg itself or if that comes from a style we apply?

dannymcclain · 2024-11-20T19:27:48Z

Should the card have rounded edges?
I would think yes - not sure if that's something we should do on the svg itself or if that comes from a style we apply?

@shawnborton 🤔 Hmm, interesting. It looks like the SVGs do have rounded corners?

koko57 · 2024-11-21T01:46:35Z

@dannymcclain we no longer use the icons from the company cards folder - we use the ones saved in companycards/large

still, it's strange as the icons from the 'large' folder also have the corners rounded

cc @mountiny

koko57 · 2024-11-21T02:25:13Z

@dannymcclain @shawnborton what is the appropriate border radius for the small card icons - in the lists?

koko57 · 2024-11-21T02:38:31Z

after the latest changes

koko57 · 2024-11-21T02:42:16Z

shawnborton · 2024-11-21T11:05:45Z

Nice, that's feeling better! Looks like we're using 4 for the border radius of the small cards in Figma.

allgandalf · 2024-11-21T12:13:11Z

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

Screen.Recording.2024-11-22.at.6.03.52.PM.mov

Android: mWeb Chrome

Screen.Recording.2024-11-22.at.6.12.54.PM.mov

iOS: Native

Screen.Recording.2024-11-22.at.5.17.46.PM.mov

iOS: mWeb Safari

Screen.Recording.2024-11-22.at.5.22.45.PM.mov

MacOS: Chrome / Safari

MacOS: Desktop

koko57 · 2024-11-21T12:17:38Z

@shawnborton fixed

allgandalf

okay changes LGTM, testing now

allgandalf · 2024-11-21T12:16:28Z

src/libs/CardUtils.ts

+    if (!cardholder) {
+        return '';
+    }
+    return `${cardholder}'s card`;


noting that we internally agreed to keep the c as small

shawnborton · 2024-11-22T14:28:30Z

do both like we're doing here but truncate the beginning of the card number instead of the end

I could get down with something like this

dannymcclain · 2024-11-22T14:35:31Z

🤔 Hmm, if we're considering truncating the beginning of the card number... Is there any reason not to just go ahead and only show the last 4? If you can't see the beginning, are the middle card numbers particularly helpful at all?

koko57 · 2024-11-25T03:10:06Z

I also changed the header to "Last 4" instead of "Card Number" when only 4 last digits are displayed for mobile/narrow screen.

allgandalf · 2024-11-25T06:27:21Z

@koko57 can you please fix the failing tests :))

koko57 · 2024-11-25T07:03:18Z

@allgandalf fixed

allgandalf · 2024-11-25T07:04:37Z

Thanks, I will wait for the design teams 👍 on the latest changes before approving

mountiny

Discussing in Slack the change to last 4 pan numbers before merging

koko57 · 2024-11-25T14:43:32Z

It will look like this after the latest changes.
cc @shawnborton @joekaufmanexpensify @mountiny

mountiny · 2024-11-25T14:52:47Z

I think that is good!

koko57 · 2024-11-25T15:12:36Z

If any other changes will be necessary, I suggest to do it as a follow-up PR as it'll be more changes in the code.

mountiny

discussed and for now this is good. We might follow up with changing how we show the card numbers across the app later.

OSBotify · 2024-11-25T15:29:17Z

✋ 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-11-26T16:40:54Z

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

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

joekaufmanexpensify · 2024-11-26T19:51:57Z

IMAGES
Check if the card icon sizing is appropriate on:
Card List page (feed selector),
Feed Selector page,
Members -> Member Details -> New Card page (accessed after clicking New Card)
Wallet main page (cards section)

Art looks good everywhere!

joekaufmanexpensify · 2024-11-26T19:58:31Z

CARD NAME
verify that the "[FirstName]'s card" is displayed as a fallback for the cards that had no name displayed after issuing

Confirmed.

joekaufmanexpensify · 2024-11-26T19:58:46Z

verify that the newly created Expensify Cards will have the "card" lowercased

Not sure where I am supposed to check this. Asking!

joekaufmanexpensify · 2024-11-26T19:59:45Z

Asked

koko57 · 2024-11-27T06:59:39Z

@joekaufmanexpensify for the physical Expensify Card if you don't change the default name during the issuing process

github-actions · 2024-11-28T14:21:57Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.0.67-9 🚀

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

joekaufmanexpensify · 2024-12-01T16:48:25Z

Got it. Tested and confirmed default name is %Firstname's% card and card is lowercase.

koko57 added 8 commits November 19, 2024 09:21

fix: display default card name as a fallback

ab54754

fix: show default name on card details page

15e2819

fix: revert the changes for bank cards icons, add another param to sh…

5d3097a

…ow large icons

fix: eslint

483e63d

fix: resolve conflicts

205e64c

fix: fix images sizes

6c7ff9a

fix: typecheck

02f7a72

fix: unify card icon size across the app

1cfa86f

koko57 marked this pull request as ready for review November 20, 2024 13:58

koko57 requested review from a team as code owners November 20, 2024 13:58

melvin-bot bot requested review from allgandalf and removed request for a team November 20, 2024 13:58

koko57 mentioned this pull request Nov 20, 2024

[HOLD for payment 2024-12-05] [Company cards] The card name after assignment is not showing correctly #52558

Closed

koko57 changed the title ~~Fix/52558 fix card name and images~~ [No QA] Fix/52558 fix card name and images Nov 20, 2024

fix: apply the same icon styles for all the cards

2b2b512

koko57 added 2 commits November 21, 2024 09:46

fix: minor change

2b53f55

Merge branch 'main' into fix/52558-fix-card-name-and-images

0c869f1

fix: border for icons

45b416c

allgandalf reviewed Nov 21, 2024

View reviewed changes

fix: resolve conflicts

c959f0d

fix: show only last 4 digits for mobile/narrow screen

fd6c86c

koko57 added 2 commits November 25, 2024 13:30

fix: failing tests

897dad7

fix: failing tests

b107f40

mountiny previously approved these changes Nov 25, 2024

View reviewed changes

fix: show only 4 last PAN

100cf3e

koko57 dismissed mountiny’s stale review via 100cf3e November 25, 2024 14:44

fix: lint

69ab559

mountiny approved these changes Nov 25, 2024

View reviewed changes

mountiny merged commit a22d12f into Expensify:main Nov 25, 2024

github-actions bot mentioned this pull request Nov 26, 2024

Deploy Checklist: New Expensify 2024-11-26 #53142

Closed

75 tasks

koko57 deleted the fix/52558-fix-card-name-and-images branch July 28, 2025 18:25

Conversation

koko57 commented Nov 19, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Nov 20, 2024

Uh oh!

shawnborton commented Nov 20, 2024

Uh oh!

dannymcclain commented Nov 20, 2024

Uh oh!

koko57 commented Nov 21, 2024

Uh oh!

koko57 commented Nov 21, 2024

Uh oh!

koko57 commented Nov 21, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

koko57 commented Nov 21, 2024

Uh oh!

shawnborton commented Nov 21, 2024

Uh oh!

allgandalf commented Nov 21, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

koko57 commented Nov 21, 2024

Uh oh!

allgandalf left a comment

Choose a reason for hiding this comment

Uh oh!

allgandalf Nov 21, 2024

Choose a reason for hiding this comment

Uh oh!

shawnborton commented Nov 22, 2024

Uh oh!

dannymcclain commented Nov 22, 2024

Uh oh!

koko57 commented Nov 25, 2024

Uh oh!

allgandalf commented Nov 25, 2024

Uh oh!

koko57 commented Nov 25, 2024

Uh oh!

allgandalf commented Nov 25, 2024

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

koko57 commented Nov 25, 2024

Uh oh!

mountiny commented Nov 25, 2024

Uh oh!

koko57 commented Nov 25, 2024

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Nov 25, 2024

Uh oh!

github-actions bot commented Nov 26, 2024

Uh oh!

joekaufmanexpensify commented Nov 26, 2024

Uh oh!

joekaufmanexpensify commented Nov 26, 2024

Uh oh!

joekaufmanexpensify commented Nov 26, 2024

Uh oh!

joekaufmanexpensify commented Nov 26, 2024

Uh oh!

koko57 commented Nov 27, 2024

Uh oh!

github-actions bot commented Nov 28, 2024

koko57 commented Nov 19, 2024 •

edited

Loading

koko57 commented Nov 21, 2024 •

edited

Loading

allgandalf commented Nov 21, 2024 •

edited

Loading

joekaufmanexpensify commented Dec 1, 2024 •

edited

Loading