update images, update paymentList cardNumber view, update maskCardNumber by waterim · Pull Request #52389 · Expensify/App

waterim · 2024-11-12T12:58:36Z

Details

Fixed Issues

$ #51910
PROPOSAL: N/A

Tests

Open any workspace
Enable Company Cards
Click company cards > Card Details

Verify that no errors appear in the JS console

Offline tests

Same as tests

QA Steps

None

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

Details

melvin-bot · 2024-11-12T12:58:42Z

@dannymcclain @allgandalf One of you needs to 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]

waterim · 2024-11-12T12:59:23Z

@mountiny Fixed here this, also found that cards were showing without mask in wallet, updated also this

waterim · 2024-11-12T13:00:01Z

Also wondering about removing old cards as its not used anymore and new cards looks correct

dannymcclain · 2024-11-12T16:21:35Z

Screenshots are looking good so far. Do we need to verify with other card images too?

Also wondering about removing old cards as its not used anymore and new cards looks correct

Are you talking about removing old card images from the repo? If so, I think we should only keep the card images we're actually using in the product in the repo and trash the rest. That's my 2 cents anyways.

dubielzyk-expensify · 2024-11-13T01:25:53Z

Agree. Would be good to confirm that the card images are all working as expected.

allgandalf · 2024-11-13T09:20:15Z

@waterim can you please resolve conflicts 😄

allgandalf · 2024-11-13T09:22:48Z

Are you talking about removing old card images from the repo? If so, I think we should only keep the card images we're actually using in the product in the repo and trash the rest. That's my 2 cents anyways.

Found one usage where we still use those old images, so i think lets keep it for now, unless we clean those up too in this PR

App/src/pages/workspace/companyCards/addNew/CardTypeStep.tsx

Line 51 in c24d217

src={Illustrations.VisaCompanyCardDetail}

# Conflicts: # src/pages/workspace/companyCards/WorkspaceCompanyCardsList.tsx

allgandalf · 2024-11-13T15:50:57Z

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

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

allgandalf

LGTM!!, @mountiny can you create a follow up issue where we can decide if we want to get rid of the old companyCard images as @dannymcclain was asking about that here

allgandalf · 2024-11-13T15:55:39Z

+    const hasSpace = /\s/.test(cardName);
    const maskedString = cardName.replace(/X/g, '•');
-    return maskedString.replace(/(.{4})/g, '$1 ').trim();
+    return hasSpace ? cardName : maskedString.replace(/(.{4})/g, '$1 ').trim();


@mountiny we fixed the spacing issue as per comment here

mountiny

Thanks! i dont think we need a new issue for that, we can just tag it to some existing one

mountiny · 2024-11-13T21:22:51Z

+    const hasSpace = /\s/.test(cardName);
    const maskedString = cardName.replace(/X/g, '•');
-    return maskedString.replace(/(.{4})/g, '$1 ').trim();
+    return hasSpace ? cardName : maskedString.replace(/(.{4})/g, '$1 ').trim();


mountiny · 2024-11-13T21:27:42Z

@koko57 @VickyStash Could you please remove the not used card svg images in some of your follow up prs?

OSBotify · 2024-11-13T21:39:11Z

✋ 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-14T00:53:32Z

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

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

github-actions · 2024-11-15T14:16:52Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.0.62-4 🚀

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

koko57 · 2024-11-19T03:00:40Z

+        [CONST.COMPANY_CARD.FEED_BANK_NAME.CITIBANK]: Illustrations.CitibankCompanyCardDetailLarge,
+        [CONST.COMPANY_CARD.FEED_BANK_NAME.WELLS_FARGO]: Illustrations.WellsFargoCompanyCardDetailLarge,
+        [CONST.COMPANY_CARD.FEED_BANK_NAME.BREX]: Illustrations.BrexCompanyCardDetailLarge,
+        [CONST.COMPANY_CARD.FEED_BANK_NAME.STRIPE]: Illustrations.StripeCompanyCardDetailLarge,


@mountiny should we revert this change for #52558

Discussed in DM, let's try to find a root cause of why the larger SVG are shown wrong

update images, update paymentList cardNumber view, update maskCardNumber

31bdf06

waterim requested review from a team as code owners November 12, 2024 12:58

melvin-bot Bot requested review from allgandalf and dannymcclain and removed request for a team November 12, 2024 12:58

mountiny assigned waterim Nov 12, 2024

mountiny added the InternalQA This pull request required internal QA label Nov 12, 2024

fix cardMask for cardName in details

ca3900e

narefyev91 added 2 commits November 13, 2024 14:21

Merge branch 'refs/heads/main' into feat/51910

16dd1b9

Merge branch 'refs/heads/main' into feat/51910

ff5335c

# Conflicts: # src/pages/workspace/companyCards/WorkspaceCompanyCardsList.tsx

allgandalf approved these changes Nov 13, 2024

View reviewed changes

melvin-bot Bot requested a review from mountiny November 13, 2024 16:09

mountiny approved these changes Nov 13, 2024

View reviewed changes

mountiny merged commit bf696c5 into Expensify:main Nov 13, 2024

github-actions Bot mentioned this pull request Nov 14, 2024

Deploy Checklist: New Expensify 2024-11-14 #52512

Closed

47 tasks

mountiny mentioned this pull request Nov 14, 2024

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

Closed

melvin-bot Bot mentioned this pull request Nov 15, 2024

[HOLD for payment 2024-11-22] [Workspace feeds] Card art on card details page looks a bit smaller than the mockups #51910

Closed

8 tasks

koko57 reviewed Nov 19, 2024

View reviewed changes

ikevin127 mentioned this pull request Feb 10, 2025

[Due for payment 2025-03-10] [HOLD][$250] AmEx icon is smaller than other card icons in the Filters #56567

Closed

8 tasks

Uh oh!

Conversation

waterim commented Nov 12, 2024

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Nov 12, 2024

Uh oh!

waterim commented Nov 12, 2024

Uh oh!

waterim commented Nov 12, 2024

Uh oh!

dannymcclain commented Nov 12, 2024

Uh oh!

dubielzyk-expensify commented Nov 13, 2024

Uh oh!

allgandalf commented Nov 13, 2024

Uh oh!

allgandalf commented Nov 13, 2024

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

allgandalf left a comment

Choose a reason for hiding this comment

Uh oh!

allgandalf Nov 13, 2024

Choose a reason for hiding this comment

Uh oh!

mountiny Nov 13, 2024

Choose a reason for hiding this comment

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

mountiny Nov 13, 2024

Choose a reason for hiding this comment

Uh oh!

mountiny commented Nov 13, 2024

Uh oh!

OSBotify commented Nov 13, 2024

Uh oh!

github-actions Bot commented Nov 14, 2024

Uh oh!

github-actions Bot commented Nov 15, 2024

Uh oh!

koko57 Nov 19, 2024

Choose a reason for hiding this comment

Uh oh!

mountiny Nov 20, 2024

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

allgandalf commented Nov 13, 2024 •

edited

Loading