Merge branch 'main' into avm99963-monorail

Merged commit cd4b3b336f1f14afa02990fdc2eec5d9467a827e

GitOrigin-RevId: e67bbf185d5538e1472bb42e0abb2a141f88bac1
diff --git a/static_src/react/issue-wizard/IssueWizardDescriptionsUtils.tsx b/static_src/react/issue-wizard/IssueWizardDescriptionsUtils.tsx
index e32d2d5..1baf35b 100644
--- a/static_src/react/issue-wizard/IssueWizardDescriptionsUtils.tsx
+++ b/static_src/react/issue-wizard/IssueWizardDescriptionsUtils.tsx
@@ -21,6 +21,10 @@
     let compVal = component || '';
     let typeLabel = isRegression ? 'Type-Bug-Regression' : 'Type-Bug';
 
+    if (category === 'Security') {
+      typeLabel = 'Type-Bug-Security'
+    }
+
     customQuestionsAnswers.forEach((ans) => {
       if (ans.startsWith(LABELS_PREFIX)) {
         const currentAnswer = ans.substring(LABELS_PREFIX.length);
@@ -42,9 +46,8 @@
             }
             break;
           case 'Security':
-            if (typeLabel === '') {
-              typeLabel = 'Type-Bug-Security';
-            }
+            typeLabel = 'Type-Bug-Security';
+            break;
           case 'Other':
             typeLabel = "Type-Bug";
             const issueType = currentAnswer.split(' - ')[0];