From 794cd579618c1414f43f1d868895fddf23883389 Mon Sep 17 00:00:00 2001
From: Mohsen <maxghafori@gmail.com>
Date: Fri, 12 Apr 2024 19:37:07 +0300
Subject: [PATCH] [#19299] fix: design feedback for settings screen (#19609)

---
 resources/images/icons2/20x20/dapps@2x.png      | Bin 0 -> 707 bytes
 resources/images/icons2/20x20/dapps@3x.png      | Bin 0 -> 1085 bytes
 .../contexts/profile/settings/list_items.cljs   |   2 +-
 .../contexts/profile/settings/view.cljs         |   2 +-
 src/status_im/contexts/shell/jump_to/view.cljs  |  16 +++++++++-------
 5 files changed, 11 insertions(+), 9 deletions(-)
 create mode 100644 resources/images/icons2/20x20/dapps@2x.png
 create mode 100644 resources/images/icons2/20x20/dapps@3x.png

diff --git a/resources/images/icons2/20x20/dapps@2x.png b/resources/images/icons2/20x20/dapps@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..35abe8064ef97425ab434a077d851317511f3685
GIT binary patch
literal 707
zcmV;!0zCbRP)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T700009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0$52zK~#7F?U>(f
z+b|HuKgtTABz@ojcA*inL7WNVPLO1RdV@L>1f3x62KEH@2K5HjL*B!O0(GiC*P|si
zPGT{XELeHa53ofE<muCqI^GHB=;*K_Py;DLsSgQ~u&j>{KT;}+uqTxSYGHqod?ko6
zK+<v867c2(Z?>)>*jZp9Zb85qY9b(}8G5%>ggOg6mV-O?+SuHP5AzJ9?8ZHQnCz09
z!>y|kfo|67VTmSTfse<sPbYG4kBS5`40+sCk2k+l`S}V>aVo<zV>pogA!>58u`~Ep
z#g+#L1QOR5!b+^76`^;*7FBLn+!ql6dkJh3{etis{F0wh$S>X)9}%A7MKRTnHZLCB
zg9Z*)w?$LNNJnM;S`(Ou8H#k9#h#b-YfWH|nCpLf5hq{Lsz82ORz)i;TZg{Qz^9rq
z@3-SF;q$JNKA&oV>TMqjJa~b6RL+uO#5+CM@)~?5g{VHoym&8gAOg-G*E_CT1vZ{>
zydv9pjm+uJ%&6rlCX-t#&b~jMz^wqiD(lmlK%FDve}JZWS-%!Nm<~;ga5Td{=z!fs
z!fMdo+e%!mv9=Wt3Z%Ne33Z#`-`M(E!;B%}7{yujrtOskR2TBfFuvnGc$AC7yA__3
z2ZK$F5+)2>q6UE+Tt6ZG$u;$LE{=Y1oSnQk&Uw!~k^Koj@wa@Cn0kBzyI~<SWReT^
za~?N(Rp@{JqaK`6{eu?n%rc)=_Z_P8r;jHj6CQTu{^^4vUbl13jAnJV&RQRjG`hy^
pm6W3?eAVN18(6lmj*gCo_y;US)`4!&MG^o2002ovPDHLkV1l50Hw*v(

literal 0
HcmV?d00001

diff --git a/resources/images/icons2/20x20/dapps@3x.png b/resources/images/icons2/20x20/dapps@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..b905d606f071f24b51e98a156429edb6500c0ed8
GIT binary patch
literal 1085
zcmV-D1j74?P)<h;3K|Lk000e1NJLTq002Ay002A)1^@s6I{evk00009a7bBm001F4
z001F40Y#QEU;qFB0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1JX%EK~#7F?V3+g
z)Ib!*zs>{=irD2=&~O6r2IC2UovwrvfG1!$0kCu>>{!AH7<TTQ8yNm9+}UCQkxA0N
zCNowtP}1piphD$W6-YPLAz#w3-|P1RG&D3cG&D5a7Yvr++~<AteFnyhjC0}kga`yG
z#+u*>KGlwaRXT0M7)F9+&jH(x(dvdG2w)j2f}ilIRS9%ppRN*rCXTmYiPC~A6q}_d
z;V#&C<D~?9+$UR&zK?Ww0cVdv1_|V?Hc4-gOEBL-;wQix{Kq8dW;^HNWDO;7Q340?
zy3Dlcd@U3w9h5*VdLiO@dSD+hB3{j;aX!s2#PKH>V*G~Hjr~FNGjpkcZe#`)@n|8W
z)&2`f^|Srdw{<R#mtcScLn1`8`JQAGmZ90wRS!|koNT{@T%<R>4g-t@k3x3XLq()!
z;*3mVxiZdQuAm^+1Xs<4ING=_nyspZ69uS^U_~k#S<~UPaIO}(1X?h}@m|o=N`BF*
zcc2dPlies3m4}8C-ixm><a;_DhOV=Zy=Qy<@b?cqR6IUSi`JAJ9#8qyhVEGFn}@rC
zR%vpHa`=|TW4JRqn~z%Aa25(oa<&{^bCWkyW5MojwoQxCyw14V3O*A-FWpY24C3%x
zsjXlIyV|Jy<6%!}1%;T0nI`8NK}g*N=fYV^E!~<{(%v3ECEu5%TQ+Oh&Su0Kc{FXo
zGToxJVG+9K0ZQP&5fZZCm>T0~WK>4ce!~fE@X6VCVG(srlpvy6#|j3E+JeK>*0xY{
zYCffzpKW_^gWJc{8kUQ$ghm>-?tVDyhO|;lwH2(grpUX=L!EK86?}=fo$t}}Aa$P7
zbJ>Q(*sji?T4p?MDDm_z#K~KovBsqq^-mo{i^FyTcdLr>=1r(frOdUNb`ii>u#3na
z)Pn~^UHTEAV$_3{nFp;(JgSzgJHA#ntX5`*ct6`mu4%i-%(5ofDfo#)QIyzAMEm)|
z8Vib6D~$zH;$7t1iI0j<(^!d>xik)=tzqjO3SumH?3%r@IaI(nf3-~0_?sNbS&@5L
zGFc>zOD$n2!ZB~MO{e~#%YWoeq92}?+SDslZp!f{mR;{T`BtgYuU_`=RH<B|GU^Tt
zDEY~QDp+HG<dOj$n=K?-vF#v}qD0Vd_L@wijjQvUU_pe|LjNj7Yewn7gG6^&&OKGe
zCY4h<WxwSzp3+02@U-iClZ;u;ccm~vi_B*VYCeSGXh)e5N@6XvOvAl+ePDCO&<*ue
z`IUm2U9W<#^D6oDP`9v^#|`c(G;L^TXlQ6?xF7xk`ma(e4WGqi00000NkvXXu0mjf
DsTBV7

literal 0
HcmV?d00001

diff --git a/src/status_im/contexts/profile/settings/list_items.cljs b/src/status_im/contexts/profile/settings/list_items.cljs
index cf02e8a17d..9e09330c3d 100644
--- a/src/status_im/contexts/profile/settings/list_items.cljs
+++ b/src/status_im/contexts/profile/settings/list_items.cljs
@@ -34,7 +34,7 @@
     (when config/show-not-implemented-features?
       {:title       (i18n/label :t/dapps)
        :on-press    not-implemented/alert
-       :image-props :i/placeholder
+       :image-props :i/dapps
        :image       :icon
        :blur?       true
        :action      :arrow})
diff --git a/src/status_im/contexts/profile/settings/view.cljs b/src/status_im/contexts/profile/settings/view.cljs
index 71c579d4c1..599eaaca3b 100644
--- a/src/status_im/contexts/profile/settings/view.cljs
+++ b/src/status_im/contexts/profile/settings/view.cljs
@@ -19,7 +19,7 @@
   [rf/delay-render
    [quo/category
     {:list-type       :settings
-     :container-style {:padding-bottom 0}
+     :container-style {:padding-bottom 12}
      :blur?           true
      :data            data}]])
 
diff --git a/src/status_im/contexts/shell/jump_to/view.cljs b/src/status_im/contexts/shell/jump_to/view.cljs
index ddfa36f27f..717f0a591a 100644
--- a/src/status_im/contexts/shell/jump_to/view.cljs
+++ b/src/status_im/contexts/shell/jump_to/view.cljs
@@ -22,13 +22,15 @@
 
 (defn floating-button
   [shared-values]
-  [quo/floating-shell-button
-   {:jump-to {:on-press            #(animation/close-home-stack true)
-              :label               (i18n/label :t/jump-to)
-              :customization-color (rf/sub [:profile/customization-color])}}
-   {:position :absolute
-    :bottom   (utils/bottom-tabs-container-height)}
-   (:home-stack-opacity shared-values)])
+  (let [current-screen-id (rf/sub [:view-id])]
+    (when-not (= current-screen-id :settings)
+      [quo/floating-shell-button
+       {:jump-to {:on-press            #(animation/close-home-stack true)
+                  :label               (i18n/label :t/jump-to)
+                  :customization-color (rf/sub [:profile/customization-color])}}
+       {:position :absolute
+        :bottom   (utils/bottom-tabs-container-height)}
+       (:home-stack-opacity shared-values)])))
 
 (defn f-shell-stack
   []