[Company Cards] Update the Amex cards format #52578

VickyStash · 2024-11-14T15:32:10Z

Explanation of Change

[Company Cards] Update the Amex cards format to show as 4 digits, 6 digits, 5 digits

Fixed Issues

$ #52551
PROPOSAL: N/A

Tests

Verify that no errors appear in the JS console

Open the app.
Go to the workspace with Company cards feature enabled and open Company cards page.
Add Amex feed and open it (even if it's in the pending state).
Set the next data into Onyx:

Onyx.merge('sharedNVP_private_domain_member_YourPolicyAccountID', {
  settings: {
    companyCards: {
      "gl1025": {
        "pending": false,
      },
    },
  }
});

Onyx.set('cards_YourPolicyAccountID_gl1025', {
        "21502608": {
            "accountID": 18545387,
            "bank": "gl1025",
            "cardID": 21502608,
            "cardName": "211944XXXXX6557",
            "domainName": "expensify-policy5a5b3fb07949e438.exfy",
            "fraud": "none",
            "isVirtual": false,
            "lastFourPAN": "6557",
            "lastScrape": "",
            "scrapeMinDate": "2024-08-15",
            "state": 3
        },
        "21503133": {
            "accountID": 18545387,
            "bank": "gl1025",
            "cardID": 21503133,
            "cardName": "331740XXXXX3816",
            "domainName": "expensify-policy5a5b3fb07949e438.exfy",
            "fraud": "none",
            "isVirtual": false,
            "lastFourPAN": "3816",
            "lastScrape": "",
            "scrapeMinDate": "2024-08-15",
            "state": 3
        },
        "cardList": {
            "211944XXXXX6557": "v11:E915DFF7BC02D02280C5321F1157DFCB",
            "293227XXXXX0083": "v11:229152887957A4B71D2E6143CF434F44",
            "331740XXXXX3816": "v11:F6C1494F302E61E0A96D51286BC801F8",
            "516365XXXXX8399": "v11:1BFD4AA0511489475D4F3DB11F68AE25",
            "627603XXXXX4300": "v11:BE56DCAA917D72FC55E95348AF9F950D",
            "629281XXXXX9824": "v11:0DF41748F172CF9B4B1BAD0E785A910C",
        }
})

Make sure the card number is displayed in 4/6/5 digits format (ex:1234 56•••• •7890) on:

Card assignment: Card Selection step
Card assignment: Confirmation step
Main card list table
Card details page

Offline tests

Same, as in the Tests section.

QA Steps

Verify that no errors appear in the JS console

Open the app.
Go to the workspace with active Amex feed and open Company cards page.
Make sure the card number is displayed in 4/6/5 digits format (ex:1234 56•••• •7890) on:

Card assignment: Card Selection step
Card assignment: Confirmation step
Main card list table
Card details page

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

…ds-format

melvin-bot · 2024-11-15T11:17:14Z

@DylanDylann 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/libs/CardUtils.ts

DylanDylann · 2024-11-18T04:18:01Z

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

Screen.Recording.2024-11-18.at.17.52.15.mov

MacOS: Desktop

src/libs/CardUtils.ts

VickyStash · 2024-11-18T10:20:25Z

@DylanDylann I've updated the PR!

mountiny · 2024-11-18T11:08:48Z

@Expensify/design Can you please check out of you happy with these changes? The numbers are not completely aligned yet as each number has slightly different width, but I am not sure if there is much we should do about it. Probably not worth the time now.

mountiny

Waiting for the design sign off, looks good, couple questions

src/libs/CardUtils.ts

tests/unit/CardUtilsTest.ts

dannymcclain · 2024-11-18T14:20:34Z

Looking much better than before IMO.

Android Native doesn't seem to have the same spacing format as the others, is that a known thing?

The numbers are not completely aligned yet as each number has slightly different width, but I am not sure if there is much we should do about it.

I think the only thing we could do about it is use tabular/monospace numerals for these, but like you, I'm not totally sure we need to anything about it right now. Will let the other designers weigh in on that!

VickyStash · 2024-11-18T16:42:11Z

Android Native doesn't seem to have the same spacing format as the others, is that a known thing?

@dannymcclain Do you mean the Hidden text alignment?
We can fix it, but I guess it won't be the issue for the real users, as they always will have both the Cardholder name and Card name showed, so two rowes, like this:

dannymcclain · 2024-11-18T17:20:20Z

Ah no, I was talking about the spacing in the actual card numbers. In the reviewer screenshots above, Android Native looks different from the rest. But that just might be a goof. They look right in the issue description screenshots.

Android native	Others

VickyStash · 2024-11-18T17:48:21Z

I've just re-checked android native and it looks as expected for me

@DylanDylann, Could you check why you had a different result?

DylanDylann · 2024-11-19T01:39:51Z

@dannymcclain sorry guys, my bad. I updated the Android screenshot again

VickyStash · 2024-11-19T08:48:21Z

@mountiny @dannymcclain So can we move on with the PR?

dannymcclain · 2024-11-19T14:04:06Z

I'd say so!

mountiny

Thanks!

OSBotify · 2024-11-19T15:24:18Z

✋ 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-21T01:44:44Z

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

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

joekaufmanexpensify · 2024-11-21T14:54:58Z

@VickyStash I tested this one and the card number looks good on:

Card list during assignment.
Confirmation page.
Main card list.
Card details.
Wallet page.

However, we're still using the XXX format with no spaces on the workspace member profile. Is that expected?

joekaufmanexpensify · 2024-11-21T14:55:24Z

Regardless, that is minor issue, so checked off for QA

VickyStash · 2024-11-21T16:31:45Z

However, we're still using the XXX format with no spaces on the workspace member profile. Is that expected?

@joekaufmanexpensify It looks like it was missed on this page, I can create a follow-up PR tomorrow 👌

joekaufmanexpensify · 2024-11-21T16:50:11Z

Sweet. TY!

DylanDylann · 2024-11-21T16:52:57Z

@VickyStash If it is minor, we can add it to #52893

VickyStash · 2024-11-22T08:34:51Z

@DylanDylann Updated it in the PR

github-actions · 2024-11-22T19:48:47Z

🚀 Deployed to production by https://github.com/chiragsalian in version: 9.0.65-5 🚀

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

Update amex cards format

601e07b

VickyStash mentioned this pull request Nov 14, 2024

[HOLD for payment 2024-11-29] [Company Cards] Update the Amex cards format #52551

Closed

VickyStash added 2 commits November 15, 2024 10:17

Merge branch 'refs/heads/main' into VickyStash/feature/52551-amex-car…

fb4b456

…ds-format

Add unit tests

fc97fdc

VickyStash marked this pull request as ready for review November 15, 2024 11:17

VickyStash requested a review from a team as a code owner November 15, 2024 11:17

melvin-bot bot requested a review from DylanDylann November 15, 2024 11:17

melvin-bot bot removed the request for review from a team November 15, 2024 11:17

DylanDylann reviewed Nov 18, 2024

View reviewed changes

src/libs/CardUtils.ts Outdated Show resolved Hide resolved

DylanDylann reviewed Nov 18, 2024

View reviewed changes

src/libs/CardUtils.ts Show resolved Hide resolved

Minor improvements

9bcec51

DylanDylann approved these changes Nov 18, 2024

View reviewed changes

melvin-bot bot requested a review from mountiny November 18, 2024 10:56

mountiny assigned VickyStash Nov 18, 2024

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

mountiny requested a review from a team November 18, 2024 11:07

mountiny reviewed Nov 18, 2024

View reviewed changes

src/libs/CardUtils.ts Outdated Show resolved Hide resolved

tests/unit/CardUtilsTest.ts Show resolved Hide resolved

Remove check for feed

1836991

mountiny approved these changes Nov 19, 2024

View reviewed changes

mountiny merged commit 9268594 into Expensify:main Nov 19, 2024
19 checks passed

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

Deploy Checklist: New Expensify 2024-11-21 #52862

Closed

65 tasks

VickyStash mentioned this pull request Nov 22, 2024

[Internal QA] [Company cards] Navigate to some other existing feed after removing one #52893

Merged

49 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Company Cards] Update the Amex cards format #52578

