From 3819a0e8e527a76f8d4e5f76e872de4d7eb5aade Mon Sep 17 00:00:00 2001
From: Alexander Pantyuhov <alwxndr@gmail.com>
Date: Tue, 8 Nov 2016 13:56:36 +0300
Subject: [PATCH] Show QR in profile (#422)

---
 .../main/res/drawable-hdpi/icon_qr_gray.png   | Bin 0 -> 2753 bytes
 .../src/main/res/drawable-mdpi/icon_qr.png    | Bin 422 -> 826 bytes
 .../main/res/drawable-mdpi/icon_qr_gray.png   | Bin 0 -> 1928 bytes
 .../main/res/drawable-xhdpi/icon_qr_gray.png  | Bin 0 -> 3559 bytes
 .../main/res/drawable-xxhdpi/icon_qr_gray.png | Bin 0 -> 5241 bytes
 .../res/drawable-xxxhdpi/icon_qr_gray.png     | Bin 0 -> 917 bytes
 .../icon_qr_gray.imageset/Contents.json       |  21 +++++++++++
 .../icon_qr_gray.imageset/icon_qr_gray.png    | Bin 0 -> 5241 bytes
 src/status_im/accounts/login/screen.cljs      |   1 -
 .../components/image_button/styles.cljs       |  28 +++++++++++++++
 .../components/image_button/view.cljs         |  31 ++++++++++++++++
 .../components/selectable_field/styles.cljs   |   6 ++--
 src/status_im/contacts/views/new_contact.cljs |  10 +++---
 src/status_im/group_settings/screen.cljs      |   2 +-
 src/status_im/profile/screen.cljs             |  34 ++++++++++++++----
 src/status_im/profile/styles.cljs             |  24 +++++++++++--
 src/status_im/qr_scanner/styles.cljs          |  22 ------------
 .../qr_scanner/views/import_button.cljs       |  21 -----------
 .../qr_scanner/views/scan_button.cljs         |  22 ------------
 src/status_im/translations/en.cljs            |   1 +
 20 files changed, 138 insertions(+), 85 deletions(-)
 create mode 100644 android/app/src/main/res/drawable-hdpi/icon_qr_gray.png
 create mode 100644 android/app/src/main/res/drawable-mdpi/icon_qr_gray.png
 create mode 100644 android/app/src/main/res/drawable-xhdpi/icon_qr_gray.png
 create mode 100644 android/app/src/main/res/drawable-xxhdpi/icon_qr_gray.png
 create mode 100644 android/app/src/main/res/drawable-xxxhdpi/icon_qr_gray.png
 create mode 100644 ios/StatusIm/Images.xcassets/icon_qr_gray.imageset/Contents.json
 create mode 100644 ios/StatusIm/Images.xcassets/icon_qr_gray.imageset/icon_qr_gray.png
 create mode 100644 src/status_im/components/image_button/styles.cljs
 create mode 100644 src/status_im/components/image_button/view.cljs
 delete mode 100644 src/status_im/qr_scanner/views/import_button.cljs
 delete mode 100644 src/status_im/qr_scanner/views/scan_button.cljs

diff --git a/android/app/src/main/res/drawable-hdpi/icon_qr_gray.png b/android/app/src/main/res/drawable-hdpi/icon_qr_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce7a826d0d9f80ffbf7a7734851555e5ee1c9334
GIT binary patch
literal 2753
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

literal 0
HcmV?d00001

diff --git a/android/app/src/main/res/drawable-mdpi/icon_qr.png b/android/app/src/main/res/drawable-mdpi/icon_qr.png
index c8b6ef10fd0ae0994baefcbd445347ea4913c445..cde09052fbc29120f7fe50ad6f9d2089a6df3196 100644
GIT binary patch
delta 428
zcmY*VyH3L}6ulLXA$$O<F$kvGNq`|%5~*s17#aZ;L%NZsX^9{YC9V=!(t#aD24?oI
z9r+r>Cm;swwgm8WeS9AG_;qc*`LtK9k6TU)VD`B6<!t}}@=tpX!2LeJ^a0>gK+|`C
zi3;#>1;CyGw$qpSg$dB;hnFsQoi6i}h<L+f5RfuTg#y4VnHZyhd#H?V<D8WiUND%L
zB}_4rlq%&n7IvL;)K0Ph9g`!XVp~B7nb~l}dYzM%Ufe8v&3VcwEsBB^ha}0yR5J{N
zsyfy6reHMlyO?`rGtPIHCO<x%AosH{<zW&d>FW)W3AZp-D#57Fa#J3Texu@iRZLW*
z@`Y+drM0<`ni6GaSr~|D8DMMXg82`VjU<`M^gr9|EW0jXQPx&WTK}A_bl(p8Gg3Cb
E0g}vs4gdfE

delta 22
ecmdnRwv2g#3KwH>kh>GZx^prwHy>iGU<3eF)d%MQ

