diff --git a/static/app/components/feedback/feedbackItem/feedbackActions.tsx b/static/app/components/feedback/feedbackItem/feedbackActions.tsx index 526c3cc96c02a7..d84954bbb1d8de 100644 --- a/static/app/components/feedback/feedbackItem/feedbackActions.tsx +++ b/static/app/components/feedback/feedbackItem/feedbackActions.tsx @@ -47,28 +47,17 @@ export default function FeedbackActions({ } function LargeWidth({feedbackItem}: {feedbackItem: FeedbackIssue}) { - const { - isResolved, - onResolveClick, - hasSpamFeature, - isSpam, - onSpamClick, - hasSeen, - onMarkAsReadClick, - } = useFeedbackActions({feedbackItem}); + const {isResolved, onResolveClick, isSpam, onSpamClick, hasSeen, onMarkAsReadClick} = + useFeedbackActions({feedbackItem}); return ( - - {hasSpamFeature && ( - - )} - + @@ -77,15 +66,8 @@ function LargeWidth({feedbackItem}: {feedbackItem: FeedbackIssue}) { } function MediumWidth({feedbackItem}: {feedbackItem: FeedbackIssue}) { - const { - isResolved, - onResolveClick, - hasSpamFeature, - isSpam, - onSpamClick, - hasSeen, - onMarkAsReadClick, - } = useFeedbackActions({feedbackItem}); + const {isResolved, onResolveClick, isSpam, onSpamClick, hasSeen, onMarkAsReadClick} = + useFeedbackActions({feedbackItem}); return ( @@ -102,13 +84,11 @@ function MediumWidth({feedbackItem}: {feedbackItem: FeedbackIssue}) { size: 'xs', }} items={[ - hasSpamFeature - ? { - key: 'spam', - label: isSpam ? t('Move to Inbox') : t('Mark as Spam'), - onAction: onSpamClick, - } - : null, + { + key: 'spam', + label: isSpam ? t('Move to Inbox') : t('Mark as Spam'), + onAction: onSpamClick, + }, { key: 'read', label: hasSeen ? t('Mark Unread') : t('Mark Read'), @@ -121,15 +101,8 @@ function MediumWidth({feedbackItem}: {feedbackItem: FeedbackIssue}) { } function SmallWidth({feedbackItem}: {feedbackItem: FeedbackIssue}) { - const { - isResolved, - onResolveClick, - hasSpamFeature, - isSpam, - onSpamClick, - hasSeen, - onMarkAsReadClick, - } = useFeedbackActions({feedbackItem}); + const {isResolved, onResolveClick, isSpam, onSpamClick, hasSeen, onMarkAsReadClick} = + useFeedbackActions({feedbackItem}); return ( { addLoadingMessage(t('Updating feedback...')); @@ -66,7 +65,6 @@ export default function useActions({feedbackItem}: Props) { return { isResolved, onResolveClick, - hasSpamFeature, isSpam, onSpamClick, hasSeen, diff --git a/static/app/components/feedback/list/feedbackListBulkSelection.tsx b/static/app/components/feedback/list/feedbackListBulkSelection.tsx index 77d500ac4bd585..32a5ee29209dfd 100644 --- a/static/app/components/feedback/list/feedbackListBulkSelection.tsx +++ b/static/app/components/feedback/list/feedbackListBulkSelection.tsx @@ -9,7 +9,6 @@ import {IconEllipsis} from 'sentry/icons/iconEllipsis'; import {t, tct} from 'sentry/locale'; import {space} from 'sentry/styles/space'; import {GroupStatus} from 'sentry/types/group'; -import useOrganization from 'sentry/utils/useOrganization'; interface Props extends Pick< @@ -25,9 +24,6 @@ export default function FeedbackListBulkSelection({ selectedIds, deselectAll, }: Props) { - const organization = useOrganization(); - const hasSpamFeature = organization.features.includes('user-feedback-spam-filter-ui'); - const {onToggleResovled, onMarkAsRead, onMarkUnread} = useBulkEditFeedbacks({ selectedIds, deselectAll, @@ -55,20 +51,18 @@ export default function FeedbackListBulkSelection({ {mailbox === 'resolved' ? t('Unresolve') : t('Resolve')} - {hasSpamFeature && ( - - - - )} + + + i.key !== 'ignored'); + const filteredMailboxes = MAILBOXES; return (