[#7155] Clear last message preview on deleting chat history
This commit is contained in:
parent
dfdbe1ccbc
commit
8e7526e68d
|
@ -100,10 +100,12 @@
|
||||||
deleted-at-clock-value
|
deleted-at-clock-value
|
||||||
(utils.clocks/send 0))]
|
(utils.clocks/send 0))]
|
||||||
{:db (update-in db [:chats chat-id] merge
|
{:db (update-in db [:chats chat-id] merge
|
||||||
{:messages empty-message-map
|
{:messages empty-message-map
|
||||||
:message-groups {}
|
:message-groups {}
|
||||||
|
:last-message-content nil
|
||||||
|
:last-message-type nil
|
||||||
:unviewed-messages-count 0
|
:unviewed-messages-count 0
|
||||||
:deleted-at-clock-value last-message-clock-value})
|
:deleted-at-clock-value last-message-clock-value})
|
||||||
:data-store/tx [(chats-store/clear-history-tx chat-id last-message-clock-value)
|
:data-store/tx [(chats-store/clear-history-tx chat-id last-message-clock-value)
|
||||||
(messages-store/delete-messages-tx chat-id)]}))
|
(messages-store/delete-messages-tx chat-id)]}))
|
||||||
|
|
||||||
|
|
|
@ -94,6 +94,8 @@
|
||||||
(fn [realm]
|
(fn [realm]
|
||||||
(let [chat (get-chat-by-id chat-id realm)]
|
(let [chat (get-chat-by-id chat-id realm)]
|
||||||
(doto chat
|
(doto chat
|
||||||
|
(aset "last-message-content" nil)
|
||||||
|
(aset "last-message-type" nil)
|
||||||
(aset "deleted-at-clock-value" deleted-at-clock-value)))))
|
(aset "deleted-at-clock-value" deleted-at-clock-value)))))
|
||||||
|
|
||||||
(defn deactivate-chat-tx
|
(defn deactivate-chat-tx
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
[react/view styles/last-message-container
|
[react/view styles/last-message-container
|
||||||
(cond
|
(cond
|
||||||
|
|
||||||
(not message)
|
(not (and content content-type))
|
||||||
[react/text {:style styles/last-message-text
|
[react/text {:style styles/last-message-text
|
||||||
:accessibility-label :no-messages-text}
|
:accessibility-label :no-messages-text}
|
||||||
(i18n/label :t/no-messages)]
|
(i18n/label :t/no-messages)]
|
||||||
|
|
Loading…
Reference in New Issue