From 9c89c566797ddd70f3ddc57fec5b93f3e8f2dfd6 Mon Sep 17 00:00:00 2001
From: Andrey Shovkoplyas <motor4ik@gmail.com>
Date: Mon, 27 Mar 2017 17:57:07 +0300
Subject: [PATCH] fixes for code review (+1 squashed commit) Squashed commits:
 [58e9394] fix for https://github.com/status-im/status-react/issues/928 (+1
 squashed commit) Squashed commits: [f56e7ad] fixes after rebase (+1 squashed
 commit) Squashed commits: [bb4a409] fixes after rebase (+1 squashed commit)
 Squashed commits: [297b52d] rebase onto ui-refresh

---
 .../main/res/drawable-hdpi/icon_ok_dark.png   | Bin 0 -> 802 bytes
 .../main/res/drawable-mdpi/icon_ok_dark.png   | Bin 0 -> 503 bytes
 .../main/res/drawable-xhdpi/icon_ok_dark.png  | Bin 0 -> 1079 bytes
 .../main/res/drawable-xxhdpi/icon_ok_dark.png | Bin 0 -> 1593 bytes
 .../res/drawable-xxxhdpi/icon_ok_dark.png     | Bin 0 -> 2206 bytes
 .../icon_ok_dark.imageset/Contents.json       |  21 ++
 .../icon_ok_dark.imageset/icon_ok_dark.png    | Bin 0 -> 1079 bytes
 src/status_im/android/platform.cljs           |  16 --
 .../action_button/action_button.cljs          |   9 +
 .../components/action_button/styles.cljs      |  21 +-
 src/status_im/components/common/common.cljs   |   6 +
 src/status_im/components/common/styles.cljs   |   4 +
 src/status_im/components/text_field/view.cljs |  21 +-
 src/status_im/ios/platform.cljs               |  23 --
 src/status_im/profile/edit/screen.cljs        |  69 +++---
 src/status_im/profile/screen.cljs             | 148 ++++++------
 src/status_im/profile/styles.cljs             | 212 +++++++++---------
 src/status_im/translations/en.cljs            |   3 +
 18 files changed, 295 insertions(+), 258 deletions(-)
 create mode 100644 android/app/src/main/res/drawable-hdpi/icon_ok_dark.png
 create mode 100644 android/app/src/main/res/drawable-mdpi/icon_ok_dark.png
 create mode 100644 android/app/src/main/res/drawable-xhdpi/icon_ok_dark.png
 create mode 100644 android/app/src/main/res/drawable-xxhdpi/icon_ok_dark.png
 create mode 100644 android/app/src/main/res/drawable-xxxhdpi/icon_ok_dark.png
 create mode 100644 ios/StatusIm/Images.xcassets/icon_ok_dark.imageset/Contents.json
 create mode 100644 ios/StatusIm/Images.xcassets/icon_ok_dark.imageset/icon_ok_dark.png

