Skip to content

Fix: show generic "Make admin" copy for group chat members#94989

Merged
blimpich merged 5 commits into
mainfrom
claude-groupMakeAdminCopy
Jun 30, 2026
Merged

Fix: show generic "Make admin" copy for group chat members#94989
blimpich merged 5 commits into
mainfrom
claude-groupMakeAdminCopy

Conversation

@MelvinBot

@MelvinBot MelvinBot commented Jun 30, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

The bulk-action dropdown shown when a group-chat admin selects members displayed "Make workspace admin" instead of the generic "Make admin".

PR #92740 renamed the shared workspace.people.makeAdmin string from "Make admin" → "Make workspace admin" (to disambiguate it from the newly added "Make card admin"). That key is also consumed by the group-chat participants dropdown in src/pages/DynamicReportParticipantsPage.tsx, which only ever renders for group chats (canSelectMultiple requires isGroupChat). As a side effect, group chats started showing the workspace-specific wording.

This change:

  • Adds a new group-specific translation key workspace.people.makeGroupAdmin ("Make admin" / "Make admins") to every locale, restoring the pre-Add Card Admin workspace access #92740 generic wording.
  • Points the group-chat bulk-action dropdown at makeGroupAdmin instead of makeAdmin.
  • Leaves makeAdmin untouched, since "Make workspace admin" is still correct on the Workspace members list.

Fixed Issues

$ #94984
PROPOSAL: #94984 (comment)

Tests

  • Verify that no errors appear in the JS console

Offline tests

  • Verify that no errors appear in the JS console

QA Steps

  • 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 verified there are no console errors

Screenshots/Videos

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

Co-authored-by: huult <huult@users.noreply.github.com>
@MelvinBot MelvinBot requested a review from a team June 30, 2026 15:24
@MelvinBot

Copy link
Copy Markdown
Contributor Author

I created this PR from an upstream branch since I don't have push access to your fork.

To take ownership of this branch and be able to push updates, run:

git remote add upstream https://github.com/Expensify/App.git
git fetch upstream claude-groupMakeAdminCopy
git checkout -b claude-groupMakeAdminCopy upstream/claude-groupMakeAdminCopy
git push -u origin claude-groupMakeAdminCopy

Then you can close this PR and open a new one from your fork.

@huult

huult commented Jun 30, 2026

Copy link
Copy Markdown
Contributor

@MelvinBot Please mark it ready and we can remove the comments within the Tests and QA Steps section since the use case is related to the offline scenario. Also, please check all the PR Author checklist items.

@MelvinBot MelvinBot marked this pull request as ready for review June 30, 2026 15:30
@MelvinBot MelvinBot requested a review from a team as a code owner June 30, 2026 15:30
@melvin-bot melvin-bot Bot requested review from a team, flaviadefaria and huult and removed request for a team June 30, 2026 15:30
@melvin-bot

melvin-bot Bot commented Jun 30, 2026

Copy link
Copy Markdown

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

@huult

huult commented Jun 30, 2026

Copy link
Copy Markdown
Contributor

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 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)
  • 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)
  • 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.
  • 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: mWeb Chrome
Screen.Recording.2026-06-30.at.23.05.18.mov
iOS: HybridApp
iOS: mWeb Safari
Screen.Recording.2026-06-30.at.22.57.58.mov
MacOS: Chrome / Safari
Screen.Recording.2026-06-30.at.22.36.28.mov

@melvin-bot melvin-bot Bot requested a review from blimpich June 30, 2026 15:31
@melvin-bot

melvin-bot Bot commented Jun 30, 2026

Copy link
Copy Markdown

@blimpich 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 June 30, 2026 15:31
@huult

huult commented Jun 30, 2026

Copy link
Copy Markdown
Contributor

@MelvinBot Please fix the generateTranslations error.

Co-authored-by: huult <huult@users.noreply.github.com>
@MelvinBot MelvinBot requested a review from a team as a code owner June 30, 2026 15:40
@melvin-bot melvin-bot Bot requested review from deetergp and removed request for a team June 30, 2026 15:41
@melvin-bot

melvin-bot Bot commented Jun 30, 2026

Copy link
Copy Markdown

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

@huult

huult commented Jun 30, 2026

Copy link
Copy Markdown
Contributor

@MelvinBot Please revert commit 54a5f04 .

MelvinBot and others added 3 commits June 30, 2026 15:44
Co-authored-by: huult <huult@users.noreply.github.com>
Co-authored-by: huult <huult@users.noreply.github.com>
…ion keys"

This reverts commit 54a5f04.

Co-authored-by: huult <huult@users.noreply.github.com>
@MelvinBot

Copy link
Copy Markdown
Contributor Author

⚠️ MelvinBot CI Fix Loop Detected

MelvinBot has made 5 consecutive commits trying to fix CI failures. Automatic CI fix dispatches are now paused for this PR.

Next steps: A human should review the recent commits and resolve the conflicting CI errors manually.

@huult

huult commented Jun 30, 2026

Copy link
Copy Markdown
Contributor

My local environment can't build the native app right now, so I can't record a video at the moment. However, this bug doesn't impact cross-platform behavior.

@huult huult left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM.

@blimpich blimpich merged commit c49419e into main Jun 30, 2026
34 of 35 checks passed
@blimpich blimpich deleted the claude-groupMakeAdminCopy branch June 30, 2026 18:51
@github-actions

Copy link
Copy Markdown
Contributor

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

@OSBotify

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

OSBotify commented Jul 1, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/blimpich in version: 9.4.26-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor Author

🤖 I reviewed this PR against Expensify's help site files under docs/articles.

No help site changes are required.

This PR is a narrow UI copy fix: it adds a group-specific workspace.people.makeGroupAdmin string ("Make admin" / "Make admins") so the group-chat participants bulk-action dropdown shows the generic wording instead of the workspace-specific "Make workspace admin" that leaked in via #92740. No user-facing feature, flow, or setting is added or changed.

I searched docs/articles for the affected labels and the group-chat admin flow:

  • No article references the "Make admin" / "Make workspace admin" dropdown labels.
  • The group-chat article (Create-a-New-Chat.md) documents creating groups/rooms and room posting permissions, but does not document assigning an admin role to a group-chat member — so there is nothing to update to match this copy change.

Since no article documents this button label or flow, there is nothing to keep in sync, so I did not create a docs PR.

@huult, please confirm you agree that no help site changes are needed for this change. If you believe an article should document group-chat admin management, let me know and I'll draft one.

@OSBotify

OSBotify commented Jul 6, 2026

Copy link
Copy Markdown
Contributor

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

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

Bundle Size Analysis (Sentry):

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.

4 participants