Merge pull request #2323 from daostack/cw-2254-@-unread-mention

Add (personal) @ icon on unread “mentioned” stream #2254
daostack · Nov 20, 2023 · 76f501f · 76f501f
2 parents 804b0d9 + 45bc1c3
commit 76f501f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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
@@ -460,8 +460,8 @@ const ProposalFeedCard = forwardRef<FeedItemRef, ProposalFeedCardProps>(
           ownerId={item.userId}
           commonId={commonId}
           hasUnseenMention={
-            feedItemUserMetadata?.hasUnseenMention ??
-            !isFeedItemUserMetadataFetched
+            isFeedItemUserMetadataFetched &&
+            feedItemUserMetadata?.hasUnseenMention
           }
         >
           {renderContent()}