From 016b38f15c1e9b0f4512b9451d01364df59795ef Mon Sep 17 00:00:00 2001
From: Andrea Maria Piana <andrea.maria.piana@gmail.com>
Date: Mon, 7 Aug 2023 14:02:49 +0100
Subject: [PATCH] Various fixes on messaging view

---
 .../components/messages/author/style.cljs     |  2 +-
 src/quo2/components/reactions/reaction.cljs   | 23 +++++++++----------
 .../contexts/chat/composer/reply/view.cljs    |  2 +-
 .../contexts/chat/composer/view.cljs          |  2 +-
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/quo2/components/messages/author/style.cljs b/src/quo2/components/messages/author/style.cljs
index 13c552d59e..b334c149f0 100644
--- a/src/quo2/components/messages/author/style.cljs
+++ b/src/quo2/components/messages/author/style.cljs
@@ -4,7 +4,7 @@
 (def container
   {:flex-wrap      :wrap
    :flex-direction :row
-   :align-items    :baseline})
+   :align-items    :center})
 
 (def middle-dot-nickname
   {:color             colors/neutral-50
diff --git a/src/quo2/components/reactions/reaction.cljs b/src/quo2/components/reactions/reaction.cljs
index c716bbddc8..49dc0c6397 100644
--- a/src/quo2/components/reactions/reaction.cljs
+++ b/src/quo2/components/reactions/reaction.cljs
@@ -7,18 +7,15 @@
             [quo2.theme :as theme]
             [react-native.core :as rn]))
 
-(defn add-reaction
-  [{:keys [on-press]}]
-  (let [dark? (theme/dark?)]
-    [rn/touchable-opacity
-     {:on-press            on-press
-      :accessibility-label :emoji-reaction-add
-      :style               (style/add-reaction)}
-     [icons/icon :i/add-reaction
-      {:size  20
-       :color (if dark?
-                colors/white
-                colors/neutral-100)}]]))
+(defn- add-reaction-internal
+  [{:keys [on-press theme]}]
+  [rn/touchable-opacity
+   {:on-press            on-press
+    :accessibility-label :emoji-reaction-add
+    :style               (style/add-reaction)}
+   [icons/icon :i/add-reaction
+    {:size  20
+     :color (colors/theme-colors colors/neutral-50 colors/white theme)}]])
 
 (defn reaction
   "Add your emoji as a param here"
@@ -41,3 +38,5 @@
        :justify-content :center}
       (when (pos? numeric-value)
         (str " " numeric-value))]]))
+
+(def add-reaction (theme/with-theme add-reaction-internal))
diff --git a/src/status_im2/contexts/chat/composer/reply/view.cljs b/src/status_im2/contexts/chat/composer/reply/view.cljs
index 25aef91474..883f191d97 100644
--- a/src/status_im2/contexts/chat/composer/reply/view.cljs
+++ b/src/status_im2/contexts/chat/composer/reply/view.cljs
@@ -73,7 +73,7 @@
        :size              :xxxs}]
      [quo/text
       {:weight          :semi-bold
-       :size            :label
+       :size            :paragraph-2
        :number-of-lines 1
        :style           style/message-author-text}
       (format-reply-author from contact-name current-public-key)]]))
diff --git a/src/status_im2/contexts/chat/composer/view.cljs b/src/status_im2/contexts/chat/composer/view.cljs
index 0ee5b66bb6..39d2e0c21b 100644
--- a/src/status_im2/contexts/chat/composer/view.cljs
+++ b/src/status_im2/contexts/chat/composer/view.cljs
@@ -112,7 +112,7 @@
            :max-font-size-multiplier 1
            :multiline                true
            :placeholder              (i18n/label :t/type-something)
-           :placeholder-text-color   (colors/theme-colors colors/neutral-40 colors/neutral-50)
+           :placeholder-text-color   (colors/theme-colors colors/neutral-30 colors/neutral-50)
            :style                    (style/input-text props state subs max-height)
            :max-length               constants/max-text-size
            :accessibility-label      :chat-message-input}]]