From 0620f4b0df77e109919861e0320921a3ed0a165c Mon Sep 17 00:00:00 2001 From: Andrey Shovkoplyas Date: Tue, 2 Jun 2020 13:40:09 +0200 Subject: [PATCH] [#10732] Remove message spinners and 'Sent' status Signed-off-by: Andrey Shovkoplyas --- .../ui/screens/chat/message/message.cljs | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/src/status_im/ui/screens/chat/message/message.cljs b/src/status_im/ui/screens/chat/message/message.cljs index 62f6c59f82..129f6acd18 100644 --- a/src/status_im/ui/screens/chat/message/message.cljs +++ b/src/status_im/ui/screens/chat/message/message.cljs @@ -202,11 +202,6 @@ (:text content)]] [message-timestamp message]]])) -(defn message-activity-indicator - [] - [react/view style/message-activity-indicator - [react/activity-indicator {:animating true}]]) - (defn message-not-sent-text [chat-id message-id] [react/touchable-highlight @@ -226,16 +221,10 @@ [vector-icons/icon :main-icons/warning {:color colors/red}]]]]) (defn message-delivery-status - [{:keys [chat-id message-id outgoing-status - first-outgoing? message-type]}] - (when (not= constants/message-type-private-group-system-message message-type) - (case outgoing-status - :sending [message-activity-indicator] - :not-sent [message-not-sent-text chat-id message-id] - :sent (when first-outgoing? - [react/text {:style style/delivery-text} - (i18n/label :t/status-sent)]) - nil))) + [{:keys [chat-id message-id outgoing-status message-type]}] + (when (and (not= constants/message-type-private-group-system-message message-type) + (= outgoing-status :not-sent)) + [message-not-sent-text chat-id message-id])) (defview message-author-name [from alias] (letsubs [contact-name [:contacts/raw-contact-name-by-identity from]]