From 17e0b6621be497c55c8073d44b4e52ebb8d4e53b Mon Sep 17 00:00:00 2001
From: Sahil Batra <sahil@zulip.com>
Date: Tue, 10 Oct 2023 20:15:05 +0530
Subject: [PATCH] settings: Update tooltip on lock icon shown for custom emoji
 panel.

This commit updates the tooltip for icon shown for custom emoji panel
to change the text to "You do not have permission to add custom emoji"
instead of just mentioning always that only admins can add them
even when we have other options like "Admins and moderators".

This also fixes the condition of showing or hiding the lock icon
to use the correct setting value and not the old setting
add_emoji_by_admins_only.
---
 web/src/settings.js                | 3 +--
 web/templates/settings_overlay.hbs | 6 ++----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/web/src/settings.js b/web/src/settings.js
index 40f386a21b..f08a58237a 100644
--- a/web/src/settings.js
+++ b/web/src/settings.js
@@ -165,8 +165,7 @@ export function initialize() {
         is_admin: page_params.is_admin,
         is_guest: page_params.is_guest,
         show_uploaded_files_section: page_params.max_file_upload_size_mib > 0,
-        show_emoji_settings_lock:
-            !page_params.is_admin && page_params.realm_add_emoji_by_admins_only,
+        show_emoji_settings_lock: !settings_data.user_can_add_custom_emoji(),
         can_create_new_bots: settings_bots.can_create_new_bots(),
     });
     $("#settings_overlay_container").append(rendered_settings_overlay);
diff --git a/web/templates/settings_overlay.hbs b/web/templates/settings_overlay.hbs
index 9d0aa47e6c..0071d5c922 100644
--- a/web/templates/settings_overlay.hbs
+++ b/web/templates/settings_overlay.hbs
@@ -79,10 +79,8 @@
                     <li tabindex="0" data-section="emoji-settings">
                         <i class="icon fa fa-smile-o" aria-hidden="true"></i>
                         <div class="text">{{t "Custom emoji" }}</div>
-                        {{#if is_guest}}
-                            <i class="locked fa fa-lock" title="{{t 'Guest users cannot edit custom emoji.' }}"></i>
-                        {{else if show_emoji_settings_lock}}
-                            <i class="locked fa fa-lock" title="{{t 'Only organization administrators can edit these settings.'}}"></i>
+                        {{#if show_emoji_settings_lock}}
+                            <i class="locked fa fa-lock" title="{{t 'You do not have permission to add custom emoji.'}}"></i>
                         {{/if}}
                     </li>
                     <li tabindex="0" data-section="linkifier-settings">