From 6359b3a834e3f56accb70ce9e96e0aeba0ef33e3 Mon Sep 17 00:00:00 2001 From: Andrea Maria Piana Date: Tue, 26 Jun 2018 14:13:56 +0200 Subject: [PATCH] Dont use denormalized name anymore Signed-off-by: Andrea Maria Piana --- src/status_im/chat/screen.cljs | 11 ++--------- .../ui/components/qr_code_viewer/styles.cljs | 12 ------------ src/status_im/ui/screens/home/styles.cljs | 4 ---- 3 files changed, 2 insertions(+), 25 deletions(-) diff --git a/src/status_im/chat/screen.cljs b/src/status_im/chat/screen.cljs index a6f9dd071a..d584744600 100644 --- a/src/status_im/chat/screen.cljs +++ b/src/status_im/chat/screen.cljs @@ -30,14 +30,6 @@ [status-im.ui.components.icons.vector-icons :as vector-icons] [status-im.ui.components.colors :as colors])) -(defn toolbar-action [chat-id chat-name group-chat public?] - [react/touchable-highlight - {:on-press #(list-selection/show {:title chat-name - :options (actions/actions chat-id group-chat public?)}) - :accessibility-label :chat-menu} - [react/view style/action - [vector-icons/icon :icons/dots-horizontal]]]) - (defview add-contact-bar [contact-identity] (letsubs [contact [:get-contact-by-identity contact-identity]] (when (models.contact/can-add-to-contacts? contact) @@ -53,7 +45,8 @@ :options (actions/actions group-chat? chat-id public?)})) (defview chat-toolbar [public?] - (letsubs [{:keys [group-chat name chat-id contacts]} [:get-current-chat]] + (letsubs [name [:get-current-chat-name] + {:keys [group-chat chat-id contacts]} [:get-current-chat]] [react/view [status-bar/status-bar] (if (= chat-id constants/console-chat-id) diff --git a/src/status_im/ui/components/qr_code_viewer/styles.cljs b/src/status_im/ui/components/qr_code_viewer/styles.cljs index 63689a949f..73acf58612 100644 --- a/src/status_im/ui/components/qr_code_viewer/styles.cljs +++ b/src/status_im/ui/components/qr_code_viewer/styles.cljs @@ -34,18 +34,6 @@ {:color colors/white :font-size 12}) -(def toolbar-action-container - {:flex 0.2 - :flex-direction :column - :align-items :center - :justify-content :center}) - -(def toolbar-action-icon-container - {:width 40 - :height 40 - :align-items :center - :justify-content :center}) - (def wallet-qr-code {:flex-grow 1 :flex-direction :column}) diff --git a/src/status_im/ui/screens/home/styles.cljs b/src/status_im/ui/screens/home/styles.cljs index 4290a6a0ed..8cd93a001b 100644 --- a/src/status_im/ui/screens/home/styles.cljs +++ b/src/status_im/ui/screens/home/styles.cljs @@ -130,10 +130,6 @@ (def native-button-offset 16) -(def toolbar-actions - {:flex-direction :row - :padding-right 14}) - (def create-icon {:font-size 20 :height 22