From 09eeb5ad4f827caa5124f93f866655906216b55e Mon Sep 17 00:00:00 2001 From: ShimaginAndrey Date: Wed, 16 Feb 2022 11:05:41 +0300 Subject: [PATCH] [SSE] Fix Bug 54924 --- .../mobile/lib/view/collaboration/Comments.jsx | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/apps/common/mobile/lib/view/collaboration/Comments.jsx b/apps/common/mobile/lib/view/collaboration/Comments.jsx index 7675b860f..582a7bd99 100644 --- a/apps/common/mobile/lib/view/collaboration/Comments.jsx +++ b/apps/common/mobile/lib/view/collaboration/Comments.jsx @@ -639,6 +639,7 @@ const ViewComments = inject("storeComments", "storeAppOptions", "storeReview")(o const viewMode = !storeAppOptions.canComments; const comments = storeComments.groupCollectionFilter || storeComments.collectionComments; + const isEdit = storeAppOptions.isEdit; const sortComments = comments.length > 0 ? [...comments].sort((a, b) => a.time > b.time ? -1 : 1) : null; const [clickComment, setComment] = useState(); @@ -674,7 +675,7 @@ const ViewComments = inject("storeComments", "storeAppOptions", "storeReview")(o
{comment.date}
- {!viewMode && + {isEdit && !viewMode &&
{(comment.editable && displayMode === 'markup' && !wsProps?.Objects) &&
{onResolveComment(comment);}}>
} {(displayMode === 'markup' && !wsProps?.Objects) && @@ -707,7 +708,7 @@ const ViewComments = inject("storeComments", "storeAppOptions", "storeReview")(o
{reply.date}
- {!viewMode && reply.editable && + {isEdit && !viewMode && reply.editable &&
{setComment(comment); setReply(reply); openActionReply(true);}} @@ -748,6 +749,7 @@ const CommentList = inject("storeComments", "storeAppOptions", "storeReview")(ob const displayMode = storeReview.displayMode; const viewMode = !storeAppOptions.canComments; + const isEdit = storeAppOptions.isEdit; const comments = storeComments.showComments; const [currentIndex, setCurrentIndex] = useState(0); @@ -784,7 +786,7 @@ const CommentList = inject("storeComments", "storeAppOptions", "storeReview")(ob return ( - {!viewMode && + {isEdit && !viewMode && {onCommentMenuClick('addReply', comment);}}>{_t.textAddReply} }
@@ -804,7 +806,7 @@ const CommentList = inject("storeComments", "storeAppOptions", "storeReview")(ob
{comment.date}
- {!viewMode && + {isEdit && !viewMode &&
{(comment.editable && displayMode === 'markup' && !wsProps?.Objects) &&
{onResolveComment(comment);}}>
} {(displayMode === 'markup' && !wsProps?.Objects) && @@ -837,7 +839,7 @@ const CommentList = inject("storeComments", "storeAppOptions", "storeReview")(ob
{reply.date}
- {!viewMode && reply.editable && + {isEdit && !viewMode && reply.editable &&
{setReply(reply); openActionReply(true);}}