Skip to content

Commit 9c50468

Browse files
committed
fix: contacts profile page jump to button color
1 parent 1a78028 commit 9c50468

File tree

5 files changed

+6
-15
lines changed

5 files changed

+6
-15
lines changed

src/status_im/contexts/profile/contact/add_nickname/view.cljs

+1-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414
[]
1515
(let [{:keys [public-key primary-name nickname customization-color]
1616
:as profile} (rf/sub [:contacts/current-contact])
17-
;; TODO(@mohsen): remove default color,
18-
;; https://github.com/status-im/status-mobile/issues/18733
19-
customization-color (or customization-color constants/profile-default-color)
17+
customization-color customization-color
2018
full-name (profile.utils/displayed-name profile)
2119
profile-picture (profile.utils/photo profile)
2220
[unsaved-nickname set-unsaved-nickname] (rn/use-state nickname)

src/status_im/contexts/profile/contact/block_contact/view.cljs

+1-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@
1313
[]
1414
(let [{:keys [customization-color contact-request-state public-key]
1515
:as contact} (rf/sub [:contacts/current-contact])
16-
;; TODO(@mohsen): remove default color,
17-
;; https://github.com/status-im/status-mobile/issues/18733
18-
customization-color (or customization-color constants/profile-default-color)
16+
customization-color customization-color
1917
full-name (profile.utils/displayed-name contact)
2018
profile-picture (profile.utils/photo contact)
2119
on-block-press (rn/use-callback

src/status_im/contexts/profile/contact/contact_request/view.cljs

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
[]
1313
(let [{:keys [public-key customization-color]
1414
:as profile} (rf/sub [:contacts/current-contact])
15-
;; TODO: remove default color when #18733 merged.
16-
customization-color (or customization-color constants/profile-default-color)
15+
customization-color customization-color
1716
full-name (profile.utils/displayed-name profile)
1817
profile-picture (profile.utils/photo profile)
1918
[message set-message] (rn/use-state "")

src/status_im/contexts/profile/contact/header/view.cljs

-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@
2929
(let [{:keys [public-key customization-color ens-name nickname secondary-name
3030
emoji-hash bio blocked? contact-request-state]
3131
:as contact} (rf/sub [:contacts/current-contact])
32-
;; TODO(@mohsen): remove default color,
33-
;; https://github.com/status-im/status-mobile/issues/18733
3432
customization-color (or customization-color constants/profile-default-color)
3533
full-name (profile.utils/displayed-name contact)
3634
profile-picture (profile.utils/photo contact)

src/status_im/contexts/profile/contact/view.cljs

+3-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
[quo.theme]
55
[react-native.reanimated :as reanimated]
66
[status-im.common.scroll-page.view :as scroll-page]
7-
[status-im.constants :as constants]
87
[status-im.contexts.profile.contact.actions.view :as actions]
98
[status-im.contexts.profile.contact.header.view :as contact-header]
109
[status-im.contexts.shell.jump-to.constants :as jump-to.constants]
@@ -25,16 +24,15 @@
2524
(defn view
2625
[]
2726
(let [{:keys [customization-color]} (rf/sub [:contacts/current-contact])
27+
profile-customization-color (rf/sub [:profile/customization-color])
2828
scroll-y (reanimated/use-shared-value 0)
2929
theme (quo.theme/use-theme-value)]
3030
[:<>
3131
[scroll-page/scroll-page
3232
{:navigate-back? true
3333
:height 148
3434
:on-scroll #(reanimated/set-shared-value scroll-y %)
35-
;; TODO(@mohsen): remove default color,
36-
;; https://github.com/status-im/status-mobile/issues/18733
37-
:cover-color (colors/resolve-color (or customization-color constants/profile-default-color)
35+
:cover-color (colors/resolve-color customization-color
3836
theme
3937
20)
4038
:background-color (colors/theme-colors colors/white colors/neutral-95 theme)
@@ -45,7 +43,7 @@
4543
[quo/floating-shell-button
4644
{:jump-to
4745
{:on-press on-jump-to
48-
:customization-color customization-color
46+
:customization-color profile-customization-color
4947
:label (i18n/label :t/jump-to)}}
5048
{:position :absolute
5149
:bottom jump-to.constants/floating-shell-button-height}]]))

0 commit comments

Comments
 (0)