From 81105762281423dfccf8f2e21adaabb28a017011 Mon Sep 17 00:00:00 2001
From: Andrey Shovkoplyas <motor4ik@gmail.com>
Date: Mon, 30 Jan 2017 19:32:25 +0300
Subject: [PATCH] no message

remove button container

fix for https://github.com/status-im/status-react/issues/657, and also Russian typo fixed
---
 src/status_im/chats_list/screen.cljs | 36 +++++++++++++---------------
 src/status_im/chats_list/styles.cljs |  9 -------
 src/status_im/contacts/screen.cljs   | 23 +++++++++---------
 src/status_im/contacts/styles.cljs   |  7 ------
 src/status_im/translations/ru.cljs   |  2 +-
 5 files changed, 29 insertions(+), 48 deletions(-)

diff --git a/src/status_im/chats_list/screen.cljs b/src/status_im/chats_list/screen.cljs
index 073a8109d2..e9299406cb 100644
--- a/src/status_im/chats_list/screen.cljs
+++ b/src/status_im/chats_list/screen.cljs
@@ -40,25 +40,23 @@
       :style              (st/toolbar chats-scrolled?)}]))
 
 (defn chats-action-button []
-  [view {:style         (st/action-buttons-container false 0)
-         :pointerEvents :box-none}
-   [action-button {:button-color color-blue
-                   :offset-x     16
-                   :offset-y     -2
-                   :hide-shadow  true
-                   :spacing      13}
-    [action-button-item
-     {:title       (label :t/new-chat)
-      :buttonColor :#9b59b6
-      :onPress     #(dispatch [:navigate-to :group-contacts :people])}
-     [ion-icon {:name  :md-create
-                :style st/create-icon}]]
-    [action-button-item
-     {:title       (label :t/new-group-chat)
-      :buttonColor :#1abc9c
-      :onPress     #(dispatch [:navigate-to :new-group])}
-     [ion-icon {:name  :md-person
-                :style st/person-stalker-icon}]]]])
+  [action-button {:button-color color-blue
+                  :offset-x     16
+                  :offset-y     22
+                  :hide-shadow  true
+                  :spacing      13}
+   [action-button-item
+    {:title       (label :t/new-chat)
+     :buttonColor :#9b59b6
+     :onPress     #(dispatch [:navigate-to :group-contacts :people])}
+    [ion-icon {:name  :md-create
+               :style st/create-icon}]]
+   [action-button-item
+    {:title       (label :t/new-group-chat)
+     :buttonColor :#1abc9c
+     :onPress     #(dispatch [:navigate-to :new-group])}
+    [ion-icon {:name  :md-person
+               :style st/person-stalker-icon}]]])
 
 (defn chat-shadow-item []
   [view {:height 3}
diff --git a/src/status_im/chats_list/styles.cljs b/src/status_im/chats_list/styles.cljs
index b89ab110e5..67353c42cc 100644
--- a/src/status_im/chats_list/styles.cljs
+++ b/src/status_im/chats_list/styles.cljs
@@ -127,12 +127,3 @@
   {:fontSize 20
    :height   22
    :color    color-white})
-
-(defn action-buttons-container [animation? offset-y]
-  ;; todo fix overlaying of parent view
-  {:position  :absolute
-   :right     0
-   :height    230
-   :width     230
-   :bottom    24
-   :transform [{:translateY (if animation? offset-y 1)}]})
diff --git a/src/status_im/contacts/screen.cljs b/src/status_im/contacts/screen.cljs
index f1821308e2..7b83b460e7 100644
--- a/src/status_im/contacts/screen.cljs
+++ b/src/status_im/contacts/screen.cljs
@@ -101,18 +101,17 @@
        [line-view])]))
 
 (defn contacts-action-button []
-  [view st/buttons-container
-   [action-button {:button-color color-blue
-                   :offset-x     16
-                   :offset-y     -2
-                   :hide-shadow  true
-                   :spacing      13}
-    [action-button-item
-     {:title       (label :t/new-contact)
-      :buttonColor :#9b59b6
-      :onPress     #(dispatch [:navigate-to :new-contact])}
-     [ion-icon {:name  :md-create
-                :style create-icon}]]]])
+  [action-button {:button-color color-blue
+                  :offset-x     16
+                  :offset-y     22
+                  :hide-shadow  true
+                  :spacing      13}
+   [action-button-item
+    {:title       (label :t/new-contact)
+     :buttonColor :#9b59b6
+     :onPress     #(dispatch [:navigate-to :new-contact])}
+    [ion-icon {:name  :md-create
+               :style create-icon}]]])
 
 (defn contact-list [_]
   (let [peoples              (subscribe [:get-added-people-with-limit contacts-limit])
diff --git a/src/status_im/contacts/styles.cljs b/src/status_im/contacts/styles.cljs
index fb4aca24c3..e1ffcc3910 100644
--- a/src/status_im/contacts/styles.cljs
+++ b/src/status_im/contacts/styles.cljs
@@ -201,13 +201,6 @@
   {:textAlign :center
    :color     color-gray})
 
-(def buttons-container
-  {:position :absolute
-   :bottom   24
-   :right    0
-   :width    220
-   :height   170})
-
 (def qr-input
   {:margin-right 42})
 
diff --git a/src/status_im/translations/ru.cljs b/src/status_im/translations/ru.cljs
index 7823ead833..0804f96347 100644
--- a/src/status_im/translations/ru.cljs
+++ b/src/status_im/translations/ru.cljs
@@ -122,7 +122,7 @@
    :show-all                              "ПОКАЗАТЬ ВСЕ"
    :contacts-group-dapps                  "ÐApps"
    :contacts-group-people                 "Люди"
-   :contacts-group-new-chat               "Начать новый час"
+   :contacts-group-new-chat               "Начать новый чат"
    :no-contacts                           "Пока нет контактов"
    :show-qr                               "Показать QR"
    :enter-address                         "Ввести адрес"