[Internal QA] feat: show domain feed in ND #59538

koko57 · 2025-04-02T13:51:23Z

Explanation of Change

Fixed Issues

$ #59364
PROPOSAL: -

Tests

PREREQUISITES:

TEST IN THE BROWSER, copy these commands, change YOUR_POLICY_ID for policyID you will be testing with and YOUR_ACCOUNT_ID for your user id or any domain member id, run these both commands in the console to set the proper data in Onyx

Onyx.set('private_expensifyCardSettings_270', {
    currentBalance: 0,
    earnedCashback: 0,
    isMonthlySettlementAllowed: false,
    limit: 3000000,
    marqetaBusinessToken: 270,
    ownerEmail: YOUR_EMAIL,
    paymentBankAccountID: 1179246,
    remainingLimit: 3000000,
    preferredPolicy: YOUR_POLICY_ID,
});

Onyx.set('cards_270_Expensify Card', {
    '205': {
        accountID: YOUR_ACCOUNT_ID,
        bank: 'Expensify Card',
        cardID: 205,
        cardName: '',
        domainName: 'expensify-policyYOUR_POLICY_ID.exfy',
        fraud: 'none',
        fundID: '270',
        isVirtual: false,
        lastFourPAN: '',
        lastScrape: '',
        lastScrapeResult: 0,
        nameValuePairs: {
            cardTitle: "owner's card",
            feedCountry: 'US',
            hasCustomUnapprovedExpenseLimit: true,
            issuedBy: 269,
            limitType: 'smart',
            unapprovedExpenseLimit: 100000,
        },
        scrapeMinDate: '',
        state: 2,
    },
});

Go to the policy you're testing
Enable Expensify cards if not enabled
Go to Expensify Card page
Verify that you see one card on the list (name will be Hidden, avatar would be a generic image)
Click on the card -> Verify that you're navigated to card details page and the card details are displayed

Verify that no errors appear in the JS console

Offline tests

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

…eader

melvin-bot · 2025-04-03T14:41:06Z

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

puneetlath · 2025-04-03T18:51:04Z

Is the reason it shows as "hidden" because the accountID here isn't on the workspace? I think if you change that accountID to one of someone that is a member of the workspace then it won't show as "hidden" anymore and you should be able to see the user and click them to see their profile.

Onyx.set('cards_270_Expensify Card', {
    '205': {
        accountID: 269,
        bank: 'Expensify Card',
        cardID: 205,
        cardName: '',
        domainName: 'expensify-policyYOUR_POLICY_ID.exfy',
        fraud: 'none',
        fundID: '270',
        isVirtual: false,
        lastFourPAN: '',
        lastScrape: '',
        lastScrapeResult: 0,
        nameValuePairs: {
            cardTitle: "owner's card",
            feedCountry: 'US',
            hasCustomUnapprovedExpenseLimit: true,
            issuedBy: 269,
            limitType: 'smart',
            unapprovedExpenseLimit: 100000,
        },
        scrapeMinDate: '',
        state: 2,
    },
});

akinwale · 2025-04-04T04:07:37Z

@koko57 Did you mean to apply the Internal QA label in the title instead of No QA? Because it looks like there is still some form of testing required for the PR.

koko57 · 2025-04-04T07:31:19Z

@akinwale changed

koko57 · 2025-04-04T07:34:03Z

@puneetlath yes, you're right, I'm changing the description then

akinwale · 2025-04-05T16:07:29Z

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

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

59364-web.mp4

MacOS: Desktop

akinwale

LGTM.

puneetlath · 2025-04-07T13:44:56Z

src/pages/workspace/expensifyCard/WorkspaceExpensifyCardDetailsPage.tsx

+
+    // TODO: add logic for choosing between the domain and workspace feed when both available
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+    const cardsID = domainCardsID || workspaceAccountID;


I notice we also have cardID. Are cardsID and cardID different?

yes, cardID is the id for a particular card, cardsID is the part of the 'private_expensifyCardSettings_' or 'cards_' key saved as fundID in the object - should I rename it for fundID?

Oh yeah, calling it fundID sounds good to me.

ok, so I'll rename to fundID

puneetlath · 2025-04-07T13:46:37Z

src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx

