Skip to content

[15902] BUGFIX - Resolve public keys into the user's name in the confirmation drawer #16176

New issue

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

#

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

Already on GitHub? # to your account

Merged
merged 5 commits into from
Jun 27, 2023
Merged

[15902] BUGFIX - Resolve public keys into the user's name in the confirmation drawer #16176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
12bb2d4
[15902] Resolve public keys into the user's name
ibrkhalil Jun 5, 2023
3c87ba9
Fix mention in chat
ibrkhalil Jun 10, 2023
dd676c6
rebase
ibrkhalil Jun 23, 2023
146f4a6
Improvements
ibrkhalil Jun 25, 2023
44a7812
Merge branch 'develop' into 15902
ibrkhalil Jun 27, 2023
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
4 changes: 2 additions & 2 deletions src/status_im2/common/confirmation_drawer/view.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
profile-picture name]} context
id (or chat-id public-key)
display-name (or
name
(when-not group-chat
(rf/sub [:contacts/contact-name-by-identity id])))
(rf/sub [:contacts/contact-name-by-identity id]))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the kind of thing we should have a subscription for, so that we can avoid code duplication to handle the logic for display names.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we either add this as part of this pr, or create a follow up issue so it can be addressed?

name)
contact (when-not group-chat
(rf/sub [:contacts/contact-by-address
id]))
Expand Down
12 changes: 7 additions & 5 deletions src/status_im2/contexts/chat/lightbox/bottom_view.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
[utils.re-frame :as rf]
[status-im2.contexts.chat.lightbox.animations :as anim]
[status-im2.contexts.chat.lightbox.constants :as c]
[status-im2.constants :as constants]))
[status-im2.contexts.chat.messages.content.text.view :as message-view]))

