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

fix chats list and ens example name 

Signed-off-by: Andrey Shovkoplyas <motor4ik@gmail.com>
This commit is contained in:
Andrey Shovkoplyas 2019-11-18 13:34:46 +01:00
parent f8c761a40e
commit 89d09c4ba5
No known key found for this signature in database
GPG Key ID: EAAB7C8622D860A4
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/status_im/ui/screens/add_new/new_public_chat/view.cljs
View File

@ -48,7 +48,7 @@
[react/text {:style styles/public-chat-icon-symbol} [react/text {:style styles/public-chat-icon-symbol}
(first topic)]]) (first topic)]])
(defn- render-topic [topic] (defn render-topic [topic]
^{:key topic} ^{:key topic}
[react/touchable-highlight {:on-press #(start-chat topic) [react/touchable-highlight {:on-press #(start-chat topic)
:accessibility-label :chat-item} :accessibility-label :chat-item}

4
src/status_im/ui/screens/ens/views.cljs
View File

@ -651,9 +651,9 @@
{:label-kw :ens-show-username {:label-kw :ens-show-username
:action-fn #(re-frame/dispatch [::ens/switch-show-username]) :action-fn #(re-frame/dispatch [::ens/switch-show-username])
:value show?}]] :value show?}]]
(let [message (merge {:content {:text (i18n/label :t/ens-test-message)} (let [message {:content {:parsed-text [{:type "paragraph", :children [{:literal (i18n/label :t/ens-test-message)}]}]}
:content-type "text/plain" :content-type "text/plain"
:timestamp-str "9:41 AM"})] :timestamp-str "9:41 AM"}]
[react/view [react/view
[react/view {:padding-left 60} [react/view {:padding-left 60}
(if show? (if show?

13
src/status_im/ui/screens/home/views.cljs
View File

@ -19,7 +19,8 @@
[status-im.ui.components.animation :as animation] [status-im.ui.components.animation :as animation]
[status-im.constants :as constants] [status-im.constants :as constants]
[status-im.ui.components.colors :as colors] [status-im.ui.components.colors :as colors]
[status-im.utils.fx :as fx]) [status-im.utils.fx :as fx]
[status-im.ui.screens.add-new.new-public-chat.view :as new-public-chat])
(:require-macros [status-im.utils.views :as views])) (:require-macros [status-im.utils.views :as views]))
(defn welcome-blank-page [blank?] (defn welcome-blank-page [blank?]
@ -55,17 +56,13 @@
:accessibility-label :lets-go-button :accessibility-label :lets-go-button
:label (i18n/label :t/lets-go)}]]]]) :label (i18n/label :t/lets-go)}]]]])
(defn- start-chat [topic]
(re-frame/dispatch [:chat.ui/start-public-chat topic {:navigation-reset? true}])
(re-frame/dispatch [:set :public-group-topic nil]))
(defn chat-tags-view [] (defn chat-tags-view []
[react/view {:align-items :center :margin-top 16} [react/view {:align-items :center :margin-top 16}
[react/i18n-text {:style styles/no-chats-text :key :follow-your-interests}] [react/i18n-text {:style styles/no-chats-text :key :follow-your-interests}]
[react/view {:style styles/tags-wrapper} [react/view {:style styles/tags-wrapper}
(for [item ["introductions", "chitchat", "status", "crypto", "tech", "music", "movies"]] [react/view {:flex-direction :row :flex-wrap :wrap :justify-content :center}
[react/touchable-highlight {:key item :on-press #(start-chat item)} (for [chat new-public-chat/default-public-chats]
[react/text {:style styles/tag-text} (str "#" item)]])]]) (new-public-chat/render-topic chat))]]])
(defn home-tooltip-view [blank? hide-home-tooltip?] (defn home-tooltip-view [blank? hide-home-tooltip?]
(filter.views/reset-height) (filter.views/reset-height)