Filter unreported expenses by owner to prevent showing member expenses to admin by abzokhattab · Pull Request #73230 · Expensify/App

abzokhattab · 2025-10-22T15:12:04Z

Explanation of Change

Fixed Issues

$ #70639
PROPOSAL: #70639 (comment)

Tests

Precondition:

Admin invites member to the workspace chat.

Steps:

[Member] Go to workspace chat.
[Member] Create an expense.
[Member] Go to expense report.
[Member] Click Report field > Remove from report.
[Admin] Go to workspace chat (workspace chat with yourself).
[Admin] Click + > Create report.
[Admin] On report preview, click Add expense > Add unreported expense.
Verify that the unreported expense from member in Step 4 doesn't appear in unreported expense list for admin.

Offline tests

Same as tests

QA Steps

same as tests

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2026-01-17.at.16.13.02.mov

Android: mWeb Chrome

Screen.Recording.2026-01-17.at.16.15.59.mov

iOS: Native

Screen.Recording.2026-01-17.at.16.08.38.mov

iOS: mWeb Safari

Screen.Recording.2026-01-17.at.16.09.49.mov

MacOS: Chrome / Safari

Screen.Recording.2026-01-17.at.16.03.15.mov

…s to admin

melvin-bot · 2025-10-22T15:12:11Z

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

abzokhattab · 2025-10-22T15:15:07Z

@iwiznia @rojiphil

there is a problem with the cardID solution; the cardList is empty in both admin and member

so what should we do here? am i accessing it in the wrong way?

here is the log of the transaction and the cardList:

rojiphil · 2025-10-22T16:43:28Z

@iwiznia I think the card for cash expense is not sent back by BE in the card list as noticed in test video below.

70639-web-chrome-issue.mp4

iwiznia · 2025-10-22T17:09:19Z

Damnit! I see here we are not returning all cards to newDot (cash, personal cards not returned, not sure if some others).
@nkuoch I see your name on that code, do you know why we are not just returning all cards owned by the user? Seems like something we will need for one reason or another, so wonder what was the reason to not return them all basically.

nkuoch · 2025-10-22T18:03:04Z

Not me :). cc @grgia https://github.com/Expensify/Auth/pull/9223 for personal cards

iwiznia · 2025-10-23T12:36:48Z

Ah thanks for that. I don't see a real reason not to add them, just that we did not want them to display them in the cards table. I think we should've done that in the frontend instead. So if @grgia agrees, I think we would:

Revert https://github.com/Expensify/Auth/pull/9223/ and ensure that returns personal cards, including the cash one, hold the PR
Include in this PR a change to filter out the personal cards (and cash one) from the list of cards

Thoughts?

grgia · 2025-10-23T14:45:53Z

Yeah @iwiznia, now that we are using personal cards in ND, makes sense

iwiznia · 2025-10-23T14:57:16Z

We are? Where? How if we are not returning them from auth?

abzokhattab · 2025-10-27T18:00:03Z

still waiting for the team's decision.

cc @iwiznia @grgia @rojiphil

rojiphil · 2025-11-07T06:34:07Z

@grgia Can you please help confirm if the BE changes are in production already? Thanks

rojiphil · 2025-11-22T12:04:24Z

I think the card for cash expense is not sent back by BE in the card list as noticed in test video below.

@iwiznia @grgia The card id for cash expense is not yet available in FE.
Any update on the BE implementation for this? Thanks.

73230-missing-cardid.mp4

iwiznia · 2025-11-24T15:08:26Z

@grgia please respond to the question above so we can get this moving forward

grgia · 2025-11-26T12:03:02Z

No update on the BE implementation, I only worked on ECards @iwiznia. Is there an issue for the BE?

iwiznia · 2025-11-26T14:22:18Z

ok talked to @grgia, I am sending the backend change right now. We need to do this, but maybe we need to do it in 3 steps so we don't break anything, so:

Send a new App PR to filter out the personal cards (and cash one) from the list of cards and get it deployed
Revert https://github.com/Expensify/Auth/pull/9223 and ensure that returns personal cards, including the cash one and get it deployed
Finish up this PR and get it deployed

Sounds good @rojiphil? If so, can you start working on the PR for the first item?

iwiznia · 2025-11-26T17:44:46Z

PR for the backend is here https://github.com/Expensify/Auth/pull/18448 will merge once the PR for item 1 in my comment above is deployed

rojiphil · 2025-11-27T18:12:55Z

Send a new App PR to filter out the personal cards (and cash one) from the list of cards and get it deployed

@iwiznia That sounds good as first step to me as well so that we don’t break anything.
Also happy to pick the PR work for this.

Meanwhile, I would need your help with the following as I am unable to figure out a way to filter. Thanks.

