Skip to content

[NO QA] Add preview expenses to merchant rules - #80758

Merged
luacmartins merged 39 commits into
mainfrom
jsenyitko-preview-matches
Jan 29, 2026
Merged

luacmartins merged 39 commits into
mainfrom
jsenyitko-preview-matches

Conversation

@JS00001

@JS00001 JS00001 commented Jan 28, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

Adds support for previewing expenses via merchant rules

Fixed Issues

$ #80524

Tests

Create three expenses
Set two of their merchants to "Merchant"
Set one merchant to "Irrelevant"
Submit one of the "Merchant" expenses
Create a new workspace merchant rule with the merchant as "mer"
Click 'Preview Matches'
Ensure that only the 1 matching expense is returned

  • Verify that no errors appear in the JS console

Offline tests

This should show an offline message when the user is offline

QA Steps

Same as tests

  • 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
    • MacOS: Desktop
  • 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 verified there are no new alerts related to the canBeMissing param for useOnyx
  • 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.
  • I verified that similar component doesn't exist in the codebase
  • I verified that all props are defined accurately and each prop has a /** comment above it */
  • I verified that each file is named correctly
  • I verified that each component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
  • I verified that the only data being stored in component state is data necessary for rendering and nothing else
  • In component if we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
  • 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)
  • I verified that component 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)
  • I verified that all JSX used for rendering exists in the render method
  • I verified that each 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

Screenshots/Videos

Screen.Recording.2026-01-28.at.1.22.06.PM.mov

@codecov

codecov Bot commented Jan 28, 2026 •

Copy link
Copy Markdown

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines Coverage Δ
src/ONYXKEYS.ts 100.00% <ø> (ø)
src/SCREENS.ts 100.00% <ø> (ø)
src/libs/API/types.ts 100.00% <ø> (ø)
...gation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts 100.00% <ø> (ø)
src/libs/Navigation/linkingConfig/config.ts 75.00% <ø> (ø)
src/ROUTES.ts 13.18% <0.00%> (-0.02%) ⬇️
...gation/AppNavigator/ModalStackNavigators/index.tsx 7.82% <0.00%> (-0.02%) ⬇️
src/pages/UnreportedExpenseListItem.tsx 0.00% <0.00%> (ø)
src/libs/actions/Policy/Rules.ts 0.00% <0.00%> (ø)
...space/rules/MerchantRules/MerchantRulePageBase.tsx 0.00% <0.00%> (ø)
... and 1 more
... and 16 files with indirect coverage changes

@OSBotify

Copy link
Copy Markdown
Contributor

🦜 Polyglot Parrot! 🦜

Squawk! Looks like you added some shiny new English strings. Allow me to parrot them back to you in other tongues:

View the translation diff
diff --git a/src/languages/de.ts b/src/languages/de.ts
index 18c6efc2..5ccc7fc0 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -6397,6 +6397,9 @@ Fordere Spesendetails wie Belege und Beschreibungen an, lege Limits und Standard
                 editRuleTitle: 'Regel bearbeiten',
                 deleteRule: 'Regel löschen',
                 deleteRuleConfirmation: 'Sind Sie sicher, dass Sie diese Regel löschen möchten?',
