Skip to content

[Release 2] [Domain Control] Close domain member account#78002

Merged
NikkiWines merged 70 commits intoExpensify:mainfrom
software-mansion-labs:feat/domain-member-close-account
Feb 5, 2026
Merged

[Release 2] [Domain Control] Close domain member account#78002
NikkiWines merged 70 commits intoExpensify:mainfrom
software-mansion-labs:feat/domain-member-close-account

Conversation

@jmusial
Copy link
Contributor

@jmusial jmusial commented Dec 18, 2025

Explanation of Change

Part for Domain Control project. This PR adds closing member account with GBR and RBR flows. For now it features single modal confirmation, pending discussion.

For the flow preview please refer to MacOS: Chrome / Safari

Fixed Issues

$ #79358 PROPOSAL:

Tests

  1. Go to the Domain-> Members ( dev.new.expensify.com:8082/domain/[DomainID]/members/)
  2. Click on a user and open their Details.
  3. Click Close account.
    (A decision modal should appear with two options: Force close and Safely close.
    Repeat the scenario on two different accounts to verify both options.)
  4. After selecting one of the options, the account should be deleted.
  • Verify that no errors appear in the JS console

Offline tests

Repeat the steps from the test section above while in offline state and verify whether a pending delete action remains under the member.

QA Steps

1. Navigate to Domain → Members
(dev.new.expensify.com:8082/domain/[DomainID]/members/).

2. Select a member and open their Details view.

3. Click Close account.

4. Verify that a decision modal appears with two options:

5. Force close

6. Safely close

7. Execute the flow on two different accounts, selecting a different option each time, and verify that:

8. The selected account is successfully deleted.

9. Confirm that no errors appear in the JS console.

Offline verification:
7. Repeat steps 1–5 while the application is in offline mode.
8. Verify that a pending delete action is visible under the member while offline

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

Refer to MacOS: Chrome / Safari

Android: mWeb Chrome

Refer to MacOS: Chrome / Safari

iOS: Native

Refer to MacOS: Chrome / Safari

iOS: mWeb Safari

Refer to MacOS: Chrome / Safari

MacOS: Chrome / Safari
Close.acc.POC.mov

@melvin-bot
Copy link

melvin-bot bot commented Dec 18, 2025

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

@codecov
Copy link

codecov bot commented Dec 19, 2025

Codecov Report

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

Files with missing lines Coverage Δ
src/components/DecisionModal.tsx 100.00% <100.00%> (ø)
src/libs/API/types.ts 100.00% <ø> (ø)
src/libs/actions/Domain.ts 31.96% <100.00%> (+6.74%) ⬆️
src/pages/domain/Admins/DomainAdminDetailsPage.tsx 0.00% <ø> (ø)
.../pages/domain/BaseDomainMemberDetailsComponent.tsx 0.00% <ø> (ø)
src/pages/domain/BaseDomainMembersPage.tsx 0.00% <ø> (ø)
src/selectors/PersonalDetails.ts 80.00% <100.00%> (+5.00%) ⬆️
src/selectors/Domain.ts 90.56% <94.11%> (+1.37%) ⬆️
src/pages/domain/Members/DomainMembersPage.tsx 0.00% <0.00%> (ø)
...c/pages/domain/Members/DomainMemberDetailsPage.tsx 0.00% <0.00%> (ø)
... and 161 files with indirect coverage changes

@jmusial jmusial changed the title Feat/domain member close account [Release 2] [Domain Control] Close domain member account Dec 22, 2025
@jmusial jmusial changed the title [Release 2] [Domain Control] Close domain member account [HOLD] [Release 2] [Domain Control] Close domain member account Dec 22, 2025
@OSBotify
Copy link
Contributor

🦜 Polyglot Parrot! 🦜

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

The diff is too large to include in this comment (119KB), so I've created a gist for you:

📋 View the translation diff here 📋

Note

You can apply these changes to your branch by copying the patch to your clipboard, then running pbpaste | git apply, or directly by running gh gist view --raw fee9857a0ee60b23c3c2d872d9ad7f52 | git apply 😉

@jmusial
Copy link
Contributor Author

jmusial commented Feb 4, 2026

@ZhenjaHorbach last commit fixes it

Screen.Recording.2026-02-04.at.12.54.03.mov

@ZhenjaHorbach
Copy link
Contributor

Perfect
Thanks!
Looks good from my side

@melvin-bot
Copy link

melvin-bot bot commented Feb 4, 2026

We did not find an internal engineer to review this PR, trying to assign a random engineer to # as well as to this PR... Please reach out for help on Slack if no one gets assigned!

JS00001
JS00001 previously approved these changes Feb 4, 2026
forceCloseAccount: 'Force close account',
safeCloseAccount: 'Close account safely',
closeAccountInfo:
'We recommend closing the account safely to skip closing it in case there are: <ul><li>Pending approvals</li><li>Active reimbursements</li><li>No alternative login methods</li></ul> Otherwise, you can ignore the safety precautions above and force close the selected account.',
Copy link
Contributor

Choose a reason for hiding this comment

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

Super minor one. There's space before Otherwise

Image

Copy link
Contributor

Choose a reason for hiding this comment

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

fixed!

mountiny
mountiny previously approved these changes Feb 4, 2026
isFirstOptionSuccess = true,
isSecondOptionSuccess = false,
isSecondOptionDanger = false,
}: DecisionModalProps) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Ok but lets follow up on this one! @sumo-slonik can you please create an issue for the PR you made with explanation of the motivation behind it?

Copy link
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.

one small typo, otherwise looks good 👍

* Adds a member to a domain
* @param domainAccountID Account ID of a domain
* @param email Email of a user to be added
* @param defaultSecurityGroupID Security group ip to be used for optimistic updates
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
* @param defaultSecurityGroupID Security group ip to be used for optimistic updates
* @param defaultSecurityGroupID Security group ID to be used for optimistic updates

const icons = useMemoizedLazyExpensifyIcons(['RemoveMembers']);
const [isModalVisible, setIsModalVisible] = useState(false);
const [shouldForceCloseAccount, setShouldForceCloseAccount] = useState<boolean>();
// we need to use isSmallScreenWidth here because the DecisionModal is opening from RHP and ShouldUseNarrowLayout layout will not work in this place
Copy link
Contributor

Choose a reason for hiding this comment

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

NAB:

Suggested change
// we need to use isSmallScreenWidth here because the DecisionModal is opening from RHP and ShouldUseNarrowLayout layout will not work in this place
// We need to use isSmallScreenWidth here because the DecisionModal is opening from RHP and ShouldUseNarrowLayout layout will not work in this place

Copy link
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 01941ae into Expensify:main Feb 5, 2026
42 of 56 checks passed
@github-project-automation github-project-automation bot moved this from In Progress to Done in Bring Domain Control to NewDot Feb 5, 2026
@melvin-bot melvin-bot bot added the Emergency label Feb 5, 2026
@melvin-bot
Copy link

melvin-bot bot commented Feb 5, 2026

@NikkiWines looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

@github-actions
Copy link
Contributor

github-actions bot commented Feb 5, 2026

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

@NikkiWines
Copy link
Contributor

tests were passing 👍

@OSBotify
Copy link
Contributor

OSBotify commented Feb 5, 2026

🚀 Deployed to staging by https://github.com/NikkiWines in version: 9.3.13-1 🚀

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

@OSBotify
Copy link
Contributor

OSBotify commented Feb 5, 2026

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

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.