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

Fix stale subscriptions

This commit is contained in:
janherich 2017-12-20 18:52:43 +01:00
parent bcc2b12036
commit f3519b975c
No known key found for this signature in database
GPG Key ID: C23B473AFBE94D13
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/status_im/chat/screen.cljs
View File

@ -73,8 +73,8 @@
:group-chat group-chat
:current-public-key current-public-key)]))
(defview messages-view [group-chat]
(letsubs [messages [:get-current-chat-messages]
(defview messages-view [chat-id group-chat]
(letsubs [messages [:get-chat-messages chat-id]
current-public-key [:get-current-public-key]]
[react/list-view {:renderRow (fn [row _ index]
(message-row {:group-chat group-chat
@ -87,11 +87,11 @@
:dataSource (listview/to-datasource-inverted messages)}]))
(defview chat []
(letsubs [{:keys [group-chat input-text]} [:get-current-chat]
show-actions? [:get-current-chat-ui-prop :show-actions?]
show-bottom-info? [:get-current-chat-ui-prop :show-bottom-info?]
show-emoji? [:get-current-chat-ui-prop :show-emoji?]
layout-height [:get :layout-height]]
(letsubs [{:keys [chat-id group-chat input-text]} [:get-current-chat]
show-actions? [:get-current-chat-ui-prop :show-actions?]
show-bottom-info? [:get-current-chat-ui-prop :show-bottom-info?]
show-emoji? [:get-current-chat-ui-prop :show-emoji?]
layout-height [:get :layout-height]]
{:component-did-mount #(re-frame/dispatch [:check-and-open-dapp!])
:component-will-unmount #(re-frame/dispatch [:set-chat-ui-props {:show-emoji? false}])}
[react/view {:style style/chat-view
@ -100,7 +100,7 @@
(when (not= height layout-height)
(re-frame/dispatch [:set-layout-height height]))))}
[chat-toolbar]
[messages-view group-chat]
[messages-view chat-id group-chat]
[input/container {:text-empty? (string/blank? input-text)}]
(when show-actions?
[actions/actions-view])

15
src/status_im/chat/subs.cljs
View File

@ -56,10 +56,10 @@
(reg-sub
:get-current-chat
(fn [_]
(let [current-chat-id (subscribe [:get-current-chat-id])]
(subscribe [:get-chat @current-chat-id])))
identity)
:<- [:chats]
:<- [:get-current-chat-id]
(fn [[chats current-chat-id]]
(get chats current-chat-id)))
(reg-sub
:chat
@ -133,10 +133,9 @@
:value (i18n/label :t/datetime-today)})))
(reg-sub
:get-current-chat-messages
(fn [_]
(let [current-chat-id (subscribe [:get-current-chat-id])]
(subscribe [:get-chat-message-datemark-groups @current-chat-id])))
:get-chat-messages
(fn [[_ chat-id]]
(subscribe [:get-chat-message-datemark-groups chat-id]))
(fn [message-datemark-groups]
(messages-stream message-datemark-groups)))