Skip to content

Format all masked PANs with the same style#83726

Merged
carlosmiceli merged 5 commits intomainfrom
cm-format-maskedpan
Mar 2, 2026
Merged

Format all masked PANs with the same style#83726
carlosmiceli merged 5 commits intomainfrom
cm-format-maskedpan

Conversation

@carlosmiceli
Copy link
Contributor

@carlosmiceli carlosmiceli commented Feb 27, 2026

Explanation of Change

Mimicking masked style from Classic for the new Company Cards table.

Before:
Screenshot 2026-02-27 at 2 18 28 PM

After:
Screenshot 2026-02-27 at 2 15 12 PM

Fixed Issues

$
PROPOSAL:

Tests

Added tests.

  • Verify that no errors appear in the JS console

Offline tests

QA Steps

Steps:

  1. Go to Company Cards and select a commercial feed
  2. Look at the card names in the table
  3. Confirm previous short names like 1234 now display as XXXX-XXXX-XXXX-1234
  • 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: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • 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 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 used JaimeGPT to get English > Spanish translation. I then posted it 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 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 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.ts 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 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 new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • 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.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • 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.

Screenshots/Videos

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari

@codecov
Copy link

codecov bot commented Feb 27, 2026

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines Coverage Δ
src/libs/CardUtils.ts 78.61% <100.00%> (+0.29%) ⬆️
...mpanyCardsTable/WorkspaceCompanyCardsTableItem.tsx 0.00% <ø> (ø)
... and 23 files with indirect coverage changes

@carlosmiceli carlosmiceli changed the title add formatMaskedCardName util Format all masked PANs with the same style Feb 27, 2026
@carlosmiceli
Copy link
Contributor Author

@MelvinBot please review.

@MelvinBot
Copy link
Contributor

🤖 MelvinBot Review

CI Failures (actionable)

Two checks are failing and need fixes before this can merge:

  1. Prettiertests/unit/CardUtilsTest.ts has a formatting diff. The last describe block is missing a trailing semicolon after the closing });. Run npm run prettier and commit the result.

  2. SpellcheckIACOVINO is flagged as an unknown word in tests/unit/CardUtilsTest.ts:3198. Either add it to the project's cspell word list or change the test data to a generic name (e.g., 'J. SMITH...4306').


Code Review

Overall: This is a clean, well-scoped change. The function logic, regex guard, and test coverage are all solid. A few observations:

Looks good

  • The regex ^[0-9X]+$ correctly matches only numeric/masked card strings, consistent with CONST.COMPANY_CARD.CARD_NUMBER_MASK_CHAR which is uppercase 'X'.
  • padStart(16, 'X') correctly handles short card numbers (e.g., 4-digit) by left-padding to a standard 16-char length.
  • The fallback for non-card names (like 'K. IACOVINO...4306') works correctly — they pass through unchanged.
  • Tests cover the key cases: short numbers, full 16-char masked numbers, and non-card name strings.

Suggestion: narrow layout consistency

In WorkspaceCompanyCardsTableItem.tsx, the narrow layout path (line ~89) still displays the raw cardName for unassigned cards:

const narrowWidthCardName = isAssigned
    ? `${customCardName ?? ''}${lastCardNumbers ? ` - ${lastCardNumbers}` : ''}`
    : cardName;  // <-- raw, unformatted

Should this also use formatMaskedCardName(cardName) for visual consistency across layouts? If the narrow layout intentionally uses a different format, a brief code comment explaining why would help future readers.


PR Description

The PR body is missing a few items:

  • Explanation of Change section is empty
  • Fixed Issues has no linked issue ($ with no URL)
  • Screenshots/Videos sections are all empty

These should be filled in per the contribution guidelines to help reviewers and QA understand the change.

@carlosmiceli
Copy link
Contributor Author

@MelvinBot fix the failing tests please.

Replace IACOVINO with SMITH to fix cspell unknown word error,
and fix import ordering to satisfy Prettier.

Co-authored-by: Carlos Miceli <carlosmiceli@users.noreply.github.com>
@MelvinBot
Copy link
Contributor

Fixed the two failing checks:

  1. Spellcheck — Replaced K. IACOVINO...4306 with J. SMITH...4306 in the test data to resolve the cspell unknown-word error.
  2. Prettier — Reordered the formatMaskedCardName import to its alphabetically correct position, satisfying Prettier's formatting rules.

