From 6bf98665c8a4eb73f46c1af56b8d372fd649323e Mon Sep 17 00:00:00 2001
From: Lukas Harbarth <lukas.harbarth@sap.com>
Date: Mon, 17 Mar 2025 08:49:38 +0100
Subject: [PATCH 1/2] fix(MessageBox): always create valid id for action
 buttons

---
 packages/main/src/components/MessageBox/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/main/src/components/MessageBox/index.tsx b/packages/main/src/components/MessageBox/index.tsx
index 079296013e0..183b36e7baa 100644
--- a/packages/main/src/components/MessageBox/index.tsx
+++ b/packages/main/src/components/MessageBox/index.tsx
@@ -259,7 +259,7 @@ const MessageBox = forwardRef<DialogDomRef, MessageBoxPropTypes>((props, ref) =>
           if (typeof action === 'string') {
             return (
               <Button
-                id={`${messageBoxId}-action-${action}`}
+                id={`${messageBoxId}-action-${index}`}
                 key={`${action}-${index}`}
                 design={emphasizedAction === action ? ButtonDesign.Emphasized : ButtonDesign.Transparent}
                 onClick={handleOnClose}

From a5a341537ed699e9c5b6a65dd1a18084f35c4d48 Mon Sep 17 00:00:00 2001
From: Lukas Harbarth <lukas.harbarth@sap.com>
Date: Mon, 17 Mar 2025 09:00:59 +0100
Subject: [PATCH 2/2] Update index.tsx

---
 packages/main/src/components/MessageBox/index.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/main/src/components/MessageBox/index.tsx b/packages/main/src/components/MessageBox/index.tsx
index 183b36e7baa..575a7f49559 100644
--- a/packages/main/src/components/MessageBox/index.tsx
+++ b/packages/main/src/components/MessageBox/index.tsx
@@ -206,9 +206,9 @@ const MessageBox = forwardRef<DialogDomRef, MessageBoxPropTypes>((props, ref) =>
   const internalActions = getActions(actions, type);
 
   const getInitialFocus = () => {
-    const actionToFocus = internalActions.find((action) => action === initialFocus);
-    if (typeof actionToFocus === 'string') {
-      return `${messageBoxId}-action-${actionToFocus}`;
+    const index = internalActions.findIndex((action) => action === initialFocus);
+    if (index !== -1 && typeof internalActions[index] === 'string') {
+      return `${messageBoxId}-action-${index}`;
     }
     return initialFocus;
   };