Merge pull request #2717 from daostack/CW-crash-backpage

Crash in backpage
daostack · Jul 31, 2024 · e5cfcff · e5cfcff
2 parents f085b2b + cfff514
commit e5cfcff
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/...ges/OldCommon/components/CommonDetailContainer/MembersComponent/CommonMemberComponent.tsx b/...ges/OldCommon/components/CommonDetailContainer/MembersComponent/CommonMemberComponent.tsx
@@ -122,11 +122,13 @@ const CommonMember: FC<CommonMemberProps> = ({
             </div>
           </div>
         </div>
-        <div className="members__section__common-member-date">
-          {joinedAt
-            .toDate()
-            .toLocaleDateString("en-US", { month: "short", day: "numeric" })}
-        </div>
+        {joinedAt && joinedAt.toDate && (
+          <div className="members__section__common-member-date">
+            {joinedAt
+              ?.toDate()
+              .toLocaleDateString("en-US", { month: "short", day: "numeric" })}
+          </div>
+        )}
         <MemberDropdown
           notMemberCircles={notMemberCircles}
           memberName={memberName}

diff --git a/src/pages/OldCommon/components/CommonDetailContainer/MembersComponent/MembersComponent.tsx b/src/pages/OldCommon/components/CommonDetailContainer/MembersComponent/MembersComponent.tsx
@@ -39,7 +39,7 @@ const MembersComponent: FC<MembersComponentProps> = ({ common }) => {
     () =>
       [...commonMembers].sort(
         (commonMember, prevCommonMember) =>
-          prevCommonMember.joinedAt.seconds - commonMember.joinedAt.seconds,
+          prevCommonMember.joinedAt?.seconds - commonMember.joinedAt?.seconds,
       ),
     [commonMembers],
   );

diff --git a/...es/common/components/CommonTabPanels/components/MembersTab/components/Members/Members.tsx b/...es/common/components/CommonTabPanels/components/MembersTab/components/Members/Members.tsx
@@ -30,7 +30,7 @@ const MembersComponent: FC<MembersComponentProps> = (props) => {
     () =>
       [...commonMembers].sort(
         (commonMember, prevCommonMember) =>
-          prevCommonMember.joinedAt.seconds - commonMember.joinedAt.seconds,
+          prevCommonMember.joinedAt?.seconds - commonMember.joinedAt?.seconds,
       ),
     [commonMembers],
   );

diff --git a/src/pages/commonFeed/components/FeedLayout/components/ProfileContent/ProfileContent.tsx b/src/pages/commonFeed/components/FeedLayout/components/ProfileContent/ProfileContent.tsx
@@ -169,7 +169,7 @@ const ProfileContent: FC<ProfileContentProps> = (props) => {
           <p className={styles.infoContent}>
             Joined {common.name} at{" "}
             {formatDate(
-              new Date(commonMember.joinedAt.seconds * 1000),
+              new Date(commonMember.joinedAt?.seconds * 1000),
               DateFormat.SuperShortSecondary,
             )}
           </p>