diff --git a/android/app/src/main/res/drawable-hdpi/icon_ok_dark.png b/android/app/src/main/res/drawable-hdpi/icon_ok_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..84836c6a2e79ff838d990135added46cf38ba2de
GIT binary patch
literal 802
zcmV+-1Ks?IP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00001b5ch_0Itp)
z=>Px%+(|@1R9Fe^mdj65K@^A2xer}{sQ6l%=)#2t(Wnul(PHhQP~xU(F|mN`{GWuj
z8@O}>6sYCBF~(O^qKL$e3q`~S8gx<ao#UCxC4B*fQrO(tOlRiIIbVNsX3hn0nxlZD
zfTO_fDu6p3-tTX(UV`OYdn=S=Z#cY|8(+ztDCgMM+;Vz}QtyDMJM~BO6^gZEKn;QR
zGp0!s3~^L~5K!f=0W~#;YDlCeSeYYf2!!9LYWE8Pl|6?V1NY7fu{=ryhyTOiFBQNu
z5Q{$DaUie1wU$VX@&O%^!4Ys#RTWR%2tO+XBj*^lJgq4hI%g4$t->Ju1PwfcM)di5
z5z7MP3$&fLgc#$@t(L)&VN^wP4;qmd>%pXLH!|4lx;J?D0$4E2Idd?*7x9O#g1f&v
z`mz{b+p3T+(0Y+97$I1J0sM}rxCeS7uZn?@HrsZ~8vUV57QirH?fq%T2;US%cMljH
zuZx9|b_Eq8BIKq_PEPWl-MFzbmn{+u1FJBahBxEg;i-*xXItbc<h|2=98#%qMk3C}
zmPAkFQTCSX5i3(?0X<}xs`Lut0xMHLXgqk6ZCTtXuXK=^@~|u?So)JFC?StxEmsY}
zwkv`lxe5dDm6dUA6-LI%1F9sgm*?l?BG;RJGN61@<T$hW{GqGDGLzCq&hyot--DVf
z-W7S9X}8(mc|fsP=K?!+bA$!yi~}B6Heo~-N85Qru=Sb=l;Fj5f#iJqf(p3$Vx7~r
z%~t!o9I_qB8e|D`oR7|a+~zgVubXHc<8m;>FcmAdbDFN!$GgHa_TEzZHG!m4`N)xl
zqxMzisX2Zqsxo18)Ls3tj`yWNWbR!TNE)u(B6+2=zh4kP%VQccqO+L}OZ}afL%9z5
zGvTquTwJOD+H0IMpHyABvE4Azf5C^*4s7?c(^DT$)zm%#0d)*B!?|=jZghUI*PY%`
gz)`?apacc}0X7W$KvNKnHvj+t07*qoM6N<$f=}3Y1poj5

literal 0
HcmV?d00001

diff --git a/android/app/src/main/res/drawable-mdpi/icon_ok_dark.png b/android/app/src/main/res/drawable-mdpi/icon_ok_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..34903a27e979edabe42c0dcf6d0230d09e3299be
GIT binary patch
literal 503
zcmV<T0SNwyP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px$u}MThR7ef&lRHZTK@i7h_7p#Xr70~$#7|*ym&8ZB1dH57EDT6QYnxyzh$1Q?
z;;YddSg5%mg7_${QmCMawVjP`%{ZHIa7j!^V!$Tb%<S&{fAiQmfW~TcpqdW&hm5XR
zEY{-I2>0eMzB(A5{rsf#{o~WLn^Ttns&32?z$7Ak2%)6h0h-*KT71rYo`}W)@ErjI
zhdUdmZjR#KRO@THvA~(fBwP_RkhHe!LPkviIAgrLd01pS28eHnqMzY;t#JaO<5X%T
zT+<^<1evIW3#7heV*99+zN$CK!b9dV0gdv5z5<BeWMbpE6kML?O_3TjCpA4hB|(KE
zdFIv470Tq`i0HSi@^Hz>uYhPGL*UUuW*gr{ogmrFgT^X9=m<~B3xVRZ6YD3=eL0&~
zfl!1gOP5*7@sq-MJT5rk8c`080=y}!GPu+iwZa!Nd%nJDAAnl84Kr+886M#;pSfJ^
zz}h~O!b(?B04Y>MhL<w12Sm+T5W{&CRXeeHUMbl5?$`g|?kauT-r0SPKmpGDMJS4D
t?`~c=qPp2$eYnG?8=krW8=!ybzz;<koROpD_Wu9?002ovPDHLkV1k%H=Dz>{

literal 0
HcmV?d00001

diff --git a/android/app/src/main/res/drawable-xhdpi/icon_ok_dark.png b/android/app/src/main/res/drawable-xhdpi/icon_ok_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..c19cf293953dac89886a0f13b09e9b9d3ecc7b4a
GIT binary patch
literal 1079
zcmV-71jze|P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px&@kvBMRA>e5mrG9*Q547TnOBQwVl**vVWNpF#OQ*B>o%xSP=b%D@kLd_j)mWV
z?_f*}PpJfoRnZn%xY6heV+<;w0v$x&r~xC5is@X>X&k-NGFXtdE@qOZ=l<v3xxe$j
zkGaE`b2$z;4mb`t4mb`t4mb|1*a3OPEi>4Va}Lj551%dAx%*5(VbSzpf6t6vcVKrT
zS31F$o~)?l2CpOrVDLpzwSsV4{q$l?(qdw+v;_Q#^K~XXad5`h#p4UR?3fh08`;)t
zYHB2OzMgY-LF^j<-pgy1Zc!8C{~`f`f7%yqKzP3h#{edn#P)?78^2g|p^)<_lz{J#
zHYLNO^W(BAdAiyI0|IYKnA1g^fbZ3tah{(|A{$dd^M*qWLrHo{F=q+*d^hEJh%_^U
zov}~>jJhQ7-feG=T6CL2PTm6qALE@jaEm!Da?yg7RK*(!Ue`r^sW|H+@XPrYbpDhG
zh9Dy{xV({2{jjM2Ezas9#yPK`^R3D7xZAwb6xp*}cuFp7BS7%oeR><?{J7{U02^ki
z=Iv^27!mb!<E$h=@VL(hajQHgf??;n41m)n@LtrH6K6bus;Vk=boN_2I)B6h1`yR`
z*?TY8G-}b8S;*)bAo#J_uQyZS*-)OQdHxlia<v_S#8wCQ%c;_y!fhQm4GfCYy?nkJ
zZJy~NgfA1@;OTNu0_N=u1;#~vrLpY@#30hh4dWL5p7!dU)z#ImbUPvV7}sy7zyk~@
zisD%<c;c~502ka*6Bu9h2ZyHSLNp~z&F-HPjWPWWwmD>}1MIEa<@SVwjT09A9}Bh#
z0EZ`*XLEKK7h@|;EsHJ`2tGRbxdYGjrGiW!C2xSqo;xkIlcK&Fv26mf>OPM>_ggx_
zJ)F)jxE@m4`Tc%(bZYJ{jh5I3j|Z>ui^|g#x;`c9s}-k!m=BJ$)qX_RiV?tioW;Xe
zcduSYUr%OTf}fr@?%}jMU}}kfG(b`CRB7`$XsNrxf^7oyJaWygX_y4QEiD(nSaPD`
zDoH-y<-D0#Jd7WI`^75Qrq}Jx&nP_g_uECW^W?bvlz;2@xbYZwl`WQg5?le!cHn62
z6?Gi7SNS-4p-|HYQO`u2Rsz&<neWo}AAI34hMSiLftQNvE~Y8CbiLKNn|1=!UFpel
zJB&DcgyAMCCto;iUbyn0xFZnwlzcB!<z*#65G6kUF3ydIIOjKtP&jRRTzPD7HsPuN
zB^R*>XvVm(Un#P@ANTe-Q^S??JfEpqb>8gT_N8Q2SnPkGuV=DwXHmqE_!`FH!3Nj*
x%3$!?pM(}`<Y<lqjsuPZjsuPZjsvL<`~-PeX=VWbykh_W002ovPDHLkV1f&e1t9<c

literal 0
HcmV?d00001

diff --git a/android/app/src/main/res/drawable-xxhdpi/icon_ok_dark.png b/android/app/src/main/res/drawable-xxhdpi/icon_ok_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac9f13def039e92e57a5d5228f1da09af79ff752
GIT binary patch
literal 1593
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

literal 0
HcmV?d00001

diff --git a/android/app/src/main/res/drawable-xxxhdpi/icon_ok_dark.png b/android/app/src/main/res/drawable-xxxhdpi/icon_ok_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..c934bde771d03e669d725f87325be957dae7b655
GIT binary patch
literal 2206
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
G9{PVdLlH>;

literal 0
HcmV?d00001

diff --git a/ios/StatusIm/Images.xcassets/icon_ok_dark.imageset/Contents.json b/ios/StatusIm/Images.xcassets/icon_ok_dark.imageset/Contents.json
new file mode 100644
index 0000000000..b0484a2440
--- /dev/null
+++ b/ios/StatusIm/Images.xcassets/icon_ok_dark.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "icon_ok_dark.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/ios/StatusIm/Images.xcassets/icon_ok_dark.imageset/icon_ok_dark.png b/ios/StatusIm/Images.xcassets/icon_ok_dark.imageset/icon_ok_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..c19cf293953dac89886a0f13b09e9b9d3ecc7b4a
GIT binary patch
literal 1079
zcmV-71jze|P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px&@kvBMRA>e5mrG9*Q547TnOBQwVl**vVWNpF#OQ*B>o%xSP=b%D@kLd_j)mWV
z?_f*}PpJfoRnZn%xY6heV+<;w0v$x&r~xC5is@X>X&k-NGFXtdE@qOZ=l<v3xxe$j
zkGaE`b2$z;4mb`t4mb`t4mb|1*a3OPEi>4Va}Lj551%dAx%*5(VbSzpf6t6vcVKrT
zS31F$o~)?l2CpOrVDLpzwSsV4{q$l?(qdw+v;_Q#^K~XXad5`h#p4UR?3fh08`;)t
zYHB2OzMgY-LF^j<-pgy1Zc!8C{~`f`f7%yqKzP3h#{edn#P)?78^2g|p^)<_lz{J#
zHYLNO^W(BAdAiyI0|IYKnA1g^fbZ3tah{(|A{$dd^M*qWLrHo{F=q+*d^hEJh%_^U
zov}~>jJhQ7-feG=T6CL2PTm6qALE@jaEm!Da?yg7RK*(!Ue`r^sW|H+@XPrYbpDhG
zh9Dy{xV({2{jjM2Ezas9#yPK`^R3D7xZAwb6xp*}cuFp7BS7%oeR><?{J7{U02^ki
z=Iv^27!mb!<E$h=@VL(hajQHgf??;n41m)n@LtrH6K6bus;Vk=boN_2I)B6h1`yR`
z*?TY8G-}b8S;*)bAo#J_uQyZS*-)OQdHxlia<v_S#8wCQ%c;_y!fhQm4GfCYy?nkJ
zZJy~NgfA1@;OTNu0_N=u1;#~vrLpY@#30hh4dWL5p7!dU)z#ImbUPvV7}sy7zyk~@
zisD%<c;c~502ka*6Bu9h2ZyHSLNp~z&F-HPjWPWWwmD>}1MIEa<@SVwjT09A9}Bh#
z0EZ`*XLEKK7h@|;EsHJ`2tGRbxdYGjrGiW!C2xSqo;xkIlcK&Fv26mf>OPM>_ggx_
zJ)F)jxE@m4`Tc%(bZYJ{jh5I3j|Z>ui^|g#x;`c9s}-k!m=BJ$)qX_RiV?tioW;Xe
zcduSYUr%OTf}fr@?%}jMU}}kfG(b`CRB7`$XsNrxf^7oyJaWygX_y4QEiD(nSaPD`
zDoH-y<-D0#Jd7WI`^75Qrq}Jx&nP_g_uECW^W?bvlz;2@xbYZwl`WQg5?le!cHn62
z6?Gi7SNS-4p-|HYQO`u2Rsz&<neWo}AAI34hMSiLftQNvE~Y8CbiLKNn|1=!UFpel
zJB&DcgyAMCCto;iUbyn0xFZnwlzcB!<z*#65G6kUF3ydIIOjKtP&jRRTzPD7HsPuN
zB^R*>XvVm(Un#P@ANTe-Q^S??JfEpqb>8gT_N8Q2SnPkGuV=DwXHmqE_!`FH!3Nj*
x%3$!?pM(}`<Y<lqjsuPZjsuPZjsvL<`~-PeX=VWbykh_W002ovPDHLkV1f&e1t9<c

literal 0
HcmV?d00001

diff --git a/src/status_im/android/platform.cljs b/src/status_im/android/platform.cljs
index 1dedaa4f0a..a1eb6c5dec 100644
--- a/src/status_im/android/platform.cljs
+++ b/src/status_im/android/platform.cljs
@@ -95,22 +95,6 @@
                            :name-text {:fontSize       16
                                        :line-height    24
                                        :color          styles/text1-color}}
