status-im/status-mobile
2
0
Fork 0
mirror of https://github.com/status-im/status-mobile.git synced 2025-01-13 18:25:45 +00:00
Code Issues Projects Releases Wiki Activity

Delivered messages have double-check icon in private chats

Browse Source 
Signed-off-by: Volodymyr Kozieiev <vkjr.sp@gmail.com>
This commit is contained in:
Volodymyr Kozieiev 2021-02-23 18:17:15 +02:00
parent d5e1d3fe65
commit a383cfa39a
No known key found for this signature in database
GPG Key ID: 82B04968DF4C0535
6 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
resources/images/icons/tiny_delivered@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 277 B

BIN
resources/images/icons/tiny_delivered@3x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 367 B

9
src/status_im/chat/models/message.cljs
View File

@ -209,12 +209,17 @@
(chat-model/join-time-messages-checked-for-chats (keys grouped-messages))))))) (chat-model/join-time-messages-checked-for-chats (keys grouped-messages)))))))
;;;; Send message ;;;; Send message
(fx/defn update-message-status (fx/defn update-db-message-status
[{:keys [db] :as cofx} chat-id message-id status] [{:keys [db] :as cofx} chat-id message-id status]
(fx/merge cofx (fx/merge cofx
{:db (assoc-in db {:db (assoc-in db
[:messages chat-id message-id :outgoing-status] [:messages chat-id message-id :outgoing-status]
status)} status)}))
(fx/defn update-message-status
[{:keys [db] :as cofx} chat-id message-id status]
(fx/merge cofx
(update-db-message-status chat-id message-id status)
(data-store.messages/update-outgoing-status message-id status))) (data-store.messages/update-outgoing-status message-id status)))
(fx/defn resend-message (fx/defn resend-message

3
src/status_im/signals/core.cljs
View File

@ -7,6 +7,7 @@
[status-im.transport.filters.core :as transport.filters] [status-im.transport.filters.core :as transport.filters]
[status-im.transport.message.core :as transport.message] [status-im.transport.message.core :as transport.message]
[status-im.notifications.local :as local-notifications] [status-im.notifications.local :as local-notifications]
[status-im.chat.models.message :as models.message]
[status-im.utils.fx :as fx] [status-im.utils.fx :as fx]
[taoensso.timbre :as log])) [taoensso.timbre :as log]))
@ -54,6 +55,8 @@
"node.login" (status-node-started cofx (js->clj event-js :keywordize-keys true)) "node.login" (status-node-started cofx (js->clj event-js :keywordize-keys true))
"envelope.sent" (transport.message/update-envelopes-status cofx (:ids (js->clj event-js :keywordize-keys true)) :sent) "envelope.sent" (transport.message/update-envelopes-status cofx (:ids (js->clj event-js :keywordize-keys true)) :sent)
"envelope.expired" (transport.message/update-envelopes-status cofx (:ids (js->clj event-js :keywordize-keys true)) :not-sent) "envelope.expired" (transport.message/update-envelopes-status cofx (:ids (js->clj event-js :keywordize-keys true)) :not-sent)
"message.delivered" (let [{:keys [chatID messageID] :as event-cljs} (js->clj event-js :keywordize-keys true)]
(models.message/update-db-message-status cofx chatID messageID :delivered))
"mailserver.request.completed" (mailserver/handle-request-completed cofx (js->clj event-js :keywordize-keys true)) "mailserver.request.completed" (mailserver/handle-request-completed cofx (js->clj event-js :keywordize-keys true))
"mailserver.request.expired" (when (multiaccounts.model/logged-in? cofx) "mailserver.request.expired" (when (multiaccounts.model/logged-in? cofx)
(mailserver/resend-request cofx {:request-id (.-hash event-js)})) (mailserver/resend-request cofx {:request-id (.-hash event-js)}))

14
src/status_im/ui/screens/chat/message/message.cljs
View File

@ -43,13 +43,15 @@
:align-items :flex-end}) :align-items :flex-end})
(when (and outgoing justify-timestamp?) (when (and outgoing justify-timestamp?)
[icons/icon (case outgoing-status [icons/icon (case outgoing-status
:sending :tiny-icons/tiny-pending :sending :tiny-icons/tiny-pending
:sent :tiny-icons/tiny-sent :sent :tiny-icons/tiny-sent
:not-sent :tiny-icons/tiny-warning :not-sent :tiny-icons/tiny-warning
:delivered :tiny-icons/tiny-delivered
:tiny-icons/tiny-pending) :tiny-icons/tiny-pending)
{:width 16 {:width 16
:height 12 :height 12
:color colors/white}]) :color colors/white
:accessibility-label (name outgoing-status)}])
[react/text {:style (style/message-timestamp-text outgoing)} [react/text {:style (style/message-timestamp-text outgoing)}
timestamp-str]])) timestamp-str]]))

6
status-go-version.json
View File

@ -2,7 +2,7 @@
"_comment": "DO NOT EDIT THIS FILE BY HAND. USE 'scripts/update-status-go.sh <tag>' instead", "_comment": "DO NOT EDIT THIS FILE BY HAND. USE 'scripts/update-status-go.sh <tag>' instead",
"owner": "status-im", "owner": "status-im",
"repo": "status-go", "repo": "status-go",
"version": "v0.71.4", "version": "v0.71.5",
"commit-sha1": "2c0383ec2286c644fe4425c04ad692f4fa0243fe", "commit-sha1": "da46a352925c105277f7d0953d077287d02c5c71",
"src-sha256": "1kvpzmkzarg8l5gq7dz7316f1bph3zh754crhc1mmd334919cn3h" "src-sha256": "041f9gvfpipanwwwwh395sv765ahvi1vx19hjw8p1qq4m59b4357"
} }