From 5501d204500af0a4c2e78fd145d57b5d32d128a6 Mon Sep 17 00:00:00 2001
From: Andrey Shovkoplyas <motor4ik@gmail.com>
Date: Fri, 27 Dec 2019 13:13:22 +0100
Subject: [PATCH] [#9723] No 'Apply' button appears when updating "Wallet"->
 "Account"-> "Account settings"

Signed-off-by: Andrey Shovkoplyas <motor4ik@gmail.com>
---
 src/status_im/ui/components/topbar.cljs | 45 +++++++++++++------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/status_im/ui/components/topbar.cljs b/src/status_im/ui/components/topbar.cljs
index 520bbc05a5..24956ad23a 100644
--- a/src/status_im/ui/components/topbar.cljs
+++ b/src/status_im/ui/components/topbar.cljs
@@ -30,26 +30,27 @@
         icon
         [icons/icon icon]
         label
-        [react/text {:style {:color colors/blue}} label])]]))
+        [react/text {:style {:color colors/blue}}
+         (utils.label/stringify label)])]]))
 
-(defn topbar [& [{:keys [title navigation accessories show-border? modal?]}]]
-  (let [navigation    (or navigation (default-navigation modal?))
-        title-padding (reagent/atom 16)]
-    (fn [_]
-      [react/view (cond-> {:height 56 :align-items :center :flex-direction :row}
-                    show-border?
-                    (assoc :border-bottom-width 1 :border-bottom-color colors/gray-lighter))
-       (when-not (= navigation :none)
-         [container {} title-padding
-          [button navigation true]])
-       [react/view {:flex 1}]
-       (when accessories
-         [container {:flex-direction :row :padding-right 6} title-padding
-          (for [value accessories]
-            ^{:key value}
-            [button value false])])
-       (when title
-         [react/view {:position :absolute :left @title-padding :right @title-padding
-                      :top      0 :bottom 0 :align-items :center :justify-content :center}
-          [react/text {:style {:typography :title-bold :text-align :center} :number-of-lines 2}
-           (utils.label/stringify title)]])])))
\ No newline at end of file
+(defn topbar [_]
+  (let [title-padding (reagent/atom 16)]
+    (fn [& [{:keys [title navigation accessories show-border? modal?]}]]
+      (let [navigation (or navigation (default-navigation modal?))]
+        [react/view (cond-> {:height 56 :align-items :center :flex-direction :row}
+                      show-border?
+                      (assoc :border-bottom-width 1 :border-bottom-color colors/gray-lighter))
+         (when-not (= navigation :none)
+           [container {} title-padding
+            [button navigation true]])
+         [react/view {:flex 1}]
+         (when accessories
+           [container {:flex-direction :row :padding-right 6} title-padding
+            (for [value accessories]
+              ^{:key value}
+              [button value false])])
+         (when title
+           [react/view {:position :absolute :left @title-padding :right @title-padding
+                        :top      0 :bottom 0 :align-items :center :justify-content :center}
+            [react/text {:style {:typography :title-bold :text-align :center} :number-of-lines 2}
+             (utils.label/stringify title)]])]))))
\ No newline at end of file