status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix duplicate mention (#19203)

This commit is contained in:
Parvesh Monu 2024-03-20 21:31:57 +05:30 committed by GitHub
parent c2f0060a47
commit 5854a473f0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/status_im/contexts/chat/messenger/messages/content/text/style.cljs
View File

@ -17,6 +17,8 @@
{:flex-direction :row {:flex-direction :row
:align-items :center :align-items :center
:height (if platform/ios? 22 21) :height (if platform/ios? 22 21)
:background-color colors/primary-50-opa-10
:padding-horizontal 3
:border-radius 6 :border-radius 6
:transform [{:translateY (if platform/ios? (if first-child-mention 4.5 3) 4.5)}]}) :transform [{:translateY (if platform/ios? (if first-child-mention 4.5 3) 4.5)}]})
@ -24,8 +26,6 @@
{:color (colors/theme-colors colors/primary-50 {:color (colors/theme-colors colors/primary-50
colors/primary-60) colors/primary-60)
:selection-color :transparent :selection-color :transparent
:background-color colors/primary-50-opa-10
:padding-horizontal 3
:suppress-highlighting true}) :suppress-highlighting true})
(defn code (defn code

5
src/status_im/contexts/chat/messenger/messages/content/text/view.cljs
View File

@ -57,16 +57,14 @@
:mention :mention
(conj (conj
units units
(let [resolved-mention (rf/sub [:messages/resolve-mention literal])]
[rn/pressable [rn/pressable
{:on-press #(rf/dispatch [:chat.ui/show-profile literal]) {:on-press #(rf/dispatch [:chat.ui/show-profile literal])
:key resolved-mention
:style (style/mention-tag-wrapper first-child-mention)} :style (style/mention-tag-wrapper first-child-mention)}
[quo/text [quo/text
{:weight :medium {:weight :medium
:style style/mention-tag-text :style style/mention-tag-text
:size :paragraph-1} :size :paragraph-1}
resolved-mention]])) (rf/sub [:messages/resolve-mention literal])]])
:edited :edited
(conj units (conj units
@ -108,6 +106,7 @@
(render-inline acc e chat-id style-override mention-first)) (render-inline acc e chat-id style-override mention-first))
[quo/text [quo/text
{:size :paragraph-1 {:size :paragraph-1
:key (rand-int 1000000) ;; https://github.com/status-im/status-mobile/pull/19203
:style {:margin-bottom (if mention-first (if platform/ios? 4 0) 2) :style {:margin-bottom (if mention-first (if platform/ios? 4 0) 2)
:margin-top (if mention-first (if platform/ios? -4 0) -1) :margin-top (if mention-first (if platform/ios? -4 0) -1)
:color (when (seq style-override) colors/white) :color (when (seq style-override) colors/white)