From 8e7526e68db49355c89c72d974d1cb3f77e741de Mon Sep 17 00:00:00 2001
From: Roman Volosovskyi <roman.wolosovskyi@gmail.com>
Date: Fri, 21 Dec 2018 09:28:26 +0200
Subject: [PATCH] [#7155] Clear last message preview on deleting chat history

---
 src/status_im/chat/models.cljs                      | 8 +++++---
 src/status_im/data_store/chats.cljs                 | 2 ++
 src/status_im/ui/screens/home/views/inner_item.cljs | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/status_im/chat/models.cljs b/src/status_im/chat/models.cljs
index 0b8cfab904..fb6646d612 100644
--- a/src/status_im/chat/models.cljs
+++ b/src/status_im/chat/models.cljs
@@ -100,10 +100,12 @@
                                      deleted-at-clock-value
                                      (utils.clocks/send 0))]
     {:db            (update-in db [:chats chat-id] merge
-                               {:messages           empty-message-map
-                                :message-groups         {}
+                               {:messages                empty-message-map
+                                :message-groups          {}
+                                :last-message-content    nil
+                                :last-message-type       nil
                                 :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)
                      (messages-store/delete-messages-tx chat-id)]}))
 
diff --git a/src/status_im/data_store/chats.cljs b/src/status_im/data_store/chats.cljs
index 2492c13027..24814a25b0 100644
--- a/src/status_im/data_store/chats.cljs
+++ b/src/status_im/data_store/chats.cljs
@@ -94,6 +94,8 @@
   (fn [realm]
     (let [chat (get-chat-by-id chat-id realm)]
       (doto chat
+        (aset "last-message-content" nil)
+        (aset "last-message-type" nil)
         (aset "deleted-at-clock-value" deleted-at-clock-value)))))
 
 (defn deactivate-chat-tx
diff --git a/src/status_im/ui/screens/home/views/inner_item.cljs b/src/status_im/ui/screens/home/views/inner_item.cljs
index 0915b27cc4..384a8da45f 100644
--- a/src/status_im/ui/screens/home/views/inner_item.cljs
+++ b/src/status_im/ui/screens/home/views/inner_item.cljs
@@ -30,7 +30,7 @@
   [react/view styles/last-message-container
    (cond
 
-     (not message)
+     (not (and content content-type))
      [react/text {:style               styles/last-message-text
                   :accessibility-label :no-messages-text}
       (i18n/label :t/no-messages)]