From 45bc1c31d8871a00b7f7ba9f1fd6ef6315486803 Mon Sep 17 00:00:00 2001
From: Roie Natan <roie.natan@gmail.com>
Date: Sun, 19 Nov 2023 16:43:52 -0500
Subject: [PATCH] fix: show @ icon only after data is fectched ; added margin
 left to @ icon

---
 .../components/DiscussionFeedCard/DiscussionFeedCard.tsx      | 4 ++--
 .../FeedCard/components/FeedCardTags/FeedCardTags.module.scss | 1 +
 .../common/components/ProposalFeedCard/ProposalFeedCard.tsx   | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/pages/common/components/DiscussionFeedCard/DiscussionFeedCard.tsx b/src/pages/common/components/DiscussionFeedCard/DiscussionFeedCard.tsx
index 5b270c797a..5e2244434a 100644
--- a/src/pages/common/components/DiscussionFeedCard/DiscussionFeedCard.tsx
+++ b/src/pages/common/components/DiscussionFeedCard/DiscussionFeedCard.tsx
@@ -335,8 +335,8 @@ const DiscussionFeedCard = forwardRef<FeedItemRef, DiscussionFeedCardProps>(
           ownerId={item.userId}
           discussionPredefinedType={discussion?.predefinedType}
           hasUnseenMention={
-            feedItemUserMetadata?.hasUnseenMention ??
-            !isFeedItemUserMetadataFetched
+            isFeedItemUserMetadataFetched &&
+            feedItemUserMetadata?.hasUnseenMention
           }
         >
           {renderContent()}
diff --git a/src/pages/common/components/FeedCard/components/FeedCardTags/FeedCardTags.module.scss b/src/pages/common/components/FeedCard/components/FeedCardTags/FeedCardTags.module.scss
index 92d2c46860..af76c91481 100644
--- a/src/pages/common/components/FeedCard/components/FeedCardTags/FeedCardTags.module.scss
+++ b/src/pages/common/components/FeedCard/components/FeedCardTags/FeedCardTags.module.scss
@@ -59,4 +59,5 @@
 
 .hasUnseenMention {
   color: $c-pink-primary;
+  margin-left: 0.75rem;
 }
diff --git a/src/pages/common/components/ProposalFeedCard/ProposalFeedCard.tsx b/src/pages/common/components/ProposalFeedCard/ProposalFeedCard.tsx
index 362fd01ba0..b29526fd31 100644
--- a/src/pages/common/components/ProposalFeedCard/ProposalFeedCard.tsx
+++ b/src/pages/common/components/ProposalFeedCard/ProposalFeedCard.tsx
@@ -460,8 +460,8 @@ const ProposalFeedCard = forwardRef<FeedItemRef, ProposalFeedCardProps>(
           ownerId={item.userId}
           commonId={commonId}
           hasUnseenMention={
-            feedItemUserMetadata?.hasUnseenMention ??
-            !isFeedItemUserMetadataFetched
+            isFeedItemUserMetadataFetched &&
+            feedItemUserMetadata?.hasUnseenMention
           }
         >
           {renderContent()}