diff --git a/android/app/src/main/res/drawable-mdpi/icon_qr_gray.png b/android/app/src/main/res/drawable-mdpi/icon_qr_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb73ad1e04034497dfa2e873f393259d3a29f52f
GIT binary patch
literal 1928
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
A7ytkO

literal 0
HcmV?d00001

diff --git a/android/app/src/main/res/drawable-xhdpi/icon_qr_gray.png b/android/app/src/main/res/drawable-xhdpi/icon_qr_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..71c6fd567d0039c60d59bb5354273814f1638f5a
GIT binary patch
literal 3559
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
ZOaA!mO~F*A<FoIS-c@7mmzoaI{{dZ<dEEd2

literal 0
HcmV?d00001

diff --git a/android/app/src/main/res/drawable-xxhdpi/icon_qr_gray.png b/android/app/src/main/res/drawable-xxhdpi/icon_qr_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..9100f6d22b038786c93bc61fadb05e70c5da8ca9
GIT binary patch
literal 5241
zcmY*dcUTk7vZaPDNH+!uAP^A<9fAQBkluR<5D11|L+>5L&_tRvK~WJ<nskufq=X_x
z=}l33@45K9_ucp2e&6iQ%$_-CX8+u$I$Fv!lt4-X0s<OU6-B-4Q}Np5$pP2<mYVyg
z>w^%Zrz}tKaR{`29Z<Ndm|_SBs2KhlA;HTW)@y*NgMo>ciKd1O%FRW{+SbkHiIAU*
z`!$+?0PZJq?YcbivIhIPIJ;tG{A9WQLC9SDf74Jd@IMeQCs{5NO&zd;o97d-gpjz9
zFqa%97z~Dc+M;Fj6qWu{ejUkj*?W1p%Rr&NzP>`fVnS}7c2E%*3<ebzg^G#_ULyoC
z{;poueuAzT?thc~50By#49e5N-OItv75tai+Q!Y>OO}i4uh4(jzx(uZK>x3jE9O6A
zT@MKTdjk~_5{CYl`??hVH!Gv<>G0%Q`7ghm2>c)9|I7VH2M+x!{(qYJ_oV-1uSb=m
zghT)PY;u$u?R=&L1oZW)ijNHZ2xk$2Sc@Lhd{|Q8)@&@>YjH;qnDO(ST^Xh{2pvh;
zD=pRA5tX_wgnE$mj(dlTwv)rsmfMHi-3goCm0jT5&%@Mss+FFmNjki!Gtki~G;lEl
zHY#2c>$%g<klSrG2U`6c*f}4BVYX(QeYc&OpIX0Z{5g|#%Dz7+H6JuT;A<TJW@X=>
zj6*_JcJu0l?^D^c7ft#qyPV?qQbwET&B;ZKmg8=W&w+1s`a6S1vf0B)EonGhYnwLT
zW1<+2v|*0s{&ip1RK5A)w2N0SmS!K~CMoEDkSRi!F26jy%tt8a2h0zDl54i^h=DAs
zS8#MwZna9p%enhGYQFg<$C=X@G|ynoTA5(cAk@l-m?X_1$?K;|WMrUquHQZ-xw&4W
zkaOg}v(r(_&vWD#vc??oShxC43w)U2n<F{%IKxM;ZeQ1FuZjLJvqc@&^BZiJxhj9`
zJnLH;g_$kNj0``uFTA3l3jZx!`T^WKSNI~xalW8<xRRzQS9nw|O4m$|$+oJNj>SVL
z4VsvMS}}p46LUp{E5WOgsiBev3FBjrlIvUagp74p!%+t*cjhSe6|2hKV-f&M+TRZ0
z9FfJ8MOVn6^Ir^yjtz9~muH7teW`q}gRNu&GTd{%bYRbJBHQBf4|ud?chjgT_gV{?
zWd=yXt%Qs%4=sKkv7xM_BM(mnhyUOw*PVr=5d6$6^l3_)gmZ@B)Ws7JM1~eM)lyce
z@!br|l)SUvj};Y|!6=(QN7`DJ?-YJ!BTr(~il{HsEwOyv(|4^_;Aw~is8LZW(~4(E
zy-AR$KvQVsPuixS5@ydj1O6q#!U}o&o<+6iTzVq{!k%s3`s7VS(janPP9a%pfr#Jp
zI{ayJ6t-k$T-3SRXdDZWs&68S@R2knfYi?coWSY)^j(WCCG8F|&`D>J_T?+cXe1Xd
z?uI^d-sp%hHjTUlarZm9ftqrJJ=1(*uL|D#5!0|;l_{6K6&lC$r_?>zBapEe&RPc;
zxUE?{n2zw>S=dG0_rVUBB!F$s6Km3#bj^AifLI+yfKG1g(CTX)xS-naLX$qrO)B0;
zNB8TU<ZoV5Fn>j3M<(eg<2l25Xl@zASl?T5vks=`mT311^F#s;R<;C>XXo<_#@O8o
zj-W>zc@6Iie|apBdN2xbP_oDSR_*mq77Pz$i8=Kq-#yB8L7t(Hc&LG}$Z<&%1qsOt
z|AP_=mD(gKg1S)rqH-NUjkV!B)LUu@73~bd&V<LX9GhpL{HyrFT(6_lV^hdLQ`Et^
z!)em81ezmP784VrM`KonPFT5OzX8y05Gx`Ry@h|PRz&nwD4`)Tp+uqJ>}lv_0H;>o
ziuq=)%dY^53;?n>b1!(l%!vQNL{+eMCG@hW%5M0r_;3!4+qlg9XKBc#_dVp^OsiCP
zWUyLL*R#Svk%=&I6KS9Rh)6bZiCvE6<OM?tix9EmSp64LIs}D^rn5+WFx~PLkMLXl
z5L;VUd_gf6!0rP@5=-uGu&GdnXldsw4Xd%XD_xmXiXcKxqR!Tb!kwJzrx(4T#zzY)
zedHt;u$eTlDXMQekMRRM+VQ;W8*6rYctpXnZ;dHC;BImv<x`@Hn*(#PZ{@I)R;29O
zDu=J_eb)ZGfS)fgJcGA=Ks8oFXzcZ6zCQDD4F5XXIffxKy2`^1X|i(XF#Rl={ULeD
z&4)X3h|S+*qll_fv<BVxab9RgkZ2o)%A^j`=(Ts*i0qvix2>P;t?iasT^zr0<Eze?
z>DeRwzMUe^7A|@bB9wt)lB9Fq&UlrZ6hrC@&&OW~oNrB6y%QWX$uRd?{*IMUkE6mY
zMse6~VGzFM2>!=(N^wdo=O^X3-@|--e3%ohq~Q-pssVK;E}Bs;%~4+3m1wv%Olc*h
zDd2LE<ZgkcyTIoA8YXfYCfxd^^4k!$hRa)KC{~N_bO8PXbFPhLqWgy~(Y>eK^lx-m
zF|cPvk6ymfWPep(%{d;B0q?#adqVARhk`RVeTKM@R-PRiqTQ$DCb@X)DWe2*Bbnt3
zk?mk|`}mtdf;JG%?XSmt65X#H>?6qpZtdAnNj`^g4X@;;`3Te~RN0w_ixZ#W5tByX
zPZoh~8$>3lP?SpxsoRKs6cgomkG)1cqC2F}$~IW)er(s+=GZ7$b5v;;$@{x@Ho57!
z-QLg*AAumN(rPC1Tp@u6^-lY5Swv306h5PpLA<-e-fmV;PHjDTP(_?4$!^=+QO&wo
zG+_>WqxyY?ux3chNRhqoo<HxlGqz{+rKfo~j=1Z)c$aZe^Eb~`>(V}TlWd_HY1)LF
z+>cGZ4JRZdFx59(lc|8s7_8LpIV3YXJeTwbLsuvW->9?qIZgfC<YcRU8sHWn@}2FJ
zb7rnJtSb2YNd2KWWzU8|Jwk)6s(eU9!Ab_5nYjv0hn_uHa3f|Db8g%RiFrPn>to4t
zIsL5yrqGLtX}w1(`*3_Wm6^WFE-$0M`vlCpIkEG6i<w4nkl%)-sU=#R;ky^977xdd
zu7)j|py?Y_`HbXtv)y7ML;zROI^dz(LPz)#Cy8wHO0Ls40jb+Fi;W{(N3WBRH{6mq
zw#USZKsI7V*_jdYWjpWNQkW)8mwS(^Ukx6Jfa!?FXBTk%8Dv`BD&$)rCuQ;;{Tg(e
zMSImZ>OE|nNF9*rM#jx}m*sOFcBZ^Yx!GQ&A-UHNSl_hjj?DflXCtyFU(uNddyp6_
zN`Lap=<fg@Tjp3-&Iz~L1I6bK-smHr$Yur~N9nhk{>=X6#AVq|PX;PK2Ij~Ir4jL6
zG>x*(3_5kQbVzAQZTWztUa5D9yhBZ%f!aeaT|lOD<Pq<aUh8%eVQH0**+Ue)10TK+
zJYIheDf43Uzi&H0%*7GaM}9(=5-Z$-;K$>hMqpNa?0=QkM3ir9vF1?aj?#`C*Osh`
zCe<Kzx{0|K^it0gHOk^XoUNDk4!ww|KfA@-|F(;r&cS#u%>Kph4K*3`hKio?z4>%n
z_N%>~SINWW3ExrCTpkha3p9~gq)0JA2enK|;uC~Qo^o6i-;=N6@Savu4DH68&pe^M
zRpe}i_c=#^-@E)lIaUtNx9sm>60eyfhqsdG7E2z!CuRh!IGqsX`|*B~51A<$`WQU7
zdEQp+Y&D-d)$slYd^#PdgHvS}rG5BmU}5w90Lw)&$KClcqLgHZl3O0Kv{}To-*@Ae
zi@&Iz3mrwsrRl9Fv4BMP$2A`P+W9=gWN;k)gj0JXWe?Copq*?cRi+Twix8Z-XlgrI
zC{Uhg9}Q~uq2aVPA4rr>Q`;51Gq-l%<MzeLe&{-o%gEev0-5yy(6bis{y>jp1k5ME
zK(^&gu{SN=;yq?1>1D5LEmT{bM_KuZSsIA-r^2Oc>Ih{GuHCsvH@0?qAkpG|z)^=7
zq_#Q0$rT^7=YXDntYYc$_C3wQhSl07`;>42?t-mjU*!NNW7He_XO3|z%Haar`}_>t
zZJt}1&^?>e+92y@ik#umM0f%B=fLB{3Na%<x5#T@2%97_bbhBlv}rd*t@y$N0w210
z;ON{N$(*(L=8}V5D~D`uyCeHNhX2>k?#3@0l7B!!eY-BG;l;{xo>{9)2=!%8>jhaD
z9vH;h>SbaNXObj8efd5n&SgbR>Z1L(8!+_g%bS5y#fMTVWzn^aen9Wt!k^F5Qasw7
zgB$HC5EJ!=B_9}WOD%<EVLKC3VdSo4GjC=sT`Hf7)&J~#ir8%@eZWF8J2-|dF)Af5
z;k{D*B>=(@`_tbcrlFBFx<k@PZ!e~oL6y`sDB@Xq)EF#jFa>}o+@_tZHOz0=+PC84
z<=wapw`kwLe{e<<*?Zi}pbBhR+HAOM#YX1aycasXXus{~Q|WYotKLF>9OoIEg#>KN
zYAe)fF*rFL{jf~nFI3=(0Bc}BOmqLCLD6pX-)V5E2^!1pdc4zr7>A90IYYN(M&vPm
z@uTI%Lz`-i#9Or%_N%Kud}I$1A=U3dV%Dc-w&flY8<aE=vm?&)iO7+xlJ<6B_!MO}
zswNYat_Cfz&wL+Pi=7H7Mj3^p*1U32>6G00q40a>=&ja?V>u9&EuDBbK)2u2xR1rx
z^?d0|vQIO?#{K+Cyq#;0N4MF`O7^+!QS=v;jD^6R9PP=Dy^Ar$oUdCA84C?xhb(;W
ztDYyaH>*Ys-O0SNSc&5Npzh-y7o{2=M~*Ic0BvImn`FmU31G|TNuX0$SyRV}3|7IO
zgOD>@L!`Wyo@m3EAn*YaA1j_9oQaCzj_sktAcm{?<7uOhI<<VTMU7vgc#d!EPr&ED
z+E^xLHHjE_axp8|MW;LnIN-kt;}g#Ofn)LLL6~GVGlo)T45aY@>gk0pYo>A2szF{1
zItRPUJ;7}C`eCzS+j8B8k)$^eT`{<71aGfvj{a6YeY!hcZ*7xs{L!kXX{tM!?#YR}
z@PfM7g|EBc=q#CVXHt^L`_891uo%4Ddv@d%D~ZjJ{K&fkllh*671>u;*~mOGMZ^?I
zrsb0deQ7*H`E(@-8?vH@giAc__!bj0S~FjwbmB!`T{30A#l<+Tcofj%I1eftbZ-%~
zW=L3`j_NieCmt1}@Es88U|To02u{Y6I_yK9M=T<B9ARk6Q<R5A_7}4&fY$y-81one
zVH$IDNOLZ_<N0lUtQsCzXxhH#UQ%N;dSi_=i-=#b!Q@77XqLnc%z$4(hoOAJLpBZ9
z92E11U$5d0J~6h}TVdgcd5LnQ2hTbOTMuAsk&ht7Z<CP%Y^kW4%Cz)ys2Yd%tPBLG
zPXD_2mgdUjicMhZKu@8HJ12IRyT4~ud>oLn@gp4t2oS^!Ft66f0=`EMwMtuk_I$jW
z`EAPV%)D@u4g3-+1!M{2Q$Q{kESwIlWu~Oo4eUDCL~>bIrRbLoSR}1~T15o4N>~vC
zJw#YI96~5FNFj_W%A|j08xEH?`$altn!{$-8FWH1G=xgow-{&k0(+B%@QjVEU#8o@
zuea_?Q?430ZsqIF50opF>q?&}O;k=i06U8jG25NJIU6Am?V<KJS7s~z!fcD7UA#CX
zIC}j>IdNKiziH|n#!z!as!3SUu4r!@HMM$mD`PSTy%*0G*%&hos|)O`y_gzshlB(j
zuW8Qz>@2Ws3KY)lChWf3ss~|IVsoaZwXTEn7hxnTWUq>p%)^@)U}*6;G(8=j+}I^b
z|4;zXX$AGWB#zvD7uveaM*EQooh%w+->T1RnA3h|qqkSZu-~2m`EIwFlB^6s1)6eP
zk7Z2B@r}sik5;LxQSV-PlKUd1Pei{#u16qT0){@BR(**&f^7S!BJW1aFFGeBC0;@B
zC(9jk+ICwIW^^cp`MvD~EWn!MZe6>7fm}Laj)+Xu>}UV|(52H@>=U)<_9hc099nwF
z*Vm=EOEk*m9$j_@De-5??9E2X3WcS^u8wHD&G^l#)wH$v0g=G!#@m-&T`_H)Qs>7r
z3Xzk3{?3m?s$L{B0ZR0zrZAVl4<`;rOH@~i$u6X$)Ez%ed&0vl|LoIIqx<-?s6UiF
zbhb3INW3L>(*Z{<z`D3vRyzPgH>|saKFbORYcBNLHSTb{<Z;H=5EZXx_OTpu1Vq8m
z<`8P~X!Teaqqq*y*HxE65hqS66sSJPaq$cL(9y9J4Sx4)od05|dAKmtDd6QF2F{W`
zk=L9P`AUh?;83NAl80-VveDU}2T`cwmmo1=6xQ<I+l&gDmE|4$g@y<Jj|{P!(2h{l
zvxEvxZ;I^SE9IN6Im?12blg!+jhjGR=aN{D^W=o)YZZ=qVi@`d7@Mndg;zAGE9dOn
zFWf)UqKwQ^L~A^Y!Q<@7Bja)67j7k-jO0`kCfYDGcuwzOhLdu9y)DsDviP(HHU9jJ
zBnLM>H!bHqEPm1R-0lPqC#@`np$juWRWgZz!MPk)wcjIw?f83qJ*AUvQjveW*DZBn
z=t01Q6Wi>LB~li|DED;dxN7Ec-Q3f-Q{y`MofJq7_vi@AS#C@Dm_QXy(5dbt0n;H2
z-Hj^(SpFKL3Qd`&+Al*UQ<!bsy|AhQiGeQK4GS`|Hf$}{GCu=do=MJiSC}>qsW(UA
zm7qY(z}$3xLoKTtpC%}^K1MpUSUTb4YhF`Nh)R6h3Fk?lXUqfT`xQ=Ko4K6}1OLFw
z59cx#!$T>zj!T+wB9^R)+|RvxZ*8rjScyxQw*OQJEME2w@B8BK47lVBKY^g9kAYXW
zX%<@@(p(a6b%*j?G-7%B;u$mx_SZQtCY$;hxxxa0=Z{rS=H1gAip@wa!gp4$V)?Tm
v=Ls_0YB4r%1$LhVd>8qw;KmejdBuYJ9W8ESsqy&lf1v7PEya)W$cTRdmS*DT

literal 0
HcmV?d00001

diff --git a/android/app/src/main/res/drawable-xxxhdpi/icon_qr_gray.png b/android/app/src/main/res/drawable-xxxhdpi/icon_qr_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd5d3df69a678b3152098e801edf266dffc5c586
GIT binary patch
literal 917
zcmV;G18V$<P)<h;3K|Lk000e1NJLTq003G5003AB1^@s6bztBL000AANkl<Zc-rk;
zOK#gR5Owd+ML$PsPtdN@MS2JWQL>0-Byx%_dXVhmeU9J*GzVz2O`wvp5WBTOk>Y6d
z^g06&2@+vA?}?w8;ZU<#K+dnO-k+7#X;H3jUE7?MtKaTtozq$!8?V#r_I=C-7FZk?
z*Vk{0#p;Js@|0^(M0@gm`97ryhQ@JG-h3z))h`9Z{%)>M-?tda$T-{^`RX2iRyS_f
zp1lpZBtzq9M!>kny%?D@vY~No*Rm0&S!nw8ShL}Av>QeZ)tpT|mJD1R-Yrqum6Lbz
z6qgAeN9$j9J^XOKy!kx8{Pr$)qw+euF0ZrOSFKKC^}^$5o%qm$Kj+KkYiS?X>x?k+
zHhS4W$I(VNp||mAu!wCtB0>gk5{Sme(G`wLOtaAR>k4z@mkw|oUF*xxc?hZg;c*zz
z6Ct{;>sLitow#T3orC_^H2=H%oB!Wbh#nkAj)84<>@MJ}-^~}_-=Gt%f}^j2%?Jn?
zw`XK%M2t<e8jijOw$m&!I;u`kiB`kW-$1{9MTepHxI`=A=xyM3vxv=NJ;D;Lg~NzO
zC)$<{+YG5TLv!yeVBrc_ECjctl4bAyYoaajub21_9s&7d8iu2+(Q!l^YCe!0&W?-2
z$_<ooSOJY94l4;$!eK>@ia4xnR}qI5qATJkE~}3WS1Trg!!8Rc<FM;*SU5~fOiWBn
zOiWBnOw7^O6P6Ghn`DyjbsQAL9G_Xy1u~-gSkk1;j4Z2lLh<4{G^0fIu_XT6k+)9o
zw^|<?iK6;gj<T9rnN)_`U6w1VkL7T7OH5K>d1s-ym_C+rgWaG>xGE8GbwW%ZO99Q^
z2+VrHgXv@WUdI%Orube5Jkcy=yHgm^6ou##o7b@yE2fW*XjJ!(<+9MrQn*}wkqlVG
z^s!ujgAc)3E_A{tl~}GQr=~Sim$+<wESK)#h2=96Mzj%aOUFcr#@-C2CHu^f(Y+g_
zDqt-44mDsIXe5spu%L$E@=L4GnIT(JX#o2$l1lVM%bgi=CH}Psg4j{kRKC|S1)?dw
z*8xv7Te$%&(QE}YNSooo9>Y`;2J7DKB0P>FM`@8hgQO|jg$=>~SwbiZ(IJyc2V|3c
ruR}XcnwsO;&&t_lAuX}%Z*uYn>zhW`dCCZ400000NkvXXu0mjfBvH5>

literal 0
HcmV?d00001

diff --git a/ios/StatusIm/Images.xcassets/icon_qr_gray.imageset/Contents.json b/ios/StatusIm/Images.xcassets/icon_qr_gray.imageset/Contents.json
new file mode 100644
index 0000000000..1738a7c226
--- /dev/null
+++ b/ios/StatusIm/Images.xcassets/icon_qr_gray.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "icon_qr_gray.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_qr_gray.imageset/icon_qr_gray.png b/ios/StatusIm/Images.xcassets/icon_qr_gray.imageset/icon_qr_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..9100f6d22b038786c93bc61fadb05e70c5da8ca9
GIT binary patch
literal 5241
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

literal 0
HcmV?d00001

diff --git a/src/status_im/accounts/login/screen.cljs b/src/status_im/accounts/login/screen.cljs
index 532dfdd88d..1e500fb54c 100644
--- a/src/status_im/accounts/login/screen.cljs
+++ b/src/status_im/accounts/login/screen.cljs
@@ -20,7 +20,6 @@
                                                  icon-qr
                                                  button-input
                                                  white-form-text-input]]
-            [status-im.qr-scanner.views.scan-button :refer [scan-button]]
             [status-im.i18n :refer [label]]
             [status-im.accounts.login.styles :as st]))
 
diff --git a/src/status_im/components/image_button/styles.cljs b/src/status_im/components/image_button/styles.cljs
new file mode 100644
index 0000000000..75782a54aa
--- /dev/null
+++ b/src/status_im/components/image_button/styles.cljs
@@ -0,0 +1,28 @@
+(ns status-im.components.image-button.styles)
+
+(def image-button
+  {:position   :absolute
+   :bottom     2
+   :right      16
+   :flex       1
+   :height     50
+   :alignItems :center})
+
+(def image-button-content
+  {:flex          1
+   :flexDirection :row
+   :height        50
+   :alignItems    :center
+   :alignSelf     :center})
+
+(def image-button-text
+  {:flex          1
+   :flexDirection :column
+   :letter-spacing -0.3
+   :margin-left   8})
+
+(def scan-button-text
+  (merge image-button-text {:color "#7099e6"}))
+
+(def show-qr-button-text
+  (merge image-button-text {:color "#838c93"}))
\ No newline at end of file
diff --git a/src/status_im/components/image_button/view.cljs b/src/status_im/components/image_button/view.cljs
new file mode 100644
index 0000000000..d95f9a3b17
--- /dev/null
+++ b/src/status_im/components/image_button/view.cljs
@@ -0,0 +1,31 @@
+(ns status-im.components.image-button.view
+  (:require [re-frame.core :refer [subscribe dispatch dispatch-sync]]
+            [status-im.components.react :refer [view
+                                                text
+                                                image
+                                                touchable-highlight]]
+            [status-im.components.styles :refer [icon-scan]]
+            [status-im.i18n :refer [label]]
+            [status-im.components.image-button.styles :as st]))
+
+(defn image-button [{:keys [value style icon handler]}]
+  [view st/image-button
+   [touchable-highlight {:on-press handler}
+    [view st/image-button-content
+     [image {:source {:uri (or icon :scan_blue)}
+             :style  icon-scan}]
+     (when text
+       [text {:style style} value])]]])
+
+(defn scan-button [{:keys [show-label? handler]}]
+  [image-button {:icon    :scan_blue
+                 :value   (if show-label?
+                            (label :t/scan-qr))
+                 :style   st/scan-button-text
+                 :handler handler}])
+
+(defn show-qr-button [{:keys [handler]}]
+  [image-button {:icon    :icon_qr_gray
+                 :value   (label :t/show-qr)
+                 :style   st/show-qr-button-text
+                 :handler handler}])
\ No newline at end of file
diff --git a/src/status_im/components/selectable_field/styles.cljs b/src/status_im/components/selectable_field/styles.cljs
index f121e04ca7..88774a9594 100644
--- a/src/status_im/components/selectable_field/styles.cljs
+++ b/src/status_im/components/selectable_field/styles.cljs
@@ -14,9 +14,9 @@
    :font-size        14})
 
 (def text-container
-  {:padding 0
-   :margin-bottom       18
-   :margin  0})
+  {:padding       0
+   :margin-bottom 18
+   :margin        0})
 
 (def text
   {:font-size           16
diff --git a/src/status_im/contacts/views/new_contact.cljs b/src/status_im/contacts/views/new_contact.cljs
index 59535c26a0..9891097bdb 100644
--- a/src/status_im/contacts/views/new_contact.cljs
+++ b/src/status_im/contacts/views/new_contact.cljs
@@ -20,7 +20,7 @@
                                                  icon-back
                                                  button-input-container
                                                  button-input]]
-            [status-im.qr-scanner.views.scan-button :refer [scan-button]]
+            [status-im.components.image-button.view :refer [scan-button]]
             [status-im.i18n :refer [label]]
             [cljs.spec :as s]
             [status-im.contacts.validations :as v]
@@ -90,10 +90,10 @@
        :on-change-text #(do
                          (dispatch [:set-in [:new-contact-identity] %])
                          (dispatch [:set :new-contact-address-error nil]))}]
-     [scan-button {:showLabel (zero? (count whisper-identity))
-                   :handler   #(dispatch [:scan-qr-code
-                                          {:toolbar-title (label :t/new-contact)}
-                                          :set-contact-identity-from-qr])}]]))
+     [scan-button {:show-label? (zero? (count whisper-identity))
+                   :handler     #(dispatch [:scan-qr-code
+                                            {:toolbar-title (label :t/new-contact)}
+                                            :set-contact-identity-from-qr])}]]))
 
 
 (defview new-contact []
diff --git a/src/status_im/group_settings/screen.cljs b/src/status_im/group_settings/screen.cljs
index 71c89efaf1..68d82a9f87 100644
--- a/src/status_im/group_settings/screen.cljs
+++ b/src/status_im/group_settings/screen.cljs
@@ -29,7 +29,7 @@
 (defview member-menu []
   [{:keys [name] :as participant} [:selected-participant]]
   (when participant
-    [modal {:animated       false
+    [modal {:animationType  :none
             :transparent    false
             :onRequestClose close-member-menu}
      [touchable-highlight {:style    st/modal-container
diff --git a/src/status_im/profile/screen.cljs b/src/status_im/profile/screen.cljs
index fd066e59b9..9d1a454492 100644
--- a/src/status_im/profile/screen.cljs
+++ b/src/status_im/profile/screen.cljs
@@ -9,9 +9,11 @@
                                                 text-input
                                                 image
                                                 icon
+                                                modal
                                                 scroll-view
                                                 touchable-highlight
                                                 touchable-opacity
+                                                touchable-without-feedback
                                                 show-image-picker
                                                 dismiss-keyboard!]]
             [status-im.components.icons.custom-icons :refer [oct-icon]]
@@ -27,6 +29,7 @@
             [status-im.profile.validations :as v]
             [status-im.profile.styles :as st]
             [status-im.utils.random :refer [id]]
+            [status-im.components.image-button.view :refer [show-qr-button]]
             [status-im.i18n :refer [label]]))
 
 (defn toolbar [{:keys [account edit?]}]
@@ -161,8 +164,20 @@
                                        )}
       [view [text {:style st/report-user-text} (label :t/report-user)]]]]]])
 
