Skip to content

Preserve per-category attendees setting when toggling attendee tracking off#85464

Merged
NikkiWines merged 1 commit intomainfrom
claude-preserveCategoryAttendeesOnToggle
Mar 24, 2026
Merged

Preserve per-category attendees setting when toggling attendee tracking off#85464
NikkiWines merged 1 commit intomainfrom
claude-preserveCategoryAttendeesOnToggle

Conversation

@MelvinBot
Copy link
Copy Markdown
Contributor

@MelvinBot MelvinBot commented Mar 16, 2026 •
edited by cead22
Loading

Explanation of Change

When the "Attendee tracking" is turned off at the policy level, the current code loops through all categories and explicitly sets areAttendeesRequired = false on each one via individual API calls. This PR removed that logic because it's unnecessary

Fixed Issues

$ #85116
PROPOSAL: #85116 (comment)

Tests

  1. Go to Settings > Workspaces > [Workspace] > Rules
  2. Enable "Attendee tracking" toggle
  3. Go to Categories, open a category, go to Category rules > Require fields
  4. Enable "Require attendees"
  5. Go back to Rules and disable "Attendee tracking"
  6. Re-enable "Attendee tracking"
  7. Go to the same category > Category rules > Require fields
  8. Verify "Require attendees" is still enabled (preserved from step 4)
  • Verify that no errors appear in the JS console

Offline tests

Same as tests

QA Steps

  1. Go to Settings > Workspaces > [Workspace] > Rules
  2. Enable "Attendee tracking" toggle
  3. Go to Categories, open a category, go to Category rules > Require fields
  4. Enable "Require attendees" and "Require description"
  5. Go back to Rules and disable "Attendee tracking"
  6. Re-enable "Attendee tracking"
  7. Go to the same category > Category rules > Require fields
  8. Verify "Require attendees" is still enabled
  9. Connect to NetSuite, perform a sync and verify "Require attendees" persists on the category that had it enabled
  • 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: mWeb Chrome
iOS: Native
iOS: mWeb Safari

MacOS: Chrome / Safari

image

@MelvinBot @cead22
Preserve per-category areAttendeesRequired when disabling attendee tr…
6b6210d 
…acking toggle

Remove the cleanup loop in handleAttendeeTrackingToggle that cleared
areAttendeesRequired on every category when the workspace-level attendee
tracking toggle was turned off. This is unnecessary because areAttendeesRequired
is already gated by isAttendeeTrackingEnabled everywhere it is consumed
(AttendeeUtils, ViolationsUtils, CategoryRequiredFieldsPage). Preserving
the per-category settings means they survive toggle off/on cycles and
NetSuite syncs without requiring manual reconfiguration.

Co-authored-by: Carlos Alvarez <cead22@users.noreply.github.com>
@MelvinBot MelvinBot requested a review from a team March 16, 2026 21:24
@MelvinBot MelvinBot mentioned this pull request Mar 16, 2026
Closed
7 tasks
@MelvinBot
Copy link
Copy Markdown
Contributor Author

MelvinBot commented Mar 16, 2026

The failing check (test (job 8)) is unrelated to this PR.

Failing test: tests/ui/SessionTest.tsx — "should not remember the report path of the last deep link login after signing out and in again" — timed out after 120 seconds.

Analysis: This is a flaky timeout in a deep linking / session test. This PR only modifies src/pages/workspace/rules/IndividualExpenseRulesSection.tsx (removing the cleanup loop for per-category areAttendeesRequired settings). The failing test deals with session management and deep link URL handling, which is completely unrelated to the attendee tracking toggle changes.

Evidence: The PR changes 1 file (IndividualExpenseRulesSection.tsx) while the failure is in tests/ui/SessionTest.tsx — no overlap in code paths. Re-running the test suite should resolve this.

