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.

Sign up for GitHub

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

Jump to bottom

fix: no avatar for the first message in 1-1 chat #18099

Merged
merged 6 commits into from
Dec 11, 2023
Merged

fix: no avatar for the first message in 1-1 chat #18099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bb6c3ae
fix: no avatar for the first message in 1-1 chat
codemaster115 Dec 6, 2023
5aec01d
fix: refactor
codemaster115 Dec 6, 2023
fd31496
fix: using sets as function
codemaster115 Dec 6, 2023
b0be57d
fix: lint
codemaster115 Dec 6, 2023
617b175
refactor
codemaster115 Dec 6, 2023
84a7847
refactor
codemaster115 Dec 11, 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
1 change: 0 additions & 1 deletion src/status_im2/contexts/chat/messages/content/reactions/view.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
(:require
[quo.core :as quo]
[quo.theme :as quo.theme]
[react-native.core :as rn]
[status-im2.constants :as constants]
[status-im2.contexts.chat.messages.drawers.view :as drawers]
[utils.re-frame :as rf]))
Expand Down
26 changes: 20 additions & 6 deletions src/status_im2/contexts/chat/messages/list/events.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,21 @@
[utils.re-frame :as rf]
[utils.red-black-tree :as red-black-tree]))

(def is-system-message-content-type?
#{constants/content-type-system-text
constants/content-type-community
constants/content-type-system-message-mutual-event-accepted
constants/content-type-system-message-mutual-event-removed
constants/content-type-system-message-mutual-event-sent
constants/content-type-system-pinned-message})

(defn is-system-message?
[content-type message-type]
(or
(is-system-message-content-type? content-type)
(= constants/message-type-private-group-system-message
message-type)))

(defn- add-datemark
[{:keys [whisper-timestamp] :as msg}]
;;NOTE(performance) this is slow
Expand All @@ -19,6 +34,7 @@
clock-value
album-id
message-type
content-type
from
outgoing
whisper-timestamp
Expand All @@ -28,12 +44,10 @@
(-> {:whisper-timestamp whisper-timestamp
:from from
:one-to-one? (= constants/message-type-one-to-one message-type)
:system-message? (boolean
(or
(= constants/message-type-private-group-system-message
message-type)
deleted?
deleted-for-me?))
:system-message? (or
(is-system-message? content-type message-type)
deleted?
deleted-for-me?)
:clock-value clock-value
:type :message
:message-id message-id
Expand Down