Merge branch 'master' into zach-starter

1 files changed, 5 insertions, 6 deletions

diff --git a/src/client/util/reportManager/ReportManagerComponents.tsx b/src/client/util/reportManager/ReportManagerComponents.tsx
index cecebc648..92f877859 100644
--- a/src/client/util/reportManager/ReportManagerComponents.tsx
+++ b/src/client/util/reportManager/ReportManagerComponents.tsx
@@ -1,8 +1,5 @@
 /* eslint-disable react/require-default-props */
 /* eslint-disable prefer-destructuring */
-/* eslint-disable jsx-a11y/label-has-associated-control */
-/* eslint-disable jsx-a11y/no-static-element-interactions */
-/* eslint-disable jsx-a11y/click-events-have-key-events */
 /* eslint-disable no-use-before-define */
 import * as React from 'react';
 import ReactMarkdown from 'react-markdown';
@@ -98,7 +95,7 @@ export function IssueCard({ issue, onSelect }: IssueCardProps) {
                 <label className="issue-label">#{issue.number}</label>
                 <div className="issue-tags">
                     {issue.labels.map(label => {
-                        const labelString = typeof label === 'string' ? label : label.name ?? '';
+                        const labelString = typeof label === 'string' ? label : (label.name ?? '');
                         const colors = getLabelColors(labelString);
                         return <Tag key={labelString} text={labelString} backgroundColor={colors[0]} color={colors[1]} />;
                     })}
@@ -295,14 +292,16 @@ export function IssueView({ issue }: IssueViewProps) {
                 <div>
                     <div className="issue-tags">
                         {issue.labels.map(label => {
-                            const labelString = typeof label === 'string' ? label : label.name ?? '';
+                            const labelString = typeof label === 'string' ? label : (label.name ?? '');
                             const colors = getLabelColors(labelString);
                             return <Tag key={labelString} text={labelString} backgroundColor={colors[0]} color={colors[1]} fontSize="12px" />;
                         })}
                     </div>
                 </div>
             )}
-            <ReactMarkdown children={issueBody} className="issue-content" remarkPlugins={[remarkGfm]} rehypePlugins={[rehypeRaw]} />
+            <ReactMarkdown className="issue-content" remarkPlugins={[remarkGfm]} rehypePlugins={[rehypeRaw]}>
+                {issueBody}
+            </ReactMarkdown>
         </div>
     );
 }