From c6e63ff5a5262fcc6d4087afa52f7f95458caaf4 Mon Sep 17 00:00:00 2001 From: Roman Volosovskyi Date: Mon, 6 Mar 2023 17:53:04 +0100 Subject: [PATCH] [#15241] Proper system message on being not a member of a group --- .../chat/messages/contact_requests/bottom_drawer.cljs | 5 ++++- src/status_im2/contexts/chat/messages/view.cljs | 4 ++-- translations/en.json | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/status_im2/contexts/chat/messages/contact_requests/bottom_drawer.cljs b/src/status_im2/contexts/chat/messages/contact_requests/bottom_drawer.cljs index f60ad08839..155eba45c9 100644 --- a/src/status_im2/contexts/chat/messages/contact_requests/bottom_drawer.cljs +++ b/src/status_im2/contexts/chat/messages/contact_requests/bottom_drawer.cljs @@ -7,7 +7,7 @@ [status-im2.constants :as constants])) (defn view - [contact-id contact-request-state] + [contact-id contact-request-state group-chat] (let [names (rf/sub [:contacts/contact-two-names-by-identity contact-id])] [permission-context/view [quo/button @@ -15,6 +15,9 @@ :on-press #(rf/dispatch [:chat.ui/show-profile contact-id]) :before :i/communities} (cond + group-chat + (i18n/label :t/group-chat-not-member) + (or (not contact-request-state) (= contact-request-state constants/contact-request-state-none) diff --git a/src/status_im2/contexts/chat/messages/view.cljs b/src/status_im2/contexts/chat/messages/view.cljs index 26790c945f..04639bc254 100644 --- a/src/status_im2/contexts/chat/messages/view.cljs +++ b/src/status_im2/contexts/chat/messages/view.cljs @@ -67,7 +67,7 @@ (defn chat-render [] (let [;;NOTE: we want to react only on these fields, do not use full chat map here - {:keys [chat-id contact-request-state show-input?] :as chat} + {:keys [chat-id contact-request-state group-chat show-input?] :as chat} (rf/sub [:chats/current-chat-chat-view])] [safe-area/consumer (fn [insets] @@ -78,7 +78,7 @@ [pin.banner/banner chat-id] [messages.list/messages-list {:chat chat :show-input? show-input?}] (if-not show-input? - [contact-requests.bottom-drawer/view chat-id contact-request-state] + [contact-requests.bottom-drawer/view chat-id contact-request-state group-chat] [composer/composer chat-id insets])])])) (defn chat diff --git a/translations/en.json b/translations/en.json index 4e937be1b4..6d96771313 100644 --- a/translations/en.json +++ b/translations/en.json @@ -642,6 +642,7 @@ "group-chat-member-removed": "**{{member}}** left the group", "group-chat-members-count": "{{selected}}/{{max}} members", "group-chat-name-changed": "**{{member}}** changed the group's name to **{{name}}**", + "group-chat-not-member": "You are not a member of this group", "group-chat-no-contacts": "You don't have any contacts yet.\nInvite your friends to start chatting", "leave-chat": "Leave chat", "leave-confirmation": "Leave {{chat-name}}",