From 9640b3d6cc555a16adbfd3bbaea923ea2095524f Mon Sep 17 00:00:00 2001 From: Julien Eluard Date: Wed, 11 Oct 2017 17:11:23 +0200 Subject: [PATCH] [BUG #2102] Fixed discover toolbar regression --- src/status_im/components/toolbar_new/styles.cljs | 9 ++++++++- src/status_im/components/toolbar_new/view.cljs | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/status_im/components/toolbar_new/styles.cljs b/src/status_im/components/toolbar_new/styles.cljs index 1888389d09..e0b33411e3 100644 --- a/src/status_im/components/toolbar_new/styles.cljs +++ b/src/status_im/components/toolbar_new/styles.cljs @@ -9,11 +9,18 @@ (def toolbar-icon-height 24) (def toolbar-icon-spacing 24) -;; TODO remove when toolbar will be replaced by toolbar2 +;; TODO remove both definitions when toolbar will be replaced by toolbar2 (defn toolbar-wrapper [background-color flat?] {:background-color (or background-color toolbar-background1) :elevation (if flat? 0 2)}) +(defstyle toolbar-old + {:flex-direction :row + :align-items :center + :justify-content :space-between + :android {:height 55} + :ios {:height 56}}) + (defnstyle toolbar [background-color flat?] {:flex 0 :flex-direction :row diff --git a/src/status_im/components/toolbar_new/view.cljs b/src/status_im/components/toolbar_new/view.cljs index dbdb2604e5..3caca588e8 100644 --- a/src/status_im/components/toolbar_new/view.cljs +++ b/src/status_im/components/toolbar_new/view.cljs @@ -135,7 +135,7 @@ style]}] (let [style (merge (tst/toolbar-wrapper background-color false) style)] [rn/view {:style style} - [rn/view tst/toolbar + [rn/view tst/toolbar-old (when-not hide-nav? [rn/view (tst/toolbar-nav-actions-container actions) [nav-button (or nav-action (if modal? act/default-close act/default-back))]])