fix: policy id shows as domain card description #48779

dominictb · 2024-09-09T10:40:55Z

Details

Fixed Issues

Tests

Test case 1 (Use the mock data)

To test this, without having any cards linked, put this useEffect in the WalletPage:

useEffect(() => {
        if (cardList[234523452345]) {
            return;
        }
        // eslint-disable-next-line rulesdir/prefer-actions-set-data
        Onyx.merge(`cardList`, {
            1234123412341234: {
                key: '1234123412341234',
                cardID: 1234123412341234,
                state: 3,
                bank: 'Expensify Card',
                availableSpend: 1000000,
                domainName: 'expensify-policy${policyID}.exfy',
                nameValuePairs: {
                    cardTitle: 'Amazon Card(title)',
                    limitType: 'smart',
                    isVirtual: false,
                },
                isVirtual: false,
                fraud: 'none',
                lastFourPAN: '1234',
            },
        });
    }, [cardList]);

Fill the ${policyID} by any existed policyID value.

Go to wallet page.
Verify that policy ID will not be displayed under the card's name for member.

Test case 2

As workspace Admin, go to Workspace settings > Expensify Card
Press Issue card
Issue a card to the member
As workspace member, go to Settings > Wallet

Verify that under Assigned cards section, the card description shows the workspace name

Verify that no errors appear in the JS console

Offline tests

QA Steps

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

Screen.Recording.2024-09-09.at.23.10.15.mov

iOS: Native

Screen.Recording.2024-09-09.at.23.05.52.mov

iOS: mWeb Safari

Screen.Recording.2024-09-09.at.22.53.22.mov

MacOS: Chrome / Safari

Screen.Recording.2024-09-09.at.22.37.36.mov

MacOS: Desktop

Screen.Recording.2024-09-09.at.22.43.53.mov

trjExpensify · 2024-09-09T14:51:43Z

@dominictb can we get this in review today, please? Thanks!

dominictb · 2024-09-09T15:46:50Z

@trjExpensify All the code changes have been implemented. I am adding the missing videos.

dominictb · 2024-09-09T16:22:05Z

I encountered an error when running the Android app, will update PR once it is fixed.

melvin-bot · 2024-09-09T16:22:29Z

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

DylanDylann · 2024-09-09T17:13:53Z

src/libs/CardUtils.ts

