fix: remove-chat-test

status-im · Nov 3, 2023 · caa178a · caa178a
1 parent 80fed9d
commit caa178a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/src/status_im2/contexts/chat/events.cljs b/src/status_im2/contexts/chat/events.cljs
@@ -159,14 +159,10 @@
 
 (rf/defn remove-chat
   "Removes chat with provided id from the chat list"
-  [{:keys [db now] :as cofx} chat-id]
-  (rf/merge
-   cofx
-   {:db (-> (if (get-in db [:chats chat-id :muted])
-                (assoc-in db [:chats chat-id :active] false)
-                (update db :chats dissoc chat-id))
-            (update :chats-home-list disj chat-id)
-            (assoc :current-chat-id nil))}))
+  [{:keys [db]} chat-id]
+  {:db (-> db
+           (update :chats-home-list disj chat-id)
+           (assoc :current-chat-id nil))})
 
 (rf/defn offload-messages
   {:events [:chat/offload-messages]}

diff --git a/src/status_im2/contexts/chat/events_test.cljs b/src/status_im2/contexts/chat/events_test.cljs
@@ -43,13 +43,11 @@
 
 (deftest remove-chat-test
   (let [chat-id "1"
-        cofx    {:db {:messages {chat-id {"1" {:clock-value 1}
-                                          "2" {:clock-value 10}
-                                          "3" {:clock-value 2}}}
-                      :chats    {chat-id {:last-message {:clock-value 10}}}}}]
-    (testing "it deletes all the messages"
+        cofx    {:db {:current-chat-id chat-id
+                      :chats-home-list #{chat-id}}}]
+    (testing "it removes the chat with given id"
       (let [actual (chat/close-and-remove-chat cofx chat-id)]
-        (is (= nil (get-in actual [:db :messages chat-id])))))))
+        (is (= nil (get-in actual [:db :chats-home-list chat-id])))))))
 
 (deftest multi-user-chat?
   (let [chat-id "1"]