Skip to content

Commit 810a37f

Browse files
committed
fix: renamed ns and passing only needed props
1 parent 891bd87 commit 810a37f

File tree

5 files changed

+16
-13
lines changed

5 files changed

+16
-13
lines changed

src/status_im/contexts/chat/messenger/messages/content/emoji/style.cljs src/status_im/contexts/chat/messenger/messages/content/emoji_message/style.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
(ns status-im.contexts.chat.messenger.messages.content.emoji.style)
1+
(ns status-im.contexts.chat.messenger.messages.content.emoji-message.style)
22

33
(defn emoji-container
44
[margin-top]

src/status_im/contexts/chat/messenger/messages/content/emoji/view.cljs src/status_im/contexts/chat/messenger/messages/content/emoji_message/view.cljs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
(ns status-im.contexts.chat.messenger.messages.content.emoji.view
1+
(ns status-im.contexts.chat.messenger.messages.content.emoji-message.view
22
(:require [react-native.core :as rn]
3-
[status-im.contexts.chat.messenger.messages.content.emoji.style :as style]))
3+
[status-im.contexts.chat.messenger.messages.content.emoji-message.style :as style]))
44

5-
(defn emoji-message
6-
[{:keys [content last-in-group? pinned]} {:keys [in-pinned-view?]}]
5+
(defn view
6+
[{:keys [content last-in-group? pinned in-pinned-view?]}]
77
(let [margin-top (if (or last-in-group? in-pinned-view? pinned) 8 0)]
88
[rn/view {:style (style/emoji-container margin-top)}
99
[rn/text {:style style/emoji-text}

src/status_im/contexts/chat/messenger/messages/content/sticker/view.cljs src/status_im/contexts/chat/messenger/messages/content/sticker_message/view.cljs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
(ns status-im.contexts.chat.messenger.messages.content.sticker.view
1+
(ns status-im.contexts.chat.messenger.messages.content.sticker-message.view
22
(:require [react-native.core :as rn]
33
[react-native.fast-image :as fast-image]))
44

5-
(defn sticker-message
5+
(defn view
66
[{:keys [url]}]
77
[rn/view {:style {:margin-top 6 :margin-bottom 4}}
88
[fast-image/fast-image

src/status_im/contexts/chat/messenger/messages/content/view.cljs

+7-4
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
[status-im.contexts.chat.messenger.messages.content.album.view :as album]
1616
[status-im.contexts.chat.messenger.messages.content.audio.view :as audio]
1717
[status-im.contexts.chat.messenger.messages.content.deleted.view :as content.deleted]
18-
[status-im.contexts.chat.messenger.messages.content.emoji.view :as emoji]
18+
[status-im.contexts.chat.messenger.messages.content.emoji-message.view :as emoji-message]
1919
[status-im.contexts.chat.messenger.messages.content.image.view :as image]
2020
[status-im.contexts.chat.messenger.messages.content.pin.view :as pin]
2121
[status-im.contexts.chat.messenger.messages.content.reactions.view :as reactions]
2222
[status-im.contexts.chat.messenger.messages.content.status.view :as status]
23-
[status-im.contexts.chat.messenger.messages.content.sticker.view :as sticker]
23+
[status-im.contexts.chat.messenger.messages.content.sticker-message.view :as sticker-message]
2424
[status-im.contexts.chat.messenger.messages.content.style :as style]
2525
[status-im.contexts.chat.messenger.messages.content.system.text.view :as system.text]
2626
[status-im.contexts.chat.messenger.messages.content.text.view :as content.text]
@@ -201,10 +201,13 @@
201201
[content.text/text-content message-data context]
202202

203203
constants/content-type-emoji
204-
[emoji/emoji-message message-data context]
204+
[emoji-message/view
205+
(-> message-data
206+
(select-keys [:content :last-in-group? :pinned])
207+
(assoc :in-pinned-view? (:in-pinned-view? context)))]
205208

206209
constants/content-type-sticker
207-
[sticker/sticker-message {:url (-> message-data :content :sticker :url)}]
210+
[sticker-message/view {:url (-> message-data :content :sticker :url)}]
208211

209212
constants/content-type-audio
210213
[audio/audio-message message-data context]

src/status_im/contexts/shell/activity_center/notification/reply/view.cljs

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[react-native.gesture :as gesture]
66
[status-im.common.not-implemented :as not-implemented]
77
[status-im.constants :as constants]
8-
[status-im.contexts.chat.messenger.messages.content.sticker.view :as sticker]
8+
[status-im.contexts.chat.messenger.messages.content.sticker-message.view :as sticker-message]
99
[status-im.contexts.shell.activity-center.notification.common.view :as common]
1010
[status-im.contexts.shell.activity-center.notification.reply.style :as style]
1111
[utils.datetime :as datetime]
@@ -34,7 +34,7 @@
3434
:message-text (get-in message [:content :text])}])
3535

3636
constants/content-type-sticker
37-
[sticker/sticker-message {:url (-> message :content :sticker :url)}]
37+
[sticker-message/view {:url (-> message :content :sticker :url)}]
3838

3939
constants/content-type-system-pinned-message
4040
[not-implemented/not-implemented

0 commit comments

Comments
 (0)