Skip to content

Merging optimistic transactions violations for policy categories#62234

Merged
arosiclair merged 32 commits intoExpensify:mainfrom
Tony-MK:fix/61306
Jun 18, 2025
Merged

Merging optimistic transactions violations for policy categories#62234
arosiclair merged 32 commits intoExpensify:mainfrom
Tony-MK:fix/61306

Conversation

@Tony-MK
Copy link
Contributor

@Tony-MK Tony-MK commented May 16, 2025

Explanation of Change

When we delete a policy category, the violations of the policy's transactions need to be updated optimistically if the policy category was used.

Fixed Issues

$ #61306
PROPOSAL: #61306 (comment)

Test Case 1:

  1. Create a new workspace.
  2. Create a manual expense with a category.
  3. Open the expense report by clicking the report preview.
  4. Confirm the expense as no violations.
  5. Go to the category page.
  6. Go offline.
  7. Delete the category used in step 2.
  8. Go back to the expense report.
  9. Confirm the category field displays a violation that reads "Category no longer valid".
  10. Go online.
  11. Confirm the violation persists.

Test Case 2:

  1. Go Offline
  2. Update the category of an expense that has no violations.
  3. Delete a category used in step 2.
  4. Go back to the expense report.
  5. Confirm the category field displays a violation that reads "Category no longer valid".
  6. Update the category of an expense.
  7. Confirm the violation is cleared.
  8. Go online.
  9. Confirm the violation is still cleared.

Test Case 3:

  1. Delete an expense.
  2. In the same workspace, create a manual expense with a category.
  3. Go Offline.
  4. Delete a category used in step 2.
  5. Go back to the expense report.
  6. Confirm the category field displays a violation that reads "Category no longer valid".
  7. Go online.
  8. Confirm the violation persists.

Tests

  • Verify that no errors appear in the JS console

Offline tests

  1. Create a new workspace.
  2. Create a manual expense with a category.
  3. Open the expense report by clicking the report preview.
  4. Confirm the expense as no violations.
  5. Go to the category page.
  6. Delete the category used in step 2.
  7. Go back to the expense report.
  8. Confirm the category field displays a violation that reads "Category no longer valid".
  9. Go online.
  10. Confirm the violation persists.

QA Steps

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

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

Screenshot 2025-05-19 at 14 13 18

Android: mWeb Chrome
Android.-.mWeb.mov
iOS: Native
iOS.-.Native.mov
iOS: mWeb Safari

iOS - mWeb

MacOS: Chrome / Safari

Test Case 1:

macOS.-.Chrome.mov

Test Case 2:

Test.Case.2.mov

Test Case 3:

Test.Case.3.mov

Offline Test:

Offline.mov
MacOS: Desktop
macOS.-.Desktop.mov

@Tony-MK Tony-MK marked this pull request as ready for review May 18, 2025 21:44
@Tony-MK Tony-MK requested a review from a team as a code owner May 18, 2025 21:44
@melvin-bot melvin-bot bot requested review from mananjadhav and removed request for a team May 18, 2025 21:44
@melvin-bot
Copy link

melvin-bot bot commented May 18, 2025

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

@Tony-MK
Copy link
Contributor Author

Tony-MK commented May 19, 2025

Hi @m-natarajan. Apart from applying the fix in the deleteWorkspaceCategories, enablePolicyCategories, setWorkspaceRequiresCategory, and setWorkspaceCategoryEnabled functions, do you think we should also implement the fix in tag-related functions? E.g.: enablePolicyTags, deletePolicyTags, and setPolicyRequiresTag. Also, since the current QA test only covers deleteWorkspaceCategories, should we consider adding extra QA tests of the other functions? Thanks!

@mananjadhav
Copy link
Collaborator

@Tony-MK I think it's best answered by @cead22 and @arosiclair.

Hi @m-natarajan. Apart from applying the fix in the deleteWorkspaceCategories, enablePolicyCategories, setWorkspaceRequiresCategory, and setWorkspaceCategoryEnabled functions, do you think we should also implement the fix in tag-related functions? E.g.: enablePolicyTags, deletePolicyTags, and setPolicyRequiresTag. Also, since the current QA test only covers deleteWorkspaceCategories, should we consider adding extra QA tests of the other functions? Thanks!

@cead22
Copy link
Contributor

cead22 commented May 21, 2025

Yes that'd be great! If you want to do it in a separate PR I can create a separate issue for it, just let me know

@Tony-MK
Copy link
Contributor Author

Tony-MK commented May 22, 2025

Yeah, I believe it's better to separate the two. Thank you. I will create the other PR by tomorrow.

@Tony-MK
Copy link
Contributor Author

Tony-MK commented May 23, 2025

Yes that'd be great! If you want to do it in a separate PR I can create a separate issue for it, just let me know

Hey @cead22, I recently created a draft PR. Could you open an issue so Melvin doesn't ping a random engineer when it's ready for review? Thanks

@Tony-MK
Copy link
Contributor Author

Tony-MK commented Jun 3, 2025

@mananjadhav, I updated the test cases.

I noticed a problem with Test Case 3, where the violation disappears briefly, and another error is shown because the expense was not submitted before I went offline.

Test.Case.3.mov

@mananjadhav
Copy link
Collaborator

mananjadhav commented Jun 3, 2025

I think that is unrelated to the PR. Will let @arosiclair and @cead22 confirm once.

@mananjadhav
Copy link
Collaborator

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
    • 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 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
android-category-violations.mov
Android: mWeb Chrome
mweb-chrome-category-violations.mov
iOS: HybridApp
ios-category-violations.mov
iOS: mWeb Safari
mweb-safari-category-violations.mov
MacOS: Chrome / Safari
web-category-violations.mp4
MacOS: Desktop
desktop-category-violations.mov

@melvin-bot melvin-bot bot requested a review from arosiclair June 3, 2025 16:56
@mananjadhav
Copy link
Collaborator

Also tagging @cead22

@mananjadhav
Copy link
Collaborator

@Tony-MK Can you please resolve the conflicts?

@Tony-MK
Copy link
Contributor Author

Tony-MK commented Jun 17, 2025

@Tony-MK Can you please resolve the conflicts?

@mananjadhav, done.

@arosiclair arosiclair requested a review from mananjadhav June 17, 2025 14:19
@arosiclair
Copy link
Contributor

@mananjadhav can you retest with the new changes?

@mananjadhav
Copy link
Collaborator

@arosiclair @cead22 Tested again with the latest changes.

https://vimeo.com/manage/videos/1094179923

@melvin-bot melvin-bot bot requested a review from arosiclair June 17, 2025 20:33
@arosiclair arosiclair merged commit f6efb52 into Expensify:main Jun 18, 2025
18 checks passed
@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

🚀 Deployed to staging by https://github.com/arosiclair in version: 9.1.69-0 🚀

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

@github-actions
Copy link
Contributor

🚀 Deployed to staging by https://github.com/arosiclair in version: 9.1.69-0 🚀

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

@github-actions
Copy link
Contributor

🚀 Deployed to staging by https://github.com/arosiclair in version: 9.1.69-0 🚀

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

@github-actions
Copy link
Contributor

🚀 Deployed to production by https://github.com/lakchote in version: 9.1.69-3 🚀

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

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.

5 participants