fix: prevent TypeError in mapToZeroUsers by ensuring non-null values (#…

…1090)
zer0-os · Oct 11, 2023 · 260066c · 260066c
1 parent 45ffb91
commit 260066c
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/store/channels-list/saga.ts b/src/store/channels-list/saga.ts
@@ -43,7 +43,7 @@ export function* mapToZeroUsers(channels: any[]) {
 
   let allMatrixIds = [];
   for (const channel of channels) {
-    const matrixIds = channel.otherMembers.map((u) => u.matrixId);
+    const matrixIds = (channel.otherMembers || []).filter((u) => u).map((u) => u.matrixId);
     allMatrixIds = union(allMatrixIds, matrixIds);
   }
 
@@ -52,8 +52,12 @@ export function* mapToZeroUsers(channels: any[]) {
   for (const user of zeroUsers) {
     zeroUsersMap[user.matrixId] = user;
   }
+
   const currentUser = yield select(currentUserSelector());
-  zeroUsersMap[currentUser.matrixId] = currentUser;
+
+  if (currentUser && currentUser.matrixId) {
+    zeroUsersMap[currentUser.matrixId] = currentUser;
+  }
 
   mapOtherMembersOfChannel(channels, zeroUsersMap);
   mapChannelMessages(channels, zeroUsersMap);