+                previewMatches: 'Übereinstimmungen anzeigen',
+                previewMatchesEmptyStateTitle: 'Nichts anzuzeigen',
+                previewMatchesEmptyStateSubtitle: 'Keine nicht eingereichten Ausgaben entsprechen dieser Regel.',
             },
         },
         planTypePage: {
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 2ed56754..e3dbe352 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -6408,6 +6408,9 @@ Exigez des informations de dépense comme les reçus et les descriptions, défin
                 editRuleTitle: 'Modifier la règle',
                 deleteRule: 'Supprimer la règle',
                 deleteRuleConfirmation: 'Voulez-vous vraiment supprimer cette règle ?',
+                previewMatches: 'Aperçu des correspondances',
+                previewMatchesEmptyStateTitle: 'Rien à afficher',
+                previewMatchesEmptyStateSubtitle: 'Aucune dépense non soumise ne correspond à cette règle.',
             },
         },
         planTypePage: {
diff --git a/src/languages/it.ts b/src/languages/it.ts
index d4b2b09b..57408f38 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -6379,6 +6379,9 @@ Richiedi dettagli di spesa come ricevute e descrizioni, imposta limiti e valori
                 editRuleTitle: 'Modifica regola',
                 deleteRule: 'Elimina regola',
                 deleteRuleConfirmation: 'Sei sicuro di voler eliminare questa regola?',
+                previewMatches: 'Anteprima corrispondenze',
+                previewMatchesEmptyStateTitle: 'Niente da mostrare',
+                previewMatchesEmptyStateSubtitle: 'Nessuna spesa non inviata corrisponde a questa regola.',
             },
         },
         planTypePage: {
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index c34e8eb5..db53807d 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -6335,6 +6335,9 @@ ${reportName}
                 editRuleTitle: 'ルールを編集',
                 deleteRule: 'ルールを削除',
                 deleteRuleConfirmation: 'このルールを削除してもよろしいですか?',
+                previewMatches: '一致結果をプレビュー',
+                previewMatchesEmptyStateTitle: '表示するものがありません',
+                previewMatchesEmptyStateSubtitle: 'このルールに一致する未提出の経費はありません。',
             },
         },
         planTypePage: {
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index bed7e806..24315ae9 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -6367,6 +6367,9 @@ Vraag verplichte uitgavedetails zoals bonnetjes en beschrijvingen, stel limieten
                 editRuleTitle: 'Regel bewerken',
                 deleteRule: 'Regel verwijderen',
                 deleteRuleConfirmation: 'Weet je zeker dat je deze regel wilt verwijderen?',
+                previewMatches: 'Voorvertoning komt overeen',
+                previewMatchesEmptyStateTitle: 'Niets om weer te geven',
+                previewMatchesEmptyStateSubtitle: 'Geen niet-ingediende uitgaven komen overeen met deze regel.',
             },
         },
         planTypePage: {
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 11285d3e..16c92769 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -6360,6 +6360,9 @@ Wymagaj szczegółów wydatków, takich jak paragony i opisy, ustawiaj limity i
                 editRuleTitle: 'Edytuj regułę',
                 deleteRule: 'Usuń regułę',
                 deleteRuleConfirmation: 'Czy na pewno chcesz usunąć tę regułę?',
+                previewMatches: 'Podgląd dopasowań',
+                previewMatchesEmptyStateTitle: 'Nie ma nic do wyświetlenia',
+                previewMatchesEmptyStateSubtitle: 'Żadne niewysłane wydatki nie pasują do tej reguły.',
             },
         },
         planTypePage: {
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index b4b4a727..024d6974 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -6360,6 +6360,9 @@ Exija detalhes de despesas como recibos e descrições, defina limites e padrõe
                 editRuleTitle: 'Editar regra',
                 deleteRule: 'Excluir regra',
                 deleteRuleConfirmation: 'Tem certeza de que deseja excluir esta regra?',
+                previewMatches: 'Visualizar correspondências',
+                previewMatchesEmptyStateTitle: 'Nada para mostrar',
+                previewMatchesEmptyStateSubtitle: 'Nenhuma despesa não enviada corresponde a esta regra.',
             },
         },
         planTypePage: {
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index d1c30a46..dadfac15 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -6225,6 +6225,9 @@ ${reportName}
                 editRuleTitle: '编辑规则',
                 deleteRule: '删除规则',
                 deleteRuleConfirmation: '您确定要删除此规则吗?',
+                previewMatches: '预览匹配结果',
+                previewMatchesEmptyStateTitle: '无内容可显示',
+                previewMatchesEmptyStateSubtitle: '没有未提交的报销符合此规则。',
             },
         },
         planTypePage: {

Note

You can apply these changes to your branch by copying the patch to your clipboard, then running pbpaste | git apply 😉

@JS00001 JS00001 changed the title add param types [NO QA] Add preview expenses to merchant rules Jan 28, 2026
@luacmartins
luacmartins removed the request for review from Ollyws January 29, 2026 17:15
@luacmartins
luacmartins self-requested a review January 29, 2026 17:44
luacmartins
luacmartins previously approved these changes Jan 29, 2026

@luacmartins luacmartins left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@situchan

Copy link
Copy Markdown
Contributor

Code looks good. Trying to test with Jack's ngrok

luacmartins
luacmartins previously approved these changes Jan 29, 2026
@situchan

Copy link
Copy Markdown
Contributor

I have expense with merchant = pr test but not showing in preview matches for the rue with Merchant = test, Match type = Contains

Screen.Recording.2026-01-30.at.1.00.56.AM.mov

@luacmartins luacmartins left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@melvin-bot
melvin-bot Bot requested a review from lakchote January 29, 2026 19:24
@melvin-bot

melvin-bot Bot commented Jan 29, 2026

Copy link
Copy Markdown

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

@luacmartins
luacmartins removed the request for review from lakchote January 29, 2026 19:27
@luacmartins
luacmartins merged commit 5331fb6 into main Jan 29, 2026
32 of 34 checks passed
@luacmartins
luacmartins deleted the jsenyitko-preview-matches branch January 29, 2026 19:32
@OSBotify

Copy link
Copy Markdown
Contributor

✋ 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

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/luacmartins in version: 9.3.11-16 🚀

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

@OSBotify

OSBotify commented Feb 5, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/Julesssss in version: 9.3.12-1 🚀

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

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.

4 participants