Skip to content

Enable merchant rules v2#82438

Merged
luacmartins merged 1 commit intomainfrom
revert-82248-revert-81033-cmartins-rmStagLock
Feb 18, 2026
Merged

Enable merchant rules v2#82438
luacmartins merged 1 commit intomainfrom
revert-82248-revert-81033-cmartins-rmStagLock

Conversation

@luacmartins
Copy link
Contributor

Explanation of Change

Enables merchant rules to all users

Fixed Issues

$ #80855

Tests

N/A

  • Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Tests found here https://docs.google.com/document/d/1M6A82DJ5B0gJ9xjX1b9GreUYID7lDSdSb59mmH4MRXA/edit?tab=t.0#heading=h.6tzmgziwc7zr

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

Screenshots/Videos

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari

@luacmartins luacmartins self-assigned this Feb 13, 2026
@luacmartins luacmartins marked this pull request as ready for review February 17, 2026 19:36
@luacmartins luacmartins requested review from a team as code owners February 17, 2026 19:36
@melvin-bot melvin-bot bot requested review from ShridharGoel and heyjennahay and removed request for a team February 17, 2026 19:36
@melvin-bot
Copy link

melvin-bot bot commented Feb 17, 2026

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

@melvin-bot melvin-bot bot removed the request for review from a team February 17, 2026 19:36
@luacmartins luacmartins requested review from a team and JS00001 and removed request for ShridharGoel and heyjennahay February 17, 2026 19:36
@melvin-bot melvin-bot bot requested review from eh2077 and joekaufmanexpensify and removed request for a team February 17, 2026 19:36
@melvin-bot
Copy link

melvin-bot bot commented Feb 17, 2026

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

@melvin-bot melvin-bot bot removed the request for review from a team February 17, 2026 19:36
@luacmartins luacmartins removed the request for review from eh2077 February 17, 2026 19:36
@luacmartins
Copy link
Contributor Author

@JS00001 can you fill the reviewer checklist too please?

@JS00001
Copy link
Contributor

JS00001 commented Feb 18, 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 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.

Copy link
Contributor

@joekaufmanexpensify joekaufmanexpensify left a comment

Choose a reason for hiding this comment

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

WN project

@luacmartins luacmartins merged commit 1bf9444 into main Feb 18, 2026
35 of 36 checks passed
@luacmartins luacmartins deleted the revert-82248-revert-81033-cmartins-rmStagLock branch February 18, 2026 15:25
@OSBotify
Copy link
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.

@github-actions
Copy link
Contributor

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

@m-natarajan
Copy link

m-natarajan commented Feb 18, 2026

@luacmartins @JS00001 Is this one for regression testing? If yes Do we have to test Relese 2 or all the test steps?

@luacmartins
Copy link
Contributor Author

@m-natarajan all test steps please

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/luacmartins in version: 9.3.22-0 🚀

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

@mitarachim
Copy link

mitarachim commented Feb 19, 2026

Hello @luacmartins are the rules still not applied offline?

Screenshot 2026-02-19 at 11 16 10 AM

In this document, there are several steps that need to be completed offline, such as step 24.
we found issue rules are not automatically applied for expense created while offline while run step 24.

Screenshot 2026-02-19 at 9 14 53 AM

Steps:

Prerequisite: Account has at least one workspace available.
Prerequisite 2: Rules enabled.

  1. Open the staging.new.expensify.com website.
  2. Navigate to "Workspaces" > "Rules" > "Add Merchant Rule"
  3. In "For expenses with" add any merchant.
  4. In "Apply these updates" add any category and description.
  5. Save the rule.
  6. Navigate to workspace chat.
  7. Turn off internet connection.
  8. Create a manual expense with merchant from step 3 and without description and category.
  9. Open the just created expense.
  10. Note that "Desctiption" field remains empty.
  11. Note that "Category" field shows "Analyzing" instead of category added in rule.

Actual result :
When an expense is created in offline mode, created merchant rule is not automatically applied. "Description" field remains empty and "Category" field shows "Analyzing" instead of saved category.

Bug7081956_1771463371009.Rule_off.mp4

should we consider this is valid issue ? or expected ?
Thank you in advance.

@jponikarchuk
Copy link

jponikarchuk commented Feb 19, 2026

This PR failing because of issues: 82890, #82892, 82896, 82899, 82914
This issue is reproducible in: All platforms

1.mp4
1.mp4
1.mp4
1.mp4

@nlemma
Copy link

nlemma commented Feb 19, 2026

Hey @luacmartins, quick question, when a member creates an expense, the workspace rule link goes to a “Not Here” page. But if the admin does it, it leads to the workspace rules settings instead of the help page. Is this intended? Just checking because it seems incoherent compared to step 21. Let me know what you think. Thanks.

ws.text.link.MP4
Cuplikan layar 2026-02-19 155240

@luacmartins
Copy link
Contributor Author

luacmartins commented Feb 19, 2026

Hello @luacmartins are the rules still not applied offline?

@mitarachim no, rules are not applied offline. We should remove those steps from the doc then. I updated the doc.

@luacmartins
Copy link
Contributor Author

@nlemma can you create an issue for it please?

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/mountiny in version: 9.3.22-4 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/mountiny in version: 9.3.22-4 🚀

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

@nlemma
Copy link

nlemma commented Feb 19, 2026

@luacmartins I've raised the bug #82978

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.

8 participants