From d086b86fd06d8a8f217b1d97181d42bb3e3082fc Mon Sep 17 00:00:00 2001 From: Parvesh Monu Date: Wed, 30 Mar 2022 00:25:46 +0530 Subject: [PATCH] don't allow mentioning non-member contacts in public chat (#13227) --- src/status_im/chat/models/mentions.cljs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/status_im/chat/models/mentions.cljs b/src/status_im/chat/models/mentions.cljs index b9e3d13e87..0a421556c0 100644 --- a/src/status_im/chat/models/mentions.cljs +++ b/src/status_im/chat/models/mentions.cljs @@ -247,7 +247,10 @@ (merge mentionable-users (mentionable-contacts-from-identites all-contacts public-key (keys community-members))) - :else (merge mentionable-users mentionable-contacts)))) + (= chat-type constants/public-chat-type) + (merge mentionable-users (select-keys mentionable-contacts (keys mentionable-users))) + + :else mentionable-users))) (def ending-chars "[\\s\\.,;:]") (def ending-chars-regex (re-pattern ending-chars))