From e9b2415e7dfd2d26005fd13ee3649cdf8cd8419d Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Wed, 11 Aug 2021 11:53:58 +0530
Subject: [PATCH] UX: show flair help text for private member visibility only
 (#14005)

---
 .../app/components/groups-form-interaction-fields.js | 12 ++++--------
 .../components/groups-form-interaction-fields.hbs    |  8 +++++---
 config/locales/client.en.yml                         |  3 +--
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/groups-form-interaction-fields.js b/app/assets/javascripts/discourse/app/components/groups-form-interaction-fields.js
index 887ba2147f..d48078c515 100644
--- a/app/assets/javascripts/discourse/app/components/groups-form-interaction-fields.js
+++ b/app/assets/javascripts/discourse/app/components/groups-form-interaction-fields.js
@@ -99,13 +99,9 @@ export default Component.extend({
   },
 
   @discourseComputed("membersVisibilityLevel")
-  membersVisibilityLevelsDescription(membersVisibilityLevel) {
-    if (
-      membersVisibilityLevel === this.visibilityLevelOptions.firstObject.value
-    ) {
-      return "admin.groups.manage.interaction.members_visibility_levels.description";
-    } else {
-      return "admin.groups.manage.interaction.members_visibility_levels.description_flair_visible";
-    }
+  membersVisibilityPrivate(membersVisibilityLevel) {
+    return (
+      membersVisibilityLevel !== this.visibilityLevelOptions.firstObject.value
+    );
   },
 });
diff --git a/app/assets/javascripts/discourse/app/templates/components/groups-form-interaction-fields.hbs b/app/assets/javascripts/discourse/app/templates/components/groups-form-interaction-fields.hbs
index e5eeb7bb45..df6d0ac8e2 100644
--- a/app/assets/javascripts/discourse/app/templates/components/groups-form-interaction-fields.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/groups-form-interaction-fields.hbs
@@ -29,9 +29,11 @@
       onChange=(action (mut model.members_visibility_level))
     }}
 
-    <div class="control-instructions">
-      {{i18n membersVisibilityLevelsDescription}}
-    </div>
+    {{#if membersVisibilityPrivate}}
+      <div class="control-instructions">
+        {{i18n "admin.groups.manage.interaction.members_visibility_levels.description"}}
+      </div>
+    {{/if}}
   </div>
 {{/if}}
 
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 76155064ad..6dd8a4bf5e 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -3928,8 +3928,7 @@ en:
               description: "Admins can see all groups."
             members_visibility_levels:
               title: "Who can see this group's members?"
-              description: "Admins can see members of all groups."
-              description_flair_visible: "Admins can see members of all groups. Flair is visible to all users."
+              description: "Admins can see members of all groups. Flair is visible to all users."
             publish_read_state: "On group messages publish group read state"
 
           membership: