diff --git a/static/app/components/modals/inviteMembersModal/useInviteModal.tsx b/static/app/components/modals/inviteMembersModal/useInviteModal.tsx index 3c5338b4534d90..ab23e5fbf5be75 100644 --- a/static/app/components/modals/inviteMembersModal/useInviteModal.tsx +++ b/static/app/components/modals/inviteMembersModal/useInviteModal.tsx @@ -29,9 +29,7 @@ function defaultInvite(): InviteRow { function canInvite(organization: Organization) { return ( organization.access?.includes('member:write') || - (organization.features.includes('members-invite-teammates') && - organization.allowMemberInvite && - organization.access?.includes('member:invite')) + (organization.allowMemberInvite && organization.access?.includes('member:invite')) ); } diff --git a/static/app/components/roleSelectControl.tsx b/static/app/components/roleSelectControl.tsx index 6f6222545701d8..d3b21790d7f707 100644 --- a/static/app/components/roleSelectControl.tsx +++ b/static/app/components/roleSelectControl.tsx @@ -25,9 +25,7 @@ type Props = Omit, 'onChange' | 'value'> & { function RoleSelectControl({roles, disableUnallowed, ...props}: Props) { const organization = useOrganization(); const isMemberInvite = - organization.features.includes('members-invite-teammates') && - organization.allowMemberInvite && - organization.access?.includes('member:invite'); + organization.allowMemberInvite && organization.access?.includes('member:invite'); return ( features.has('members-invite-teammates'), }, { name: 'allowMemberProjectCreation', diff --git a/static/app/views/settings/organizationMembers/organizationMemberRow.spec.tsx b/static/app/views/settings/organizationMembers/organizationMemberRow.spec.tsx index d8f14d3b112cff..443664d7ee1847 100644 --- a/static/app/views/settings/organizationMembers/organizationMemberRow.spec.tsx +++ b/static/app/views/settings/organizationMembers/organizationMemberRow.spec.tsx @@ -120,7 +120,6 @@ describe('OrganizationMemberRow', function () { it('has "Resend Invite" button if invite was sent from curr user and feature is on', function () { const org = OrganizationFixture({ - features: ['members-invite-teammates'], access: ['member:invite'], }); render(); @@ -131,7 +130,6 @@ describe('OrganizationMemberRow', function () { it('does not have "Resend Invite" button if invite was sent from other user and feature is on', function () { const org = OrganizationFixture({ - features: ['members-invite-teammates'], access: ['member:invite'], }); render( @@ -175,7 +173,6 @@ describe('OrganizationMemberRow', function () { it('has Remove button if invite was sent from curr user and feature is on', function () { const org = OrganizationFixture({ - features: ['members-invite-teammates'], access: ['member:invite'], }); render(); @@ -185,7 +182,6 @@ describe('OrganizationMemberRow', function () { it('has disabled Remove button if invite was sent from other user and feature is on', function () { const org = OrganizationFixture({ - features: ['members-invite-teammates'], access: ['member:invite'], }); render( diff --git a/static/app/views/settings/organizationMembers/organizationMemberRow.tsx b/static/app/views/settings/organizationMembers/organizationMemberRow.tsx index 9aa1bb0ac6805e..cc17d7b4351776 100644 --- a/static/app/views/settings/organizationMembers/organizationMemberRow.tsx +++ b/static/app/views/settings/organizationMembers/organizationMemberRow.tsx @@ -115,10 +115,7 @@ export default class OrganizationMemberRow extends PureComponent { const showRemoveButton = !isCurrentUser; const showLeaveButton = isCurrentUser; const isInviteFromCurrentUser = pending && inviterName === currentUser.name; - const canInvite = - organization.features?.includes('members-invite-teammates') && - organization.allowMemberInvite && - access.includes('member:invite'); + const canInvite = organization.allowMemberInvite && access.includes('member:invite'); // members can remove invites they sent if allowMemberInvite is true const canEditInvite = canInvite && isInviteFromCurrentUser; const canRemoveMember =