-   :profile               {:profile-bage {:padding-top 24}
-                           :profile-name-text {:color       styles/color-black
-                                               :font-size   16
-                                               :line-height 24}
-                           :profile-status-text {:font-size   15
-                                                 :line-height 20}
-                           :profile-setting-item {:padding-left  72
-                                                  :padding-right 13
-                                                  :height        72}
-                           :profile-setting-title {:font-size 12}
-                           :profile-setting-text {:font-size 16
-                                                  :color     styles/color-black}
-                           :profile-setting-spacing {:height 7}
-                           :form-separator {:margin-left 72}
-                           :edit-name-title {:font-size 12}
-                           :profile-icon-edit-text {:font-size 12}}
    :new-group             {:group-name-text {:font-size 12}
                            :members-text {:font-size 14}
                            :members-text-count  {:font-size 14}
diff --git a/src/status_im/components/action_button/action_button.cljs b/src/status_im/components/action_button/action_button.cljs
index fb3ade1fc9..ee86737d69 100644
--- a/src/status_im/components/action_button/action_button.cljs
+++ b/src/status_im/components/action_button/action_button.cljs
@@ -15,5 +15,14 @@
      [text {:style st/action-button-label}
       label]]]])
 
+(defn action-button-disabled [label icon-key]
+  [view st/action-button
+   [view st/action-button-icon-container-disabled
+    [view {:opacity 0.4}
+     [icon icon-key]]]
+   [view st/action-button-label-container
+    [text {:style st/action-button-label-disabled}
+     label]]])
+
 (defn action-separator []
   [list-separator])
