remove old comments from right panel

wax-prosemirror-services/src/CommentsService/components/BoxList.js

@@ -20,10 +20,7 @@ export default ({ commentsTracks, view, position, recalculateTops, users }) => {
 
         const top = position[index] ? position[index][id] : 0;
 
-        if (
-          commentTrack?.type?.name === 'comment' ||
-          commentTrack?.data?.type === 'comment'
-        ) {
+        if (commentTrack.data?.type === 'comment') {
           return (
             <ConnectedComment
               comment={commentTrack}

wax-prosemirror-services/src/CommentsService/components/ConnectedComment.js

@@ -39,10 +39,8 @@ export default ({ comment, top, commentId, recalculateTops, users }) => {
   const [clickPost, setClickPost] = useState(false);
 
   const { state, dispatch } = activeView;
-  const viewId = comment.attrs ? comment.attrs.viewid : comment.data.viewId;
-  const conversation = comment.attrs
-    ? comment.attrs.conversation
-    : comment.data.conversation;
+  const { viewId, conversation } = comment.data;
+
   let allCommentsWithSameId = [];
 
   if (pmViews[viewId]) {
@@ -165,7 +163,7 @@ export default ({ comment, top, commentId, recalculateTops, users }) => {
     //   onClickPost(content);
     // }
     setTimeout(() => {
-      if (comment.attrs.conversation.length === 0 && !clickPost) {
+      if (conversation.length === 0 && !clickPost) {
         onClickResolve();
         activeView.focus();
       }
@@ -177,12 +175,12 @@ export default ({ comment, top, commentId, recalculateTops, users }) => {
       <ConnectedCommentStyled
         active={isActive}
         data-box={commentId}
-        length={comment.attrs.conversation.length === 0}
+        length={conversation.length === 0}
         style={styles}
       >
         <CommentBox
           active={isActive}
-          commentData={comment.attrs.conversation}
+          commentData={conversation}
           commentId={commentId}
           isReadOnly={isReadOnly}
           key={commentId}
@@ -197,7 +195,7 @@ export default ({ comment, top, commentId, recalculateTops, users }) => {
         />
       </ConnectedCommentStyled>
     ),
-    [isActive, top, comment.attrs.conversation.length, users],
+    [isActive, top, conversation.length, users],
   );
   return <>{MemorizedComponent}</>;
 };

wax-prosemirror-services/src/CommentsService/components/RightArea.js

@@ -213,7 +213,6 @@ const updateMarks = (views, comments) => {
       if (node.node.marks.length > 0) {
         node.node.marks.filter(mark => {
           if (
-            mark.type.name === 'comment' ||
             mark.type.name === 'insertion' ||
             mark.type.name === 'deletion' ||
             mark.type.name === 'format_change'