From dc01b9e3b766f7c9c7000fa576c8b7c3189d477e Mon Sep 17 00:00:00 2001
From: Andrey Shovkoplyas <motor4ik@gmail.com>
Date: Mon, 30 Jan 2017 21:24:28 +0300
Subject: [PATCH] fix for https://github.com/status-im/status-react/pull/773
 and https://github.com/status-im/status-react/issues/694

fix for https://github.com/status-im/status-react/issues/635
---
 src/status_im/android/platform.cljs  | 1 +
 src/status_im/chats_list/styles.cljs | 5 +++--
 src/status_im/contacts/styles.cljs   | 4 ++--
 src/status_im/discover/screen.cljs   | 2 +-
 src/status_im/discover/styles.cljs   | 3 ---
 src/status_im/ios/platform.cljs      | 1 +
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/status_im/android/platform.cljs b/src/status_im/android/platform.cljs
index 202be5d98b..b88b388176 100644
--- a/src/status_im/android/platform.cljs
+++ b/src/status_im/android/platform.cljs
@@ -39,6 +39,7 @@
    :bottom-gradient       {:height 3}
    :input-label           {:left 4}
    :input-error-text      {:margin-left 4}
+   :main-tab-list         {:margin-bottom 20}
    :toolbar-nav-action    {:width           56
                            :height          56
                            :align-items     :center
diff --git a/src/status_im/chats_list/styles.cljs b/src/status_im/chats_list/styles.cljs
index 67353c42cc..8dfe379c2a 100644
--- a/src/status_im/chats_list/styles.cljs
+++ b/src/status_im/chats_list/styles.cljs
@@ -115,8 +115,9 @@
   {:flex 1})
 
 (def list-container
-  {:background-color color-light-gray
-   :margin-bottom    (when p/ios? 72)})
+  (merge (get-in p/platform-specific [:component-styles :main-tab-list])
+         {:background-color color-light-gray}))
+
 
 (def create-icon
   {:fontSize 20
diff --git a/src/status_im/contacts/styles.cljs b/src/status_im/contacts/styles.cljs
index e1ffcc3910..25a9592d31 100644
--- a/src/status_im/contacts/styles.cljs
+++ b/src/status_im/contacts/styles.cljs
@@ -20,8 +20,8 @@
    :background-color toolbar-background2})
 
 (def contacts-list-container
-  {:flex          1
-   :margin-bottom (when p/ios? 72)})
+  (merge (get-in p/platform-specific [:component-styles :main-tab-list])
+         {:flex 1}))
 
 (def empty-contact-groups
   (merge contact-groups
diff --git a/src/status_im/discover/screen.cljs b/src/status_im/discover/screen.cljs
index 984c0f68e4..ad77c850be 100644
--- a/src/status_im/discover/screen.cljs
+++ b/src/status_im/discover/screen.cljs
@@ -81,7 +81,7 @@
    [toolbar-view (and current-view?
                       (= show-search :discover))]
    (if discoveries
-     [scroll-view st/scroll-view-container
+     [scroll-view {:style (get-in platform-specific [:component-styles :main-tab-list])}
       [discover-popular {:contacts        contacts
                          :current-account current-account}]
       [discover-recent {:current-account current-account}]]
diff --git a/src/status_im/discover/styles.cljs b/src/status_im/discover/styles.cljs
index 8954947ba5..c215993350 100644
--- a/src/status_im/discover/styles.cljs
+++ b/src/status_im/discover/styles.cljs
@@ -26,9 +26,6 @@
 (def section-spacing
   {:padding 16})
 
-(def scroll-view-container
-  {:bounces false})
-
 ;; Popular
 
 (def popular-container
diff --git a/src/status_im/ios/platform.cljs b/src/status_im/ios/platform.cljs
index 251cbd525d..e5aed5af8c 100644
--- a/src/status_im/ios/platform.cljs
+++ b/src/status_im/ios/platform.cljs
@@ -47,6 +47,7 @@
    :bottom-gradient       {:height 1}
    :input-label           {:left 0}
    :input-error-text      {:margin-left 0}
+   :main-tab-list         {:margin-bottom 72}
    :toolbar-nav-action    {:width           46
                            :height          56
                            :align-items     :center