From bd19e2ab26b7ef5314c3ab880057d3684159dfb6 Mon Sep 17 00:00:00 2001 From: Yordan Neshkolov Date: Sun, 14 Jun 2020 00:23:48 +0300 Subject: [PATCH] NY-10685 [WEB]: Crash on JR web --- src/core/resource/conversations/modules/Conversations.module.js | 2 +- src/core/resource/roomlist/sagas/Rooms.saga.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/resource/conversations/modules/Conversations.module.js b/src/core/resource/conversations/modules/Conversations.module.js index b998cc66d..6f2c97167 100644 --- a/src/core/resource/conversations/modules/Conversations.module.js +++ b/src/core/resource/conversations/modules/Conversations.module.js @@ -118,7 +118,7 @@ const getRequests = (state, conversations) => { const groupDataAdapter = (id, data, name, unread, last_msg, admins, members, description) => { const user = { phone_id: id, - avatar: data[0] ? data[0].payload : null, + avatar: data && data[0] ? data[0].payload : null, names: name, surnames: '', description, diff --git a/src/core/resource/roomlist/sagas/Rooms.saga.js b/src/core/resource/roomlist/sagas/Rooms.saga.js index 377ab2edb..5f1c42e83 100644 --- a/src/core/resource/roomlist/sagas/Rooms.saga.js +++ b/src/core/resource/roomlist/sagas/Rooms.saga.js @@ -969,7 +969,7 @@ function* responseJoinMemberToRoomNotification() { id: rosterId, payload: roomPayload.data })); - } else if (!joinedMember || (groupId && groupId.startsWith('conference_'))) { + } else if (!joinedMember || groupId) { yield put(roomListActions.update({ id: rosterId, payload: roomPayload.data -- GitLab