From 67a663280aee1af51270a255302d469ddb8c059f Mon Sep 17 00:00:00 2001
From: Lukas Harbarth <lukas.harbarth@sap.com>
Date: Wed, 18 Dec 2024 09:09:28 +0100
Subject: [PATCH 1/2] fix(MessageView): fix group order

---
 .../src/components/MessageView/MessageView.stories.tsx |  3 ++-
 packages/main/src/components/MessageView/index.tsx     | 10 ++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/main/src/components/MessageView/MessageView.stories.tsx b/packages/main/src/components/MessageView/MessageView.stories.tsx
index f2ac36a3fa2..f7ea2cece4c 100644
--- a/packages/main/src/components/MessageView/MessageView.stories.tsx
+++ b/packages/main/src/components/MessageView/MessageView.stories.tsx
@@ -73,7 +73,8 @@ const meta = {
         groupName={'Employees'}
       >
         Informative message
-      </MessageItem>
+      </MessageItem>,
+      <MessageItem key={7} titleText={'Error Message Type'} type={ValueState.Negative} counter={3} />
     ]
   }
 } satisfies Meta<typeof MessageView>;
diff --git a/packages/main/src/components/MessageView/index.tsx b/packages/main/src/components/MessageView/index.tsx
index 5ccf657ed57..f9dae775f1b 100644
--- a/packages/main/src/components/MessageView/index.tsx
+++ b/packages/main/src/components/MessageView/index.tsx
@@ -91,8 +91,14 @@ export const resolveMessageGroups = (children: ReactElement<MessageItemPropTypes
     return acc;
   }, {});
 
-  return Object.entries<ReactElement<MessageItemPropTypes>[]>(groups).sort((a, b) => {
-    return a[0].localeCompare(b[0]);
+  return Object.entries<ReactElement<MessageItemPropTypes>[]>(groups).sort(([keyA], [keyB]) => {
+    if (keyA === '' && keyB !== '') {
+      return -1;
+    }
+    if (keyA !== '' && keyB === '') {
+      return 1;
+    }
+    return 0;
   });
 };
 

From 78e683e5e15d887747757723c2a67615468eddaa Mon Sep 17 00:00:00 2001
From: Lukas Harbarth <lukas.harbarth@sap.com>
Date: Wed, 18 Dec 2024 09:33:08 +0100
Subject: [PATCH 2/2] MessageItem: fix block border

---
 packages/main/src/components/MessageView/MessageItem.module.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/main/src/components/MessageView/MessageItem.module.css b/packages/main/src/components/MessageView/MessageItem.module.css
index 3a6357353cb..0544ae8b851 100644
--- a/packages/main/src/components/MessageView/MessageItem.module.css
+++ b/packages/main/src/components/MessageView/MessageItem.module.css
@@ -1,4 +1,5 @@
 .listItem {
+  min-height: 0;
   height: var(--_ui5wcr-MessageViewListItemHeightSingle);
 }