Skip to content

[Release 3.6] [Domain Control] Bulk close members' accounts#81527

Merged
mountiny merged 32 commits intoExpensify:mainfrom
software-mansion-labs:domain-member-add-selection-2
Feb 11, 2026
Merged

[Release 3.6] [Domain Control] Bulk close members' accounts#81527
mountiny merged 32 commits intoExpensify:mainfrom
software-mansion-labs:domain-member-add-selection-2

Conversation

@jmusial
Copy link
Contributor

@jmusial jmusial commented Feb 5, 2026

Explanation of Change

Part for Domain Control project.
This PR adds bulk closing member account with GBR and RBR flows. It features a double modal confirmation.

Fixed Issues

$ #79572

PROPOSAL:

Tests

  1. Open app
  2. Go to domain/domainID/members
  3. Select several members
  4. Then select all members
  5. Deselect all members
  6. Make sure the count on the primary action button at the top is correct
  7. Verify the counts are correct when there are over 16 members and search is applied
  8. Click the primary action button and verify that the Close Account button is there
  9. Click Close accounts
  10. Select either of the options on the modal
  11. Select close accounts
  12. Members should disappear from the list and loose access to domain.

Offline tests

1 - 11 same as regular tests
12. Members should be crossed out on the list and disappear after the connection is reestablished.

QA Steps

Same as tests.

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
0092.android.native.mov
Android: mWeb Chrome
0092.android.chrome.mov
iOS: Native
092.ios.native.mov
iOS: mWeb Safari
0092.ios.safari.mov
MacOS: Chrome / Safari
0092.desktop.chrome.mov

@melvin-bot
Copy link

melvin-bot bot commented Feb 5, 2026

Hey, I noticed you changed src/languages/en.ts in a PR from a fork. For security reasons, translations are not generated automatically for PRs from forks.

If you want to automatically generate translations for other locales, an Expensify employee will have to:

  1. Look at the code and make sure there are no malicious changes.
  2. Run the Generate static translations GitHub workflow. If you have write access and the K2 extension, you can simply click: [this button]

Alternatively, if you are an external contributor, you can run the translation script locally with your own OpenAI API key. To learn more, try running:

npx ts-node ./scripts/generateTranslations.ts --help

Typically, you'd want to translate only what you changed by running npx ts-node ./scripts/generateTranslations.ts --compare-ref main

@jmusial jmusial changed the title [Release 3.3] [Domain Control]Bulk close members' accounts [Release 3.3] [Domain Control] Bulk close members' accounts Feb 5, 2026
@jmusial jmusial changed the title [Release 3.3] [Domain Control] Bulk close members' accounts [Release 3.6] [Domain Control] Bulk close members' accounts Feb 5, 2026
@codecov
Copy link

codecov bot commented Feb 5, 2026

Codecov Report

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

Files with missing lines Coverage Δ
src/CONST/index.ts 87.39% <ø> (ø)
...c/pages/domain/Members/DomainMemberDetailsPage.tsx 0.00% <0.00%> (ø)
src/pages/domain/BaseDomainMembersPage.tsx 0.00% <0.00%> (ø)
src/pages/domain/Members/DomainMembersPage.tsx 0.00% <0.00%> (ø)
... and 11 files with indirect coverage changes

@jmusial jmusial marked this pull request as ready for review February 6, 2026 07:59
@jmusial jmusial requested review from a team as code owners February 6, 2026 07:59
@melvin-bot melvin-bot bot requested a review from Beamanator February 10, 2026 14:52
@ZhenjaHorbach
Copy link
Contributor

CC: @mountiny

@mountiny mountiny self-requested a review February 10, 2026 14:59
@mountiny
Copy link
Contributor

@situchan Did you also want to review/ test?

@mountiny
Copy link
Contributor

@codex review

@situchan
Copy link
Contributor

On it now

@situchan
Copy link
Contributor

Not caused by this PR but recent regression. Happening on all other pages.

bug

Copy link

@chatgpt-codex-connector chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 10b65660b7

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

