Fix card number previews and expiration date format on expensify card page #34677

grgia · 2024-01-17T21:34:41Z

Details

Figma mock:

This PR fixes minor UI bugs on the Expensify Card Page (/settings/wallet/card/expensify.com) to the above Mock from Figma.

Change log:

Virtual Card Number is displayed as •••• •••• •••• ••••
Physical Card Number is not bold
Expiration Date is formatted as MM/YYYY

Fixed Issues

$ #34629
$ #34682

Tests

Verify that no errors appear in the JS console
Added Card Data for testing via console:

Onyx.merge('cardList',
{
  2: {
    "availableSpend": 10000000,
    "bank": "Expensify Card",
    "cardID": 2,
    "cardName": "485932XXXXXX0255",
    "domainName": "expensify.com",
    "fraud": "none",
    "isVirtual": true,
    "lastFourPAN": "0255",
    "state": 3
  },

  3: {
    "availableSpend": 10000000,
    "bank": "Expensify Card",
    "cardID": 3,
    "cardName": "485932XXXXXX1234",
    "domainName": "expensify.com",
    "fraud": "none",
    "isVirtual": false,
    "lastFourPAN": "0255",
    "state": 3
  },
});

✅ Verify that the card number previews match the above mock.
Hard-coded card details for testing expiration date:

App/src/pages/settings/Wallet/ExpensifyCardPage.js

Lines 226 to 229 in 4e9f199

    
           {details.pan ? ( 
        
               <CardDetails 
        
                   pan={details.pan} 
        
                   expiration={CardUtils.formatCardExpiration(details.expiration)}

                                        {true ? (
                                            <CardDetails
                                                pan={details.pan}
                                                expiration={CardUtils.formatCardExpiration('0645')}

✅ Verify that the expiration date is in the format MM/YYYY
✅ Added Automated tests for expiration date and manually tested by modifying these with manual tests

Offline tests

QA Steps

Verify that no errors appear in the JS console
On an account with a VIRTUAL and PHYSICAL Expensify card:
Go to settings/wallet and click on Expensify Card
✅ Verify that the card number previews match the above mock.
Click on reveal details next to virtual card
✅ Verify that the expiration date is in the format MM/YYYY

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2024-01-17T21:57:01Z

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

mananjadhav · 2024-01-18T02:27:36Z

Code change looks simple enough. I'll work on the checklist in a few hours.

mananjadhav · 2024-01-18T17:08:04Z

@grgia I was able to access the Expensify Accepted card, but the card page itself didn't load. Is the Onyx data enough for it to load?

I get this error.

mananjadhav · 2024-01-18T17:35:52Z

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
- [x]] 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 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 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

grgia · 2024-01-19T00:38:39Z

@grgia I was able to access the Expensify Accepted card, but the card page itself didn't load. Is the Onyx data enough for it to load?

@mananjadhav what did your data look like? I don't get that error

mananjadhav

Thanks @grgia. I missed a step of manually updating the expirationDate. It worked after following all the steps. Tests well.

melvin-bot · 2024-01-19T04:26:14Z

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

OSBotify · 2024-01-19T06:14:08Z

✋ 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 · 2024-01-19T10:02:27Z

🚀 Deployed to staging by https://github.com/joelbettner in version: 1.4.28-0 🚀

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

OSBotify · 2024-01-21T22:47:10Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.4.28-0 🚀

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

fix bold font, fix expiration date format on card page

f341508

grgia self-assigned this Jan 17, 2024

virtual card # preview should display only ••••

4e9f199

grgia changed the title ~~fix bold font, fix expiration date format on card page~~ Fix card number previews and expiration date format on expensify card page Jan 17, 2024

grgia marked this pull request as ready for review January 17, 2024 21:56

grgia requested a review from a team as a code owner January 17, 2024 21:56

melvin-bot bot removed the request for review from a team January 17, 2024 21:57

melvin-bot bot requested a review from mananjadhav January 17, 2024 21:57

fix date comment

ed9fa1e

mananjadhav approved these changes Jan 19, 2024

View reviewed changes

melvin-bot bot requested a review from joelbettner January 19, 2024 04:26

joelbettner approved these changes Jan 19, 2024

View reviewed changes

joelbettner merged commit 991a4e2 into main Jan 19, 2024
17 checks passed

joelbettner deleted the georgia-formatExpiration branch January 19, 2024 06:10

github-actions bot mentioned this pull request Jan 19, 2024

Deploy Checklist: New Expensify 2024-01-19 #34789

Closed

19 tasks

This was referenced Jan 21, 2024

[HOLD for payment 2024-01-28] [ECARD SETTINGS] Expiration date in card details is using the wrong format #34629

Closed

[HOLD for payment 2024-01-28] [ECARD SETTINGS] Fix Card Number Styling on Expensify Card Page #34682

Closed

grgia mentioned this pull request Jan 26, 2024

Physical card number on card details page should not be bold #34965

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix card number previews and expiration date format on expensify card page #34677

Fix card number previews and expiration date format on expensify card page #34677

grgia commented Jan 17, 2024 •

edited

Loading

melvin-bot bot commented Jan 17, 2024

mananjadhav commented Jan 18, 2024

mananjadhav commented Jan 18, 2024

mananjadhav commented Jan 18, 2024 •

edited

Loading

grgia commented Jan 19, 2024

mananjadhav left a comment

melvin-bot bot commented Jan 19, 2024

OSBotify commented Jan 19, 2024

OSBotify commented Jan 19, 2024

OSBotify commented Jan 21, 2024

	{details.pan ? (
	<CardDetails
	pan={details.pan}
	expiration={CardUtils.formatCardExpiration(details.expiration)}

Fix card number previews and expiration date format on expensify card page #34677

Fix card number previews and expiration date format on expensify card page #34677

Conversation

grgia commented Jan 17, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jan 17, 2024

mananjadhav commented Jan 18, 2024

mananjadhav commented Jan 18, 2024

mananjadhav commented Jan 18, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

grgia commented Jan 19, 2024

mananjadhav left a comment

Choose a reason for hiding this comment

melvin-bot bot commented Jan 19, 2024

OSBotify commented Jan 19, 2024

OSBotify commented Jan 19, 2024

OSBotify commented Jan 21, 2024

grgia commented Jan 17, 2024 •

edited

Loading

mananjadhav commented Jan 18, 2024 •

edited

Loading