Skip to content

feat: Add Category visibility row and category picker to member details and show an error when disabling a category would leave members without categories - #105184

Merged
chiragsalian merged 24 commits into
Expensify:mainfrom
nkdengineer:fix/105081
Nov 6, 2026

Conversation

@nkdengineer

@nkdengineer nkdengineer commented Oct 27, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

Add Category visibility row and category picker to member details and show an error when disabling a category would leave members without categories

Fixed Issues

$ #105081
#105082
PROPOSAL:

Tests

  1. As a Control workspace admin on the beta, open a member's details and confirm the "Category visibility" row shows "All categories".
  2. Open it, uncheck all but two categories, save, and confirm the row shows "2 categories".
  3. Reopen it, check every category, save, and confirm the row shows "All categories" again.
  4. Uncheck every category, save, and confirm the "Members must have at least one category" modal shows and nothing is saved.
  5. Sign in as an admin not on the beta and confirm the row isn't shown.
  6. Repeat step 2 offline, and confirm the change shows as pending and saves when back online.
  7. Restrict a member to one category, turn that category's Enabled toggle off on the Categories page, and confirm the modal lists the member's email and the category stays enabled.
  8. Repeat from the category's settings page, and with the bulk Disable action, and confirm the same modal.
  9. Restrict 4 members to the same single category, disable it, and confirm the modal lists 3 emails and "and 1 more".
  10. Restrict a member to two categories, disable one, and confirm it's disabled with no modal.
  11. Go offline, restrict a member to one category, then try to disable that category, and confirm the same modal shows without any network request.
  • Verify that no errors appear in the JS console

Offline tests

QA Steps

Same as test

  • 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 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 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)
  • 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 the PR adds or modifies the UI:
    • I asked an AI agent to review the changes for accessibility issues and addressed its findings.
    • I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
    • I verified all new/changed elements have meaningful accessible names and roles.
    • I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
  • 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
Screen.Recording.2026-11-05.at.01.34.57.mov
Android: mWeb Chrome
Screen.Recording.2026-11-05.at.01.26.07.mov
iOS: Native
Screen.Recording.2026-11-05.at.01.27.14.mov
iOS: mWeb Safari
Screen.Recording.2026-11-05.at.01.28.07.mov
MacOS: Chrome / Safari
Screen.Recording.2026-11-05.at.01.23.34.mov

@melvin-bot

melvin-bot Bot commented Oct 27, 2026

Copy link
Copy Markdown

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 bun ./scripts/generateTranslations.ts --help

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

@codecov

codecov Bot commented Oct 27, 2026 •

Copy link
Copy Markdown

Codecov Report

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

Files with missing lines Coverage Δ
src/CONST/index.ts 96.03% <ø> (ø)
src/ONYXKEYS.ts 100.00% <ø> (ø)
src/SCREENS.ts 100.00% <ø> (ø)
src/hooks/useLoadPolicyCategories.ts 81.81% <100.00%> (+0.86%) ⬆️
src/libs/API/types.ts 100.00% <ø> (ø)
src/libs/CategoryUtils.ts 86.66% <100.00%> (+2.38%) ⬆️
src/libs/ExportOnyxState/masking.ts 93.45% <ø> (ø)
src/libs/Middleware/register.ts 100.00% <100.00%> (ø)
src/libs/Navigation/AppNavigator/AuthScreens.tsx 81.81% <ø> (ø)
...gation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts 100.00% <ø> (ø)
... and 13 more
... and 8 files with indirect coverage changes

@nkdengineer
nkdengineer marked this pull request as ready for review October 28, 2026 19:33
@nkdengineer
nkdengineer requested review from a team as code owners October 28, 2026 19:33
@melvin-bot
melvin-bot Bot requested review from daledah and removed request for a team October 28, 2026 19:33
@melvin-bot

melvin-bot Bot commented Oct 28, 2026

Copy link
Copy Markdown

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