diff --git a/src/status_im/components/action_button/styles.cljs b/src/status_im/components/action_button/styles.cljs
index b883896adf..9ffee17d9c 100644
--- a/src/status_im/components/action_button/styles.cljs
+++ b/src/status_im/components/action_button/styles.cljs
@@ -1,15 +1,18 @@
 (ns status-im.components.action-button.styles
   (:require-macros [status-im.utils.styles :refer [defstyle]])
-  (:require [status-im.components.styles :refer [color-white
+  (:require [status-im.utils.platform :as p]
+            [status-im.components.styles :refer [color-white
                                                  color-light-blue-transparent
                                                  color-light-blue
-                                                 color-black]]))
+                                                 color-light-gray
+                                                 color-black
+                                                 color-gray4]]))
 
 (defstyle action-button
   {:padding-left   16
    :flex-direction :row
    :align-items    :center
-   :ios            {:height 64}
+   :ios            {:height 63}
    :android        {:height 56}})
 
 (defstyle action-button-icon-container
@@ -38,3 +41,15 @@
                       :padding-bottom 8}})
 
 
+(def action-button-label-disabled
+  (merge action-button-label
+         {:color color-gray4}))
+
+(defstyle action-button-icon-container-disabled
+  {:border-radius    50
+   :width            40
+   :height           40
+   :align-items      :center
+   :justify-content  :center
+   :ios              {:background-color color-light-gray}})
+
diff --git a/src/status_im/components/common/common.cljs b/src/status_im/components/common/common.cljs
index b14a9fb79f..e89cc8fb2e 100644
--- a/src/status_im/components/common/common.cljs
+++ b/src/status_im/components/common/common.cljs
@@ -19,6 +19,12 @@
   [view st/separator-wrapper
    [view (merge st/separator style)]])
 
+(defn form-spacer []
+  [view
+   [bottom-shaddow]
+   [view st/form-spacer]
+   [top-shaddow]])
+
 (defn list-separator []
   [separator st/list-separator])
 
diff --git a/src/status_im/components/common/styles.cljs b/src/status_im/components/common/styles.cljs
index 5afe20641a..fc1801151a 100644
--- a/src/status_im/components/common/styles.cljs
+++ b/src/status_im/components/common/styles.cljs
@@ -63,3 +63,7 @@
           :padding-left 8
           :color        text4-color}))
 
+
+(defstyle form-spacer
+  {:ios     {:height 16}
+   :android {:height 11}})
diff --git a/src/status_im/components/text_field/view.cljs b/src/status_im/components/text_field/view.cljs
index c051d8a934..b7f7b45c95 100644
--- a/src/status_im/components/text_field/view.cljs
+++ b/src/status_im/components/text_field/view.cljs
@@ -39,16 +39,19 @@
                     :auto-capitalize   :sentences})
 
 (defn field-animation [{:keys [top to-top font-size to-font-size
-                               line-width to-line-width line-height to-line-height]}]
+                               line-width to-line-width line-height to-line-height]} & [value-blank?]]
   (let [duration  (:label-animation-duration config)
-        animation (anim/parallel [(anim/timing top {:toValue  to-top
-                                                    :duration duration})
-                                  (anim/timing font-size {:toValue  to-font-size
+        animation (anim/parallel (into []
+                                   (concat
+                                     (when (or (nil? value-blank?) value-blank?)
+                                       [(anim/timing top {:toValue  to-top
                                                           :duration duration})
-                                  (anim/timing line-width {:toValue  to-line-width
-                                                           :duration duration})
-                                  (anim/timing line-height {:toValue  to-line-height
-                                                            :duration duration})])]
+                                        (anim/timing font-size {:toValue  to-font-size
+                                                                :duration duration})])
+                                     [(anim/timing line-width {:toValue  to-line-width
+                                                               :duration duration})
+                                      (anim/timing line-height {:toValue  to-line-height
+                                                                :duration duration})])))]
     (anim/start animation (fn [arg]
                             (when (.-finished arg)
                               (log/debug "Field animation finished"))))))
@@ -92,7 +95,7 @@
   (log/debug "Input blurred")
   (r/set-state component {:has-focus    false
                           :float-label? (if (s/blank? value) false true)})
-  (field-animation animation)
+  (field-animation animation (s/blank? value))
   (when onBlur (onBlur)))
 
 (defn get-width [event]
diff --git a/src/status_im/ios/platform.cljs b/src/status_im/ios/platform.cljs
index 0efffddf12..edb43e9fcf 100644
--- a/src/status_im/ios/platform.cljs
+++ b/src/status_im/ios/platform.cljs
@@ -103,29 +103,6 @@
                                        :line-height    20
                                        :letter-spacing -0.2
                                        :color          styles/text1-color}}