(defn get-small-item-layout
[_ index]
Expand Down Expand Up @@ -50,15 +50,17 @@

(defn bottom-view
[messages index scroll-index insets animations derived item-width props]
(let [text (get-in (first messages) [:content :text])
padding-horizontal (- (/ item-width 2) (/ c/focused-image-size 2))]
(let [{:keys [chat-id content]} (first messages)
padding-horizontal (- (/ item-width 2) (/ c/focused-image-size 2))]
[reanimated/linear-gradient
{:colors [:black :transparent]
:start {:x 0 :y 1}
:end {:x 0 :y 0}
:style (style/gradient-container insets animations derived)}
(when constants/image-description-in-lightbox?
[rn/text {:style style/text-style} text])
[message-view/render-parsed-text
{:content content
:chat-id chat-id
:style-override style/text-style}]
[rn/flat-list
{:ref #(reset! (:small-list-ref props) %)
:key-fn :message-id
Expand Down
161 changes: 90 additions & 71 deletions src/status_im2/contexts/chat/messages/content/text/view.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,87 +9,106 @@
[utils.re-frame :as rf]))

(defn render-inline
[units {:keys [type literal destination]} chat-id]
(case (keyword type)
:code
(conj units [quo/text {:style (merge style/block (style/code)) :weight :code} literal])

:emph
(conj units [quo/text {:style {:font-style :italic}} literal])

:strong
(conj units [quo/text {:weight :bold} literal])

:strong-emph
(conj units
[quo/text
{:weight :bold
:style {:font-style :italic}} literal])

:del
(conj units [quo/text {:style {:text-decoration-line :line-through}} literal])

:link
(conj units
[quo/text
{:style {:color (colors/theme-colors colors/primary-50 colors/primary-60)}
:on-press #(rf/dispatch [:browser.ui/message-link-pressed destination])}
destination])

:mention
(conj
units
[rn/view
{:style style/mention-tag-wrapper}
[rn/touchable-opacity
{:active-opacity 1
:on-press #(rf/dispatch [:chat.ui/show-profile literal])
:style style/mention-tag}
[quo/text
{:weight :medium
:style style/mention-tag-text}
(rf/sub [:messages/resolve-mention literal])]]])

:edited
(conj units

[quo/text
{:weight :medium
:style {:font-size 11 ; Font-size must be used instead of props or the
; styles will clash with original message text
:color (colors/theme-colors colors/neutral-40
colors/neutral-50)}}
literal])
:status-tag
(let [community-id (rf/sub [:community-id-by-chat-id chat-id])]
[units {:keys [type literal destination]} chat-id style-override]
(let [show-as-plain-text? (seq style-override)]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this could just be the prop value instead, would be slightly nicer as you don't couple style override to this.
e.g

(defn render-inline
  [units {:keys [type literal destination]} chat-id show-as-plain-text? ]
  ...

(render-inline {...} "chat-id" (seq style-override)) ...

(case (keyword type)
:code
(conj units
[quo/text
{:style (if show-as-plain-text?
{:color colors/white}
(merge style/block (style/code)))
:weight :code} literal])

:emph
(conj units
[quo/text
{:style {:font-style :italic
:color (when show-as-plain-text? colors/white)}} literal])

:strong
(conj units
[quo/text
(cond-> {:weight :bold}
show-as-plain-text? (assoc :style {:color colors/white})) literal])

:strong-emph
(conj units
[quo/text
{:weight :bold
:style {:font-style :italic
:color (when show-as-plain-text? colors/white)}} literal])

:del
(conj units
[quo/text
{:style {:text-decoration-line :line-through
:color (when show-as-plain-text? colors/white)}} literal])

:link
(conj units
[quo/text
{:style {:color (colors/theme-colors colors/primary-50 colors/primary-60)}
:on-press #(rf/dispatch [:browser.ui/message-link-pressed destination])}
destination])

:mention
(conj
units
[rn/view
{:style style/mention-tag-wrapper}
[rn/touchable-opacity
{:active-opacity 1
:on-press #(rf/dispatch [:chat.ui/show-profile literal])
:style style/mention-tag}
[quo/text
{:weight :medium
:style style/mention-tag-text}
(rf/sub [:messages/resolve-mention literal])]]])

:edited
(conj units
[rn/text
(when community-id
{:style {:color :blue
:text-decoration-line :underline}
:on-press #(rf/dispatch [:communities/status-tag-pressed community-id literal])})
"#"
literal]))

(conj units literal)))
[quo/text
{:weight :medium
:style {:font-size 11 ; Font-size must be used instead of props or the
; styles will clash with original message text
:color (colors/theme-colors colors/neutral-40
colors/neutral-50)}}
literal])
:status-tag
(let [community-id (rf/sub [:community-id-by-chat-id chat-id])]
(conj units
[rn/text
(when community-id
{:style {:color :blue
:text-decoration-line :underline}
:on-press #(rf/dispatch [:communities/status-tag-pressed community-id literal])})
"#"
literal]))

(conj units literal))))


(defn render-block
[blocks {:keys [type literal children]} chat-id]
[blocks {:keys [type literal children]} chat-id style-override]
(case (keyword type)
:paragraph
(conj blocks
(reduce
(fn [acc e]
(render-inline acc e chat-id))
[quo/text {:size :paragraph-1}]
children))
[rn/view
(reduce
(fn [acc e]
(render-inline acc e chat-id style-override))
[quo/text
{:style {:size :paragraph-1
:color (when (seq style-override) colors/white)}}]
children)])

:edited-block
(conj blocks
(reduce
(fn [acc e]
(render-inline acc e chat-id))
(render-inline acc e chat-id style-override))
[quo/text {:size :paragraph-1}]
children))

Expand Down Expand Up @@ -120,11 +139,11 @@
(conj parsed-text {:type :edited-block :children [edited-tag]}))))

(defn render-parsed-text
[{:keys [content chat-id edited-at]}]
[{:keys [content chat-id edited-at style-override]}]
^{:key (:parsed-text content)}
[rn/view
[rn/view {:style style-override}
(reduce (fn [acc e]
(render-block acc e chat-id))
(render-block acc e chat-id style-override))
[:<>]
(cond-> (:parsed-text content)
edited-at
Expand Down