[#12014] Skip 'Accept and join' view when navigating back from public chat joined from referral
Signed-off-by: Andrea Maria Piana <andrea.maria.piana@gmail.com>
This commit is contained in:
parent
da9e6686c6
commit
c2212af3ff
|
@ -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]}
|
||||
|
|
|
@ -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])])
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue