ref(feedback): consolidate all settings into one heading under project

static/app/data/forms/userFeedback.tsx

@@ -14,10 +14,10 @@ const formGroups: JsonFormObject[] = [
         type: 'boolean',
 
         // additional data/props that is related to rendering of form field rather than data
-        label: t('Show Sentry Branding'),
+        label: t('Show Sentry Branding in Crash Report Modal'),
         placeholder: 'e.g. secondary@example.com',
         help: t(
-          'Show "powered by Sentry" within the feedback dialog. We appreciate you helping get the word out about Sentry! <3'
+          'Show "powered by Sentry" within the Crash Report Modal. We appreciate you helping get the word out about Sentry! <3'
         ),
         getData: data => ({options: data}),
       },
@@ -40,6 +40,15 @@ const formGroups: JsonFormObject[] = [
           ),
         getData: data => ({options: data}),
       },
+      {
+        name: 'sentry:feedback_ai_spam_detection',
+        type: 'boolean',
+
+        // additional data/props that is related to rendering of form field rather than data
+        label: 'Enable Spam Detection',
+        help: 'Toggles whether or not to enable auto spam detection in User Feedback.',
+        getData: data => ({options: data}),
+      },
     ],
   },
 ];

static/app/routes.tsx

@@ -495,6 +495,11 @@ function buildRoutes() {
         name={t('Data Forwarding')}
         component={make(() => import('sentry/views/settings/projectDataForwarding'))}
       />
+      <Route
+        path="user-feedback/"
+        name={t('User Feedback')}
+        component={make(() => import('sentry/views/settings/projectUserFeedback'))}
+      />
       <Route path="security-and-privacy/" name={t('Security & Privacy')}>
         <IndexRoute
           component={make(
@@ -540,14 +545,6 @@ function buildRoutes() {
         name={t('Replays')}
         component={make(() => import('sentry/views/settings/project/projectReplays'))}
       />
-      <Route
-        path="user-feedback-processing/"
-        name={t('User Feedback')}
-        component={make(
-          () => import('sentry/views/settings/project/projectUserFeedbackProcessing')
-        )}
-      />
-
       <Route path="source-maps/" name={t('Source Maps')}>
         <IndexRoute
           component={make(() => import('sentry/views/settings/projectSourceMaps'))}
@@ -635,13 +632,6 @@ function buildRoutes() {
         name={t('Loader Script')}
         component={make(() => import('sentry/views/settings/project/loaderScript'))}
       />
-      <Route
-        path="user-feedback/"
-        name={t('User Feedback')}
-        component={make(
-          () => import('sentry/views/settings/project/projectUserFeedback')
-        )}
-      />
       <Redirect from="csp/" to="security-headers/" />
       <Route path="security-headers/" name={t('Security Headers')}>
         <IndexRoute

static/app/views/settings/project/navigationConfiguration.tsx

@@ -56,6 +56,10 @@ export default function getConfiguration({
           path: `${pathPrefix}/data-forwarding/`,
           title: t('Data Forwarding'),
         },
+        {
+          path: `${pathPrefix}/user-feedback/`,
+          title: t('User Feedback'),
+        },
       ],
     },
     {
@@ -120,11 +124,6 @@ export default function getConfiguration({
           title: t('Replays'),
           show: () => !!organization?.features?.includes('session-replay-ui'),
         },
-        {
-          path: `${pathPrefix}/user-feedback-processing/`,
-          title: t('User Feedback'),
-          show: () => !!organization?.features?.includes('user-feedback-ui'),
-        },
       ],
     },
     {
@@ -148,11 +147,6 @@ export default function getConfiguration({
           path: `${pathPrefix}/security-headers/`,
           title: t('Security Headers'),
         },
-        {
-          path: `${pathPrefix}/user-feedback/`,
-          title: t('User Feedback'),
-          description: t('Configure user feedback reporting feature'),
-        },
       ],
     },
     {

static/app/views/settings/project/projectReplays.tsx

@@ -30,7 +30,7 @@ function ProjectReplaySettings({organization, project, params: {projectId}}: Pro
             external
             href="https://docs.sentry.io/product/session-replay/replay-page-and-filters/"
           >
-            {t('Read the docs')}
+            {t('Read the Docs')}
           </Button>
         }
       />