♻️ Add more null checks

zivavu · May 11, 2024 · e6f9064 · e6f9064
1 parent 8f12862
commit e6f9064
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/common/friendsManage/getAcceptedFriends.ts b/src/common/friendsManage/getAcceptedFriends.ts
@@ -4,6 +4,6 @@ export default function getAcceptedFriends(userData: IUser) {
   const acceptedFriends =
     Object.values(userData.friends)
       .filter((friend) => friend.status === 'accepted')
-      .sort((a, b) => b.acceptedAt.seconds - a.acceptedAt.seconds) || [];
+      .sort((a, b) => b.acceptedAt?.seconds - a.acceptedAt?.seconds) || [];
   return acceptedFriends;
 }
diff --git a/src/common/friendsManage/useGetMutualFriends.ts b/src/common/friendsManage/useGetMutualFriends.ts
@@ -12,6 +12,6 @@ export default function useGetMutualFriends(friendId: string) {
       .filter((friend) => {
         return userFriends[friend.id];
       })
-      .sort((b, a) => b.acceptedAt.seconds - a.acceptedAt.seconds) || [];
+      .sort((b, a) => b?.acceptedAt?.seconds - a?.acceptedAt?.seconds) || [];
   return mutualFriends;
 }
diff --git a/src/components/molecules/ContactsSidebar/index.tsx b/src/components/molecules/ContactsSidebar/index.tsx
@@ -35,7 +35,7 @@ export default function ContactsSidebar({ sx, ...rootProps }: BoxProps) {
           const friendData = everyUserBasicInfo[friend.id];
           return { basicInfo: friendData, ...friend } as IFriendWithBasicInfo;
         })
-        .sort((a, b) => b.acceptedAt.seconds - a.acceptedAt.seconds);
+        .sort((a, b) => b?.acceptedAt?.seconds - a?.acceptedAt?.seconds);
       setFriends(friendsWithBasicInfo);
     }
   }, [loggedUser, everyUserBasicInfo]);