Compare commits

...
8 changed files with 18 additions and 11 deletions
+1 -1
View File
@@ -1 +1 @@
1.12.0
1.13.0
+1 -1
View File
@@ -38,7 +38,7 @@
(fx/defn join-public-chat
[cofx chat-name]
(chat/start-public-chat cofx chat-name nil))
(chat/start-public-chat cofx chat-name {:navigation-reset? true}))
(fx/defn accept-pack
{:events [::accept-pack]}
+3 -1
View File
@@ -273,7 +273,8 @@
{:events [:chat.ui/navigate-to-chat]}
[{db :db :as cofx} chat-id]
(fx/merge cofx
{:db (assoc db :current-chat-id chat-id)}
(close-chat)
#(assoc-in % [:db :current-chat-id] chat-id)
(preload-chat-data chat-id)
(navigation/navigate-to-cofx :chat-stack {:screen :chat})))
@@ -330,6 +331,7 @@
(fx/defn start-timeline-chat
"Starts a new timeline chat"
{:events [:chat/start-timeline-chat]}
[cofx]
(when-not (active-chat? cofx constants/timeline-chat-id)
(add-public-chat cofx constants/timeline-chat-id nil true)))
+3 -1
View File
@@ -28,7 +28,9 @@
new-chats)
chats (merge old-chats chats)]
{:db (assoc db :chats chats
:chats/loading? false)}))
:chats/loading? false)
:dispatch-n [[:chat/start-timeline-chat]
[:start-profile-chat (get-in db [:multiaccount :public-key])]]}))
(fx/defn initialize-chats
"Initialize persisted chats on startup"
@@ -31,9 +31,9 @@
(i18n/label :chat-is-a-contact)
(i18n/label :chat-is-not-a-contact))]]))
(defn toolbar-content-view []
(defn toolbar-content-view-inner [chat-info]
(let [{:keys [group-chat invitation-admin color chat-id contacts chat-type chat-name public?]}
@(re-frame/subscribe [:chats/current-chat])]
chat-info]
[react/view {:style st/toolbar-container}
[react/view {:margin-right 10}
[react/touchable-highlight {:on-press #(when-not group-chat (re-frame/dispatch [:chat.ui/show-profile chat-id]))}
@@ -50,3 +50,6 @@
(when (and group-chat (not invitation-admin) (not= chat-type constants/community-chat-type))
[group-last-activity {:contacts contacts
:public? public?}])]]))
(defn toolbar-content-view []
[toolbar-content-view-inner @(re-frame/subscribe [:chats/current-chat])])
@@ -35,7 +35,7 @@
(when last?
{:border-bottom-color (quo.colors/get-color :ui-01)
:border-bottom-width 1}))
:on-press (fn [id]
:on-press (fn []
(>evt [:dismiss-keyboard])
(>evt [:navigate-to :community {:community-id id}]))}
[:<>
@@ -83,7 +83,7 @@
:group-chat true}]
[:<>
[topbar/topbar
{:content [toolbar-content/toolbar-content-view chat-info]
{:content [toolbar-content/toolbar-content-view-inner chat-info]
:navigation {:on-press #(re-frame/dispatch [:navigate-to :home])}}]
[rn/scroll-view {:style {:flex 1}
:center-content true
+3 -3
View File
@@ -2,7 +2,7 @@
"_comment": "DO NOT EDIT THIS FILE BY HAND. USE 'scripts/update-status-go.sh <tag>' instead",
"owner": "status-im",
"repo": "status-go",
"version": "v0.76.4",
"commit-sha1": "ddc93981a7403bdc4ce205524789d5731cd58116",
"src-sha256": "0ijs1x20hkg7x2dnwjkbqn11pi7g1pm6bx3g62wwwfvk26qz4g6s"
"version": "v0.76.4+hotfix.1",
"commit-sha1": "9c792986dd374771a376e1bc7965f05bad1eb0f5",
"src-sha256": "0vaqgrjphzqjb26mnxbazzk9qwg4armylnb0dxwid4vmajj1ws7b"
}