Both checks pass locally now. Pushed as commit d5739ce.

1 similar comment
@MelvinBot
Copy link
Contributor

Fixed the two failing checks:

  1. Spellcheck — Replaced K. IACOVINO...4306 with J. SMITH...4306 in the test data to resolve the cspell unknown-word error.
  2. Prettier — Reordered the formatMaskedCardName import to its alphabetically correct position, satisfying Prettier's formatting rules.

Both checks pass locally now. Pushed as commit d5739ce.

@carlosmiceli carlosmiceli marked this pull request as ready for review February 27, 2026 17:27
@carlosmiceli carlosmiceli requested review from a team as code owners February 27, 2026 17:27
@melvin-bot melvin-bot bot requested review from mjasikowski and trjExpensify and removed request for a team February 27, 2026 17:27
@melvin-bot
Copy link

melvin-bot bot commented Feb 27, 2026

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

@joekaufmanexpensify
Copy link
Contributor

@carlosmiceli question, why were some cards showing only last 4 before (and why is only the last 4 unmasked after this change)? Is it not possible to show all cards on commercial feeds with the exact same styling?

@carlosmiceli
Copy link
Contributor Author

carlosmiceli commented Feb 28, 2026

@joekaufmanexpensify didn't we want to mimick how they are displayed in Classic?

Screenshot 2026-02-27 at 9 26 10 PM

I'm not sure why we have cards stored some with only 4 digits and some with the full masked PAN, I imagine the feed didn't always provide the BIN? @fedirjh would you have a theory? The change here is purely cosmetic, and we'd be matching the style of Classic. We could extract the BIN from other cards and apply the same uncovered first 6 digits style to all of them, but that's only in the case that BINs would always be the same for all cards in the table (if no BIN is found in any card, we'd just default to Xs).

@trjExpensify trjExpensify removed their request for review March 2, 2026 10:31
@joekaufmanexpensify
Copy link
Contributor

@joekaufmanexpensify didn't we want to mimick how they are displayed in Classic?

Interesting, yeah I see that in classic too. That still strikes me as odd. I'd be interested to know why that is, since my understanding is we get the full PAN for all commercial cards from the network. But agree NAB here since that's what classic does now 👍

@carlosmiceli
Copy link
Contributor Author

Cool, seems like you can review @fedirjh :)

Copy link
Contributor

@fedirjh fedirjh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me

Copy link
Contributor

@joekaufmanexpensify joekaufmanexpensify left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good for product 👍

@carlosmiceli
Copy link
Contributor Author

@fedirjh mind adding the PR reviewer checklist?

@fedirjh
Copy link
Contributor

fedirjh commented Mar 2, 2026

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 that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
  • I verified tests pass on all platforms & I tested again on:
    • Android: HybridApp
    • Android: mWeb Chrome
    • iOS: HybridApp
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • 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.ts 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.
  • For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
  • 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

Screenshot 2026-03-02 at 5 35 57 PM
Android: HybridApp
Android: mWeb Chrome
iOS: HybridApp
iOS: mWeb Safari
MacOS: Chrome / Safari

@carlosmiceli carlosmiceli merged commit 179e3fb into main Mar 2, 2026
30 of 32 checks passed
@carlosmiceli carlosmiceli deleted the cm-format-maskedpan branch March 2, 2026 16:41
@OSBotify
Copy link
Contributor

OSBotify commented Mar 2, 2026

✋ 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
Copy link
Contributor

github-actions bot commented Mar 2, 2026

🚧 @carlosmiceli has triggered a test Expensify/App build. You can view the workflow run here.

@OSBotify
Copy link
Contributor

OSBotify commented Mar 2, 2026

🚀 Deployed to staging by https://github.com/carlosmiceli in version: 9.3.28-0 🚀

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

@OSBotify
Copy link
Contributor

OSBotify commented Mar 4, 2026

🚀 Deployed to staging by https://github.com/carlosmiceli in version: 9.3.30-0 🚀

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

@OSBotify
Copy link
Contributor

OSBotify commented Mar 4, 2026

🚀 Deployed to production by https://github.com/blimpich in version: 9.3.30-3 🚀

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants