merge issue

elastic · Mar 23, 2020 · fb88c5c · fb88c5c
1 parent c14f1d4
commit fb88c5c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/index.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/index.tsx
@@ -156,7 +156,7 @@ export const UserActionTree = React.memo(
           isEditable={manageMarkdownEditIds.includes(DESCRIPTION_ID)}
           isLoading={isLoadingDescription}
           labelEditAction={i18n.EDIT_DESCRIPTION}
-          labelTitle={i18n.ADDED_DESCRIPTION}
+          labelTitle={<>{i18n.ADDED_DESCRIPTION}</>}
           fullName={caseData.createdBy.fullName ?? caseData.createdBy.username}
           markdown={MarkdownDescription}
           onEdit={handleManageMarkdownEditId.bind(null, DESCRIPTION_ID)}

diff --git a/...ck/legacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_item.tsx b/...ck/legacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_item.tsx
@@ -146,7 +146,7 @@ export const UserActionItem = ({
                 createdAt={createdAt}
                 id={id}
                 isLoading={isLoading}
-                labelAction={labelEditAction}
+                labelEditAction={labelEditAction}
                 labelTitle={labelTitle ?? <></>}
                 linkId={linkId}
                 userName={userName}