-   :profile               {:profile-bage {:padding-top 24}
-                           :profile-name-text {:font-size      17
-                                               :line-height    20
-                                               :letter-spacing -0.2}
-                           :profile-status-text {:font-size      14
-                                                 :line-height    20
-                                                 :letter-spacing -0.2}
-                           :profile-setting-item {:padding-left  16
-                                                  :padding-right 16
-                                                  :height        73}
-                           :profile-setting-title {:font-size      14
-                                                   :letter-spacing -0.2}
-                           :profile-setting-text {:font-size      17
-                                                  :letter-spacing -0.2}
-                           :profile-setting-spacing {:height 10}
-                           :add-to-contacts-text {:font-size      17
-                                                  :line-height    20
-                                                  :letter-spacing -0.2}
-                           :edit-name-title {:font-size      13
-                                             :letter-spacing -0.1}
-                           :profile-icon-edit-text {:font-size        15
-                                                    :line-height      20
-                                                    :letter-spacing   -0.2}}
    :new-group             {:group-name-text {:font-size 13}
                            :members-text {:letter-spacing -0.2
                                           :font-size      16}
diff --git a/src/status_im/profile/edit/screen.cljs b/src/status_im/profile/edit/screen.cljs
index 5e1c242cfe..921fc0d3c1 100644
--- a/src/status_im/profile/edit/screen.cljs
+++ b/src/status_im/profile/edit/screen.cljs
@@ -8,6 +8,7 @@
             [status-im.components.toolbar-new.actions :as act]
             [status-im.components.text-field.view :refer [text-field]]
             [status-im.i18n :refer [label]]
+            [status-im.profile.screen :refer [colorize-status-hashtags]]
             [status-im.components.confirm-button :refer [confirm-button]]
             [status-im.components.chat-icon.screen :refer [my-profile-icon]]
             [status-im.components.context-menu :refer [context-menu]]
@@ -18,8 +19,11 @@
                                                 text
                                                 touchable-highlight
                                                 text-input]]
+            [status-im.utils.utils :refer [clean-text]]
+            [cljs.spec :as s]
+            [clojure.string :as str]
             [status-im.utils.platform :refer [ios?]]
