From f1272f4d49801cf987ca2dd03a519c8c5af17c7d Mon Sep 17 00:00:00 2001 From: Andrea Maria Piana Date: Wed, 3 Jun 2020 14:39:27 +0200 Subject: [PATCH] [Fixes #10751] Remove messages & list when blocking Signed-off-by: Andrea Maria Piana --- src/status_im/contact/block.cljs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/status_im/contact/block.cljs b/src/status_im/contact/block.cljs index 353496d2a7..361db1e685 100644 --- a/src/status_im/contact/block.cljs +++ b/src/status_im/contact/block.cljs @@ -23,19 +23,17 @@ (fn [[message-id {:keys [from]}]] (when (= from public-key) message-id)) - (get-in db [:chats chat-id :messages])) + (get-in db [:messages chat-id])) db (-> db ;; remove messages - (update-in [:chats chat-id :messages] + (update-in [:messages chat-id] #(apply dissoc % removed-messages-ids)) - ;; remove message groups - (update-in [:chats chat-id] - dissoc :message-list) (update-in [:chats chat-id] assoc :unviewed-messages-count unviewed-messages-count :last-message last-message))] - {:db (update-in db [:chats chat-id :message-list] message-list/add-many (vals (get-in db [:chats chat-id :messages])))})) + {:db (assoc-in db [:message-lists chat-id] + (message-list/add-many nil (vals (get-in db [:messages chat-id]))))})) (fx/defn contact-blocked {:events [::contact-blocked]}