Remove clear history from non-public chats

Author: cammellos

src/status_im/group_chats/core.cljs

@@ -209,11 +209,12 @@
 
 (fx/defn ui-leave-chat-pressed
   {:events [:group-chats.ui/leave-chat-pressed]}
-  [_ chat-id]
-  {:ui/show-confirmation
-   {:title               (i18n/label :t/leave-confirmation)
-    :content             (i18n/label :t/leave-chat-confirmation)
-    :confirm-button-text (i18n/label :t/leave)
-    :on-accept           #(do
-                            (re-frame/dispatch [:bottom-sheet/hide])
-                            (re-frame/dispatch [:group-chats.ui/leave-chat-confirmed chat-id]))}})
+  [{:keys [db]} chat-id]
+  (let [chat-name (get-in db [:chats chat-id :name])]
+    {:ui/show-confirmation
+     {:title               (i18n/label :t/leave-confirmation {:chat-name chat-name})
+      :content             (i18n/label :t/leave-chat-confirmation)
+      :confirm-button-text (i18n/label :t/leave)
+      :on-accept           #(do
+                              (re-frame/dispatch [:bottom-sheet/hide])
+                              (re-frame/dispatch [:group-chats.ui/leave-chat-confirmed chat-id]))}}))

src/status_im/ui/screens/chat/sheets.cljs

@@ -35,12 +35,6 @@
        :accessibility-label :mark-all-read-button
        :icon                :main-icons/check
        :on-press            #(hide-sheet-and-dispatch [:chat.ui/mark-all-read-pressed chat-id])}]
-     [quo/list-item
-      {:theme               :accent
-       :title               (i18n/label :t/clear-history)
-       :accessibility-label :clear-history-button
-       :icon                :main-icons/close
-       :on-press            #(re-frame/dispatch [:chat.ui/clear-history-pressed chat-id])}]
      [quo/list-item
       {:theme               :negative
        :title               (i18n/label :t/delete-chat)
@@ -105,13 +99,7 @@
        :title               (i18n/label :t/mark-all-read)
        :accessibility-label :mark-all-read-button
        :icon                :main-icons/check
-       :on-press            #(hide-sheet-and-dispatch [:chat.ui/mark-all-read-pressed chat-id])}]
-     [quo/list-item
-      {:theme               :accent
-       :title               (i18n/label :t/clear-history)
-       :accessibility-label :clear-history-button
-       :icon                :main-icons/close
-       :on-press            #(re-frame/dispatch [:chat.ui/clear-history-pressed chat-id])}]]))
+       :on-press            #(hide-sheet-and-dispatch [:chat.ui/mark-all-read-pressed chat-id])}]]))
 
 (defn group-chat-accents []
   (fn [{:keys [chat-id group-chat chat-name color invitation-admin]}]
@@ -141,12 +129,6 @@
            :accessibility-label :mark-all-read-button
            :icon                :main-icons/check
            :on-press            #(hide-sheet-and-dispatch [:chat.ui/mark-all-read-pressed chat-id])}]
-         [quo/list-item
-          {:theme               :accent
-           :title               (i18n/label :t/clear-history)
-           :accessibility-label :clear-history-button
-           :icon                :main-icons/close
-           :on-press            #(re-frame/dispatch [:chat.ui/clear-history-pressed chat-id])}]
          (when joined?
            [quo/list-item
             {:theme               :negative

translations/en.json

@@ -595,8 +595,8 @@
     "group-chat-name-changed": "**{{member}}** changed the group's name to **{{name}}**",
     "group-chat-no-contacts": "You don't have any contacts yet.\nInvite your friends to start chatting",
     "leave-chat":"Leave chat",
-    "leave-confirmation": "Leave chat",
-    "leave-chat-confirmation": "Are you sure you want to leave the chat?",
+    "leave-confirmation": "Leave {{chat-name}}",
+    "leave-chat-confirmation": "Chat history will be removed from your device. After rejoining you won't be able to retrieve any of your history.",
     "group-chat-all-contacts-invited": "All your contacts are already in the group",
     "group-info": "Group info",
     "gwei": "Gwei",