Skip to content

Fix View payment history to show only billing owner's receipts#90106

Merged
yuwenmemon merged 3 commits into
Expensify:mainfrom
aswin-s:aswin-s/fix/89402-view-payment-history-filter
May 15, 2026
Merged

Fix View payment history to show only billing owner's receipts#90106
yuwenmemon merged 3 commits into
Expensify:mainfrom
aswin-s:aswin-s/fix/89402-view-payment-history-filter

Conversation

@aswin-s
Copy link
Copy Markdown
Contributor

@aswin-s aswin-s commented May 9, 2026 •
edited
Loading

Explanation of Change

The viewPurchases() function in CardSection.tsx builds the search query for View payment history with only type, status, and merchant filters. Two issues:

  1. No from filter — without scoping by the current user, the search returns Expensify, Inc. billing receipts from all visible users, not just the billing owner.
  2. Deleted status excluded — CONST.SEARCH.STATUS.EXPENSE.ALL is an empty string (''), which is falsy and gets silently skipped by buildQueryStringFromFilterFormValues. The billing owner's own receipts are in Deleted status, so they never appear.

This PR adds from: [CONST.SEARCH.ME] to scope results to the billing owner and replaces the empty ALL status with an explicit array of all expense statuses including DELETED.

Additionally, the me keyword was not being resolved in the search filter UI — the From filter chip and Filters panel appeared empty because buildFilterFormValuesFromQuery tried to look up "me" in personalDetails (which has no such key). This PR also resolves "me" to the current user's account ID in buildFilterFormValuesFromQuery and handles the keyword directly in getFilterDisplayValue so the filter chip correctly displays the user's name.

Fixed Issues

$ #89402
PROPOSAL: #89402 (comment)

Tests

  1. Navigate to Account > Subscription > View payment history
  2. Verify the search query contains from:me and merchant:"Expensify, Inc."
  3. Verify the search query includes all statuses: unreported,drafts,outstanding,approved,done,paid,deleted
  4. Verify the From filter chip shows the current user's name (e.g. "From: John Doe")
  5. Click Filters and verify the From field shows the current user's name
  6. Verify the billing owner's own Expensify billing receipts appear (including deleted ones)
  7. Verify billing receipts from other team members do not appear
  • Verify that no errors appear in the JS console

Offline tests

N/A — this change only modifies the search query string built before navigation. No network request is made until the search page loads, which has its own offline handling.

QA Steps

  1. Log in as a billing owner for a company
  2. Navigate to Account > Subscription > View payment history
  3. Verify the Expenses search page shows only the billing owner's own Expensify, Inc. receipts
  4. Verify the From filter chip shows the billing owner's name
  5. Click Filters and verify the From field shows the billing owner's name
  6. Verify deleted billing receipts from the billing owner are included in the results
  7. Verify receipts from other team members are not shown
  • 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.mp4
Android: mWeb Chrome
android-web.mp4
iOS: Native
ios.mp4
iOS: mWeb Safari
ios-web.mp4
MacOS: Chrome / Safari
Mac.OS.mp4

@trjExpensify
Copy link
Copy Markdown
Contributor

trjExpensify commented May 11, 2026

@aswin-s what's your ETA on putting this into review?

aswin-s added 2 commits May 12, 2026 01:33
@aswin-s
Fix View payment history to show only billing owner's receipts
9b74993 
Add from:me filter to scope results to the current user and explicitly
list all expense statuses including Deleted so billing owner's own
receipts are not excluded.

Fixes Expensify#89402
@aswin-s
Resolve from:me filter display in search chips and Filters panel
0220235 
The 'me' keyword in user-based filters (from, to, assignee, exporter)
was not being resolved to the current user's account ID when populating
the Filters form and display chips, causing the From field to appear
empty. This resolves 'me' to the current user's account ID in
buildFilterFormValuesFromQuery and handles the 'me' keyword directly
in getFilterDisplayValue.
@aswin-s aswin-s force-pushed the aswin-s/fix/89402-view-payment-history-filter branch from 5838561 to 0220235 Compare May 11, 2026 20:05
@aswin-s aswin-s marked this pull request as ready for review May 11, 2026 20:23
@aswin-s aswin-s requested review from a team as code owners May 11, 2026 20:23
@melvin-bot melvin-bot Bot requested review from JmillsExpensify and mananjadhav and removed request for a team May 11, 2026 20:23
@melvin-bot
Copy link
Copy Markdown

melvin-bot Bot commented May 11, 2026

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

@codecov
Copy link
Copy Markdown

codecov Bot commented May 11, 2026 •
edited by github-actions Bot
Loading

Codecov Report

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

