status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed timeline load more, fixed message confirmation status 

fixed group chat invitation

Signed-off-by: andrey <motor4ik@gmail.com>
This commit is contained in:
andrey 2021-03-15 11:39:28 +01:00
parent c7cc9e27a9
commit 503028cb4e
No known key found for this signature in database
GPG Key ID: 89B67245FD2F0272
5 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/status_im/group_chats/core.cljs
View File

@ -160,6 +160,7 @@
{:db (assoc-in db [:chat/memberships current-chat-id] nil)
::json-rpc/call [{:method (json-rpc/call-ext-method "sendGroupChatInvitationRequest")
:params [nil current-chat-id invitation-admin message]
:js-response true
:on-success #(re-frame/dispatch [:sanitize-messages-and-process-response %])}]}))
(fx/defn send-group-chat-membership-rejection
@ -168,6 +169,7 @@
[cofx invitation-id]
{::json-rpc/call [{:method (json-rpc/call-ext-method "sendGroupChatInvitationRejection")
:params [nil invitation-id]
:js-response true
:on-success #(re-frame/dispatch [:sanitize-messages-and-process-response %])}]})
(fx/defn handle-invitations

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

@ -64,7 +64,7 @@
"subscriptions.data" (ethereum.subscriptions/handle-signal cofx (js->clj event-js :keywordize-keys true))
"subscriptions.error" (ethereum.subscriptions/handle-error cofx (js->clj event-js :keywordize-keys true))
"whisper.filter.added" (transport.filters/handle-negotiated-filter cofx (js->clj event-js :keywordize-keys true))
"messages.new" (transport.message/sanitize-messages-and-process-response cofx event-js)
"messages.new" (transport.message/sanitize-messages-and-process-response cofx event-js true)
"wallet" (ethereum.subscriptions/new-wallet-event cofx (js->clj event-js :keywordize-keys true))
"local-notifications" (local-notifications/process cofx (js->clj event-js :keywordize-keys true))
(log/debug "Event " type " not handled"))))

37
src/status_im/transport/message/core.cljs
View File

@ -18,9 +18,15 @@
[status-im.multiaccounts.model :as multiaccounts.model]
[clojure.string :as string]))
(fx/defn process-next
[cofx ^js response-js sync-handler]
(if sync-handler
(sync-handler cofx response-js true)
{:utils/dispatch-later [{:ms 20 :dispatch [:process-response response-js]}]}))
(fx/defn process-response
{:events [:process-response]}
[cofx ^js response-js]
[cofx ^js response-js process-async]
(let [^js communities (.-communities response-js)
^js requests-to-join-community (.-requestsToJoinCommunity response-js)
^js chats (.-chats response-js)
@ -31,7 +37,8 @@
^js filters (.-filters response-js)
^js removed-filters (.-removedFilters response-js)
^js invitations (.-invitations response-js)
^js removed-chats (.-removedChats response-js)]
^js removed-chats (.-removedChats response-js)
sync-handler (when-not process-async process-response)]
(cond
@ -39,7 +46,7 @@
(do
(js-delete response-js "chats")
(fx/merge cofx
{:utils/dispatch-later [{:ms 20 :dispatch [:process-response response-js]}]}
(process-next response-js sync-handler)
(models.chat/ensure-chats (map #(-> %
(data-store.chats/<-rpc)
;;TODO why here?
@ -53,61 +60,61 @@
(let [installations-clj (types/js->clj installations)]
(js-delete response-js "installations")
(fx/merge cofx
{:utils/dispatch-later [{:ms 20 :dispatch [:process-response response-js]}]}
(process-next response-js sync-handler)
(models.pairing/handle-installations installations-clj)))
(seq contacts)
(let [contacts-clj (types/js->clj contacts)]
(js-delete response-js "contacts")
(fx/merge cofx
{:utils/dispatch-later [{:ms 20 :dispatch [:process-response response-js]}]}
(process-next response-js sync-handler)
(models.contact/ensure-contacts (map data-store.contacts/<-rpc contacts-clj))))
(seq communities)
(let [communities-clj (types/js->clj communities)]
(js-delete response-js "communities")
(fx/merge cofx
{:utils/dispatch-later [{:ms 20 :dispatch [:process-response response-js]}]}
(process-next response-js sync-handler)
(models.communities/handle-communities (types/js->clj communities-clj))))
(seq removed-chats)
(let [removed-chats-clj (types/js->clj removed-chats)]
(js-delete response-js "removedChats")
(fx/merge cofx
{:utils/dispatch-later [{:ms 20 :dispatch [:process-response response-js]}]}
(process-next response-js sync-handler)
(models.communities/handle-removed-chats (types/js->clj removed-chats-clj))))
(seq requests-to-join-community)
(let [request (.pop requests-to-join-community)]
(fx/merge cofx
{:utils/dispatch-later [{:ms 20 :dispatch [::process response-js]}]}
(process-next response-js sync-handler)
(models.communities/handle-request-to-join (types/js->clj request))))
(seq emoji-reactions)
(let [reactions (types/js->clj emoji-reactions)]
(js-delete response-js "emojiReactions")
(fx/merge cofx
{:utils/dispatch-later [{:ms 20 :dispatch [:process-response response-js]}]}
(process-next response-js sync-handler)
(models.reactions/receive-signal (map data-store.reactions/<-rpc reactions))))
(seq invitations)
(let [invitations (types/js->clj invitations)]
(js-delete response-js "invitations")
(fx/merge cofx
{:utils/dispatch-later [{:ms 20 :dispatch [:process-response response-js]}]}
(process-next response-js sync-handler)
(models.group/handle-invitations (map data-store.invitations/<-rpc invitations))))
(seq filters)
(let [filters (types/js->clj filters)]
(js-delete response-js "filters")
(fx/merge cofx
{:utils/dispatch-later [{:ms 20 :dispatch [:process-response response-js]}]}
(process-next response-js sync-handler)
(models.filters/handle-filters filters)))
(seq removed-filters)
(let [removed-filters (types/js->clj removed-filters)]
(js-delete response-js "removedFilters")
(fx/merge cofx
{:utils/dispatch-later [{:ms 20 :dispatch [:process-response response-js]}]}
(process-next response-js sync-handler)
(models.filters/handle-filters-removed filters))))))
(defn group-by-and-update-unviewed-counts
@ -155,7 +162,7 @@
(fx/defn sanitize-messages-and-process-response
"before processing we want to filter and sort messages, so we can process first only messages which will be showed"
{:events [:sanitize-messages-and-process-response]}
[{:keys [db] :as cofx} ^js response-js]
[{:keys [db] :as cofx} ^js response-js process-async]
(let [current-chat-id (:current-chat-id db)
{:keys [db messages transactions chats statuses]}
(reduce group-by-and-update-unviewed-counts
@ -173,7 +180,7 @@
{:ms 100 :dispatch [:watch-tx transaction-hash]}))
(when (seq chats)
[{:ms 100 :dispatch [:chat/join-times-messages-checked chats]}]))}
(process-response response-js))))
(process-response response-js process-async))))
(fx/defn remove-hash
[{:keys [db]} envelope-hash]
@ -242,4 +249,4 @@
(types/js->clj (.-messages response-js)))]
(apply fx/merge cofx
(conj set-hash-fxs
#(sanitize-messages-and-process-response % response-js)))))
#(sanitize-messages-and-process-response % response-js false)))))

2
src/status_im/ui/screens/profile/group_chat/views.cljs
View File

@ -114,7 +114,7 @@
:content-type constants/content-type-text}]
[react/view {:margin-bottom 8 :margin-right 16}
[react/view {:padding-left 72}
(chat.utils/format-author (multiaccounts/displayed-name contact))]
(chat.utils/format-author contact)]
[react/view {:flex-direction :row :align-items :flex-end}
[react/view {:padding-left 16 :padding-top 4}
[photos/photo (multiaccounts/displayed-photo contact) {:size 36}]]

2
src/status_im/ui/screens/status/views.cljs
View File

@ -187,7 +187,7 @@
[react/view {:flex 1}
[react/view {:height 1
:background-color colors/gray-lighter}]
(if loading-messages?
(if (and no-messages? loading-messages?)
[react/view {:flex 1 :align-items :center :justify-content :center}
[react/activity-indicator {:animating true}]]
(if no-messages?