Remove not-implemented box from sticker/emoji messages

src/legacy/status_im/ui/screens/chat/message/legacy_view.cljs

@@ -2,7 +2,6 @@
   (:require
     [legacy.status-im.react-native.resources :as resources]
     [legacy.status-im.ui.components.colors :as quo.colors]
-    [legacy.status-im.ui.components.fast-image :as fast-image]
     [legacy.status-im.ui.screens.chat.message.legacy-style :as style]
     [quo.core :as quo]
     [quo.foundations.colors :as colors]
@@ -145,23 +144,6 @@
      [rn/text {:style (style/status-text)}]
      (-> content :parsed-text peek :children))]])
 
-;; EMOJI
-(defn emoji
-  []
-  (fn [{:keys [content] :as message}]
-    [rn/view (style/message-view message)
-     [rn/view {:style (style/message-view-content)}
-      [rn/view {:style (style/style-message-text)}
-       [rn/text {:style (style/emoji-message message)}
-        (:text content)]]]]))
-
-;; STICKER
-(defn sticker
-  [{:keys [content]}]
-  [fast-image/fast-image
-   {:style  {:margin 10 :width 140 :height 140}
-    :source {:uri (str (-> content :sticker :url) "&download=true")}}])
-
 (defn contact-request-status-pending
   []
   [rn/view {:style {:flex-direction :row}}

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

@@ -0,0 +1,10 @@
+(ns status-im.contexts.chat.messenger.messages.content.emoji-message.style)
+
+(defn emoji-container
+  [margin-top]
+  {:flex-direction :row
+   :margin-top     margin-top})
+
+(def emoji-text
+  {:font-size   36
+   :line-height 42})

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

@@ -0,0 +1,10 @@
+(ns status-im.contexts.chat.messenger.messages.content.emoji-message.view
+  (:require [react-native.core :as rn]
+            [status-im.contexts.chat.messenger.messages.content.emoji-message.style :as style]))
+
+(defn view
+  [{:keys [content last-in-group? pinned in-pinned-view?]}]
+  (let [margin-top (if (or last-in-group? in-pinned-view? pinned) 8 0)]
+    [rn/view {:style (style/emoji-container margin-top)}
+     [rn/text {:style style/emoji-text}
+      (:text content)]]))

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

@@ -0,0 +1,10 @@
+(ns status-im.contexts.chat.messenger.messages.content.sticker-message.view
+  (:require [react-native.core :as rn]
+            [react-native.fast-image :as fast-image]))
+
+(defn view
+  [{:keys [url]}]
+  [rn/view {:style {:margin-top 6 :margin-bottom 4}}
+   [fast-image/fast-image
+    {:style  {:width 120 :height 120}
+     :source {:uri (str url "&download=true")}}]])

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

@@ -15,10 +15,12 @@
     [status-im.contexts.chat.messenger.messages.content.album.view :as album]
     [status-im.contexts.chat.messenger.messages.content.audio.view :as audio]
     [status-im.contexts.chat.messenger.messages.content.deleted.view :as content.deleted]
+    [status-im.contexts.chat.messenger.messages.content.emoji-message.view :as emoji-message]
     [status-im.contexts.chat.messenger.messages.content.image.view :as image]
     [status-im.contexts.chat.messenger.messages.content.pin.view :as pin]
     [status-im.contexts.chat.messenger.messages.content.reactions.view :as reactions]
     [status-im.contexts.chat.messenger.messages.content.status.view :as status]
+    [status-im.contexts.chat.messenger.messages.content.sticker-message.view :as sticker-message]
     [status-im.contexts.chat.messenger.messages.content.style :as style]
     [status-im.contexts.chat.messenger.messages.content.system.text.view :as system.text]
     [status-im.contexts.chat.messenger.messages.content.text.view :as content.text]
@@ -199,10 +201,13 @@
                [content.text/text-content message-data context]
 
                constants/content-type-emoji
-               [not-implemented/not-implemented [old-message/emoji message-data]]
+               [emoji-message/view
+                (-> message-data
+                    (select-keys [:content :last-in-group? :pinned])
+                    (assoc :in-pinned-view? (:in-pinned-view? context)))]
 
                constants/content-type-sticker
-               [not-implemented/not-implemented [old-message/sticker message-data]]
+               [sticker-message/view {:url (-> message-data :content :sticker :url)}]
 
                constants/content-type-audio
                [audio/audio-message message-data context]

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

@@ -1,11 +1,11 @@
 (ns status-im.contexts.shell.activity-center.notification.reply.view
   (:require
     [clojure.string :as string]
-    [legacy.status-im.ui.screens.chat.message.legacy-view :as old-message]
     [quo.core :as quo]
     [react-native.gesture :as gesture]
     [status-im.common.not-implemented :as not-implemented]
     [status-im.constants :as constants]
+    [status-im.contexts.chat.messenger.messages.content.sticker-message.view :as sticker-message]
     [status-im.contexts.shell.activity-center.notification.common.view :as common]
     [status-im.contexts.shell.activity-center.notification.reply.style :as style]
     [utils.datetime :as datetime]
@@ -34,7 +34,7 @@
         :message-text (get-in message [:content :text])}])
 
     constants/content-type-sticker
-    [old-message/sticker message]
+    [sticker-message/view {:url (-> message :content :sticker :url)}]
 
     constants/content-type-system-pinned-message
     [not-implemented/not-implemented