@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 28, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-28T20:01:04.120706Z 9a7cf4c Draft marked ready
ℹ️ About Codex in GitHub

Your team has set up Codex to 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" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@melvin-bot
melvin-bot Bot requested review from JmillsExpensify and removed request for a team October 28, 2026 19:33

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

Copy link
Copy Markdown

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: 9a7cf4c0ee

ℹ️ 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".

@JmillsExpensify

Copy link
Copy Markdown
Contributor

@chiragsalian When is the beta going to be available in Supportal or beta overrides? Asking because I need that to test this PR.

@chiragsalian

Copy link
Copy Markdown
Contributor

When is the beta going to be available in Supportal or beta overrides? Asking because I need that to test this PR.

If you want to test this PR on staging, you need every project number before this one to be done. So this issue project number is 1.6. So that means 1.1 till 1.5 should be live before you can test this on staging. So far only 1.1 is live. 1.2 is merged, not live yet. 1.3-1.5 is in progress.

Copy link
Copy Markdown
Contributor

Cool, thanks for clarifying. So technically we shouldn't have this open for review yet.

Comment thread src/types/onyx/PolicyCategory.ts Resolved
Comment thread src/libs/actions/Policy/Category.ts Resolved
@nkdengineer

Copy link
Copy Markdown
Contributor Author

I've updated the error message.

@OSBotify

OSBotify commented Nov 5, 2026

Copy link
Copy Markdown
Contributor

🦜 Polyglot Parrot! 🦜

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

View the translation diff
diff --git a/src/languages/de.ts b/src/languages/de.ts
index b25aa5fa..97b92123 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -7101,8 +7101,8 @@ _Für ausführlichere Anweisungen [besuchen Sie unsere Hilfeseite](${CONST.NETSU
                 title: ({categoryName}: {categoryName: string}) => `${categoryName} kann nicht deaktiviert werden`,
                 bulkTitle: 'Diese Kategorien können nicht deaktiviert werden',
                 description: ({count}: {count: number}) => ({
-                    one: '1 Mitglied hätte keine Kategorien mehr zur Auswahl. Aktualisiere die Kategorie-Sichtbarkeit und versuche es dann erneut:',
-                    other: `${count} Mitglieder hätten keine Kategorien mehr zur Auswahl. Aktualisiere ihre Kategorie-Sichtbarkeit und versuche es dann erneut:`,
+                    one: '1 Mitglied hätte keine Kategorien mehr zur Auswahl. Aktualisieren Sie die Kategorien-Sichtbarkeit dieser Person und versuchen Sie es dann erneut:',
+                    other: `${count} Mitgliedern blieben keine Kategorien zur Auswahl. Aktualisieren Sie deren Kategoriesichtbarkeit und versuchen Sie es dann erneut:`,
                 }),
                 andMore: ({count}: {count: number}) => `und ${count} weitere`,
             },
diff --git a/src/languages/el.ts b/src/languages/el.ts
index a94539eb..48cc07b5 100644
--- a/src/languages/el.ts
+++ b/src/languages/el.ts
@@ -7196,10 +7196,10 @@ _Για πιο αναλυτικές οδηγίες, [επισκεφθείτε τ
             },
             cannotDisableCategoryForMembers: {
                 title: ({categoryName}: {categoryName: string}) => `Δεν είναι δυνατή η απενεργοποίηση της κατηγορίας ${categoryName}`,
-                bulkTitle: 'Δεν είναι δυνατή η απενεργοποίηση αυτών των κατηγοριών',
+                bulkTitle: 'Δεν μπορείτε να απενεργοποιήσετε αυτές τις κατηγορίες',
                 description: ({count}: {count: number}) => ({
-                    one: '1 μέλος θα έμενε χωρίς κατηγορίες για επιλογή. Ενημέρωσε την ορατότητα κατηγοριών του και δοκίμασε ξανά:',
-                    other: `${count} μέλη θα έμεναν χωρίς κατηγορίες για επιλογή. Ενημέρωσε την ορατότητα κατηγοριών τους και δοκίμασε ξανά:`,
+                    one: '1 μέλος θα μείνει χωρίς κατηγορίες για να διαλέξει. Ενημερώστε την ορατότητα των κατηγοριών του και δοκιμάστε ξανά:',
+                    other: `${count} μέλη θα μείνουν χωρίς κατηγορίες για να επιλέξουν. Ενημερώστε την ορατότητα των κατηγοριών τους και δοκιμάστε ξανά:`,
                 }),
                 andMore: ({count}: {count: number}) => `και ${count} ακόμη`,
             },
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 79ec9fca..0af70975 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -6943,11 +6943,11 @@ ${amount} para ${merchant} - ${date}`,
                 description: `Debe quedar al menos una categoría habilitada porque tu espacio de trabajo requiere categorías.`,
             },
             cannotDisableCategoryForMembers: {
-                title: ({categoryName}: {categoryName: string}) => `No se puede deshabilitar ${categoryName}`,
+                title: ({categoryName}: {categoryName: string}) => `No se puede desactivar ${categoryName}`,
                 bulkTitle: 'No se pueden deshabilitar estas categorías',
                 description: ({count}: {count: number}) => ({
-                    one: '1 miembro se quedaría sin categorías para elegir. Actualiza su visibilidad de categorías y vuelve a intentarlo:',
-                    other: `${count} miembros se quedarían sin categorías para elegir. Actualiza su visibilidad de categorías y vuelve a intentarlo:`,
+                    one: '1 miembro se quedaría sin categorías para elegir. Actualiza la visibilidad de sus categorías y vuelve a intentarlo:',
+                    other: `${count} miembros se quedarían sin categorías para elegir. Actualiza la visibilidad de sus categorías y vuelve a intentarlo:`,
                 }),
                 andMore: ({count}: {count: number}) => `y ${count} más`,
             },
@@ -7674,7 +7674,7 @@ El plan Controlar empieza en 9 $ por miembro activo al mes.`,
             },
             officeLocation: 'Ubicación de la oficina',
             officeLocationWithAddress: ({name, address}: {name: string; address: string}) => `${name} (${address})`,