Comment on lines 99 to 101
const memberLogin = personalDetails?.[accountID]?.login ?? '';
const securityGroupData = selectSecurityGroupForAccount(accountID)(domain);
closeUserAccount(domainAccountID, domainName ?? '', memberLogin, securityGroupData, shouldForceCloseAccount);

Choose a reason for hiding this comment

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

P2 Badge Skip bulk close when member login is unavailable

This loop always falls back to '' for memberLogin and still calls closeUserAccount, so if personal details are not hydrated yet for any selected account (a valid state because selection is driven by account IDs), the API request is sent with targetEmail: '' and optimistic/error updates are keyed to the empty string instead of the real member. In that case the selected user is not actually closed and failures are misattributed, so the bulk action should skip unresolved members (or block until their login is loaded).

Useful? React with 👍 / 👎.

onSelectAll={toggleAllUsers}
onCheckboxPress={toggleUser}
selectedItems={selectedMembers}
turnOnSelectionModeOnLongPress

Choose a reason for hiding this comment

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

P3 Badge Gate long-press selection mode to selectable pages

Long-press selection is now always enabled in the shared base list, but BaseDomainMembersPage is also used by pages like DomainAdminsPage that do not pass selection state handlers. On mobile, long-pressing an admin row now opens the "Select" flow even though no item can be selected and no bulk actions exist, which is a regression in UX and state handling; this should only be enabled when multi-select props are actually wired.

Useful? React with 👍 / 👎.

Copy link
Contributor

Choose a reason for hiding this comment

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

Actually good point
We need to fix this

Copy link
Contributor

Choose a reason for hiding this comment

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

Indeed this causes regression

Screen.Recording.2026-02-10.at.9.32.16.PM.mov

customText={translate('common.more')}
options={[]}
isSplitButton={false}
wrapperStyle={styles.flexGrow0}
Copy link
Contributor

Choose a reason for hiding this comment

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

Don't we have dropdown icon on More button?

Image

Other page:

Image

Copy link
Contributor

@ZhenjaHorbach ZhenjaHorbach Feb 10, 2026

Choose a reason for hiding this comment

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

I suppose it's okay
If we don't have any options in the more menu
But from another side
Do we need to show the button in this case?🧐

Copy link
Contributor

Choose a reason for hiding this comment

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

I suppose this is temporary empty button. Maybe add items in next PR?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

On mobile it's only active when something is selected. Selection mode obfuscates that so it's always disabled. But on the other hand it suggests user that there are more actions avaiable ...

@jmusial
Copy link
Contributor Author

jmusial commented Feb 11, 2026

Not caused by this PR but recent regression. Happening on all other pages.

bug

Fixed for members, can do others in a follow up, there are 10 other places that require change

@jmusial
Copy link
Contributor Author

jmusial commented Feb 11, 2026

@jmusial jmusial mentioned this pull request Feb 11, 2026
51 tasks
@situchan
Copy link
Contributor

Conflicts! And revert this change as it's out of scope:

-                       listHeaderWrapperStyle: [styles.ph9, styles.pv3, styles.pb5],
+                       listHeaderWrapperStyle: [styles.ph10, styles.pv3, styles.pb5],

Copy link
Contributor

@mountiny mountiny left a comment

Choose a reason for hiding this comment

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

Thanks! I think that @Beamanator was assigned by coincidence, since there is a lot of changes here to avoid conflicts, I will merge it

@mountiny mountiny merged commit 5638089 into Expensify:main Feb 11, 2026
30 checks passed
@github-project-automation github-project-automation bot moved this from Ready for Review to Done in Bring Domain Control to NewDot Feb 11, 2026
@github-actions
Copy link
Contributor

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

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

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/mountiny in version: 9.3.18-0 🚀

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

@vincdargento
Copy link

@jmusial This PR is failing because of a regression issue #82302
The issue is reproducible in: Web, Android, iOS

bug.mp4

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/lakchote in version: 9.3.18-8 🚀

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

Labels

None yet

Projects

Development

Successfully merging this pull request may close these issues.

7 participants