Mock card structure for personal card and cash expense for testing.
The parameter of card (within `cardList) that would help us to filter the personal cards(and cash expense) from others.

An access to the relevant design document is also good enough if that helps.

Btw, I am partially available today and tomorrow due to travel but hope to work on the PR over the weekend.

abzokhattab · 2025-11-27T18:15:47Z

Looks like a solid plan if you will need a C+ for the other PR I can work on it as well.

iwiznia · 2025-12-01T15:50:12Z

Meanwhile, I would need your help with the following as I am unable to figure out a way to filter. Thanks.

Are you asking how to identify which cards are personal vs non personal and how to differentiate the cash personal card from other cards? If so:

Personal cards will have fundID set to 0
Cash card will have a name of __CASH__

iwiznia · 2025-12-23T15:27:32Z

Can we keep this moving please @rojiphil ?

abzokhattab · 2026-01-05T13:53:24Z

so according to this plan seems like we are now pending on the second point #73230 (comment)

@iwiznia

grgia · 2026-01-05T15:19:43Z

The second point is https://github.com/Expensify/Auth/pull/18448 I believe @iwiznia

iwiznia · 2026-01-05T18:25:33Z

I am lost. Did we do step 1 here already?

abzokhattab · 2026-01-28T09:02:27Z

Sure ,, just resolved the conflicts

rojiphil · 2026-01-29T05:25:12Z

Conflicts again @abzokhattab. Please resolve. Working on checklist now

rojiphil · 2026-01-29T05:36:16Z

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 there are no new alerts related to the canBeMissing param for useOnyx
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: HybridApp

70639-android-hybrid-001.mp4

Android: mWeb Chrome

70639-mweb-chrome-001.mp4

iOS: HybridApp

70639-ios-hybrid-001.mp4

iOS: mWeb Safari

70639-mweb-safari-001.mp4

MacOS: Chrome / Safari

79772-web-chrome-002.mp4

rojiphil · 2026-01-29T05:52:01Z

    const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${getNonEmptyStringOnyxID(report?.policyID)}`, {canBeMissing: true});
    const [hasMoreUnreportedTransactionsResults] = useOnyx(ONYXKEYS.HAS_MORE_UNREPORTED_TRANSACTIONS_RESULTS, {canBeMissing: true});
    const [isLoadingUnreportedTransactions] = useOnyx(ONYXKEYS.IS_LOADING_UNREPORTED_TRANSACTIONS, {canBeMissing: true});
+    const [cardList] = useOnyx(ONYXKEYS.CARD_LIST, {selector: filterPersonalCards, canBeMissing: true});


@abzokhattab We should not include the selector here as we should look into the entire cardlist to determine if the transaction belongs to this user

Suggested change

const [cardList] = useOnyx(ONYXKEYS.CARD_LIST, {selector: filterPersonalCards, canBeMissing: true});

const [cardList] = useOnyx(ONYXKEYS.CARD_LIST, {canBeMissing: true});

rojiphil · 2026-01-29T06:52:45Z

Completed checklist. Tests well after applying the suggestion here.
Will check once again after the changes are done.

…es-ownership-check

…eportedExpense

rojiphil · 2026-01-29T18:16:37Z

LGTM

79772-web-chrome-002.mp4

rojiphil

Thanks @abzokhattab for the updates.

@iwiznia Changes LGTM.
Over to you. Thanks.

…es-ownership-check

abzokhattab · 2026-01-29T19:27:03Z

FYI: To incorporate this comment, I negated the isPersonalCard calls. However, I didn’t negate this condition:

card?.bank === CONST.PERSONAL_CARD.BANK_NAME.CSV which was added later by another PR

i am afriad that the current changes bring regressions since we are now checking for !isPersonalCard instead of isPersonalCard

cc @rojiphil

rojiphil · 2026-01-30T03:05:57Z

i am afriad that the current changes bring regressions since we are now checking for !isPersonalCard instead of isPersonalCard

@abzokhattab I think this will get addressed once we resolve the conflicts here.
Also, related to comment here, please note that if we are removing the duplicate code in cardutils, we need to move the unit tests from cardutils to card

…es-ownership-check

abzokhattab · 2026-02-01T00:26:01Z

resolved the conflicts

rojiphil · 2026-02-02T01:38:32Z

Changes LGTM

73230-web-chrome-003.mp4

rojiphil

@iwiznia Over to you for review. Thanks.

github-actions · 2026-02-04T14:15:17Z

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

github-actions · 2026-02-04T14:20:09Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #73230.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-f6b0796-1ea7ffbf349c6e6064b9c89d8bbfcb5398fabcad/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-f6b0796-f556aa2018a6468beb4088d81b397f947c8545ba/index.html

Web 🕸️
https://73230.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

OSBotify · 2026-02-04T14:24:47Z

✋ 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 · 2026-02-05T20:45:45Z

🚀 Deployed to staging by https://github.com/iwiznia in version: 9.3.13-1 🚀

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

OSBotify · 2026-02-05T21:46:11Z

🚀 Deployed to staging by https://github.com/iwiznia in version: 9.3.15-0 🚀

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

