status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[16524] Fix chevron icon showing when chat is muted (#16528)

This commit is contained in:
Ibrahem Khalil 2023-07-12 11:28:53 +03:00 committed by GitHub
parent bcb55a1ab3
commit 2e397f0065
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/status_im2/common/home/actions/view.cljs
View File

@ -139,7 +139,7 @@
#(mute-chat-action chat-id chat-type)) #(mute-chat-action chat-id chat-type))
:danger? false :danger? false
:accessibility-label :mute-chat :accessibility-label :mute-chat
:chevron? true}))) :chevron? (not muted?)})))
(defn mark-as-read-entry (defn mark-as-read-entry
[chat-id needs-divider?] [chat-id needs-divider?]

24
src/status_im2/contexts/communities/actions/chat/view.cljs
View File

@ -47,17 +47,19 @@
(defn- action-toggle-muted (defn- action-toggle-muted
[id muted? muted-till chat-type] [id muted? muted-till chat-type]
(let [muted (and muted? (some? muted-till))] (let [muted (and muted? (some? muted-till))]
{:icon :i/muted (cond-> {:icon :i/muted
:right-icon :i/chevron-right :accessibility-label :chat-toggle-muted
:accessibility-label :chat-toggle-muted :sub-label (when muted
:sub-label (when muted (str (i18n/label :t/muted-until)
(str (i18n/label :t/muted-until) " " (datetime/format-mute-till muted-till))) " "
:on-press (if muted? (datetime/format-mute-till muted-till)))
#(unmute-channel-action id) :on-press (if muted?
#(mute-channel-action id chat-type)) #(unmute-channel-action id)
:label (i18n/label (if muted #(mute-channel-action id chat-type))
:t/unmute-channel :label (i18n/label (if muted
:t/mute-channel))})) :t/unmute-channel
:t/mute-channel))}
(not muted?) (assoc :right-icon :i/chevron-right))))
(defn- action-notification-settings (defn- action-notification-settings
[] []