From 8bda4e9a3731b182dae11c9574e926a040f988b8 Mon Sep 17 00:00:00 2001 From: Mia Hsu Date: Tue, 25 Feb 2025 16:47:50 -0800 Subject: [PATCH] fix(member-invites): show role error messages --- .../components/modals/inviteMembersModal/useInviteModal.tsx | 6 ++++-- .../settings/components/teamSelect/teamSelectForMember.tsx | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/static/app/components/modals/inviteMembersModal/useInviteModal.tsx b/static/app/components/modals/inviteMembersModal/useInviteModal.tsx index be1e6d1c430439..7dbfb74fd52196 100644 --- a/static/app/components/modals/inviteMembersModal/useInviteModal.tsx +++ b/static/app/components/modals/inviteMembersModal/useInviteModal.tsx @@ -136,11 +136,13 @@ export default function useInviteModal({organization, initialData, source}: Prop // Use the email error message if available. This inconsistently is // returned as either a list of errors for the field, or a single error. const emailError = - !errorResponse || !errorResponse.email + !errorResponse || + (!errorResponse.email ? false : Array.isArray(errorResponse.email) ? errorResponse.email[0] - : errorResponse.email; + : errorResponse.email) || + (!errorResponse.role ? false : errorResponse.role); const orgLevelError = errorResponse?.organization; const error = orgLevelError || emailError || t('Could not invite user'); diff --git a/static/app/views/settings/components/teamSelect/teamSelectForMember.tsx b/static/app/views/settings/components/teamSelect/teamSelectForMember.tsx index 11c0692649672b..135a33eb2fc50b 100644 --- a/static/app/views/settings/components/teamSelect/teamSelectForMember.tsx +++ b/static/app/views/settings/components/teamSelect/teamSelectForMember.tsx @@ -178,7 +178,7 @@ function TeamRow({ const GRID_TEMPLATE = ` display: grid; - grid-template-columns: minmax(100px, 1fr) minmax(0px, 100px) 200px 95px; + grid-template-columns: minmax(100px, 1fr) minmax(0px, 100px) 200px; gap: ${space(1)}; > div:last-child {