From 79daa4d5290626ccc7e157f9600685722054e09e Mon Sep 17 00:00:00 2001 From: Andrea Maria Piana Date: Wed, 16 Aug 2023 17:58:42 +0100 Subject: [PATCH] [Fixes: #17027] Fix spacing between own messages --- .../contexts/chat/messages/content/style.cljs | 11 +++++++++++ .../contexts/chat/messages/content/view.cljs | 7 ++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/status_im2/contexts/chat/messages/content/style.cljs b/src/status_im2/contexts/chat/messages/content/style.cljs index 7fd7028a4c..a452ee959c 100644 --- a/src/status_im2/contexts/chat/messages/content/style.cljs +++ b/src/status_im2/contexts/chat/messages/content/style.cljs @@ -13,3 +13,14 @@ (and (not in-pinned-view?) (or mentioned pinned-by last-in-group?)) (assoc :margin-top 8)))) + +(defn user-message-content + [{:keys [first-in-group? outgoing outgoing-status]}] + {:border-radius 16 + :padding-horizontal 8 + :padding-vertical (if first-in-group? + 8 + 4) + :opacity (if (and outgoing (= outgoing-status :sending)) + 0.5 + 1)}) diff --git a/src/status_im2/contexts/chat/messages/content/view.cljs b/src/status_im2/contexts/chat/messages/content/view.cljs index 4a90dbc657..b9ba364661 100644 --- a/src/status_im2/contexts/chat/messages/content/view.cljs +++ b/src/status_im2/contexts/chat/messages/content/view.cljs @@ -134,9 +134,10 @@ :message-sending :message-sent) :underlay-color (colors/theme-colors colors/neutral-5 colors/neutral-90) - :style {:border-radius 16 - :padding 8 - :opacity (if (and outgoing (= outgoing-status :sending)) 0.5 1)} + :style (style/user-message-content + {:first-in-group? (:first-in-group? message-data) + :outgoing outgoing + :outgoing-status outgoing-status}) :on-press (fn [] (if (and platform/ios? keyboard-shown?) (rn/dismiss-keyboard!)