From f8db861495223b3270c2751b6a97458a68e8a865 Mon Sep 17 00:00:00 2001
From: Mohsen <maxghafori@gmail.com>
Date: Tue, 6 Feb 2024 21:37:47 +0300
Subject: [PATCH] [#18453] fix: design feedbacks

---
 src/quo/components/colors/color_picker/view.cljs       |  2 +-
 .../contexts/profile/edit/accent_colour/style.cljs     |  9 ++++-----
 .../contexts/profile/edit/accent_colour/view.cljs      |  3 ++-
 src/status_im/navigation/options.cljs                  | 10 +++++++++-
 src/status_im/navigation/screens.cljs                  |  6 +++---
 status-go-version.json                                 |  6 +++---
 6 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/quo/components/colors/color_picker/view.cljs b/src/quo/components/colors/color_picker/view.cljs
index fa02a7d3a79..14579fc044e 100644
--- a/src/quo/components/colors/color_picker/view.cljs
+++ b/src/quo/components/colors/color_picker/view.cljs
@@ -35,7 +35,7 @@
             (when (and @ref (>= index 0))
               (some-> ^js @ref
                       (.scrollToIndex #js
-                                       {:animated     true
+                                       {:animated     false
                                         :index        index
                                         :viewPosition 0.5})))))
         50)))
diff --git a/src/status_im/contexts/profile/edit/accent_colour/style.cljs b/src/status_im/contexts/profile/edit/accent_colour/style.cljs
index f826a2e50b2..571bf77eb2f 100644
--- a/src/status_im/contexts/profile/edit/accent_colour/style.cljs
+++ b/src/status_im/contexts/profile/edit/accent_colour/style.cljs
@@ -11,11 +11,10 @@
 (def screen-container
   {:flex            1
    :padding-top     14
-   :padding-left    20
    :justify-content :space-between})
 
-(def padding-right
-  {:padding-right 20})
+(def padding-horizontal
+  {:padding-horizontal 20})
 
 (def color-title
   {:color         colors/white-70-blur
@@ -23,8 +22,8 @@
    :margin-bottom 16})
 
 (def button-wrapper
-  {:margin-vertical 12
-   :padding-right   20})
+  {:margin-vertical    12
+   :padding-horizontal 20})
 
 (def profile-card
   {:margin-top    22
diff --git a/src/status_im/contexts/profile/edit/accent_colour/view.cljs b/src/status_im/contexts/profile/edit/accent_colour/view.cljs
index 023c52353b6..e0f8db4a0ef 100644
--- a/src/status_im/contexts/profile/edit/accent_colour/view.cljs
+++ b/src/status_im/contexts/profile/edit/accent_colour/view.cljs
@@ -34,7 +34,7 @@
           {:key   :content
            :style style/screen-container}
           [rn/view {:style {:flex 1}}
-           [rn/view {:style style/padding-right}
+           [rn/view {:style style/padding-horizontal}
             [quo/text-combinations {:title (i18n/label :t/accent-colour)}]
             [quo/profile-card
              {:profile-picture     profile-picture
@@ -50,6 +50,7 @@
             {:blur?            true
              :default-selected @unsaved-custom-color
              :on-change        on-change
+             :container-style  style/padding-horizontal
              :window-width     window-width}]]
           [rn/view {:style style/button-wrapper}
            [quo/button
diff --git a/src/status_im/navigation/options.cljs b/src/status_im/navigation/options.cljs
index 93b67c20be2..db545150d29 100644
--- a/src/status_im/navigation/options.cljs
+++ b/src/status_im/navigation/options.cljs
@@ -2,7 +2,8 @@
   (:require
     [quo.foundations.colors :as colors]
     [quo.theme :as quo.theme]
-    [react-native.platform :as platform]))
+    [react-native.platform :as platform]
+    [status-im.navigation.transitions :as transitions]))
 
 (defn default-options
   []
@@ -88,6 +89,13 @@
                              :orientation              ["portrait"]
                              :backgroundColor          :transparent}}))
 
+(def transparent-modal-screen-options
+  (merge
+   transparent-screen-options
+   {:animations (merge
+                 transitions/new-to-status-modal-animations
+                 transitions/push-animations-for-transparent-background)}))
+
 (def sheet-options
   {:layout                 {:componentBackgroundColor :transparent
                             :orientation              ["portrait"]
diff --git a/src/status_im/navigation/screens.cljs b/src/status_im/navigation/screens.cljs
index a978fd8baa9..2cd5e60e2a9 100644
--- a/src/status_im/navigation/screens.cljs
+++ b/src/status_im/navigation/screens.cljs
@@ -174,15 +174,15 @@
      :component profiles/view}
 
     {:name      :edit-profile
-     :options   options/transparent-screen-options
+     :options   options/transparent-modal-screen-options
      :component edit-profile/view}
 
     {:name      :edit-accent-colour
-     :options   options/transparent-screen-options
+     :options   options/transparent-modal-screen-options
      :component edit-accent-colour/view}
 
     {:name      :edit-name
-     :options   options/transparent-screen-options
+     :options   options/transparent-modal-screen-options
      :component edit-name/view}
 
     {:name      :new-to-status
diff --git a/status-go-version.json b/status-go-version.json
index 01725148c89..59f4e81d7a8 100644
--- a/status-go-version.json
+++ b/status-go-version.json
@@ -3,7 +3,7 @@
     "_comment": "Instead use: scripts/update-status-go.sh <rev>",
     "owner": "status-im",
     "repo": "status-go",
-    "version": "feat/change-accent-colour",
-    "commit-sha1": "3b9d813f4b1d815c11f56abc93c4d6bfe16d4b5b",
-    "src-sha256": "0grzw3fa9b25ph6i64inwbsr9nrgs2jzgz9v3db88q8jwlwn15sz"
+    "version": "v0.174.1",
+    "commit-sha1": "70ee70a19aeafb34e51db1e771b5472fd2568ba9",
+    "src-sha256": "1v2mg106r4dzl0hf36nr0jz5wnszk03nmasqvwsvzsrypkcd01c4"
 }