-            categoryVisibility: 'Visibilidad de categoría',
+            categoryVisibility: 'Visibilidad de categorías',
             allCategories: 'Todas las categorías',
             categoriesCount: ({count}: {count: number}) => ({
                 one: '1 categoría',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 72fdd207..062396b4 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -7110,8 +7110,8 @@ _Pour des instructions plus détaillées, [visitez notre site d’aide](${CONST.
                 title: ({categoryName}: {categoryName: string}) => `Impossible de désactiver ${categoryName}`,
                 bulkTitle: 'Impossible de désactiver ces catégories',
                 description: ({count}: {count: number}) => ({
-                    one: '1 membre n’aurait plus aucune catégorie à choisir. Mettez à jour sa visibilité des catégories, puis réessayez :',
-                    other: `${count} membres n’auraient plus aucune catégorie à choisir. Mettez à jour leur visibilité des catégories, puis réessayez :`,
+                    one: '1 membre n’aurait plus aucune catégorie à sélectionner. Mettez à jour la visibilité de ses catégories, puis réessayez :',
+                    other: `${count} membres se retrouveraient sans aucune catégorie à choisir. Mettez à jour la visibilité de leurs catégories, puis réessayez :`,
                 }),
                 andMore: ({count}: {count: number}) => `et ${count} de plus`,
             },
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 68a48645..251239c3 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -7041,11 +7041,11 @@ _Per istruzioni più dettagliate, [visita il nostro sito di assistenza](${CONST.
                 description: `Almeno una categoria deve rimanere abilitata perché il tuo spazio di lavoro richiede le categorie.`,
             },
             cannotDisableCategoryForMembers: {
-                title: ({categoryName}: {categoryName: string}) => `Impossibile disattivare ${categoryName}`,
+                title: ({categoryName}: {categoryName: string}) => `Impossibile disabilitare ${categoryName}`,
                 bulkTitle: 'Impossibile disattivare queste categorie',
                 description: ({count}: {count: number}) => ({
-                    one: '1 membro resterebbe senza categorie tra cui scegliere. Aggiorna la sua visibilità delle categorie, poi riprova:',
-                    other: `${count} membri resterebbero senza categorie tra cui scegliere. Aggiorna la loro visibilità delle categorie, poi riprova:`,
+                    one: '1 membro resterebbe senza categorie tra cui scegliere. Aggiorna la visibilità delle sue categorie, quindi riprova:',
+                    other: `A ${count} membri non rimarrebbe alcuna categoria tra cui scegliere. Aggiorna la visibilità delle loro categorie, poi riprova:`,
                 }),
                 andMore: ({count}: {count: number}) => `e altri ${count}`,
             },
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index bcd36fb4..61f7b367 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -6947,10 +6947,10 @@ _詳しい手順については、[ヘルプサイトをご覧ください](${CO
             },
             cannotDisableCategoryForMembers: {
                 title: ({categoryName}: {categoryName: string}) => `${categoryName}を無効にできません`,
-                bulkTitle: 'これらのカテゴリーを無効にできません',
+                bulkTitle: 'これらのカテゴリーは無効にできません',
                 description: ({count}: {count: number}) => ({
-                    one: '1人のメンバーが選択できるカテゴリーがなくなります。カテゴリーの表示設定を更新してから、もう一度お試しください:',
-                    other: `${count}人のメンバーが選択できるカテゴリーがなくなります。カテゴリーの表示設定を更新してから、もう一度お試しください:`,
+                    one: '1人のメンバーが選択できるカテゴリがなくなってしまいます。該当メンバーのカテゴリの表示設定を更新してから、もう一度お試しください。',
+                    other: `${count} 人のメンバーが選択できるカテゴリがなくなります。これらのメンバーのカテゴリの表示設定を更新してから、もう一度お試しください。`,
                 }),
                 andMore: ({count}: {count: number}) => `ほか ${count} 件`,
             },
@@ -7661,13 +7661,10 @@ Control プランは、アクティブメンバー1人あたり月額 $9 から
             categoryVisibility: 'カテゴリの表示',
             allCategories: 'すべてのカテゴリ',
             categoriesCount: ({count}: {count: number}) => ({
-                one: '1件のカテゴリー',
-                other: `${count} 個のカテゴリ`,
+                one: '1 件のカテゴリ',
+                other: `${count} 件のカテゴリ`,
             }),
-            categoryVisibilityRequiredModal: {
-                title: 'メンバーは少なくとも1つのカテゴリを持っている必要があります',
-                description: 'このメンバーが使用できるカテゴリを少なくとも1つ選択してください。',
-            },
+            categoryVisibilityRequiredModal: {title: 'メンバーには少なくとも 1 つのカテゴリーが必要です', description: 'このメンバーが使用できるカテゴリを少なくとも 1 つ選択してください。'},
             changeOfficeLocation: 'オフィスの所在地を変更',
             changeWorkArrangement: '勤務形態を変更',
             changeRole: 'ロールを変更',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 7e26e95d..f5e6f1ad 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -7038,10 +7038,10 @@ _Voor meer gedetailleerde instructies, [bezoek onze help-site](${CONST.NETSUITE_
             },
             cannotDisableCategoryForMembers: {
                 title: ({categoryName}: {categoryName: string}) => `Kan ${categoryName} niet uitschakelen`,
-                bulkTitle: 'Kan deze categorieën niet uitschakelen',
+                bulkTitle: 'Deze categorieën kunnen niet worden uitgeschakeld',
                 description: ({count}: {count: number}) => ({
-                    one: '1 lid zou geen categorieën meer hebben om uit te kiezen. Werk de categoriezichtbaarheid bij en probeer het opnieuw:',
-                    other: `${count} leden zouden geen categorieën meer hebben om uit te kiezen. Werk hun categoriezichtbaarheid bij en probeer het opnieuw:`,
+                    one: '1 lid zou geen categorieën meer hebben om uit te kiezen. Werk de zichtbaarheid van diens categorieën bij en probeer het opnieuw:',
+                    other: `${count} leden zouden geen categorieën meer hebben om uit te kiezen. Werk hun categoriezichtbaarheid bij en probeer het daarna opnieuw:`,
                 }),
                 andMore: ({count}: {count: number}) => `en nog ${count} andere`,
             },
@@ -7761,7 +7761,7 @@ Het Control-abonnement begint bij $9 per actieve deelnemer per maand.`,
                 one: '1 categorie',
                 other: `${count} categorieën`,
             }),
-            categoryVisibilityRequiredModal: {title: 'Leden moeten minstens één categorie hebben', description: 'Selecteer minstens één categorie die dit lid kan gebruiken.'},
+            categoryVisibilityRequiredModal: {title: 'Leden moeten ten minste één categorie hebben', description: 'Selecteer minstens één categorie die dit lid kan gebruiken.'},
             changeOfficeLocation: 'Locatie kantoor wijzigen',
             changeWorkArrangement: 'Werkregeling wijzigen',
             changeRole: 'Rol wijzigen',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 1b5d6bac..8c143434 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -7062,15 +7062,13 @@ _Aby uzyskać bardziej szczegółowe instrukcje, [odwiedź naszą stronę pomocy
                 description: `Co najmniej jedna kategoria musi pozostać włączona, ponieważ w Twoim workspace wymagane są kategorie.`,
             },
             cannotDisableCategoryForMembers: {
-                title: ({categoryName}: {categoryName: string}) => `Nie można wyłączyć kategorii ${categoryName}`,
+                title: ({categoryName}: {categoryName: string}) => `Nie można wyłączyć ${categoryName}`,
                 bulkTitle: 'Nie można wyłączyć tych kategorii',
                 description: ({count}: {count: number}) => ({
-                    one: '1 członek zostałby bez kategorii do wyboru. Zaktualizuj widoczność kategorii, a potem spróbuj ponownie:',
-                    few: `${count} członkowie zostaliby bez kategorii do wyboru. Zaktualizuj ich widoczność kategorii, a potem spróbuj ponownie:`,
-                    many: `${count} członków zostałoby bez kategorii do wyboru. Zaktualizuj ich widoczność kategorii, a potem spróbuj ponownie:`,
-                    other: `${count} członków zostałoby bez kategorii do wyboru. Zaktualizuj ich widoczność kategorii, a potem spróbuj ponownie:`,
+                    one: '1 członek nie miałby żadnych kategorii do wyboru. Zaktualizuj widoczność kategorii dla tej osoby, a potem spróbuj ponownie:',
+                    other: `${count} członków nie będzie miało żadnych kategorii do wyboru. Zaktualizuj widoczność ich kategorii, a potem spróbuj ponownie:`,
                 }),
-                andMore: ({count}: {count: number}) => `i ${count} więcej`,
+                andMore: ({count}: {count: number}) => `i jeszcze ${count}`,
             },
         },
         moreFeatures: {
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index e2c92e64..70384231 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -7046,8 +7046,8 @@ _Para instruções mais detalhadas, [visite nossa central de ajuda](${CONST.NETS
                 title: ({categoryName}: {categoryName: string}) => `Não é possível desativar ${categoryName}`,
                 bulkTitle: 'Não é possível desativar estas categorias',
                 description: ({count}: {count: number}) => ({
-                    one: '1 membro ficaria sem categorias para escolher. Atualize a visibilidade de categorias e tente novamente:',
-                    other: `${count} membros ficariam sem categorias para escolher. Atualize a visibilidade de categorias e tente novamente:`,
+                    one: '1 membro ficaria sem categorias para escolher. Atualize a visibilidade das categorias dele e tente novamente:',
+                    other: `${count} membros ficariam sem categorias para escolher. Atualize a visibilidade das categorias para eles e tente novamente:`,
                 }),
                 andMore: ({count}: {count: number}) => `e mais ${count}`,
             },
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 3e0bb953..b9c048bb 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -6792,11 +6792,11 @@ _如需更详细的说明,请[访问我们的帮助网站](${CONST.NETSUITE_IM
                 description: `由于您的工作区需要类别,必须至少保留一个已启用的类别。`,
             },
             cannotDisableCategoryForMembers: {
-                title: ({categoryName}: {categoryName: string}) => `无法停用${categoryName}`,
-                bulkTitle: '无法停用这些类别',
+                title: ({categoryName}: {categoryName: string}) => `无法禁用 ${categoryName}`,
+                bulkTitle: '无法禁用这些类别',
                 description: ({count}: {count: number}) => ({
-                    one: '1 名成员将没有可选择的类别。请更新其类别可见性,然后重试:',
-                    other: `${count} 名成员将没有可选择的类别。请更新他们的类别可见性,然后重试:`,
+                    one: '将会有 1 名成员没有可选择的类别。请先更新 TA 的类别可见性,然后再试一次:',
+                    other: `将有 ${count} 名成员将没有可选择的类别。请先更新他们的类别可见性,然后重试:`,
                 }),
                 andMore: ({count}: {count: number}) => `和另外 ${count} 个`,
             },
@@ -7481,7 +7481,7 @@ _如需更详细的说明,请[访问我们的帮助网站](${CONST.NETSUITE_IM
                 one: '1 个类别',
                 other: `${count} 个类别`,
             }),
-            categoryVisibilityRequiredModal: {title: '成员必须至少拥有一个类别', description: '请选择至少一个此成员可以使用的类别。'},
+            categoryVisibilityRequiredModal: {title: '成员必须至少有一个类别', description: '请选择该成员可使用的至少一个类别。'},
             changeOfficeLocation: '更改办公室位置',
             changeWorkArrangement: '更改工作安排',
             changeRole: '更改角色',

Note

You can apply these changes to your branch by copying the patch to your clipboard, then running pbpaste | git apply 😉

View workflow run

chiragsalian
chiragsalian previously approved these changes Nov 6, 2026

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

@chiragsalian

Copy link
Copy Markdown
Contributor

Ah looks like you have a merge conflict to address

@chiragsalian
chiragsalian merged commit f5887ad into Expensify:main Nov 6, 2026
38 of 39 checks passed
@github-actions

github-actions Bot commented Nov 6, 2026

Copy link
Copy Markdown
Contributor

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

@OSBotify

OSBotify commented Nov 6, 2026

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.

@github-actions

github-actions Bot commented Nov 6, 2026

Copy link
Copy Markdown
Contributor

@OSBotify OSBotify mentioned this pull request Nov 6, 2026
93 tasks done
@OSBotify

OSBotify commented Nov 6, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/chiragsalian in version: 9.5.33-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

FullStory updates are warranted. Created Update FullStory for E/A#105184 Member category visibility picker and disabling safeguards, labeled Weekly and assigned to JmillsExpensify and nkdengineer.

Recommendations: mask affected members' contact details, add stable custom-element identifiers for Save and both warning confirmations, and use the picker's automatic Page_viewed tracking. No new events or user properties are needed. The issue includes code locations, confidence levels, and an open question about masking category names.

@mitarachim

Copy link
Copy Markdown

Deploy Blocker #106206 was identified to be related to this PR.

@mitarachim

Copy link
Copy Markdown

Deploy Blocker #106213 was identified to be related to this PR.Deploy Blocker #106206 was identified to be related to this PR.

@OSBotify

OSBotify commented Nov 7, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/roryabraham in version: 9.5.33-1 🚀

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

Bundle Size Analysis (Sentry):

@Chandkia24

Copy link
Copy Markdown

This PR is failing because of regression issue #107039

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.

8 participants