Merge pull request #2255 from daostack/dev

Sprint 30
daostack · Oct 26, 2023 · 1ff4682 · 1ff4682
2 parents 789d328 + 529ebaf
commit 1ff4682
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 16 deletions.
diff --git a/src/pages/common/components/DiscussionFeedCard/DiscussionFeedCard.tsx b/src/pages/common/components/DiscussionFeedCard/DiscussionFeedCard.tsx
@@ -327,8 +327,10 @@ const DiscussionFeedCard = forwardRef<FeedItemRef, DiscussionFeedCardProps>(
           isFollowing={feedItemFollow.isFollowing}
           isLoading={isLoading}
           menuItems={menuItems}
-          seenOnce={feedItemUserMetadata?.seenOnce ?? true}
-          seen={feedItemUserMetadata?.seen ?? true}
+          seenOnce={
+            feedItemUserMetadata?.seenOnce ?? !isFeedItemUserMetadataFetched
+          }
+          seen={feedItemUserMetadata?.seen ?? !isFeedItemUserMetadataFetched}
           ownerId={item.userId}
           discussionPredefinedType={discussion?.predefinedType}
         >

diff --git a/src/pages/common/components/ProposalFeedCard/ProposalFeedCard.tsx b/src/pages/common/components/ProposalFeedCard/ProposalFeedCard.tsx
@@ -452,8 +452,10 @@ const ProposalFeedCard = forwardRef<FeedItemRef, ProposalFeedCardProps>(
           isFollowing={feedItemFollow.isFollowing}
           isLoading={isLoading}
           type={item.data.type}
-          seenOnce={feedItemUserMetadata?.seenOnce ?? true}
-          seen={feedItemUserMetadata?.seen ?? true}
+          seenOnce={
+            feedItemUserMetadata?.seenOnce ?? !isFeedItemUserMetadataFetched
+          }
+          seen={feedItemUserMetadata?.seen ?? !isFeedItemUserMetadataFetched}
           menuItems={menuItems}
           ownerId={item.userId}
         >

diff --git a/...ommonFeed/components/HeaderContent/components/NewStreamButton/NewStreamButton.module.scss b/...ommonFeed/components/HeaderContent/components/NewStreamButton/NewStreamButton.module.scss
@@ -1,9 +1,17 @@
 @import "../../../../../../constants";
 @import "../../../../../../styles/sizes";
 
+.buttonIcon {
+  background-color: transparent;
+
+  &:hover {
+    background-color: $light-gray-1;
+  }
+}
+
 .icon {
-  width: 0.625rem;
-  height: 0.625rem;
+  width: 1rem;
+  height: 1rem;
   color: $c-gray-800;
 
   @include tablet {

diff --git a/src/pages/commonFeed/components/HeaderContent/components/NewStreamButton/NewStreamButton.tsx b/src/pages/commonFeed/components/HeaderContent/components/NewStreamButton/NewStreamButton.tsx
@@ -43,16 +43,8 @@ const NewStreamButton: FC<NewStreamButtonProps> = (props) => {
   }
 
   const triggerEl = (
-    <ButtonIcon
-      variant={
-        isMobileVersion ? ButtonVariant.Transparent : ButtonVariant.PrimaryGray
-      }
-    >
-      {isMobileVersion ? (
-        <PlusIcon className={styles.icon} />
-      ) : (
-        <BoldPlusIcon className={styles.icon} />
-      )}
+    <ButtonIcon className={styles.buttonIcon}>
+      <PlusIcon className={styles.icon} />
     </ButtonIcon>
   );
   const menuProps = {