diff --git a/.circleci/config.yml b/.circleci/config.yml index 5f3cac937..a4fab1541 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -226,7 +226,6 @@ workflows: branches: only: - dev - - pm-3141_3 - deployQa: context: org-global diff --git a/src/apps/review/src/lib/components/FieldMarkdownEditor/FieldMarkdownEditor.tsx b/src/apps/review/src/lib/components/FieldMarkdownEditor/FieldMarkdownEditor.tsx index 58897ba0c..6a76e9139 100644 --- a/src/apps/review/src/lib/components/FieldMarkdownEditor/FieldMarkdownEditor.tsx +++ b/src/apps/review/src/lib/components/FieldMarkdownEditor/FieldMarkdownEditor.tsx @@ -135,7 +135,7 @@ const toggleStrategy = { }, italic: (start: any, end: any) => { const startType = start.replace(/(\*|_)(?![\s\S]*(\*|_))/, '') - const endType = end.replace(/(\*|_)/, '') + const endType = end.replace(/(\*|_)/g, '') return { endType, startType } }, strikethrough: (start: any, end: any) => { diff --git a/src/apps/review/src/lib/components/Scorecard/ScorecardViewer/ScorecardQuestion/ReviewResponse/ReviewManagerComment/ReviewManagerComment.tsx b/src/apps/review/src/lib/components/Scorecard/ScorecardViewer/ScorecardQuestion/ReviewResponse/ReviewManagerComment/ReviewManagerComment.tsx index 99ace9f3c..82f26a1a8 100644 --- a/src/apps/review/src/lib/components/Scorecard/ScorecardViewer/ScorecardQuestion/ReviewResponse/ReviewManagerComment/ReviewManagerComment.tsx +++ b/src/apps/review/src/lib/components/Scorecard/ScorecardViewer/ScorecardQuestion/ReviewResponse/ReviewManagerComment/ReviewManagerComment.tsx @@ -31,6 +31,7 @@ interface ReviewManagerCommentProps { const ReviewManagerComment: FC = props => { const { isManagerEdit, + canAddManagerComment, isSavingManagerComment, addManagerComment, }: ScorecardViewerContextValue = useScorecardViewerContext() @@ -131,7 +132,7 @@ const ReviewManagerComment: FC = props => { )} - {!showCommentForm && !comment && isManagerEdit && ( + {!showCommentForm && !comment && isManagerEdit && canAddManagerComment && (