Files with missing lines Coverage Δ
src/hooks/useFilterFormValues.tsx 100.00% <100.00%> (ø)
src/libs/SearchQueryUtils.ts 85.37% <100.00%> (+0.14%) ⬆️
.../settings/Subscription/CardSection/CardSection.tsx 0.00% <ø> (ø)
... and 6 files with indirect coverage changes

@aswin-s
Add unit tests for from:me resolution in search filters
f4ed6b9 
Tests buildFilterFormValuesFromQuery resolving 'me' to account ID for
from/to filters, and getFilterDisplayValue returning 'me' for the
literal keyword.
@aswin-s
Copy link
Copy Markdown
Contributor Author

aswin-s commented May 11, 2026

@trjExpensify It is ready for review.

@trjExpensify
Copy link
Copy Markdown
Contributor

trjExpensify commented May 11, 2026

Thanks! @mananjadhav can you jump on this, please?

@mananjadhav
Copy link
Copy Markdown
Collaborator

mananjadhav commented May 12, 2026

On my list today.

@trjExpensify
Copy link
Copy Markdown
Contributor

trjExpensify commented May 13, 2026

Bump @mananjadhav!

@mananjadhav
Copy link
Copy Markdown
Collaborator

mananjadhav commented May 13, 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

Android: HybridApp
Android: mWeb Chrome
mweb-chrome-subscription-filter.mov
iOS: HybridApp

(Offline)
https://github.com/user-attachments/assets/797cf0f8-c176-4c78-a456-ba11ecf7ac6b

iOS: mWeb Safari
mweb-safari-subscription-filter.mov
MacOS: Chrome / Safari
web-subscription-filter.mov

mananjadhav
mananjadhav approved these changes May 13, 2026
View reviewed changes
Copy link
Copy Markdown
Collaborator

@mananjadhav mananjadhav left a comment

Choose a reason for hiding this comment

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

I was just on the PR when I got bumped. My Android emulator keeps crashing due to memory. The change is not platform specific, tested on other platforms.

@melvin-bot melvin-bot Bot requested a review from yuwenmemon May 13, 2026 23:51
yuwenmemon
yuwenmemon approved these changes May 15, 2026
View reviewed changes
Copy link
Copy Markdown
Contributor

@yuwenmemon yuwenmemon left a comment

Choose a reason for hiding this comment

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

LGTM - sorry for the delay here

@yuwenmemon yuwenmemon merged commit 73d2c22 into Expensify:main May 15, 2026
37 checks passed
@melvin-bot melvin-bot Bot added the Emergency label May 15, 2026
@melvin-bot
Copy link
Copy Markdown

melvin-bot Bot commented May 15, 2026

@yuwenmemon looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented May 15, 2026

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

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented May 15, 2026

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

Android 🤖 iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-73d2c22-1eb9762-5464c82a83beb7f4a75945f1161e8c9fa8fe4f6e/index.html https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-73d2c22-1eb9762-f36c7f25889a9c20233e14130ee26b0bf0711c18/index.html
Android iOS
Web 🕸️
https://90106.pr-testing.expensify.com
Web

👀 View the workflow run that generated this build 👀

@OSBotify
Copy link
Copy Markdown
Contributor

OSBotify commented May 15, 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.

@OSBotify OSBotify mentioned this pull request May 19, 2026
Closed
75 tasks
@OSBotify
Copy link
Copy Markdown
Contributor

OSBotify commented May 19, 2026

🚀 Deployed to staging by https://github.com/yuwenmemon in version: 9.3.76-0 🚀

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

@MelvinBot
Copy link
Copy Markdown
Contributor

MelvinBot commented May 19, 2026

No help site changes are required for this PR.

This PR fixes the search query logic behind the View payment history button (adding from:me scoping, including all expense statuses, and fixing the me keyword in filter UI). These are internal behavior fixes — no new UI elements, navigation paths, or user-facing features were added. The existing help site articles already correctly direct users to Account > Subscription for billing receipts.

@melvin-bot melvin-bot Bot mentioned this pull request May 19, 2026
Closed
@OSBotify
Copy link
Copy Markdown
Contributor

OSBotify commented May 19, 2026

🚀 Deployed to production by https://github.com/roryabraham in version: 9.3.77-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

Reviewers

@yuwenmemon yuwenmemon yuwenmemon approved these changes

@JmillsExpensify JmillsExpensify Awaiting requested review from JmillsExpensify

+1 more reviewer

@mananjadhav mananjadhav mananjadhav approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@aswin-s aswin-s

Labels

Emergency

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@aswin-s @trjExpensify @mananjadhav @OSBotify @MelvinBot @yuwenmemon