+(defview qr-modal []
+  [qr [:get-in [:profile-edit :qr-code]]]
+  [modal {:transparent   true
+          :visible       (not (nil? qr))
+          :animationType :fade}
+   [touchable-without-feedback {:on-press #(dispatch [:set-in [:profile-edit :qr-code] nil])}
+    [view st/qr-code-container
+     [view st/qr-code
+      [qr-code {:value (str "ethereum:" qr)
+                :size  220}]]]]])
+
 (defview my-profile []
   [edit? [:get-in [:profile-edit :edit?]]
+   qr [:get-in [:profile-edit :qr-code]]
    current-account [:get-current-account]
    changed-account [:get :profile-edit]]
   (let [{:keys [phone
@@ -171,6 +186,7 @@
                                            changed-account
                                            current-account)]
     [scroll-view {:style                     st/profile
+                  :bounces                   false
                   :keyboardShouldPersistTaps true}
      [status-bar]
      [toolbar {:account account
@@ -188,16 +204,20 @@
        [view st/underline-container]]
 
       [view st/profile-property
-       [selectable-field {:label (label :t/address)
-                          :value address}]
+       [view st/profile-property-row
+        [view st/profile-property-field
+         [selectable-field {:label (label :t/address)
+                            :value address}]]
+        [show-qr-button {:handler #(dispatch [:set-in [:profile-edit :qr-code] address])}]]
        [view st/underline-container]]
 
       [view st/profile-property
-       [selectable-field {:label (label :t/public-key)
-                          :value public-key}]]
+       [view st/profile-property-row
+        [view st/profile-property-field
+         [selectable-field {:label (label :t/public-key)
+                            :value public-key}]]
+        [show-qr-button {:handler #(dispatch [:set-in [:profile-edit :qr-code] public-key])}]]]
 
       [view st/underline-container]
 
-      [view st/qr-code-container
-       [qr-code {:value (str "ethereum:" public-key)
-                 :size  220}]]]]))
+      [qr-modal]]]))
diff --git a/src/status_im/profile/styles.cljs b/src/status_im/profile/styles.cljs
index 932ce7f98b..5c51c35879 100644
--- a/src/status_im/profile/styles.cljs
+++ b/src/status_im/profile/styles.cljs
@@ -121,6 +121,14 @@
 (def profile-property
   {:margin-left 16})
 
+(def profile-property-row
+  {:flex           1
+   :flex-direction :row})
+
+(def profile-property-field
+  {:margin-right 90
+   :flex         1})
+
 (def profile-input-wrapper
   {:margin-bottom 16})
 
@@ -143,9 +151,19 @@
    :letter-spacing 0.5})
 
 (def qr-code-container
-  {:flex       1
-   :alignItems :center
-   :margin     32})
+  {:flex             1
+   :alignItems       :center
+   :justify-content  :center
+   :background-color "#000000aa"})
+
+(def qr-code
+  {:width            250
+   :height           250
+   :background-color "white"
+   :border-radius    4
+   :align-items      :center
+   :padding-top      15
+   :elevation        4})
 
 (def hashtag
   {:color "#7099e6"})
diff --git a/src/status_im/qr_scanner/styles.cljs b/src/status_im/qr_scanner/styles.cljs
index 607f5b7a33..7e92540003 100644
--- a/src/status_im/qr_scanner/styles.cljs
+++ b/src/status_im/qr_scanner/styles.cljs
@@ -73,26 +73,4 @@
   {:flex          1
    :flexDirection :column
    :color         color-white
-   :margin-left   8})
-
-
-(def scan-button
-  {:position   :absolute
-   :bottom     0
-   :right      16
-   :flex       1
-   :height     50
-   :alignItems :center})
-
-(def scan-button-content
-  {:flex          1
-   :flexDirection :row
-   :height        50
-   :alignItems    :center
-   :alignSelf     :center})
-
-(def scan-text
-  {:flex          1
-   :flexDirection :column
-   :color         "#7099e6"
    :margin-left   8})
