status-im/status-react
2
0
Fork 0
mirror of https://github.com/status-im/status-react.git synced 2025-02-02 22:25:12 +00:00
Code Issues Projects Releases Wiki Activity

Avatars are missing in messages bridged from Discord to Status app (#19994)

Browse Source
This commit is contained in:
flexsurfer 2024-05-16 12:10:20 +02:00 committed by GitHub
parent 05f381044c
commit 30715a69e1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/react_native/fast_image.cljs
View File

@ -15,7 +15,7 @@
[_] [_]
(let [loaded? (reagent/atom false) (let [loaded? (reagent/atom false)
error? (reagent/atom false)] error? (reagent/atom false)]
(fn [{:keys [source] :as props}] (fn [{:keys [source fallback-content] :as props}]
[fast-image-class [fast-image-class
(merge (merge
props props
@ -35,6 +35,6 @@
(when (or @error? (not @loaded?)) (when (or @error? (not @loaded?))
[placeholder (:style props) [placeholder (:style props)
(if @error? (if @error?
[rn/text "X"] (or fallback-content [rn/text "X"])
(when-not @loaded? (when-not @loaded?
[rn/activity-indicator {:animating true}]))])]))) [rn/activity-indicator {:animating true}]))])])))

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

@ -126,25 +126,32 @@
(-> user-name (-> user-name
(string/replace "<b>" "") (string/replace "<b>" "")
(string/replace "</b>" "")))] (string/replace "</b>" "")))]
[rn/view (when (and user-name content)
{:style {:flex-direction :row [rn/view
:padding-horizontal 12 {:style {:flex-direction :row
:padding-top 4}} :padding-horizontal 12
[fast-image/fast-image :padding-top 4}}
{:source {:uri user-avatar} [fast-image/fast-image
:style {:width 32 {:source {:uri user-avatar}
:margin-top 4 :fallback-content [quo/user-avatar
:border-radius 16 {:full-name user-name
:height 32}}] :ring? false
[rn/view {:margin-left 8 :flex 1} :online? false
[quo/author :status-indicator? false
{:primary-name (str user-name) :size :small}]
:short-chat-key (str "Bridged from " bridge-name) :style {:width 32
:time-str (datetime/timestamp->time timestamp)}] :margin-top 4
[quo/text :border-radius 16
{:size :paragraph-1 :height 32}}]
:style {:line-height 22.75}} [rn/view {:margin-left 8 :flex 1}
content]]])) [quo/author
{:primary-name (str user-name)
:short-chat-key (str "Bridged from " bridge-name)
:time-str (datetime/timestamp->time timestamp)}]
[quo/text
{:size :paragraph-1
:style {:line-height 22.75}}
content]]])))
(declare on-long-press) (declare on-long-press)