From bd530333df65ec0a5315fbca64c3f18910e2bb74 Mon Sep 17 00:00:00 2001
From: Doug <6060466+pixlwave@users.noreply.github.com>
Date: Mon, 28 Nov 2022 11:54:00 +0000
Subject: [PATCH] Match reaction alignment to message alignment. (#344)

* Match reaction alignment to message alignment.

* Add extra padding for clearer bubble alignment.
---
 .../View/Style/TimelineItemBubbledStylerView.swift          | 6 +++---
 changelog.d/307.bugfix                                      | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 changelog.d/307.bugfix

diff --git a/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemBubbledStylerView.swift b/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemBubbledStylerView.swift
index a72cad750..4376ff07a 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemBubbledStylerView.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemBubbledStylerView.swift
@@ -43,11 +43,11 @@ struct TimelineItemBubbledStylerView<Content: View>: View {
                         }
                     }
                     .padding(.trailing, 16)
-                    .padding(.leading, 16)
+                    .padding(.leading, 56)
                 } else {
                     styledContentWithReactions
                         .padding(.leading, 24)
-                        .padding(.trailing, 24)
+                        .padding(.trailing, 56)
                 }
             }
         }
@@ -82,7 +82,7 @@ struct TimelineItemBubbledStylerView<Content: View>: View {
             
             if !timelineItem.properties.reactions.isEmpty {
                 TimelineReactionsView(reactions: timelineItem.properties.reactions,
-                                      alignment: .leading) { key in
+                                      alignment: alignment) { key in
                     context.send(viewAction: .sendReaction(key: key, eventID: timelineItem.id))
                 }
                 .padding(.horizontal, 12)
diff --git a/changelog.d/307.bugfix b/changelog.d/307.bugfix
new file mode 100644
index 000000000..9dc268a13
--- /dev/null
+++ b/changelog.d/307.bugfix
@@ -0,0 +1 @@
+Reactions: Match alignment with the message to fix random floating reactions.