From 2244ab7b87510eb5ba007a72568d4177d216126b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20LEMIEUX?=
 <1904889+raplemie@users.noreply.github.com>
Date: Thu, 16 Feb 2023 14:03:23 -0500
Subject: [PATCH 1/2] UI: Fix React BriefMessage breaking toast display.
 (#5085)

(cherry picked from commit bb19163f6cd9b500444adc010d62ef1cfc4b9090)
---
 ui/appui-react/src/appui-react/messages/MessageManager.tsx | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/ui/appui-react/src/appui-react/messages/MessageManager.tsx b/ui/appui-react/src/appui-react/messages/MessageManager.tsx
index 997f0c5bceeb..1e32f3f8415d 100644
--- a/ui/appui-react/src/appui-react/messages/MessageManager.tsx
+++ b/ui/appui-react/src/appui-react/messages/MessageManager.tsx
@@ -254,12 +254,9 @@ export class MessageManager {
     };
     toaster.setSettings({ placement: "bottom", order: "ascending", ...settings });
     const content = <>
-      {message.briefMessage}
+      {(message.briefMessage as ReactMessage).reactNode || message.briefMessage}
       {message.detailedMessage &&
-      <>
-        <br/>
-        <Small>{(message.detailedMessage as ReactMessage).reactNode || message.detailedMessage}</Small>
-      </>
+        <Small style={{display: "block"}}>{(message.detailedMessage as ReactMessage).reactNode || message.detailedMessage}</Small>
       }
     </>;
     switch (message.priority) {

From cfbc9366bb6dc73d0b224ec22c00d7f0826c9aaf Mon Sep 17 00:00:00 2001
From: Raphael Lemieux <1904889+raplemie@users.noreply.github.com>
Date: Thu, 16 Feb 2023 14:09:08 -0500
Subject: [PATCH 2/2] rush change

---
 ...gify-bp-release-3.6.x-pr-5085_2023-02-16-19-08.json | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 common/changes/@itwin/appui-react/mergify-bp-release-3.6.x-pr-5085_2023-02-16-19-08.json

diff --git a/common/changes/@itwin/appui-react/mergify-bp-release-3.6.x-pr-5085_2023-02-16-19-08.json b/common/changes/@itwin/appui-react/mergify-bp-release-3.6.x-pr-5085_2023-02-16-19-08.json
new file mode 100644
index 000000000000..79bb6fbdcc91
--- /dev/null
+++ b/common/changes/@itwin/appui-react/mergify-bp-release-3.6.x-pr-5085_2023-02-16-19-08.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@itwin/appui-react",
+      "comment": "Fix react briefMessage in toasts",
+      "type": "none"
+    }
+  ],
+  "packageName": "@itwin/appui-react"
+}
\ No newline at end of file