From a78971ee7c4f249a785965d56f7d9dc25f8d03da Mon Sep 17 00:00:00 2001 From: Jahziel Villasana-Espinoza Date: Mon, 2 Dec 2024 17:11:52 -0500 Subject: [PATCH 1/3] fix: use the correct copy for a macos host --- .../UnlockedHostActivityItem/UnlockedHostActivityItem.tsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/frontend/pages/hosts/details/cards/Activity/ActivityItems/UnlockedHostActivityItem/UnlockedHostActivityItem.tsx b/frontend/pages/hosts/details/cards/Activity/ActivityItems/UnlockedHostActivityItem/UnlockedHostActivityItem.tsx index 079f4463b7d1..d7aaa102f386 100644 --- a/frontend/pages/hosts/details/cards/Activity/ActivityItems/UnlockedHostActivityItem/UnlockedHostActivityItem.tsx +++ b/frontend/pages/hosts/details/cards/Activity/ActivityItems/UnlockedHostActivityItem/UnlockedHostActivityItem.tsx @@ -1,4 +1,4 @@ -import React from "react"; +import React, { act } from "react"; import { IHostActivityItemComponentProps } from "../../ActivityConfig"; import HostActivityItem from "../../HostActivityItem"; @@ -8,9 +8,13 @@ const baseClass = "unlocked-host-activity-item"; const UnlockedHostActivityItem = ({ activity, }: IHostActivityItemComponentProps) => { + let desc = "unlocked this host."; + if (activity.details?.host_platform === "darwin") { + desc = "viewed the six-digit unlock PIN for this host."; + } return ( - {activity.actor_full_name} unlocked this host. + {activity.actor_full_name} {desc} ); }; From 83b324774451ef19dc7dd0934357caabb8e279e7 Mon Sep 17 00:00:00 2001 From: Jahziel Villasana-Espinoza Date: Mon, 2 Dec 2024 17:13:09 -0500 Subject: [PATCH 2/3] chore: changes file --- changes/23621-unlock-text | 1 + 1 file changed, 1 insertion(+) create mode 100644 changes/23621-unlock-text diff --git a/changes/23621-unlock-text b/changes/23621-unlock-text new file mode 100644 index 000000000000..6715062fdff8 --- /dev/null +++ b/changes/23621-unlock-text @@ -0,0 +1 @@ +- Fixes an issue with the copy for the activity generated by viewing a locked macOS host's PIN. \ No newline at end of file From bd228d7a11cf876906d05c6d5bb55279dd3cd682 Mon Sep 17 00:00:00 2001 From: Jahziel Villasana-Espinoza Date: Mon, 2 Dec 2024 17:17:28 -0500 Subject: [PATCH 3/3] chore: remove unused import --- .../UnlockedHostActivityItem/UnlockedHostActivityItem.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/pages/hosts/details/cards/Activity/ActivityItems/UnlockedHostActivityItem/UnlockedHostActivityItem.tsx b/frontend/pages/hosts/details/cards/Activity/ActivityItems/UnlockedHostActivityItem/UnlockedHostActivityItem.tsx index d7aaa102f386..6fa7cd0550fe 100644 --- a/frontend/pages/hosts/details/cards/Activity/ActivityItems/UnlockedHostActivityItem/UnlockedHostActivityItem.tsx +++ b/frontend/pages/hosts/details/cards/Activity/ActivityItems/UnlockedHostActivityItem/UnlockedHostActivityItem.tsx @@ -1,4 +1,4 @@ -import React, { act } from "react"; +import React from "react"; import { IHostActivityItemComponentProps } from "../../ActivityConfig"; import HostActivityItem from "../../HostActivityItem";