@cead22 cead22 marked this pull request as ready for review March 24, 2026 02:20
@cead22 cead22 requested a review from a team as a code owner March 24, 2026 02:20
@melvin-bot melvin-bot bot requested review from huult and joekaufmanexpensify and removed request for a team March 24, 2026 02:20
@melvin-bot
Copy link
Copy Markdown

melvin-bot bot commented Mar 24, 2026

@huult 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 March 24, 2026 02:20
@huult
Copy link
Copy Markdown
Contributor

huult commented Mar 24, 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
Screen.Recording.2026-03-24.at.16.08.53.mp4
Android: mWeb Chrome
Screen.Recording.2026-03-24.at.16.11.50.mp4
iOS: HybridApp
Screen.Recording.2026-03-24.at.16.16.20.mp4
iOS: mWeb Safari
Screen.Recording.2026-03-24.at.16.18.53.mp4
MacOS: Chrome / Safari
Screen.Recording.2026-03-24.at.16.02.58.mp4

huult
huult approved these changes Mar 24, 2026
View reviewed changes
Copy link
Copy Markdown
Contributor

@huult huult left a comment

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 cead22 March 24, 2026 09:24
NikkiWines
NikkiWines approved these changes Mar 24, 2026
View reviewed changes
Copy link
Copy Markdown
Contributor

@NikkiWines NikkiWines left a comment

Choose a reason for hiding this comment

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

👍

@NikkiWines NikkiWines merged commit 9afd6cf into main Mar 24, 2026
59 of 60 checks passed
@NikkiWines NikkiWines deleted the claude-preserveCategoryAttendeesOnToggle branch March 24, 2026 16:34
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Mar 24, 2026

🚧 @NikkiWines 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 Mar 24, 2026

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

Android 🤖 iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-9afd6cf-55a46af-7db938231a0f59ee3d50848d99e6874f888a1e76/index.html https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-9afd6cf-55a46af-fb1389cfddb6fb506430e1d76f0ac286e8f55fd9/index.html
Android iOS
Web 🕸️
https://85464.pr-testing.expensify.com
Web

👀 View the workflow run that generated this build 👀

@OSBotify
Copy link
Copy Markdown
Contributor

OSBotify commented Mar 24, 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 Mar 25, 2026
Closed
71 tasks
@OSBotify
Copy link
Copy Markdown
Contributor

OSBotify commented Mar 25, 2026

🚀 Deployed to staging by https://github.com/NikkiWines in version: 9.3.44-0 🚀

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

Bundle Size Analysis (Sentry):

@OSBotify
Copy link
Copy Markdown
Contributor

OSBotify commented Mar 25, 2026

🚀 Deployed to staging by https://github.com/NikkiWines in version: 9.3.47-0 🚀

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

Bundle Size Analysis (Sentry):

@lanitochka17
Copy link
Copy Markdown

lanitochka17 commented Mar 25, 2026

After connecting to NetSuite, all default categories are deleted, so unable to check Step 9.
Is it expected that default categories are deleted after establishing the connection? (The same with Intacct Sage, QBO and Xero)

ScreenRecording_03-25-2026.14-39-39_1.mp4

@cead22
Copy link
Copy Markdown
Contributor

cead22 commented Mar 25, 2026

Yeah that's fine, can you do these steps to cross off this PR from the checklist?

  • Update one of the NS categories to require attendees
  • Switch off attendee tracking at the workspace level
  • Trigger a Sync with Netsuite
  • Switch on attendee tracking at the workspace level
  • Confirm the category you updated on step one still requires attendees

@OSBotify
Copy link
Copy Markdown
Contributor

OSBotify commented Mar 26, 2026

🚀 Deployed to production by https://github.com/grgia in version: 9.3.48-2 🚀

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

@cead22 cead22 cead22 approved these changes

@NikkiWines NikkiWines NikkiWines approved these changes

@joekaufmanexpensify joekaufmanexpensify Awaiting requested review from joekaufmanexpensify

+1 more reviewer

@huult huult huult approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@cead22 cead22

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@MelvinBot @huult @OSBotify @lanitochka17 @cead22 @NikkiWines