From 7c2c537a1aa85efbc49161796bd63b6ed04a5425 Mon Sep 17 00:00:00 2001
From: Vitaliy Vlasov <siphiuel@gmail.com>
Date: Wed, 1 Aug 2018 00:38:10 -0600
Subject: [PATCH] Fix adv settings clicks, some styling changes

---
 .../ui/screens/desktop/main/tabs/profile/styles.cljs  | 11 ++++++++---
 .../ui/screens/desktop/main/tabs/profile/views.cljs   |  8 ++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/status_im/ui/screens/desktop/main/tabs/profile/styles.cljs b/src/status_im/ui/screens/desktop/main/tabs/profile/styles.cljs
index 26c191c159..5a927e380f 100644
--- a/src/status_im/ui/screens/desktop/main/tabs/profile/styles.cljs
+++ b/src/status_im/ui/screens/desktop/main/tabs/profile/styles.cljs
@@ -16,14 +16,19 @@
    :height             56
    :align-self         :stretch
    :align-items        :center
-   :background-color   (if active? colors/gray-lighter colors/white)
-   :margin-top         20})
+   :background-color   (if active? colors/gray-lighter colors/white)})
 
 (defn profile-row-text [color active?]
   {:color       color
    :font-weight (if active? "600" :normal)
    :font-size   16})
 
+(def adv-settings
+  {:justify-content :space-between
+   :flex-direction  :row
+   :align-items     :center
+   :flex            1})
+
 (def profile-photo
   {:border-radius 100
    :width         100
@@ -40,7 +45,7 @@
    :height            45
    :width             240
    :margin-horizontal 50
-   :margin-bottom     20
+   :margin-bottom     48
    :border-radius     8
    :background-color  (colors/alpha colors/blue 0.1)})
 
diff --git a/src/status_im/ui/screens/desktop/main/tabs/profile/views.cljs b/src/status_im/ui/screens/desktop/main/tabs/profile/views.cljs
index e84efbd4b1..e5ed4d9162 100644
--- a/src/status_im/ui/screens/desktop/main/tabs/profile/views.cljs
+++ b/src/status_im/ui/screens/desktop/main/tabs/profile/views.cljs
@@ -86,10 +86,10 @@
       [react/view styles/profile-view
        [profile-badge user]
        [share-contact-code]
-       [react/view {:style (styles/profile-row adv-settings-open?)}
-        [react/touchable-highlight {:on-press #(re-frame/dispatch [:navigate-to (if adv-settings-open? :home :advanced-settings)])}
-         [react/text {:style (styles/profile-row-text colors/black adv-settings-open?)} (i18n/label :t/advanced-settings)]]
-        [react/touchable-highlight {:on-press #(re-frame/dispatch [:navigate-to (if adv-settings-open? :intro :home)])}
+       [react/touchable-highlight {:style  (styles/profile-row adv-settings-open?)
+                                   :on-press #(re-frame/dispatch [:navigate-to (if adv-settings-open? :home :advanced-settings)])}
+        [react/view {:style styles/adv-settings}
+         [react/text {:style (styles/profile-row-text colors/black adv-settings-open?)} (i18n/label :t/advanced-settings)]
          [vector-icons/icon :icons/forward {:style {:tint-color colors/gray}}]]]
        [react/view {:style (styles/profile-row false)}
         [react/touchable-highlight {:on-press #(re-frame/dispatch [:logout])}