Merge branch 'develop' into feature/delivery-status

src/status_im/chats_list/styles.cljs

@@ -116,9 +116,10 @@
    :color    :white})
 
 (defn action-buttons-container [animation? offset-y]
+  ;; todo fix overlaying of parent view
   {:position  :absolute
-   :left         0
    :right     0
-   :top          0
+   :height    230
+   :width     80
    :bottom    0
    :transform [{:translateY (if animation? offset-y 1)}]})

src/status_im/components/main_tabs.cljs

@@ -103,9 +103,8 @@
   [view-id [:get :view-id]
    tab-animation? [:get :prev-tab-view-id]]
   [drawer-view
-   [view {:style common-st/flex}
    [view {:style         common-st/flex
           :pointerEvents (if tab-animation? :none :auto)}
-     (doall (map #(tab-view %) tab-list))]
+    (doall (map #(tab-view %) tab-list))
     [tabs {:selected-view-id view-id
            :tab-list         tab-list}]]])

src/status_im/components/tabs/styles.cljs

@@ -14,7 +14,11 @@
 (def tab-height 56)
 
 (defn tabs-container [hidden? animation? offset-y]
-  {:height          tabs-height
+  {:position        :absolute
+   :bottom          0
+   :left            0
+   :right           0
+   :height          tabs-height
    :backgroundColor color-white
    :marginBottom    (if (or hidden? animation?)
                       (- tabs-height) 0)
@@ -60,4 +64,5 @@
    :left           0
    :right          0
    :bottom         0
+   :padding-bottom 59
    :transform      [{:translateX offset-x}]})

src/status_im/contacts/screen.cljs

@@ -88,6 +88,7 @@
          [view st/empty-contact-groups
           [react/icon :group_big st/empty-contacts-icon]
           [text {:style st/empty-contacts-text} (label :t/no-contacts)]])
+       [view st/buttons-container
         [action-button {:buttonColor color-blue
                         :offsetY     16
                         :offsetX     16}
@@ -96,4 +97,4 @@
            :buttonColor :#9b59b6
            :onPress     #(dispatch [:navigate-to :new-contact])}
           [icon {:name  :android-create
-                :style create-icon}]]]])))
+                 :style create-icon}]]]]])))

src/status_im/contacts/styles.cljs

@@ -180,3 +180,10 @@
 (def address-explication
   {:textAlign :center
    :color "#838c93de"})
+
+(def buttons-container
+  {:position :absolute
+   :bottom 0
+   :right 0
+   :width 200
+   :height 170})