@@ -36,9 +36,12 @@ type WorkspaceExpensifyCardListPageProps = {

    /** List of Expensify cards */
    cardsList: OnyxEntry<WorkspaceCardsList>;
+
+    /** Cards ID */
+    cardsID: number;


It makes more sense to me that this would be singular if it's the ID for a single card. Or is this the ID for the card feed?

Suggested change

cardsID: number;

cardID: number;

puneetlath · 2025-04-07T13:56:48Z

src/pages/workspace/expensifyCard/WorkspaceExpensifyCardPage.tsx

+
+    // TODO: add logic for choosing between the domain and workspace feed when both available
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+    const cardsID = domainCardsID || workspaceAccountID;


Maybe we can call this domainAccountID since that's what it is in the db. And technically a workspaceAccountID is a type of domainAccountID. Or maybe we call it the cardAccountID.

I think cardsID is easily mixed up with cardID.

puneetlath · 2025-04-07T13:59:42Z

src/hooks/useDomainCardsID.ts

+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+
+function useDomainCardsID(policyID: string | undefined) {


There can technically be multiple domainAccountIDs that we would return here, right? Since there could be multiple domains that have this set as the preferred policy. Maybe it would make sense to call it useDomainCardIDs or useDomainAccountIDs.

ok, so I need to refactor this then, for now it takes the first matching entry

I've changed it to FundID like in the other locations, if it's a fundID in the cards_ object

@puneetlath May I work on refactoring it to return an array of the ids in the second PR for selector? Here, without selector it would make things a bit complicated

Sure, that makes sense to me.

OSBotify · 2025-04-07T15:42:33Z

✋ 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 · 2025-04-07T23:09:31Z

🚀 Deployed to staging by https://github.com/puneetlath in version: 9.1.24-2 🚀

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

github-actions · 2025-04-09T02:14:47Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 9.1.24-10 🚀

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

github-actions · 2025-04-09T04:33:08Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 9.1.24-10 🚀

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

koko57 added 9 commits April 1, 2025 15:53

feat: wip - display cardList when the workspace has domain feed

68a11a4

feat: add preferredPolicy to ExpensifyCardSettings type

867b5f7

feat: wip - display card list items, pass cardSettings as a prop to h…

d8aa73c

…eader

feat: create a hook for getting domainCardsID

2a582dd

feat: read data for domain card in frequency and account settings

14df615

fix: extract domain cards ID from the key

dda41ee

Merge branch 'main' into feat/59364-show-domain-feed-in-ND

8e52783

fix: minor temporary fix

9aaefd3

fix: prettier

4062666

koko57 changed the title ~~feat: show domain feed in ND~~ [No QA] feat: show domain feed in ND Apr 3, 2025

koko57 marked this pull request as ready for review April 3, 2025 14:41

koko57 requested a review from a team as a code owner April 3, 2025 14:41

melvin-bot bot requested review from akinwale and removed request for a team April 3, 2025 14:41

koko57 mentioned this pull request Apr 3, 2025

[Due for payment 2025-04-25] Update Expensify Card page to potentially show domain feeds #59364

Closed

koko57 changed the title ~~[No QA] feat: show domain feed in ND~~ [Internal QA] feat: show domain feed in ND Apr 4, 2025

akinwale approved these changes Apr 5, 2025

View reviewed changes

melvin-bot bot requested a review from puneetlath April 5, 2025 16:07

puneetlath reviewed Apr 7, 2025

View reviewed changes

koko57 added 2 commits April 7, 2025 16:24

Merge branch 'main' into feat/59364-show-domain-feed-in-ND

8ca900c

fix: rename cardsID to fundID

beaddf1

puneetlath previously approved these changes Apr 7, 2025

View reviewed changes

fix: resolve conflicts

9c23913

koko57 dismissed puneetlath’s stale review via 9c23913 April 7, 2025 15:14

puneetlath approved these changes Apr 7, 2025

View reviewed changes

puneetlath merged commit e95881b into Expensify:main Apr 7, 2025
17 checks passed

github-actions bot mentioned this pull request Apr 7, 2025

Deploy Checklist: New Expensify 2025-04-07 #59756

Closed

[Internal QA] feat: show domain feed in ND #59538

[Internal QA] feat: show domain feed in ND #59538

Uh oh!

Conversation

koko57 commented Apr 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Apr 3, 2025

Uh oh!

puneetlath commented Apr 3, 2025

Uh oh!

akinwale commented Apr 4, 2025

Uh oh!

koko57 commented Apr 4, 2025

Uh oh!

koko57 commented Apr 4, 2025

Uh oh!

akinwale commented Apr 5, 2025

Reviewer Checklist

Screenshots/Videos

Uh oh!

akinwale left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Apr 7, 2025

Uh oh!

github-actions bot commented Apr 7, 2025

Uh oh!

github-actions bot commented Apr 9, 2025

Uh oh!

github-actions bot commented Apr 9, 2025

Uh oh!

Uh oh!

koko57 commented Apr 2, 2025 •

edited

Loading