+    const match = domainName.match(CONST.REGEX.EXPENSIFY_POLICY_DOMAIN_NAME);
+    if (match) {


@mountiny Should we use bank field to check? If possible, I think it will be simpler

We already implemented isExpensifyCard function to check this

I think we need to change this, it does not have to be only Expensify cards here, I think we need to check if this feed is a workspace feed or not.

If yes, use workspace name

I think we need to change this, it does not have to be only Expensify cards here, I think we need to check if this feed is a workspace feed or not.

If yes, use workspace name

@mountiny Please elaborate this point. Thanks!

~~Oh wait, I think @mountiny agrees with your current regex~~

Not sure, Let's wait for @mountiny to confirm

mountiny · 2024-09-09T17:34:03Z

src/libs/CardUtils.ts

@@ -194,6 +195,16 @@ function getCardFeedIcon(cardFeed: string): IconAsset {
    return Illustrations.AmexCompanyCards;
 }

+function getDescriptionForPolicyDomainCard(domainName: string) {
+    const match = domainName.match(CONST.REGEX.EXPENSIFY_POLICY_DOMAIN_NAME);


So this would be more like isWorkspaceFeed if the domain name matches the expensify-policy<policyID>.exfy format

mountiny · 2024-09-09T17:34:35Z

src/libs/CardUtils.ts

+    const match = domainName.match(CONST.REGEX.EXPENSIFY_POLICY_DOMAIN_NAME);
+    if (match) {


I think we need to change this, it does not have to be only Expensify cards here, I think we need to check if this feed is a workspace feed or not.

If yes, use workspace name

src/libs/CardUtils.ts

…/48749

…o fix/48749

trjExpensify · 2024-09-10T20:29:22Z

Are we ready for a re-review?

mountiny

@dominictb can you please update these small changes, otherwise looks good

src/pages/settings/Wallet/PaymentMethodList.tsx

DylanDylann · 2024-09-11T10:36:03Z

@dominictb Please create a physical card instead of mock data

BUG: Your change works with the mock data but fails with the real data because the the letter in policyID is lowercase

Screen.Recording.2024-09-11.at.17.32.26.mov

dominictb · 2024-09-12T07:32:07Z

@DylanDylann Could you retry? I turned the policyID uppercase to handle your case.

DylanDylann · 2024-09-12T08:40:42Z

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

MacOS: Desktop

The requested changes were addressed

OSBotify · 2024-09-12T09:07:02Z

✋ 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-09-12T21:37:39Z

🚀 Deployed to staging by https://github.com/MariaHCD in version: 9.0.34-0 🚀

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

OSBotify · 2024-09-13T22:45:21Z

🚀 Deployed to production by https://github.com/luacmartins in version: 9.0.34-3 🚀

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

fix: policy id shows as domain card description

1f58e3e

just apply getDescriptionForPolicyDomainCard to expensify card

fb65ba5

dominictb marked this pull request as ready for review September 9, 2024 16:22

dominictb requested a review from a team as a code owner September 9, 2024 16:22

melvin-bot bot requested review from DylanDylann and removed request for a team September 9, 2024 16:22

DylanDylann reviewed Sep 9, 2024

View reviewed changes

mountiny assigned dominictb Sep 9, 2024

mountiny requested changes Sep 9, 2024

View reviewed changes

dominictb added 4 commits September 10, 2024 16:04

Merge branch 'main' of https://github.com/dominictb/epsf-app into fix…

5457f38

…/48749

move out of utils functions

8368f49

Merge branch 'fix/48749' of https://github.com/dominictb/epsf-app int…

8a72564

…o fix/48749

resolve conflicts

657d3d0

mountiny previously requested changes Sep 10, 2024

View reviewed changes

src/pages/settings/Wallet/PaymentMethodList.tsx Outdated Show resolved Hide resolved

src/pages/settings/Wallet/PaymentMethodList.tsx Outdated Show resolved Hide resolved

src/pages/settings/Wallet/PaymentMethodList.tsx Outdated Show resolved Hide resolved

handle lowercase ID

9222766

add comments and change variable name

e52e9a9

DylanDylann approved these changes Sep 12, 2024

View reviewed changes

melvin-bot bot requested a review from mountiny September 12, 2024 08:44

MariaHCD approved these changes Sep 12, 2024

View reviewed changes

MariaHCD merged commit cf07039 into Expensify:main Sep 12, 2024
17 of 18 checks passed

github-actions bot mentioned this pull request Sep 12, 2024

Deploy Checklist: New Expensify 2024-09-12 #49139

Closed

30 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: policy id shows as domain card description #48779

fix: policy id shows as domain card description #48779

dominictb commented Sep 9, 2024 •

edited

Loading

trjExpensify commented Sep 9, 2024

dominictb commented Sep 9, 2024

dominictb commented Sep 9, 2024

melvin-bot bot commented Sep 9, 2024

DylanDylann Sep 9, 2024

DylanDylann Sep 9, 2024

mountiny Sep 9, 2024

dominictb Sep 10, 2024

DylanDylann Sep 10, 2024 •

edited

Loading

mountiny Sep 9, 2024

mountiny Sep 9, 2024

trjExpensify commented Sep 10, 2024

mountiny left a comment

DylanDylann commented Sep 11, 2024

dominictb commented Sep 12, 2024

DylanDylann commented Sep 12, 2024 •

edited

Loading

OSBotify commented Sep 12, 2024

OSBotify commented Sep 12, 2024

OSBotify commented Sep 13, 2024

		const match = domainName.match(CONST.REGEX.EXPENSIFY_POLICY_DOMAIN_NAME);
		if (match) {

fix: policy id shows as domain card description #48779

fix: policy id shows as domain card description #48779

Conversation

dominictb commented Sep 9, 2024 • edited Loading

Details

Fixed Issues

Tests

Test case 1 (Use the mock data)

Test case 2

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

trjExpensify commented Sep 9, 2024

dominictb commented Sep 9, 2024

dominictb commented Sep 9, 2024

melvin-bot bot commented Sep 9, 2024

DylanDylann Sep 9, 2024

Choose a reason for hiding this comment

DylanDylann Sep 9, 2024

Choose a reason for hiding this comment

mountiny Sep 9, 2024

Choose a reason for hiding this comment

dominictb Sep 10, 2024

Choose a reason for hiding this comment

DylanDylann Sep 10, 2024 • edited Loading

Choose a reason for hiding this comment

mountiny Sep 9, 2024

Choose a reason for hiding this comment

mountiny Sep 9, 2024

Choose a reason for hiding this comment

trjExpensify commented Sep 10, 2024

mountiny left a comment

Choose a reason for hiding this comment

DylanDylann commented Sep 11, 2024

dominictb commented Sep 12, 2024

DylanDylann commented Sep 12, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

OSBotify commented Sep 12, 2024

OSBotify commented Sep 12, 2024

OSBotify commented Sep 13, 2024

dominictb commented Sep 9, 2024 •

edited

Loading

DylanDylann Sep 10, 2024 •

edited

Loading

DylanDylann commented Sep 12, 2024 •

edited

Loading