Merge develop into event-details-comments-dropdown-fix and resolve conflicts

Author: priya-tik

src/components/events/partials/ModalTabsAndPages/EventDetailsCommentsTab.tsx

@@ -60,7 +60,7 @@ const EventDetailsCommentsTab = ({
 	const user = useAppSelector(state => getUserInformation(state));
 
 	const saveComment = (commentText: string, commentReason: string) => {
-		dispatch(saveNewComment({eventId, commentText, commentReason})).then((successful) => {
+		dispatch(saveNewComment({eventId, commentText, commentReason})).then(successful => {
 			if (successful) {
 				dispatch(fetchComments(eventId));
 				setNewCommentText("");
@@ -85,25 +85,25 @@ const EventDetailsCommentsTab = ({
 
 	const saveReply = (originalComment: Comment, reply: string, isResolved: boolean) => {
 		dispatch(saveNewCommentReply({eventId, commentId: originalComment.id, replyText: reply, commentResolved: isResolved})).then(
-			(success) => {
+			success => {
 				if (success) {
 					dispatch(fetchComments(eventId));
 					exitReplyMode();
 				}
-			}
+			},
 		);
 	};
 
 	const deleteComment = (comment: Comment) => {
-		dispatch(deleteOneComment({eventId, commentId: comment.id})).then((success) => {
+		dispatch(deleteOneComment({eventId, commentId: comment.id})).then(success => {
 			if (success) {
 				dispatch(fetchComments(eventId));
 			}
 		});
 	};
 
 	const deleteReply = (comment: Comment, reply: CommentReply) => {
-		dispatch(deleteCommentReply({eventId, commentId: comment.id, replyId: reply.id})).then((success) => {
+		dispatch(deleteCommentReply({eventId, commentId: comment.id, replyId: reply.id})).then(success => {
 			if (success) {
 				dispatch(fetchComments(eventId));
 			}
@@ -151,7 +151,7 @@ const EventDetailsCommentsTab = ({
 									{/* links with performable actions for the comment */}
 									{hasAccess(
 										"ROLE_UI_EVENTS_DETAILS_COMMENTS_DELETE",
-										user
+										user,
 									) && (
 										<ButtonLikeAnchor
 											onClick={() => deleteComment(comment)}
@@ -162,7 +162,7 @@ const EventDetailsCommentsTab = ({
 									)}
 									{hasAccess(
 										"ROLE_UI_EVENTS_DETAILS_COMMENTS_REPLY",
-										user
+										user,
 									) && (
 										<ButtonLikeAnchor
 											onClick={
@@ -205,7 +205,7 @@ const EventDetailsCommentsTab = ({
 												{/* link for deleting the reply */}
 												{hasAccess(
 													"ROLE_UI_EVENTS_DETAILS_COMMENTS_DELETE",
-													user
+													user,
 												) && (
 													<ButtonLikeAnchor
 														onClick={() =>
@@ -234,11 +234,11 @@ const EventDetailsCommentsTab = ({
 								{/* text field */}
 								<textarea
 									value={newCommentText}
-									onChange={(comment) =>
+									onChange={comment =>
 										setNewCommentText(comment.target.value)
 									}
 									placeholder={t(
-										"EVENTS.EVENTS.DETAILS.COMMENTS.PLACEHOLDER"
+										"EVENTS.EVENTS.DETAILS.COMMENTS.PLACEHOLDER",
 									)}
 								></textarea>
 
@@ -249,13 +249,13 @@ const EventDetailsCommentsTab = ({
 										text={t(commentReason as ParseKeys)}
 										options={Object.entries(commentReasons).map(([key, value]) => ({ label: value, value: key }))}
 										required={true}
-										handleChange={(element) => {
+										handleChange={element => {
 											if (element) {
 												setCommentReason(element.value)
 											}
 										}}
 										placeholder={t(
-											"EVENTS.EVENTS.DETAILS.COMMENTS.SELECTPLACEHOLDER"
+											"EVENTS.EVENTS.DETAILS.COMMENTS.SELECTPLACEHOLDER",
 										)}
 										customCSS={{width: 200, optionPaddingTop: 5, optionLineHeight: "105%"}}
 									/>
@@ -296,7 +296,7 @@ const EventDetailsCommentsTab = ({
 							{/* text field */}
 							<textarea
 								value={commentReplyText}
-								onChange={(reply) =>
+								onChange={reply =>
 									setCommentReplyText(reply.target.value)
 								}
 								placeholder={
@@ -309,7 +309,7 @@ const EventDetailsCommentsTab = ({
 							{/* 'resolved' checkbox */}
 							{hasAccess(
 								"ROLE_UI_EVENTS_DETAILS_COMMENTS_RESOLVE",
-								user
+								user,
 							) && (
 								<>
 									<div className="resolved-checkbox">
@@ -324,7 +324,7 @@ const EventDetailsCommentsTab = ({
 										<label>
 											{
 												t(
-													"EVENTS.EVENTS.DETAILS.COMMENTS.RESOLVED"
+													"EVENTS.EVENTS.DETAILS.COMMENTS.RESOLVED",
 												) /* Resolved */
 											}
 										</label>
@@ -336,7 +336,7 @@ const EventDetailsCommentsTab = ({
 							<button className="cancel" onClick={() => exitReplyMode()}>
 								{
 									t(
-										"EVENTS.EVENTS.DETAILS.COMMENTS.CANCEL_REPLY"
+										"EVENTS.EVENTS.DETAILS.COMMENTS.CANCEL_REPLY",
 									) /* Cancel */
 								}
 							</button>
@@ -362,7 +362,7 @@ const EventDetailsCommentsTab = ({
 										saveReply(
 											originalComment,
 											commentReplyText,
-											commentReplyIsResolved
+											commentReplyIsResolved,
 										)
 									}
 								}}