From 775cfca185ba8e4f56b3d1f96366bd37a6b75332 Mon Sep 17 00:00:00 2001 From: Parvesh Monu Date: Wed, 31 Aug 2022 21:10:01 +0530 Subject: [PATCH] fix Adding/removing user from contacts duplicating their messages in profile (#13897) (cherry picked from commit bc57298e07b33e44b728837848603c7c419b52a4) --- src/status_im/chat/models/message.cljs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/status_im/chat/models/message.cljs b/src/status_im/chat/models/message.cljs index ff84e5314a..4199e4cd0a 100644 --- a/src/status_im/chat/models/message.cljs +++ b/src/status_im/chat/models/message.cljs @@ -137,10 +137,11 @@ [{:ms 100 :dispatch [:chat/add-senders-to-chat-users (vals senders)]}]))})) (defn reduce-js-statuses [db ^js message-js] - (let [chat-id (.-localChatId message-js) + (let [chat-id (.-localChatId message-js) profile-initialized (get-in db [:pagination-info chat-id :messages-initialized?]) - timeline-message (timeline-message? db chat-id)] - (if (or profile-initialized timeline-message) + timeline-message (timeline-message? db chat-id) + old-message (get-in db [:messages chat-id (.-id message-js)])] + (if (and (or profile-initialized timeline-message) (nil? old-message)) (let [{:keys [message-id] :as message} (data-store.messages/<-rpc (types/js->clj message-js))] (cond-> db profile-initialized @@ -233,4 +234,4 @@ {:db (reduce (fn [acc current] (update-in acc [:messages (:chatId current)] remove-cleared-message (:clearedAt current))) db - cleared-histories)}) \ No newline at end of file + cleared-histories)})