OSBotify · 2026-02-10T07:02:06Z

🚀 Deployed to production by https://github.com/lakchote in version: 9.3.15-10 🚀

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

Filter unreported expenses by owner to prevent showing member expense…

f4877dd

…s to admin

abzokhattab requested a review from a team as a code owner October 22, 2025 15:12

melvin-bot Bot assigned abzokhattab Oct 22, 2025

melvin-bot Bot requested review from rojiphil and removed request for a team October 22, 2025 15:12

abzokhattab marked this pull request as draft October 22, 2025 15:12

abzokhattab mentioned this pull request Nov 24, 2025

[Due for payment 2026-02-17] [Due for payment 2026-01-09] [$500] Expense - Member's unreported expense appears in admin's unreported expense list #70639

Closed

8 tasks

rojiphil mentioned this pull request Dec 8, 2025

[No QA] Filter personal cards from Cardlist #76967

Merged

52 tasks

fixing prettier

e0df05f

rojiphil reviewed Jan 29, 2026

View reviewed changes

abzokhattab added 2 commits January 29, 2026 13:38

Merge remote-tracking branch 'origin/main' into fix/unreported-expens…

658b2c5

…es-ownership-check

removing filterPersonalCards selector from cardList inside the AddUnr…

212d413

…eportedExpense

rojiphil mentioned this pull request Jan 29, 2026

[Sprint] [CSV Card Import] Properly display CSV cards in Newdot #80556

Merged

54 tasks

rojiphil approved these changes Jan 29, 2026

View reviewed changes

melvin-bot Bot requested a review from iwiznia January 29, 2026 18:22

Merge remote-tracking branch 'origin/main' into fix/unreported-expens…

8aa61b1

…es-ownership-check

abzokhattab added 2 commits February 1, 2026 01:24

Merge remote-tracking branch 'origin/main' into fix/unreported-expens…

485864d

…es-ownership-check

keeping only filterOutPersonalCards function

9d74a8d

abzokhattab requested a review from rojiphil February 1, 2026 00:30

rojiphil approved these changes Feb 2, 2026

View reviewed changes

iwiznia approved these changes Feb 4, 2026

View reviewed changes

iwiznia merged commit f6b0796 into Expensify:main Feb 4, 2026
30 checks passed

OSBotify mentioned this pull request Feb 5, 2026

Deploy Checklist: New Expensify 2026-02-05 #81590

Closed

	const [cardList] = useOnyx(ONYXKEYS.CARD_LIST, {selector: filterPersonalCards, canBeMissing: true});
	const [cardList] = useOnyx(ONYXKEYS.CARD_LIST, {canBeMissing: true});

Conversation

abzokhattab commented Oct 22, 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 Oct 22, 2025

Uh oh!

abzokhattab commented Oct 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rojiphil commented Oct 22, 2025

Uh oh!

iwiznia commented Oct 22, 2025

Uh oh!

nkuoch commented Oct 22, 2025

Uh oh!

iwiznia commented Oct 23, 2025

Uh oh!

grgia commented Oct 23, 2025

Uh oh!

iwiznia commented Oct 23, 2025

Uh oh!

abzokhattab commented Oct 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rojiphil commented Nov 7, 2025

Uh oh!

rojiphil commented Nov 22, 2025

Uh oh!

iwiznia commented Nov 24, 2025

Uh oh!

grgia commented Nov 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

iwiznia commented Nov 26, 2025

Uh oh!

iwiznia commented Nov 26, 2025

Uh oh!

rojiphil commented Nov 27, 2025

Uh oh!

abzokhattab commented Nov 27, 2025

Uh oh!

iwiznia commented Dec 1, 2025

Uh oh!

iwiznia commented Dec 23, 2025

Uh oh!

abzokhattab commented Jan 5, 2026

Uh oh!

grgia commented Jan 5, 2026

Uh oh!

iwiznia commented Jan 5, 2026

Uh oh!

abzokhattab commented Jan 28, 2026

Uh oh!

rojiphil commented Jan 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rojiphil commented Jan 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

rojiphil Jan 29, 2026

Choose a reason for hiding this comment

Uh oh!

rojiphil Jan 29, 2026

Choose a reason for hiding this comment

Uh oh!

abzokhattab Jan 29, 2026

Choose a reason for hiding this comment

Uh oh!

rojiphil commented Jan 29, 2026

Uh oh!

rojiphil commented Jan 29, 2026

abzokhattab commented Oct 22, 2025 •

edited

Loading

abzokhattab commented Oct 22, 2025 •

edited

Loading

abzokhattab commented Oct 27, 2025 •

edited

Loading

grgia commented Nov 26, 2025 •

edited

Loading

rojiphil commented Jan 29, 2026 •

edited

Loading

rojiphil commented Jan 29, 2026 •

edited

Loading

abzokhattab commented Jan 29, 2026 •

edited

Loading