Merge branch 'scroll-to-links-fix' of gitlab.com:discoursio/discoursio-webapp into scroll-to-links-fix

src/components/Article/CommentsTree.tsx

@@ -10,7 +10,6 @@ import { useReactions } from '../../context/reactions'
 import { byCreated } from '../../utils/sortby'
 import { ShowIfAuthenticated } from '../_shared/ShowIfAuthenticated'
 import { useLocalize } from '../../context/localize'
-import Cookie from 'js-cookie'
 
 type CommentsOrder = 'createdAt' | 'rating' | 'newOnly'
 
@@ -148,7 +147,7 @@ export const CommentsTree = (props: Props) => {
         </ul>
       </div>
       <ul class={styles.comments}>
-        <For each={sortedComments().filter((r) => !r.replyTo)}>
+        <For each={sortedComments().filter((r: Reaction) => !r.replyTo)}>
           {(reaction) => (
             <Comment
               sortedComments={sortedComments()}

src/components/Article/FullArticle.tsx

@@ -187,7 +187,7 @@ export const FullArticle = (props: ArticleProps) => {
 
               <a href="#comments" class={styles.shoutStatsItem}>
                 <Icon name="comment" class={styles.icon} />
-                {/*{props.article.stat?.commented || ''}*/}
+                {props.article.stat?.commented ?? ''}
               </a>
 
               <div class={styles.shoutStatsItem}>

src/components/Feed/Card.tsx

@@ -155,7 +155,6 @@ export const ArticleCard = (props: ArticleCardProps) => {
                 </For>
               </div>
             </Show>
-
             <Show when={!props.settings?.nodate}>
               <div class={styles.shoutDate}>{formattedDate()}</div>
             </Show>