From 2a8eb6157a91fd7b64b4dc621c3f39b73f632ad5 Mon Sep 17 00:00:00 2001 From: Yuwen Memon Date: Fri, 28 Jun 2024 17:16:00 -0700 Subject: [PATCH 1/2] Use policy owner details in employee removal confirmation modal --- src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx b/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx index c23266f5789..2c95c114eec 100644 --- a/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx +++ b/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx @@ -65,13 +65,15 @@ function WorkspaceMemberDetailsPage({personalDetails, policy, route}: WorkspaceM const isSelectedMemberCurrentUser = accountID === currentUserPersonalDetails?.accountID; const isCurrentUserAdmin = policy?.employeeList?.[personalDetails?.[currentUserPersonalDetails?.accountID]?.login ?? '']?.role === CONST.POLICY.ROLE.ADMIN; const isCurrentUserOwner = policy?.owner === currentUserPersonalDetails?.login; + const ownerDetails = personalDetails?.[policy?.ownerAccountID ?? -1] ?? ({} as PersonalDetails); + const policyOwnerDisplayName = ownerDetails.displayName ?? policy?.owner ?? ''; const confirmModalPrompt = useMemo(() => { const isApprover = Member.isApprover(policy, accountID); if (!isApprover) { translate('workspace.people.removeMemberPrompt', {memberName: displayName}); } - return translate('workspace.people.removeMembersWarningPrompt', {memberName: displayName, ownerName: policy?.owner ?? ''}); + return translate('workspace.people.removeMembersWarningPrompt', {memberName: displayName, ownerName: policyOwnerDisplayName}); }, [accountID, policy, displayName, translate]); const roleItems: ListItemType[] = useMemo( From 6de207a149a6c078154de9f6a52a7c3b16904c07 Mon Sep 17 00:00:00 2001 From: Yuwen Memon Date: Fri, 28 Jun 2024 17:33:42 -0700 Subject: [PATCH 2/2] Memo hook thang --- src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx b/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx index 2c95c114eec..9924d47764e 100644 --- a/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx +++ b/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx @@ -74,7 +74,7 @@ function WorkspaceMemberDetailsPage({personalDetails, policy, route}: WorkspaceM translate('workspace.people.removeMemberPrompt', {memberName: displayName}); } return translate('workspace.people.removeMembersWarningPrompt', {memberName: displayName, ownerName: policyOwnerDisplayName}); - }, [accountID, policy, displayName, translate]); + }, [accountID, policy, displayName, policyOwnerDisplayName, translate]); const roleItems: ListItemType[] = useMemo( () => [