Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: wrong color stroke in profile setting #19815

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions src/status_im/contexts/profile/settings/header/style.cljs
Original file line number Diff line number Diff line change
@@ -1,26 +1,16 @@
(ns status-im.contexts.profile.settings.header.style
(:require [quo.foundations.colors :as colors]))

(defn header-view
[customization-color theme]
{:background-color (colors/resolve-color customization-color theme 40)
:min-height 100
:flex 1})

(def avatar-row-wrapper
{:display :flex
:padding-left 16
:padding-left 20
:padding-right 12
:margin-top -60
:margin-bottom -4
:align-items :flex-end
:justify-content :space-between
:flex-direction :row})

(def title-container
{:padding-horizontal 20
:padding-vertical 12})

(defn header-middle-shape
[background-color]
{:background-color background-color
Expand Down
12 changes: 5 additions & 7 deletions src/status_im/contexts/profile/settings/header/view.cljs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
(ns status-im.contexts.profile.settings.header.view
(:require [clojure.string :as string]
[quo.core :as quo]
(:require [quo.core :as quo]
[quo.foundations.colors :as colors]
[quo.theme]
[react-native.core :as rn]
Expand All @@ -15,6 +14,7 @@
(defn view
[{:keys [scroll-y]}]
(let [theme (quo.theme/use-theme)
app-theme (rf/sub [:theme])
{:keys [public-key emoji-hash bio] :as profile} (rf/sub [:profile/profile-with-image])
online? (rf/sub [:visibility-status-updates/online?
public-key])
Expand All @@ -24,9 +24,8 @@
customization-color (rf/sub [:profile/customization-color])
full-name (profile.utils/displayed-name profile)
profile-picture (profile.utils/photo profile)
emoji-string (string/join emoji-hash)
{:keys [status-title status-icon]} (header.utils/visibility-status-type-data status)
border-theme theme]
border-theme app-theme]
[:<>
[header.shape/view
{:scroll-y scroll-y
Expand Down Expand Up @@ -55,9 +54,8 @@
:theme :dark
:content (fn [] [visibility-sheet/view])}])}
status-title]]]
[quo/text-combinations
[quo/page-top
{:title-accessibility-label :username
:container-style style/title-container
:emoji-hash emoji-string
:emoji-dash emoji-hash
:description bio
:title full-name}]]))
6 changes: 4 additions & 2 deletions src/status_im/contexts/profile/settings/list_items.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,9 @@
:image-props :i/light})]
[{:title (i18n/label :t/about)
:on-press #(rf/dispatch [:open-modal :about-app])
:action :arrow}
:action :arrow
:blur? true}
{:title (i18n/label :t/status-help)
:on-press #(rf/dispatch [:open-modal :help-center])
:action :arrow}]])
:action :arrow
:blur? true}]])