From 158cd48e0b11de1611432cb0d63050df88661c4d Mon Sep 17 00:00:00 2001
From: SergeyEzhin <ezhin@mail.ru>
Date: Wed, 24 Aug 2022 17:36:14 +0300
Subject: [PATCH] [DE mobile] Fix Bug 58665
---
.../lib/view/collaboration/Comments.jsx | 68 +++++++++----------
1 file changed, 34 insertions(+), 34 deletions(-)
diff --git a/apps/common/mobile/lib/view/collaboration/Comments.jsx b/apps/common/mobile/lib/view/collaboration/Comments.jsx
index 4525329bc..4ccb89031 100644
--- a/apps/common/mobile/lib/view/collaboration/Comments.jsx
+++ b/apps/common/mobile/lib/view/collaboration/Comments.jsx
@@ -677,7 +677,7 @@ const ViewComments = inject("storeComments", "storeAppOptions", "storeReview")(o
</div>
{isEdit && !viewMode &&
<div className='right'>
- {(comment.editable && displayMode === 'markup' && !wsProps?.Objects) && <div className='comment-resolve' onClick={() => {!isViewer && onResolveComment(comment);}}><Icon icon={comment.resolved ? 'icon-resolve-comment check' : 'icon-resolve-comment'} /></div> }
+ {(comment.editable && displayMode === 'markup' && !wsProps?.Objects && !isViewer) && <div className='comment-resolve' onClick={() => {onResolveComment(comment);}}><Icon icon={comment.resolved ? 'icon-resolve-comment check' : 'icon-resolve-comment'} /></div> }
{(displayMode === 'markup' && !wsProps?.Objects && !isViewer) &&
<div className='comment-menu'
onClick={() => {setComment(comment); openActionComment(true);}}>
@@ -808,7 +808,7 @@ const CommentList = inject("storeComments", "storeAppOptions", "storeReview")(ob
</div>
{isEdit && !viewMode &&
<div className='right'>
- {(comment.editable && displayMode === 'markup' && !wsProps?.Objects) && <div className='comment-resolve' onClick={() => {!isViewer && onResolveComment(comment);}}><Icon icon={comment.resolved ? 'icon-resolve-comment check' : 'icon-resolve-comment'}/></div>}
+ {(comment.editable && displayMode === 'markup' && !wsProps?.Objects && !isViewer) && <div className='comment-resolve' onClick={() => {onResolveComment(comment);}}><Icon icon={comment.resolved ? 'icon-resolve-comment check' : 'icon-resolve-comment'}/></div>}
{(displayMode === 'markup' && !wsProps?.Objects && !isViewer) &&
<div className='comment-menu'
onClick={() => {openActionComment(true);}}>
@@ -822,43 +822,43 @@ const CommentList = inject("storeComments", "storeAppOptions", "storeReview")(ob
{comment.quote && <div className='comment-quote'>{sliceQuote(comment.quote)}</div>}
<div className='comment-text'><pre>{pickLink(comment.comment)}</pre></div>
{comment.replies.length > 0 &&
- <ul className='reply-list'>
- {comment.replies.map((reply, indexReply) => {
- return (
- <li key={`reply-${indexReply}`}
- className='reply-item'
- >
- <div className='item-content'>
- <div className='item-inner'>
- <div className='item-title'>
- <div slot='header' className='reply-header'>
- <div className='left'>
- {isAndroid && <div className='initials' style={{backgroundColor: `${reply.userColor ? reply.userColor : '#cfcfcf'}`}}>{reply.userInitials}</div>}
- <div>
- <div className='user-name'>{reply.parsedName}</div>
- <div className='reply-date'>{reply.date}</div>
- </div>
- </div>
- {isEdit && !viewMode && reply.editable && !isViewer &&
- <div className='right'>
- <div className='reply-menu'
- onClick={() => {setReply(reply); openActionReply(true);}}
- >
- <Icon icon='icon-menu-comment'/>
+ <ul className='reply-list'>
+ {comment.replies.map((reply, indexReply) => {
+ return (
+ <li key={`reply-${indexReply}`}
+ className='reply-item'
+ >
+ <div className='item-content'>
+ <div className='item-inner'>
+ <div className='item-title'>
+ <div slot='header' className='reply-header'>
+ <div className='left'>
+ {isAndroid && <div className='initials' style={{backgroundColor: `${reply.userColor ? reply.userColor : '#cfcfcf'}`}}>{reply.userInitials}</div>}
+ <div>
+ <div className='user-name'>{reply.parsedName}</div>
+ <div className='reply-date'>{reply.date}</div>
</div>
</div>
- }
- </div>
- <div slot='footer'>
- <div className='reply-text'><pre>{pickLink(reply.reply)}</pre></div>
+ {isEdit && !viewMode && reply.editable && !isViewer &&
+ <div className='right'>
+ <div className='reply-menu'
+ onClick={() => {setReply(reply); openActionReply(true);}}
+ >
+ <Icon icon='icon-menu-comment'/>
+ </div>
+ </div>
+ }
+ </div>
+ <div slot='footer'>
+ <div className='reply-text'><pre>{pickLink(reply.reply)}</pre></div>
+ </div>
</div>
</div>
</div>
- </div>
- </li>
- )
- })}
- </ul>
+ </li>
+ )
+ })}
+ </ul>
}
</div>
</ListItem>