[Company Cards] Update the Amex cards format #52578

VickyStash commented Nov 14, 2024 •

edited

Loading

melvin-bot bot commented Nov 15, 2024

DylanDylann commented Nov 18, 2024 •

edited

Loading

VickyStash commented Nov 18, 2024

mountiny commented Nov 18, 2024

mountiny left a comment

dannymcclain commented Nov 18, 2024

VickyStash commented Nov 18, 2024

dannymcclain commented Nov 18, 2024

VickyStash commented Nov 18, 2024

DylanDylann commented Nov 19, 2024

VickyStash commented Nov 19, 2024

dannymcclain commented Nov 19, 2024

mountiny left a comment

OSBotify commented Nov 19, 2024

github-actions bot commented Nov 21, 2024

joekaufmanexpensify commented Nov 21, 2024

joekaufmanexpensify commented Nov 21, 2024

VickyStash commented Nov 21, 2024 •

edited

Loading

joekaufmanexpensify commented Nov 21, 2024

DylanDylann commented Nov 21, 2024

VickyStash commented Nov 22, 2024

github-actions bot commented Nov 22, 2024

[Company Cards] Update the Amex cards format #52578

[Company Cards] Update the Amex cards format #52578

Conversation

VickyStash commented Nov 14, 2024 • edited Loading

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Nov 15, 2024

DylanDylann commented Nov 18, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

VickyStash commented Nov 18, 2024

mountiny commented Nov 18, 2024

mountiny left a comment

Choose a reason for hiding this comment

dannymcclain commented Nov 18, 2024

VickyStash commented Nov 18, 2024

dannymcclain commented Nov 18, 2024

VickyStash commented Nov 18, 2024

DylanDylann commented Nov 19, 2024

VickyStash commented Nov 19, 2024

dannymcclain commented Nov 19, 2024

mountiny left a comment

Choose a reason for hiding this comment

OSBotify commented Nov 19, 2024

github-actions bot commented Nov 21, 2024

joekaufmanexpensify commented Nov 21, 2024

joekaufmanexpensify commented Nov 21, 2024

VickyStash commented Nov 21, 2024 • edited Loading

joekaufmanexpensify commented Nov 21, 2024

DylanDylann commented Nov 21, 2024

VickyStash commented Nov 22, 2024

github-actions bot commented Nov 22, 2024

VickyStash commented Nov 14, 2024 •

edited

Loading

DylanDylann commented Nov 18, 2024 •

edited

Loading

VickyStash commented Nov 21, 2024 •

edited

Loading