-            [cljs.spec :as s]))
+            [reagent.core :as r]))
 
 (defn edit-my-profile-toolbartoolbar []
   [toolbar {:title   (label :t/edit-profile)
@@ -29,11 +33,10 @@
   [new-profile-name [:get-in [:profile-edit :name]]]
   [view
    [text-field
-    {:wrapper-style     st/profile-name-wrapper
-     :line-color        st/edit-line-color
+    {:line-color        st/edit-line-color
      :focus-line-color  st/profile-focus-line-color
      :focus-line-height st/profile-focus-line-height
-     :label-hidden?     true
+     :label             (label :t/name)
      :input-style       st/profile-name-input
      :on-change-text    #(dispatch [:set-in [:profile-edit :name] %])
      :value             new-profile-name}]])
@@ -44,38 +47,50 @@
 
 (defn edit-profile-bage [contact]
   [view st/edit-profile-bage
-   [view
+   [view st/edit-profile-icon-container
     [context-menu
      [my-profile-icon {:account contact
                        :edit?   true}]
      profile-icon-options
      st/context-menu-custom-styles]]
    [view st/edit-profile-name-container
-    [text {:style st/edit-name-title}
-     (label :t/name)]
     [profile-name-input]]])
 
-(defn edit-profile-status [{:keys [status]}]
-  [view st/edit-profile-status
-   [view
-    [text {:style st/edit-status-title} "Status"]
-    [view
-     [text-field
-      {:wrapper-style     st/profile-status-wrapper
-       :line-color        st/edit-line-color
-       :focus-line-color  st/profile-focus-line-color
-       :focus-line-height st/profile-focus-line-height
-       :multiline         true
-       :max-length        140
-       :placeholder       (label :t/profile-no-status)
-       :label-hidden?     true
-       :input-style       st/profile-status-input
-       :on-change-text    #(dispatch [:set-in [:profile-edit :status] %])
-       :value             status}]]]])
+(defn edit-profile-status [{:keys [status edit-status?]}]
+  (let [input-ref (r/atom nil)]
+    [view st/edit-profile-status
+     [scroll-view
+      (if edit-status?
+        [text-input
+         {:ref               #(reset! input-ref %)
+          :auto-focus        edit-status?
+          :multiline         true
+          :max-length        140
+          :placeholder       (label :t/status)
+          :style             st/profile-status-input
+          :on-change-text    #(dispatch [:set-in [:profile-edit :status] (clean-text %)])
+          :on-blur           #(dispatch [:set-in [:profile-edit :edit-status?] false])
+          :blur-on-submit    true
+          :on-submit-editing #(.blur @input-ref)
+          :default-value     status}]
+        [touchable-highlight {:on-press #(dispatch [:set-in [:profile-edit :edit-status?] true])}
+         [view
+          (if (str/blank? status)
+            [text {:style st/add-a-status}
+             (label :t/status)]
+            [text {:style st/profile-status-text}
+             (colorize-status-hashtags status)])]])]]))
+
+(defn status-prompt [{:keys [status]}]
+  (when (or (nil? status) (str/blank? status))
+    [view st/status-prompt
+     [text {:style st/status-prompt-text}
+      (colorize-status-hashtags (label :t/status-prompt))]]))
 
 (defview edit-my-profile []
   [current-account [:get-current-account]
    changed-account [:get :profile-edit]]
+  {:component-will-unmount #(dispatch [:set-in [:profile-edit :edit-status?] false])}
   (let [profile-edit-data-valid? (s/valid? ::v/profile changed-account)
         profile-edit-data-changed? (or (not= (:name current-account) (:name changed-account))
                                        (not= (:status current-account) (:status changed-account))
@@ -84,10 +99,10 @@
                                                   st/profile)
      [status-bar]
      [edit-my-profile-toolbartoolbar]
-     [view {:flex 1}
-      [scroll-view st/edit-my-profile-form
+     [view st/edit-my-profile-form
        [edit-profile-bage changed-account]
-       [edit-profile-status changed-account]]]
+       [edit-profile-status changed-account]
+       [status-prompt changed-account]]
      (when (and profile-edit-data-changed? profile-edit-data-valid?)
        [confirm-button (label :t/save) #(do
                                           (dispatch [:check-status-change (:status changed-account)])
diff --git a/src/status_im/profile/screen.cljs b/src/status_im/profile/screen.cljs
index 7a44d65171..824cb01851 100644
--- a/src/status_im/profile/screen.cljs
+++ b/src/status_im/profile/screen.cljs
@@ -4,12 +4,16 @@
             [clojure.string :as str]
             [reagent.core :as r]
             [status-im.contacts.styles :as cst]
-            [status-im.components.common.common :refer [separator]]
+            [status-im.components.common.common :refer [separator
+                                                        form-spacer
+                                                        top-shaddow
+                                                        bottom-shaddow]]
             [status-im.components.styles :refer [color-blue color-gray5]]
             [status-im.components.context-menu :refer [context-menu]]
             [status-im.components.action-button.action-button :refer [action-button
+                                                                      action-button-disabled
                                                                       action-separator]]
-            [status-im.components.common.common :refer [top-shaddow bottom-shaddow]]
+            [status-im.components.action-button.styles :refer [actions-list]]
             [status-im.components.react :refer [view
                                                 text
                                                 text-input
@@ -33,6 +37,12 @@
   [toolbar {:actions [(act/opts [{:value #(dispatch [:open-edit-my-profile])
                                   :text (label :t/edit)}])]}])
 
+(defn profile-toolbar [contact]
+  [toolbar
+   (when-not (:pending? contact)
+     {:actions [(act/opts [{:value #(dispatch [:hide-contact contact])
+                            :text  (label :t/remove-from-contacts)}])]})])
+
 (defn online-text [last-online]
   (let [last-online-date (time/to-date last-online)
         now-date         (time/now)]
@@ -45,33 +55,24 @@
   [view st/profile-bage
    [my-profile-icon {:account contact
                      :edit?   false}]
-   [view st/profile-name-container
-    [text {:style st/profile-name-text}
-     name]]
-   (when-not (nil? last-online)
-     [view st/profile-status-container
-      [text {:style st/profile-status-text}
-       (online-text last-online)]])])
+   [view st/profile-bage-name-container
+    [text {:style st/profile-name-text
+           :number-of-lines 1}
+      name]
+    (when-not (nil? last-online)
+      [view st/profile-activity-status-container
+       [text {:style st/profile-activity-status-text}
+        (online-text last-online)]])]])
 
-(defn add-to-contacts [pending? chat-id]
-  [view
+(defn profile-actions [{:keys [pending? whisper-identity]} chat-id]
+  [view actions-list
    (if pending?
-     [touchable-highlight {:on-press #(dispatch [:add-pending-contact chat-id])}
-      [view st/add-to-contacts
-       [text {:style st/add-to-contacts-text
-              :font (when android? :medium)
-              :uppercase? (get-in platform-specific [:uppercase?])}
-        (label :t/add-to-contacts)]]]
-     [view st/in-contacts
-      [icon :ok_blue]
-      [view st/in-contacts-inner
-       [text {:style st/in-contacts-text
-              :font (when android? :medium)
-              :uppercase? (get-in platform-specific [:uppercase?])}
-        (label :t/in-contacts)]]])])
-
-(defn profile-actions [whisper-identity chat-id]
-  [view st/profile-actions-container
+     [action-button (label :t/add-to-contacts)
+                    :add_blue
+                    #(dispatch [:add-pending-contact chat-id])]
+     [action-button-disabled (label :t/in-contacts)
+                             :ok_dark])
+   [action-separator]
    [action-button (label :t/start-conversation)
                   :chats_blue
                   #(message-user whisper-identity)]
@@ -82,7 +83,7 @@
 
 (defn profile-info-item [{:keys [label value options text-mode empty-value?]}]
   [view st/profile-setting-item
-   [view (st/profile-setting-text-container options)
+   [view (st/profile-info-text-container options)
     [text {:style st/profile-setting-title}
      label]
     [view st/profile-setting-spacing]
@@ -137,18 +138,8 @@
       ^{:key (str "item-" i)}
       (str status " "))))
 
-(defn profile-info-status-item [status & [options]]
-  (let [status-empty? (= "" status)
-        status-text  (if status-empty?
-                       (label :t/profile-no-status)
-                       (colorize-status-hashtags status))]
-    [profile-info-item {:label        (label :t/status)
-                        :value        status-text
-                        :options      options
-                        :empty-value? status-empty?}]))
-
 (defn profile-info-phone-item [phone & [options]]
-  (let [phone-empty? (or (nil? phone) (= "" phone))
+  (let [phone-empty? (or (nil? phone) (str/blank? phone))
         phone-text  (if phone-empty?
                        (label :t/not-specified)
                        phone)]
@@ -157,27 +148,16 @@
                         :options      options
                         :empty-value? phone-empty?}]))
 
-(defn profile-info [{:keys [whisper-identity :whisper-identity
-                            status           :status
-                            phone            :phone] :as contact}]
-    [view
-     [profile-info-status-item status]
-     [info-item-separator]
-     [profile-info-address-item contact]
-     [info-item-separator]
-     [profile-info-public-key-item whisper-identity contact]
-     [info-item-separator]
-     [profile-info-phone-item phone]])
-
-(defn my-profile-info [{:keys [public-key :public-key
-                               status     :status
-                               phone      :phone] :as contact}]
-  [view st/my-profile-info-container
-   [profile-info-status-item
-    status
-    [{:value #(dispatch [:open-edit-my-profile])
-      :text (label :t/edit)}]]
+(defn profile-info [{:keys [whisper-identity status phone] :as contact}]
+  [view
+   [profile-info-address-item contact]
    [info-item-separator]
+   [profile-info-public-key-item whisper-identity contact]
+   [info-item-separator]
+   [profile-info-phone-item phone]])
+
+(defn my-profile-info [{:keys [public-key status phone] :as contact}]
+  [view
    [profile-info-address-item contact]
    [info-item-separator]
    [profile-info-public-key-item public-key contact]
@@ -187,40 +167,58 @@
     [{:value #(dispatch [:phone-number-change-requested])
       :text (label :t/edit)}]]])
 
+(defn- profile-status-on-press []
+  (dispatch [:set-in [:profile-edit :edit-status?] true])
+  (dispatch [:open-edit-my-profile]))
+
+(defn profile-status [status & [edit?]]
+  [view st/profile-status-container
+   (if (or (nil? status) (str/blank? status))
+     [touchable-highlight {:on-press profile-status-on-press}
+      [view
+       [text {:style st/add-a-status}
+        (label :t/add-a-status)]]]
+     [scroll-view
+      [touchable-highlight {:on-press (when edit? profile-status-on-press)}
+       [view
+        [text {:style st/profile-status-text}
+         (colorize-status-hashtags status)]]]])])
+
 (defview my-profile []
-  [current-account [:get-current-account]]
+  [{:keys [status] :as current-account} [:get-current-account]]
   [view st/profile
    [status-bar]
    [my-profile-toolbar]
-   [view st/my-profile-form
-    [profile-bage current-account]]
-   [bottom-shaddow]
+   [view st/profile-form
+    [profile-bage current-account]
+    [profile-status status true]]
+   [form-spacer]
+   [view actions-list
+    [action-button (label :t/show-qr)
+     :q_r_blue
+     (show-qr current-account :public-key)]]
+   [form-spacer]
    [view st/profile-info-container
-    [top-shaddow]
-    [view st/profile-actions-container
-     [action-button (label :t/share-qr)
-                    :q_r_blue
-                    (show-qr current-account :public-key)]]
-    [view st/form-separator]
     [my-profile-info current-account]
     [bottom-shaddow]]])
 
 (defview profile []
   [{:keys [pending?
+           status
            whisper-identity]
     :as contact} [:contact]
    chat-id [:get :current-chat-id]]
   [view st/profile
    [status-bar]
-   [toolbar]
+   [profile-toolbar contact]
    [scroll-view
     [view st/profile-form
      [profile-bage contact]
-     [add-to-contacts pending? chat-id]]
-    [bottom-shaddow]
+     (when (and (not (nil? status)) (not (str/blank? status)))
+       [profile-status status])]
+    [form-spacer]
+    [profile-actions contact chat-id]
+    [form-spacer]
     [view st/profile-info-container
-     [top-shaddow]
-     [profile-actions whisper-identity chat-id]
-     [view st/form-separator]
      [profile-info contact]
      [bottom-shaddow]]]])
\ No newline at end of file
diff --git a/src/status_im/profile/styles.cljs b/src/status_im/profile/styles.cljs
index 8f3cf36a00..0e3d5bb48d 100644
--- a/src/status_im/profile/styles.cljs
+++ b/src/status_im/profile/styles.cljs
@@ -1,6 +1,7 @@
 (ns status-im.profile.styles
   (:require-macros [status-im.utils.styles :refer [defstyle]])
   (:require [status-im.components.styles :refer [color-white
+                                                 color-black
                                                  color-gray4
                                                  color-gray5
                                                  color-light-gray
@@ -9,9 +10,6 @@
                                                  text1-color]]
             [status-im.utils.platform :as p]))
 
-(defn ps-profile [item]
-  (get-in p/platform-specific [:component-styles :profile item]))
-
 (def profile
   {:flex             1
    :background-color color-light-gray
@@ -19,146 +17,121 @@
 
 (def profile-form
   {:background-color color-white
-   :padding-bottom   16})
-
-(def my-profile-form
-  {:background-color color-white
-   :padding-bottom   24})
+   :padding          16})
 
 (def edit-my-profile-form
   {:background-color color-white
    :flex             1})
 
 (defstyle profile-info-container
-  {:background-color color-white
-   :ios              {:margin-top 16}
-   :android          {:margin-top 12}})
+  {:background-color color-white})
 
-(defstyle profile-actions-container
-  {:android {:padding-top    8
-             :padding-bottom 8}})
+(def status-prompt
+  {:padding-left  16
+   :padding-right 16
+   :padding-top   6})
 
-(defstyle my-profile-info-container
-  {:android {:padding-top    8
-             :padding-bottom 8}})
+(defstyle status-prompt-text
+  {:color   color-gray4
+   :ios     {:font-size      14
+             :line-height    25
+             :letter-spacing -0.2}
+   :android {:line-height 18
+             :font-size   12}})
+
+(def profile-status-container
+  {:background-color color-light-gray
+   :margin-top       16
+   :border-radius    4
+   :padding          16
+   :max-height       114})
 
 (def profile-bage
-  (merge (ps-profile :profile-bage)
-         {:align-items :center}))
+  {:flex-direction :row})
 
 (def edit-profile-bage
   {:flex-direction :row
    :align-items    :center
-   :padding-left   24
-   :padding-top    25})
+   :padding-left   24})
 
 (def context-menu-custom-styles
   {:optionsContainer {:margin-top 78}})
 
-(def profile-name-container
-  {:margin-top 12})
-
 (defstyle edit-profile-name-container
   {:flex 1
    :ios     {:padding-left 32
-             :padding-top  11}
+             :padding-top 15}
    :android {:padding-top  16
              :padding-left 16}})
 
+(def edit-profile-icon-container
+  {:padding-top 25})
+
 (def edit-name-title
-  (merge (ps-profile :edit-name-title)
-         {:color color-gray4}))
+  {:color   color-gray4
+   :ios     {:font-size      13
+             :letter-spacing -0.1}
+   :android {:font-size 12}})
 
-(def edit-status-title
-  edit-name-title)
+(defstyle profile-name-text
+  {:ios      {:font-size      17
+              :line-height    20
+              :letter-spacing -0.2}
+   :android  {:color       color-black
+              :font-size   16
+              :line-height 24}})
 
-(def profile-name-text
-  (ps-profile :profile-name-text))
+(def profile-bage-name-container
+  {:flex            1
+   :justify-content :center
+   :padding-left    16})
 
-(def profile-status-container
+(def profile-activity-status-container
   {:margin-top 4})
 
-(def profile-status-text
-  (merge (ps-profile :profile-status-text)
-         {:color color-gray4}))
+(defstyle profile-activity-status-text
+  {:color   color-gray4
+   :ios     {:font-size      14
+             :line-height    20
+             :letter-spacing -0.2}
+   :android {:font-size   15
+             :line-height 20}})
 
-(def profile-setting-item
-  (merge (ps-profile :profile-setting-item)
-         {:flex-direction :row
-          :align-items    :center}))
+(defstyle profile-setting-item
+  {:flex-direction :row
+   :align-items    :center
+   :padding-left   16
+   :padding-right  16
+   :ios            {:height 73}
+   :android        {:height 72}})
 
-(defn profile-setting-text-container [options]
+(defn profile-info-text-container [options]
   {:flex          1
    :padding-right (if options 16 40)})
 
-(def profile-setting-title
-  (merge (ps-profile :profile-setting-title)
-         {:color color-gray4}))
+(defstyle profile-setting-title
+  {:color   color-gray4
+   :ios     {:font-size      14
+             :letter-spacing -0.2}
+   :android {:font-size 12}})
 
-(def profile-setting-text
-  (ps-profile :profile-setting-text))
+(defstyle profile-setting-text
+  {:ios     {:font-size      17
+             :letter-spacing -0.2}
+   :android {:font-size 16
+             :color     color-black}})
+
+(defstyle profile-setting-spacing
+  {:ios     {:height 10}
+   :android {:height 7}})
 
 (def profile-setting-text-empty
   (merge profile-setting-text
          {:color color-gray4}))
 
-(def profile-setting-spacing
-  (ps-profile :profile-setting-spacing))
-
-(def add-to-contacts
-  {:margin-top       24
-   :margin-left      16
-   :margin-right     16
-   :background-color color-light-blue
-   :border-radius    4
-   :height           52
-   :align-items     :center
-   :justify-content :center})
-
-(def in-contacts
-  (merge add-to-contacts
-         {:flex-direction  :row
-          :padding-right   40
-          :padding-left    16
-          :justify-content :flex-start
-          :background-color color-light-blue-transparent}))
-
-(def in-contacts-inner
-  {:align-items :center
-   :flex        1})
-
-(def add-to-contacts-text
-  (merge (ps-profile :add-to-contacts-text)
-         {:color color-white}))
-
-(def in-contacts-text
-  (merge add-to-contacts-text
-         {:color color-light-blue}))
-
 (def info-item-separator
   {:margin-left      16})
 
-(def form-separator
-  (merge (ps-profile :form-separator)
-         {:height           1
-          :background-color color-gray5
-          :opacity          0.5}))
-
-(def profile-name-wrapper
-  {:padding-top    0
-   :margin-top     0
-   :margin-bottom  0
-   :height         42
-   :padding-bottom 0})
-
-(defstyle profile-status-wrapper
-  {:padding-top    0
-   :margin-bottom  0
-   :height         85
-   :padding-bottom 1
-   :ios            {:margin-top 3}
-   :android        {:margin-top 1}})
-
 (def edit-line-color
   (if p/ios?
     (str color-gray5 "80")
@@ -183,11 +156,40 @@
              :padding-bottom 0}})
 
 (defstyle profile-status-input
-  {:height      82
-   :line-height 24;;TODO doesnt' work for multiline because bug in the RN
-   :android     {:padding-top  0}})
+  {:line-height  24;;TODO doesnt' work for multiline because a bug in the RN
+   :color        text1-color
+   :padding-left 0
+   :ios          {:font-size      17
+                  :padding-bottom 0
+                  :padding-top    0
+                  :height         74
+                  :letter-spacing -0.2}
+   :android      {:font-size      16
+                  :padding-top    5
+                  :height 74
+                  :text-align-vertical :top
+                  :padding-bottom 0}})
 
-(def edit-profile-status
-  {:padding-left 16
-   :padding-top  35})
+(defstyle profile-status-text
+  {:color        text1-color
+   :line-height  24
+   :ios          {:font-size      17
+                  :letter-spacing -0.2}
+   :android      {:font-size      16}})
+
+(defstyle edit-profile-status
+  {:background-color   color-light-gray
+   :border-radius      4
+   :height             104
+   :padding-horizontal 16
+   :padding-bottom     16
+   :margin-left        16
+   :margin-right       16
+   :margin-top         24
+   :ios                {:padding-top 10}
+   :android            {:padding-top 13}})
+
+(def add-a-status
+  (merge profile-status-text
+         {:color color-gray4}))
 
diff --git a/src/status_im/translations/en.cljs b/src/status_im/translations/en.cljs
index b95cbc2392..b5258992dd 100644
--- a/src/status_im/translations/en.cljs
+++ b/src/status_im/translations/en.cljs
@@ -77,8 +77,11 @@
    :phone-number                          "Phone number"
    :email                                 "Email"
    :profile-no-status                     "No status"
+   :add-a-status                          "Add a status..."
+   :status-prompt                         "Create a status to help people know about the things you are offering. You can use #hashtags too."
    :add-to-contacts                       "Add to contacts"
    :in-contacts                           "In contacts"
+   :remove-from-contacts                  "Remove from contacts"
    :start-conversation                    "Start conversation"
    :send-transaction                      "Send transaction"
    :share-qr                              "Share QR"