Merge pull request #9582 from hicommonwealth/release/v1.7.1-x

Release/v1.7.1-4
hicommonwealth · Oct 17, 2024 · fbeada3 · fbeada3
2 parents 191d414 + 90868b2
commit fbeada3
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 12 deletions.
diff --git a/...scripts/views/pages/discussions/ThreadCard/AuthorAndPublishInfo/AuthorAndPublishInfo.scss b/...scripts/views/pages/discussions/ThreadCard/AuthorAndPublishInfo/AuthorAndPublishInfo.scss
@@ -120,4 +120,13 @@
   display: flex;
   flex-direction: column;
   gap: 4px;
+
+  .collaborator-user-name {
+    color: $neutral-600;
+  }
+
+  .collaborator-user-name:hover {
+    text-decoration: underline;
+    text-decoration-color: $neutral-600;
+  }
 }
diff --git a/.../scripts/views/pages/discussions/ThreadCard/AuthorAndPublishInfo/AuthorAndPublishInfo.tsx b/.../scripts/views/pages/discussions/ThreadCard/AuthorAndPublishInfo/AuthorAndPublishInfo.tsx
@@ -2,6 +2,7 @@ import { PopperPlacementType } from '@mui/base/Popper';
 import { threadStageToLabel } from 'helpers';
 import moment from 'moment';
 import React, { useRef } from 'react';
+import { Link } from 'react-router-dom';
 import { useGetCommunityByIdQuery } from 'state/api/communities';
 import { ArchiveTrayWithTooltip } from 'views/components/ArchiveTrayWithTooltip';
 import { LockWithTooltip } from 'views/components/LockWithTooltip';
@@ -187,18 +188,23 @@ export const AuthorAndPublishInfo = ({
             <CWPopover
               content={
                 <div className="collaborators">
-                  {/*@ts-expect-error <StrictNullChecks>*/}
-                  {collaboratorsInfo.map(({ address, community_id, User }) => {
-                    return (
-                      <FullUser
-                        shouldLinkProfile
-                        key={address}
-                        userAddress={address}
-                        userCommunityId={community_id}
-                        profile={User.profile}
-                      />
-                    );
-                  })}
+                  {collaboratorsInfo?.map(
+                    ({
+                      User,
+                    }: {
+                      address: string;
+                      community_id: string;
+                      User: { id: number; profile: UserProfile };
+                    }) => {
+                      return (
+                        <Link key={User.id} to={`/profile/id/${User.id}`}>
+                          <CWText className="collaborator-user-name">
+                            {User.profile.name}
+                          </CWText>
+                        </Link>
+                      );
+                    },
+                  )}
                 </div>
               }
               {...popoverProps}