\ No newline at end of file
diff --git a/src/status_im/qr_scanner/views/import_button.cljs b/src/status_im/qr_scanner/views/import_button.cljs
deleted file mode 100644
index 3fd20640b7..0000000000
--- a/src/status_im/qr_scanner/views/import_button.cljs
+++ /dev/null
@@ -1,21 +0,0 @@
-(ns status-im.qr-scanner.views.import-button
-  (:require-macros [status-im.utils.views :refer [defview]])
-  (:require [re-frame.core :refer [subscribe dispatch dispatch-sync]]
-            [status-im.components.react :refer [view
-                                                text
-                                                image
-                                                touchable-highlight]]
-            [status-im.components.styles :refer [icon-qr]]
-            [status-im.i18n :refer [label]]
-            [status-im.qr-scanner.styles :as st]))
-
-
-(defview import-button [handler]
-  []
-  [view st/import-button
-   [touchable-highlight
-    {:on-press handler}
-    [view st/import-button-content
-     [image {:source {:uri :icon_qr}
-             :style  icon-qr}]
-     [text {:style st/import-text} (label :t/import-qr)]]]])
\ No newline at end of file
diff --git a/src/status_im/qr_scanner/views/scan_button.cljs b/src/status_im/qr_scanner/views/scan_button.cljs
deleted file mode 100644
index 07c15be14f..0000000000
--- a/src/status_im/qr_scanner/views/scan_button.cljs
+++ /dev/null
@@ -1,22 +0,0 @@
-(ns status-im.qr-scanner.views.scan-button
-  (:require-macros [status-im.utils.views :refer [defview]])
-  (:require [re-frame.core :refer [subscribe dispatch dispatch-sync]]
-            [status-im.components.react :refer [view
-                                                text
-                                                image
-                                                touchable-highlight]]
-            [status-im.components.styles :refer [icon-scan]]
-            [status-im.i18n :refer [label]]
-            [status-im.qr-scanner.styles :as st]))
-
-
-(defview scan-button [{:keys [showLabel icon labelStyle handler]}]
-  (let [showLabel (if (nil? showLabel) true showLabel)]
-    [view st/scan-button
-     [touchable-highlight
-      {:on-press handler}
-      [view st/scan-button-content
-       [image {:source {:uri (or icon :scan_blue)}
-               :style  icon-scan}]
-       (when showLabel [text {:style (merge st/scan-text labelStyle)}
-                                  (label :t/scan-qr)])]]]))
\ No newline at end of file
diff --git a/src/status_im/translations/en.cljs b/src/status_im/translations/en.cljs
index 59a8ca8979..a98bb58865 100644
--- a/src/status_im/translations/en.cljs
+++ b/src/status_im/translations/en.cljs
@@ -117,6 +117,7 @@
    :contacts-group-people                 "People"
    :contacts-group-new-chat               "Start new chat"
    :no-contacts                           "No contacts yet"
+   :show-qr                               "Show QR"
 
    ;group-settings
    :remove                                "Remove"