sceyt-chat-react-uikit 1.6.8-beta.2 → 1.6.8-beta.3

package/index.js

@@ -11482,7 +11482,66 @@ var MessageTextFormat = function MessageTextFormat(_ref2) {
   }
 };
 
-var _marked = /*#__PURE__*/_regeneratorRuntime().mark(watchForEvents);
+var _marked = /*#__PURE__*/_regeneratorRuntime().mark(updateActiveChannelMembersAdd),
+  _marked2 = /*#__PURE__*/_regeneratorRuntime().mark(updateActiveChannelMembersRemove);
+function updateActiveChannelMembersAdd(addedMembers) {
+  var state, activeChannel, updatedMembers;
+  return _regeneratorRuntime().wrap(function updateActiveChannelMembersAdd$(_context) {
+    while (1) switch (_context.prev = _context.next) {
+      case 0:
+        _context.next = 2;
+        return effects.select();
+      case 2:
+        state = _context.sent;
+        activeChannel = state.ChannelReducer.activeChannel;
+        if (!(activeChannel && activeChannel.id)) {
+          _context.next = 9;
+          break;
+        }
+        updatedMembers = [].concat(activeChannel.members || [], addedMembers);
+        updatedMembers = Array.from(new Set(updatedMembers));
+        _context.next = 9;
+        return effects.put(updateChannelDataAC(activeChannel.id, {
+          members: updatedMembers
+        }));
+      case 9:
+      case "end":
+        return _context.stop();
+    }
+  }, _marked);
+}
+function updateActiveChannelMembersRemove(removedMembers) {
+  var state, activeChannel, updatedMembers;
+  return _regeneratorRuntime().wrap(function updateActiveChannelMembersRemove$(_context2) {
+    while (1) switch (_context2.prev = _context2.next) {
+      case 0:
+        _context2.next = 2;
+        return effects.select();
+      case 2:
+        state = _context2.sent;
+        activeChannel = state.ChannelReducer.activeChannel;
+        if (!(activeChannel && activeChannel.id)) {
+          _context2.next = 9;
+          break;
+        }
+        updatedMembers = (activeChannel.members || []).filter(function (member) {
+          return !removedMembers.find(function (removed) {
+            return removed.id === member.id;
+          });
+        });
+        updatedMembers = Array.from(new Set(updatedMembers));
+        _context2.next = 9;
+        return effects.put(updateChannelDataAC(activeChannel.id, {
+          members: updatedMembers
+        }));
+      case 9:
+      case "end":
+        return _context2.stop();
+    }
+  }, _marked2);
+}
+
+var _marked$1 = /*#__PURE__*/_regeneratorRuntime().mark(watchForEvents);
 function watchForEvents() {
   var SceytChatClient, channelListener, connectionListener, usersTimeout, chan, _loop;
   return _regeneratorRuntime().wrap(function watchForEvents$(_context2) {
@@ -11852,7 +11911,7 @@ function watchForEvents() {
                 type = _yield$take.type;
                 args = _yield$take.args;
                 _context.t0 = type;
-                _context.next = _context.t0 === CHANNEL_EVENT_TYPES.CREATE ? 8 : _context.t0 === CHANNEL_EVENT_TYPES.JOIN ? 25 : _context.t0 === CHANNEL_EVENT_TYPES.LEAVE ? 34 : _context.t0 === CHANNEL_EVENT_TYPES.BLOCK ? 58 : _context.t0 === CHANNEL_EVENT_TYPES.UNBLOCK ? 65 : _context.t0 === CHANNEL_EVENT_TYPES.KICK_MEMBERS ? 67 : _context.t0 === CHANNEL_EVENT_TYPES.ADD_MEMBERS ? 96 : _context.t0 === CHANNEL_EVENT_TYPES.UPDATE_CHANNEL ? 119 : _context.t0 === CHANNEL_EVENT_TYPES.MESSAGE ? 136 : _context.t0 === CHANNEL_EVENT_TYPES.MESSAGE_MARKERS_RECEIVED ? 203 : _context.t0 === CHANNEL_EVENT_TYPES.DELETE ? 226 : _context.t0 === CHANNEL_EVENT_TYPES.DELETE_MESSAGE ? 233 : _context.t0 === CHANNEL_EVENT_TYPES.EDIT_MESSAGE ? 250 : _context.t0 === CHANNEL_EVENT_TYPES.REACTION_ADDED ? 265 : _context.t0 === CHANNEL_EVENT_TYPES.REACTION_DELETED ? 293 : _context.t0 === CHANNEL_EVENT_TYPES.UNREAD_MESSAGES_INFO ? 309 : _context.t0 === CHANNEL_EVENT_TYPES.CLEAR_HISTORY ? 316 : _context.t0 === CHANNEL_EVENT_TYPES.MUTE ? 334 : _context.t0 === CHANNEL_EVENT_TYPES.UNMUTE ? 340 : _context.t0 === CHANNEL_EVENT_TYPES.PINED ? 346 : _context.t0 === CHANNEL_EVENT_TYPES.UNPINED ? 352 : _context.t0 === CHANNEL_EVENT_TYPES.HIDE ? 358 : _context.t0 === CHANNEL_EVENT_TYPES.UNHIDE ? 363 : _context.t0 === CHANNEL_EVENT_TYPES.CHANNEL_MARKED_AS_UNREAD ? 368 : _context.t0 === CHANNEL_EVENT_TYPES.CHANNEL_MARKED_AS_READ ? 376 : _context.t0 === CHANNEL_EVENT_TYPES.CHANGE_ROLE ? 384 : _context.t0 === CHANNEL_EVENT_TYPES.FROZEN ? 403 : _context.t0 === CHANNEL_EVENT_TYPES.UNFROZEN ? 406 : _context.t0 === CHANNEL_EVENT_TYPES.CHANNEL_EVENT ? 409 : _context.t0 === CONNECTION_EVENT_TYPES.CONNECTION_STATUS_CHANGED ? 440 : 448;
+                _context.next = _context.t0 === CHANNEL_EVENT_TYPES.CREATE ? 8 : _context.t0 === CHANNEL_EVENT_TYPES.JOIN ? 25 : _context.t0 === CHANNEL_EVENT_TYPES.LEAVE ? 34 : _context.t0 === CHANNEL_EVENT_TYPES.BLOCK ? 60 : _context.t0 === CHANNEL_EVENT_TYPES.UNBLOCK ? 67 : _context.t0 === CHANNEL_EVENT_TYPES.KICK_MEMBERS ? 69 : _context.t0 === CHANNEL_EVENT_TYPES.ADD_MEMBERS ? 100 : _context.t0 === CHANNEL_EVENT_TYPES.UPDATE_CHANNEL ? 125 : _context.t0 === CHANNEL_EVENT_TYPES.MESSAGE ? 142 : _context.t0 === CHANNEL_EVENT_TYPES.MESSAGE_MARKERS_RECEIVED ? 209 : _context.t0 === CHANNEL_EVENT_TYPES.DELETE ? 232 : _context.t0 === CHANNEL_EVENT_TYPES.DELETE_MESSAGE ? 239 : _context.t0 === CHANNEL_EVENT_TYPES.EDIT_MESSAGE ? 256 : _context.t0 === CHANNEL_EVENT_TYPES.REACTION_ADDED ? 271 : _context.t0 === CHANNEL_EVENT_TYPES.REACTION_DELETED ? 299 : _context.t0 === CHANNEL_EVENT_TYPES.UNREAD_MESSAGES_INFO ? 315 : _context.t0 === CHANNEL_EVENT_TYPES.CLEAR_HISTORY ? 322 : _context.t0 === CHANNEL_EVENT_TYPES.MUTE ? 340 : _context.t0 === CHANNEL_EVENT_TYPES.UNMUTE ? 346 : _context.t0 === CHANNEL_EVENT_TYPES.PINED ? 352 : _context.t0 === CHANNEL_EVENT_TYPES.UNPINED ? 358 : _context.t0 === CHANNEL_EVENT_TYPES.HIDE ? 364 : _context.t0 === CHANNEL_EVENT_TYPES.UNHIDE ? 369 : _context.t0 === CHANNEL_EVENT_TYPES.CHANNEL_MARKED_AS_UNREAD ? 374 : _context.t0 === CHANNEL_EVENT_TYPES.CHANNEL_MARKED_AS_READ ? 382 : _context.t0 === CHANNEL_EVENT_TYPES.CHANGE_ROLE ? 390 : _context.t0 === CHANNEL_EVENT_TYPES.FROZEN ? 409 : _context.t0 === CHANNEL_EVENT_TYPES.UNFROZEN ? 412 : _context.t0 === CHANNEL_EVENT_TYPES.CHANNEL_EVENT ? 415 : _context.t0 === CONNECTION_EVENT_TYPES.CONNECTION_STATUS_CHANGED ? 446 : 454;
                 break;
               case 8:
                 createdChannel = args.createdChannel;
@@ -11886,7 +11945,7 @@ function watchForEvents() {
                   addChannelToAllChannels(createdChannel);
                 }
               case 24:
-                return _context.abrupt("break", 449);
+                return _context.abrupt("break", 455);
               case 25:
                 channel = args.channel;
                 log.info('channel JOIN ... . ', channel);
@@ -11897,7 +11956,7 @@ function watchForEvents() {
                 if (!_chan2) {
                   addChannelToAllChannels(channel);
                 }
-                return _context.abrupt("break", 449);
+                return _context.abrupt("break", 455);
               case 34:
                 _channel = args.channel, member = args.member;
                 log.info('channel LEAVE ... ', _channel, member);
@@ -11915,208 +11974,217 @@ function watchForEvents() {
               case 43:
                 removeChannelFromMap(_channel.id);
                 deleteChannelFromAllChannels(_channel.id);
-                _context.next = 57;
+                _context.next = 59;
                 break;
               case 47:
                 groupName = getChannelGroupName(_channel);
                 if (!_channelExists) {
-                  _context.next = 54;
+                  _context.next = 56;
                   break;
                 }
                 if (!(_activeChannelId === _channel.id)) {
-                  _context.next = 52;
+                  _context.next = 54;
                   break;
                 }
                 _context.next = 52;
                 return effects.put(removeMemberFromListAC([member]));
               case 52:
                 _context.next = 54;
+                return updateActiveChannelMembersRemove([member]);
+              case 54:
+                _context.next = 56;
                 return effects.put(updateChannelDataAC(_channel.id, {
                   memberCount: _channel.memberCount,
                   muted: _channel.muted,
                   mutedTill: _channel.mutedTill
                 }));
-              case 54:
-                _context.next = 56;
+              case 56:
+                _context.next = 58;
                 return effects.put(updateSearchedChannelDataAC(_channel.id, {
                   memberCount: _channel.memberCount,
                   muted: _channel.muted,
                   mutedTill: _channel.mutedTill
                 }, groupName));
-              case 56:
+              case 58:
                 updateChannelOnAllChannels(_channel.id, {
                   memberCount: _channel.memberCount,
                   muted: _channel.muted,
                   mutedTill: _channel.mutedTill
                 });
-              case 57:
-                return _context.abrupt("break", 449);
-              case 58:
+              case 59:
+                return _context.abrupt("break", 455);
+              case 60:
                 log.info('channel BLOCK ... ');
                 _channel2 = args.channel;
                 _channelExists2 = checkChannelExists(_channel2.id);
                 if (!_channelExists2) {
-                  _context.next = 64;
+                  _context.next = 66;
                   break;
                 }
-                _context.next = 64;
+                _context.next = 66;
                 return effects.put(removeChannelAC(_channel2.id));
-              case 64:
-                return _context.abrupt("break", 449);
-              case 65:
-                log.info('channel UNBLOCK ... ');
-                return _context.abrupt("break", 449);
+              case 66:
+                return _context.abrupt("break", 455);
               case 67:
+                log.info('channel UNBLOCK ... ');
+                return _context.abrupt("break", 455);
+              case 69:
                 _channel3 = args.channel, removedMembers = args.removedMembers;
                 log.info('channel KICK_MEMBERS ... ', removedMembers);
-                _context.next = 71;
+                _context.next = 73;
                 return effects.call(getActiveChannelId);
-              case 71:
+              case 73:
                 _activeChannelId2 = _context.sent;
                 _channelExists3 = checkChannelExists(_channel3.id);
                 if (!_channelExists3) {
-                  _context.next = 94;
+                  _context.next = 98;
                   break;
                 }
                 if (!removedMembers.find(function (mem) {
                   return mem.id === SceytChatClient.user.id;
                 })) {
-                  _context.next = 86;
+                  _context.next = 88;
                   break;
                 }
                 removeChannelFromMap(_channel3.id);
-                _context.next = 78;
-                return effects.put(removeChannelAC(_channel3.id));
-              case 78:
                 _context.next = 80;
-                return effects.call(getLastChannelFromMap);
+                return effects.put(removeChannelAC(_channel3.id));
               case 80:
+                _context.next = 82;
+                return effects.call(getLastChannelFromMap);
+              case 82:
                 activeChannel = _context.sent;
                 if (!activeChannel) {
-                  _context.next = 84;
+                  _context.next = 86;
                   break;
                 }
-                _context.next = 84;
+                _context.next = 86;
                 return effects.put(switchChannelActionAC(JSON.parse(JSON.stringify(activeChannel))));
-              case 84:
-                _context.next = 94;
-                break;
               case 86:
+                _context.next = 98;
+                break;
+              case 88:
                 if (!(_activeChannelId2 === _channel3.id)) {
-                  _context.next = 89;
+                  _context.next = 93;
                   break;
                 }
-                _context.next = 89;
+                _context.next = 91;
                 return effects.put(removeMemberFromListAC(removedMembers));
-              case 89:
+              case 91:
+                _context.next = 93;
+                return updateActiveChannelMembersRemove(removedMembers);
+              case 93:
                 _groupName = getChannelGroupName(_channel3);
-                _context.next = 92;
+                _context.next = 96;
                 return effects.put(updateSearchedChannelDataAC(_channel3.id, {
                   memberCount: _channel3.memberCount,
                   muted: _channel3.muted,
                   mutedTill: _channel3.mutedTill
                 }, _groupName));
-              case 92:
-                _context.next = 94;
+              case 96:
+                _context.next = 98;
                 return effects.put(updateChannelDataAC(_channel3.id, {
                   memberCount: _channel3.memberCount,
                   muted: _channel3.muted,
                   mutedTill: _channel3.mutedTill
                 }));
-              case 94:
+              case 98:
                 updateChannelOnAllChannels(_channel3.id, {
                   memberCount: _channel3.memberCount,
                   muted: _channel3.muted,
                   mutedTill: _channel3.mutedTill
                 });
-                return _context.abrupt("break", 449);
-              case 96:
+                return _context.abrupt("break", 455);
+              case 100:
                 _channel4 = args.channel, addedMembers = args.addedMembers;
                 log.info('channel ADD_MEMBERS ... ', addedMembers);
-                _context.next = 100;
+                _context.next = 104;
                 return effects.call(getActiveChannelId);
-              case 100:
+              case 104:
                 _activeChannelId3 = _context.sent;
                 _channelExists4 = checkChannelExists(_channel4.id);
                 if (!_channelExists4) {
-                  _context.next = 110;
+                  _context.next = 116;
                   break;
                 }
                 if (!(_activeChannelId3 === _channel4.id)) {
-                  _context.next = 106;
+                  _context.next = 112;
                   break;
                 }
-                _context.next = 106;
+                _context.next = 110;
                 return effects.put(addMembersToListAC(addedMembers));
-              case 106:
-                _context.next = 108;
+              case 110:
+                _context.next = 112;
+                return updateActiveChannelMembersAdd(addedMembers);
+              case 112:
+                _context.next = 114;
                 return effects.put(updateChannelDataAC(_channel4.id, {
                   memberCount: _channel4.memberCount,
                   muted: _channel4.muted,
                   mutedTill: _channel4.mutedTill
                 }));
-              case 108:
-                _context.next = 114;
+              case 114:
+                _context.next = 120;
                 break;
-              case 110:
-                _context.next = 112;
+              case 116:
+                _context.next = 118;
                 return effects.call(setChannelInMap, _channel4);
-              case 112:
-                _context.next = 114;
+              case 118:
+                _context.next = 120;
                 return effects.put(setAddedToChannelAC(JSON.parse(JSON.stringify(_channel4))));
-              case 114:
+              case 120:
                 _groupName2 = getChannelGroupName(_channel4);
-                _context.next = 117;
+                _context.next = 123;
                 return effects.put(updateSearchedChannelDataAC(_channel4.id, {
                   memberCount: _channel4.memberCount,
                   muted: _channel4.muted,
                   mutedTill: _channel4.mutedTill
                 }, _groupName2));
-              case 117:
+              case 123:
                 updateChannelOnAllChannels(_channel4.id, {
                   memberCount: _channel4.memberCount,
                   muted: _channel4.muted,
                   mutedTill: _channel4.mutedTill
                 });
-                return _context.abrupt("break", 449);
-              case 119:
+                return _context.abrupt("break", 455);
+              case 125:
                 updatedChannel = args.updatedChannel;
                 _channelExists5 = checkChannelExists(updatedChannel.id);
                 subject = updatedChannel.subject, avatarUrl = updatedChannel.avatarUrl, muted = updatedChannel.muted, mutedTill = updatedChannel.mutedTill, metadata = updatedChannel.metadata;
                 if (!_channelExists5) {
-                  _context.next = 131;
+                  _context.next = 137;
                   break;
                 }
-                _context.next = 125;
+                _context.next = 131;
                 return effects.put(updateChannelDataAC(updatedChannel.id, {
                   subject: subject,
                   avatarUrl: avatarUrl,
                   muted: muted,
                   mutedTill: mutedTill
                 }));
-              case 125:
-                _context.next = 127;
+              case 131:
+                _context.next = 133;
                 return effects.call(getActiveChannelId);
-              case 127:
+              case 133:
                 _activeChannelId4 = _context.sent;
                 if (!(_activeChannelId4 === updatedChannel.id)) {
-                  _context.next = 131;
+                  _context.next = 137;
                   break;
                 }
-                _context.next = 131;
+                _context.next = 137;
                 return effects.put(setActiveChannelAC(_extends({}, updatedChannel, {
                   metadata: isJSON(metadata) ? JSON.parse(metadata) : metadata
                 })));
-              case 131:
+              case 137:
                 _groupName3 = getChannelGroupName(updatedChannel);
-                _context.next = 134;
+                _context.next = 140;
                 return effects.put(updateSearchedChannelDataAC(updatedChannel.id, {
                   subject: subject,
                   avatarUrl: avatarUrl,
                   muted: muted,
                   mutedTill: mutedTill
                 }, _groupName3));
-              case 134:
+              case 140:
                 updateChannelOnAllChannels(updatedChannel.id, {
                   subject: subject,
                   avatarUrl: avatarUrl,
@@ -12124,102 +12192,102 @@ function watchForEvents() {
                   mutedTill: mutedTill,
                   metadata: isJSON(metadata) ? JSON.parse(metadata) : metadata
                 });
-                return _context.abrupt("break", 449);
-              case 136:
+                return _context.abrupt("break", 455);
+              case 142:
                 _channel5 = args.channel, message = args.message;
                 log.info('channel MESSAGE ... id : ', message.id, ' message: ', message, ' channel.id: ', _channel5.id);
                 messageToHandle = handleNewMessages ? handleNewMessages(message, _channel5) : message;
                 _channelFilterTypes = getChannelTypesFilter();
                 if (!(messageToHandle && _channel5 && (_channelFilterTypes !== null && _channelFilterTypes !== void 0 && _channelFilterTypes.length ? _channelFilterTypes.includes(_channel5.type) : true))) {
-                  _context.next = 202;
+                  _context.next = 208;
                   break;
                 }
                 _channel5.metadata = isJSON(_channel5.metadata) ? JSON.parse(_channel5.metadata) : _channel5.metadata;
-                _context.next = 144;
+                _context.next = 150;
                 return effects.call(getActiveChannelId);
-              case 144:
+              case 150:
                 _activeChannelId5 = _context.sent;
                 _channelExists6 = checkChannelExists(_channel5.id);
                 channelForAdd = JSON.parse(JSON.stringify(_channel5));
-                _context.next = 149;
+                _context.next = 155;
                 return effects.put(addChannelAC(channelForAdd));
-              case 149:
+              case 155:
                 if (_channelExists6) {
-                  _context.next = 154;
+                  _context.next = 160;
                   break;
                 }
-                _context.next = 152;
+                _context.next = 158;
                 return effects.call(setChannelInMap, _channel5);
-              case 152:
-                _context.next = 157;
+              case 158:
+                _context.next = 163;
                 break;
-              case 154:
+              case 160:
                 if (message.repliedInThread) {
-                  _context.next = 157;
+                  _context.next = 163;
                   break;
                 }
-                _context.next = 157;
+                _context.next = 163;
                 return effects.put(updateChannelLastMessageAC(message, channelForAdd));
-              case 157:
+              case 163:
                 if (!(_channel5.id === _activeChannelId5)) {
-                  _context.next = 169;
+                  _context.next = 175;
                   break;
                 }
                 if (getHasNextCached()) {
-                  _context.next = 161;
+                  _context.next = 167;
                   break;
                 }
-                _context.next = 161;
+                _context.next = 167;
                 return effects.put(addMessageAC(message));
-              case 161:
+              case 167:
                 addAllMessages([message], MESSAGE_LOAD_DIRECTION.NEXT);
-                _context.next = 165;
+                _context.next = 171;
                 return effects.select(messagesHasNextSelector);
-              case 165:
+              case 171:
                 hasNextMessage = _context.sent;
                 if (!(!getHasNextCached() && !hasNextMessage)) {
-                  _context.next = 169;
+                  _context.next = 175;
                   break;
                 }
-                _context.next = 169;
+                _context.next = 175;
                 return effects.put(scrollToNewMessageAC(true, false, true));
-              case 169:
+              case 175:
                 if (getMessagesFromMap(_channel5.id) && getMessagesFromMap(_channel5.id).length) {
                   addMessageToMap(_channel5.id, message);
                 }
-                _context.next = 172;
+                _context.next = 178;
                 return effects.put(updateChannelDataAC(_channel5.id, _extends({}, channelForAdd, {
                   userMessageReactions: [],
                   lastReactedMessage: null
                 })));
-              case 172:
+              case 178:
                 _groupName4 = getChannelGroupName(_channel5);
-                _context.next = 175;
+                _context.next = 181;
                 return effects.put(updateSearchedChannelDataAC(_channel5.id, _extends({}, channelForAdd, {
                   userMessageReactions: [],
                   lastReactedMessage: null
                 }), _groupName4));
-              case 175:
+              case 181:
                 showNotifications = getShowNotifications();
                 if (!(showNotifications && !message.silent && message.user.id !== SceytChatClient.user.id && !_channel5.muted)) {
-                  _context.next = 192;
+                  _context.next = 198;
                   break;
                 }
                 if (!(Notification.permission === 'granted')) {
-                  _context.next = 192;
+                  _context.next = 198;
                   break;
                 }
-                _context.next = 180;
+                _context.next = 186;
                 return effects.select(browserTabIsActiveSelector);
-              case 180:
+              case 186:
                 tabIsActive = _context.sent;
                 if (!(document.visibilityState !== 'visible' || !tabIsActive || _channel5.id !== _activeChannelId5)) {
-                  _context.next = 192;
+                  _context.next = 198;
                   break;
                 }
-                _context.next = 184;
+                _context.next = 190;
                 return effects.select(contactsMapSelector);
-              case 184:
+              case 190:
                 contactsMap = _context.sent;
                 _getFromContacts = getShowOnlyContactUsers();
                 state = store.getState();
@@ -12239,42 +12307,42 @@ function watchForEvents() {
                 setNotification(messageBody, message.user, _channel5, undefined, message.attachments && message.attachments.length ? message.attachments.find(function (att) {
                   return att.type !== attachmentTypes.link;
                 }) : undefined);
-              case 192:
+              case 198:
                 log.info('send delivered for message . .. . ', message);
                 if (!(message.repliedInThread && message.parentMessage.id)) {
-                  _context.next = 198;
+                  _context.next = 204;
                   break;
                 }
-                _context.next = 196;
+                _context.next = 202;
                 return effects.put(markMessagesAsDeliveredAC(message.parentMessage.id, [message.id]));
-              case 196:
-                _context.next = 200;
+              case 202:
+                _context.next = 206;
                 break;
-              case 198:
-                _context.next = 200;
+              case 204:
+                _context.next = 206;
                 return effects.put(markMessagesAsDeliveredAC(_channel5.id, [message.id]));
-              case 200:
+              case 206:
                 updateChannelOnAllChannels(_channel5.id, _extends({}, channelForAdd, {
                   userMessageReactions: [],
                   lastReactedMessage: null
                 }));
                 updateChannelLastMessageOnAllChannels(_channel5.id, _channel5.lastMessage);
-              case 202:
-                return _context.abrupt("break", 449);
-              case 203:
+              case 208:
+                return _context.abrupt("break", 455);
+              case 209:
                 channelId = args.channelId, markerList = args.markerList;
-                _context.next = 206;
+                _context.next = 212;
                 return effects.call(getChannelFromMap, channelId);
-              case 206:
+              case 212:
                 _channel6 = _context.sent;
                 log.info('channel MESSAGE_MARKERS_RECEIVED ... channel: ', _channel6, 'markers list: ', markerList);
                 if (!_channel6) {
-                  _context.next = 225;
+                  _context.next = 231;
                   break;
                 }
-                _context.next = 211;
+                _context.next = 217;
                 return effects.call(getActiveChannelId);
-              case 211:
+              case 217:
                 _activeChannelId6 = _context.sent;
                 updateLastMessage = false;
                 markersMap = {};
@@ -12292,91 +12360,91 @@ function watchForEvents() {
                   });
                 });
                 if (!updateLastMessage) {
-                  _context.next = 220;
+                  _context.next = 226;
                   break;
                 }
                 lastMessage = _extends({}, _channel6.lastMessage, {
                   deliveryStatus: markerList.name
                 });
                 updateChannelLastMessageOnAllChannels(_channel6.id, lastMessage);
-                _context.next = 220;
+                _context.next = 226;
                 return effects.put(updateChannelLastMessageStatusAC(lastMessage, JSON.parse(JSON.stringify(_channel6))));
-              case 220:
+              case 226:
                 if (!(_activeChannelId6 === channelId)) {
-                  _context.next = 224;
+                  _context.next = 230;
                   break;
                 }
-                _context.next = 223;
+                _context.next = 229;
                 return effects.put(updateMessagesStatusAC(markerList.name, markersMap));
-              case 223:
+              case 229:
                 updateMarkersOnAllMessages(markersMap, markerList.name);
-              case 224:
+              case 230:
                 updateMessageStatusOnMap(_channel6.id, {
                   name: markerList.name,
                   markersMap: markersMap
                 });
-              case 225:
-                return _context.abrupt("break", 449);
-              case 226:
+              case 231:
+                return _context.abrupt("break", 455);
+              case 232:
                 _channelId = args.channelId;
                 log.info('channel DELETE ... ');
                 _channel7 = getChannelFromMap(_channelId);
-                _context.next = 231;
+                _context.next = 237;
                 return effects.put(setChannelToRemoveAC(_channel7));
-              case 231:
+              case 237:
                 deleteChannelFromAllChannels(_channelId);
-                return _context.abrupt("break", 449);
-              case 233:
+                return _context.abrupt("break", 455);
+              case 239:
                 _channel8 = args.channel, deletedMessage = args.deletedMessage;
                 _activeChannelId7 = getActiveChannelId();
                 log.info('channel DELETE_MESSAGE ... ');
                 _channelExists7 = checkChannelExists(_channel8.id);
                 if (!(_channel8.id === _activeChannelId7)) {
-                  _context.next = 241;
+                  _context.next = 247;
                   break;
                 }
                 updateMessageOnAllMessages(deletedMessage.id, deletedMessage);
-                _context.next = 241;
+                _context.next = 247;
                 return effects.put(updateMessageAC(deletedMessage.id, deletedMessage));
-              case 241:
+              case 247:
                 updateMessageOnMap(_channel8.id, {
                   messageId: deletedMessage.id,
                   params: deletedMessage
                 });
                 if (!_channelExists7) {
-                  _context.next = 248;
+                  _context.next = 254;
                   break;
                 }
-                _context.next = 245;
+                _context.next = 251;
                 return effects.put(updateChannelDataAC(_channel8.id, {
                   newMessageCount: _channel8.newMessageCount,
                   muted: _channel8.muted,
                   mutedTill: _channel8.mutedTill
                 }));
-              case 245:
+              case 251:
                 if (!(_channel8.lastMessage.id === deletedMessage.id)) {
-                  _context.next = 248;
+                  _context.next = 254;
                   break;
                 }
-                _context.next = 248;
+                _context.next = 254;
                 return effects.put(updateChannelLastMessageAC(deletedMessage, _channel8));
-              case 248:
+              case 254:
                 updateChannelOnAllChannels(_channel8.id, {
                   newMessageCount: _channel8.newMessageCount,
                   muted: _channel8.muted,
                   mutedTill: _channel8.mutedTill
                 }, deletedMessage);
-                return _context.abrupt("break", 449);
-              case 250:
+                return _context.abrupt("break", 455);
+              case 256:
                 _channel9 = args.channel, _message = args.message;
                 log.info('channel EDIT_MESSAGE ... ', _message);
                 _activeChannelId8 = getActiveChannelId();
                 _channelExists8 = checkChannelExists(_channel9.id);
                 if (!(_channel9.id === _activeChannelId8)) {
-                  _context.next = 258;
+                  _context.next = 264;
                   break;
                 }
-                _context.next = 257;
+                _context.next = 263;
                 return effects.put(updateMessageAC(_message.id, {
                   body: _message.body,
                   state: _message.state,
@@ -12385,7 +12453,7 @@ function watchForEvents() {
                   mentionedUsers: _message.mentionedUsers,
                   updatedAt: _message.updatedAt
                 }));
-              case 257:
+              case 263:
                 updateMessageOnAllMessages(_message.id, {
                   body: _message.body,
                   state: _message.state,
@@ -12394,18 +12462,18 @@ function watchForEvents() {
                   mentionedUsers: _message.mentionedUsers,
                   updatedAt: _message.updatedAt
                 });
-              case 258:
+              case 264:
                 if (!_channelExists8) {
-                  _context.next = 262;
+                  _context.next = 268;
                   break;
                 }
                 if (!(_channel9.lastMessage.id === _message.id)) {
-                  _context.next = 262;
+                  _context.next = 268;
                   break;
                 }
-                _context.next = 262;
+                _context.next = 268;
                 return effects.put(updateChannelLastMessageAC(_message, _channel9));
-              case 262:
+              case 268:
                 if (checkChannelExistsOnMessagesMap(_channel9.id)) {
                   updateMessageOnMap(_channel9.id, {
                     messageId: _message.id,
@@ -12413,36 +12481,36 @@ function watchForEvents() {
                   });
                 }
                 updateChannelOnAllChannels(_channel9.id, {}, _message);
-                return _context.abrupt("break", 449);
-              case 265:
+                return _context.abrupt("break", 455);
+              case 271:
                 _channel0 = args.channel, user = args.user, _message2 = args.message, reaction = args.reaction;
                 log.info('channel REACTION_ADDED ... ', args);
                 isSelf = user.id === SceytChatClient.user.id;
                 _activeChannelId9 = getActiveChannelId();
                 if (!(_channel0.id === _activeChannelId9)) {
-                  _context.next = 273;
+                  _context.next = 279;
                   break;
                 }
-                _context.next = 272;
+                _context.next = 278;
                 return effects.put(addReactionToMessageAC(_message2, reaction, isSelf));
-              case 272:
+              case 278:
                 addReactionOnAllMessages(_message2, reaction, true);
-              case 273:
+              case 279:
                 if (!(_message2.user.id === SceytChatClient.user.id)) {
-                  _context.next = 291;
+                  _context.next = 297;
                   break;
                 }
                 if (!(!isSelf && Notification.permission === 'granted')) {
-                  _context.next = 286;
+                  _context.next = 292;
                   break;
                 }
                 if (!(document.visibilityState !== 'visible' || _channel0.id !== _activeChannelId9)) {
-                  _context.next = 286;
+                  _context.next = 292;
                   break;
                 }
-                _context.next = 278;
+                _context.next = 284;
                 return effects.select(contactsMapSelector);
-              case 278:
+              case 284:
                 _contactsMap = _context.sent;
                 _getFromContacts2 = getShowOnlyContactUsers();
                 _state = store.getState();
@@ -12462,9 +12530,9 @@ function watchForEvents() {
                 setNotification(_messageBody, reaction.user, _channel0, reaction.key, _message2.attachments && _message2.attachments.length ? _message2.attachments.find(function (att) {
                   return att.type !== attachmentTypes.link;
                 }) : undefined);
-              case 286:
+              case 292:
                 if (!(_channel0.newReactions && _channel0.newReactions.length)) {
-                  _context.next = 290;
+                  _context.next = 296;
                   break;
                 }
                 channelUpdateParams = {
@@ -12474,9 +12542,9 @@ function watchForEvents() {
                   muted: _channel0.muted,
                   mutedTill: _channel0.mutedTill
                 };
-                _context.next = 290;
+                _context.next = 296;
                 return effects.put(updateChannelDataAC(_channel0.id, channelUpdateParams));
-              case 290:
+              case 296:
                 updateChannelOnAllChannels(_channel0.id, {
                   userMessageReactions: _channel0.newReactions,
                   lastReactedMessage: _message2,
@@ -12484,77 +12552,77 @@ function watchForEvents() {
                   muted: _channel0.muted,
                   mutedTill: _channel0.mutedTill
                 });
-              case 291:
+              case 297:
                 if (checkChannelExistsOnMessagesMap(_channel0.id)) {
                   addReactionToMessageOnMap(_channel0.id, _message2, reaction, true);
                 }
-                return _context.abrupt("break", 449);
-              case 293:
+                return _context.abrupt("break", 455);
+              case 299:
                 _channel1 = args.channel, _user = args.user, _message3 = args.message, _reaction = args.reaction;
                 log.info('channel REACTION_DELETED ... ', _channel1);
                 channelFromMap = getChannelFromMap(_channel1.id);
                 _isSelf = _user.id === SceytChatClient.user.id;
                 _activeChannelId0 = getActiveChannelId();
                 if (!(_channel1.id === _activeChannelId0)) {
-                  _context.next = 302;
+                  _context.next = 308;
                   break;
                 }
-                _context.next = 301;
+                _context.next = 307;
                 return effects.put(deleteReactionFromMessageAC(_message3, _reaction, _isSelf));
-              case 301:
+              case 307:
                 removeReactionOnAllMessages(_message3, _reaction, true);
-              case 302:
+              case 308:
                 _channelUpdateParams = JSON.parse(JSON.stringify(_channel1));
                 if (channelFromMap && channelFromMap.lastReactedMessage && channelFromMap.lastReactedMessage.id === _message3.id) {
                   _channelUpdateParams.lastReactedMessage = null;
                 }
-                _context.next = 306;
+                _context.next = 312;
                 return effects.put(updateChannelDataAC(_channel1.id, _channelUpdateParams));
-              case 306:
+              case 312:
                 updateChannelOnAllChannels(_channel1.id, _channelUpdateParams);
                 if (checkChannelExistsOnMessagesMap(_channel1.id)) {
                   removeReactionToMessageOnMap(_channel1.id, _message3, _reaction, true);
                 }
-                return _context.abrupt("break", 449);
-              case 309:
+                return _context.abrupt("break", 455);
+              case 315:
                 _channel10 = args.channel;
                 if (!_channel10) {
-                  _context.next = 315;
+                  _context.next = 321;
                   break;
                 }
                 _updatedChannel = JSON.parse(JSON.stringify(_channel10));
-                _context.next = 314;
+                _context.next = 320;
                 return effects.put(updateChannelDataAC(_channel10.id, _updatedChannel));
-              case 314:
+              case 320:
                 updateChannelOnAllChannels(_channel10.id, _updatedChannel);
-              case 315:
-                return _context.abrupt("break", 449);
-              case 316:
+              case 321:
+                return _context.abrupt("break", 455);
+              case 322:
                 _channel11 = args.channel;
                 log.info('CLEAR_HISTORY: ', _channel11);
-                _context.next = 320;
+                _context.next = 326;
                 return effects.call(getActiveChannelId);
-              case 320:
+              case 326:
                 _activeChannelId1 = _context.sent;
-                _context.next = 323;
+                _context.next = 329;
                 return effects.call(checkChannelExists, _channel11.id);
-              case 323:
+              case 329:
                 channelExist = _context.sent;
                 if (!(_channel11.id === _activeChannelId1)) {
-                  _context.next = 328;
+                  _context.next = 334;
                   break;
                 }
-                _context.next = 327;
+                _context.next = 333;
                 return effects.put(clearMessagesAC());
-              case 327:
+              case 333:
                 removeAllMessages();
-              case 328:
+              case 334:
                 removeMessagesFromMap(_channel11.id);
                 if (!channelExist) {
-                  _context.next = 332;
+                  _context.next = 338;
                   break;
                 }
-                _context.next = 332;
+                _context.next = 338;
                 return effects.put(updateChannelDataAC(_channel11.id, {
                   lastMessage: null,
                   newMessageCount: 0,
@@ -12562,7 +12630,7 @@ function watchForEvents() {
                   muted: _channel11.muted,
                   mutedTill: _channel11.mutedTill
                 }));
-              case 332:
+              case 338:
                 updateChannelOnAllChannels(_channel11.id, {
                   lastMessage: null,
                   newMessageCount: 0,
@@ -12570,173 +12638,173 @@ function watchForEvents() {
                   muted: _channel11.muted,
                   mutedTill: _channel11.mutedTill
                 });
-                return _context.abrupt("break", 449);
-              case 334:
+                return _context.abrupt("break", 455);
+              case 340:
                 _channel12 = args.channel;
                 log.info('channel MUTE ... ');
-                _context.next = 338;
+                _context.next = 344;
                 return effects.put(updateChannelDataAC(_channel12.id, {
                   muted: _channel12.muted,
                   mutedTill: _channel12.mutedTill
                 }));
-              case 338:
+              case 344:
                 updateChannelOnAllChannels(_channel12.id, {
                   muted: _channel12.muted,
                   mutedTill: _channel12.mutedTill
                 });
-                return _context.abrupt("break", 449);
-              case 340:
+                return _context.abrupt("break", 455);
+              case 346:
                 _channel13 = args.channel;
                 log.info('channel UNMUTE ... ');
-                _context.next = 344;
+                _context.next = 350;
                 return effects.put(updateChannelDataAC(_channel13.id, {
                   muted: _channel13.muted,
                   mutedTill: _channel13.mutedTill
                 }));
-              case 344:
+              case 350:
                 updateChannelOnAllChannels(_channel13.id, {
                   muted: _channel13.muted,
                   mutedTill: _channel13.mutedTill
                 });
-                return _context.abrupt("break", 449);
-              case 346:
+                return _context.abrupt("break", 455);
+              case 352:
                 _channel14 = args.channel;
                 log.info('channel PINED ... ');
-                _context.next = 350;
+                _context.next = 356;
                 return effects.put(updateChannelDataAC(_channel14.id, {
                   pinnedAt: _channel14.pinnedAt
                 }, true));
-              case 350:
+              case 356:
                 updateChannelOnAllChannels(_channel14.id, {
                   pinnedAt: _channel14.pinnedAt
                 });
-                return _context.abrupt("break", 449);
-              case 352:
+                return _context.abrupt("break", 455);
+              case 358:
                 _channel15 = args.channel;
                 log.info('channel UNPINED ... ');
-                _context.next = 356;
+                _context.next = 362;
                 return effects.put(updateChannelDataAC(_channel15.id, {
                   pinnedAt: _channel15.pinnedAt
                 }, false, true));
-              case 356:
+              case 362:
                 updateChannelOnAllChannels(_channel15.id, {
                   pinnedAt: _channel15.pinnedAt
                 });
-                return _context.abrupt("break", 449);
-              case 358:
+                return _context.abrupt("break", 455);
+              case 364:
                 _channel16 = args.channel;
                 log.info('channel HIDE ... ');
-                _context.next = 362;
+                _context.next = 368;
                 return effects.put(setChannelToHideAC(_channel16));
-              case 362:
-                return _context.abrupt("break", 449);
-              case 363:
+              case 368:
+                return _context.abrupt("break", 455);
+              case 369:
                 _channel17 = args.channel;
                 log.info('channel UNHIDE ... ');
-                _context.next = 367;
+                _context.next = 373;
                 return effects.put(setChannelToUnHideAC(_channel17));
-              case 367:
-                return _context.abrupt("break", 449);
-              case 368:
+              case 373:
+                return _context.abrupt("break", 455);
+              case 374:
                 _channel18 = args.channel;
-                _context.next = 371;
+                _context.next = 377;
                 return effects.put(updateChannelDataAC(_channel18.id, {
                   unread: _channel18.unread,
                   muted: _channel18.muted,
                   mutedTill: _channel18.mutedTill
                 }));
-              case 371:
+              case 377:
                 _groupName5 = getChannelGroupName(_channel18);
-                _context.next = 374;
+                _context.next = 380;
                 return effects.put(updateSearchedChannelDataAC(_channel18.id, {
                   unread: _channel18.unread
                 }, _groupName5));
-              case 374:
+              case 380:
                 updateChannelOnAllChannels(_channel18.id, {
                   unread: _channel18.unread
                 });
-                return _context.abrupt("break", 449);
-              case 376:
+                return _context.abrupt("break", 455);
+              case 382:
                 _channel19 = args.channel;
-                _context.next = 379;
+                _context.next = 385;
                 return effects.put(updateChannelDataAC(_channel19.id, {
                   unread: _channel19.unread,
                   muted: _channel19.muted,
                   mutedTill: _channel19.mutedTill
                 }));
-              case 379:
+              case 385:
                 _groupName6 = getChannelGroupName(_channel19);
-                _context.next = 382;
+                _context.next = 388;
                 return effects.put(updateSearchedChannelDataAC(_channel19.id, {
                   unread: _channel19.unread
                 }, _groupName6));
-              case 382:
+              case 388:
                 updateChannelOnAllChannels(_channel19.id, {
                   unread: _channel19.unread
                 });
-                return _context.abrupt("break", 449);
-              case 384:
+                return _context.abrupt("break", 455);
+              case 390:
                 _channel20 = args.channel, members = args.members;
                 log.info('channel CHANGE_ROLE  channel ... ', _channel20);
                 log.info('channel CHANGE_ROLE  member ... ', members);
-                _context.next = 389;
+                _context.next = 395;
                 return effects.call(getActiveChannelId);
-              case 389:
+              case 395:
                 _activeChannelId10 = _context.sent;
                 if (!(_channel20.id === _activeChannelId10)) {
-                  _context.next = 393;
+                  _context.next = 399;
                   break;
                 }
-                _context.next = 393;
+                _context.next = 399;
                 return effects.put(updateMembersAC(members));
-              case 393:
+              case 399:
                 i = 0;
-              case 394:
+              case 400:
                 if (!(i < members.length)) {
-                  _context.next = 402;
+                  _context.next = 408;
                   break;
                 }
                 if (!(members[i].id === SceytChatClient.user.id)) {
-                  _context.next = 399;
+                  _context.next = 405;
                   break;
                 }
-                _context.next = 398;
+                _context.next = 404;
                 return effects.put(updateChannelDataAC(_channel20.id, {
                   userRole: members[i].role,
                   muted: _channel20.muted,
                   mutedTill: _channel20.mutedTill
                 }));
-              case 398:
+              case 404:
                 updateChannelOnAllChannels(_channel20.id, {
                   userRole: members[i].role,
                   muted: _channel20.muted,
                   mutedTill: _channel20.mutedTill
                 });
-              case 399:
+              case 405:
                 i++;
-                _context.next = 394;
+                _context.next = 400;
                 break;
-              case 402:
-                return _context.abrupt("break", 449);
-              case 403:
+              case 408:
+                return _context.abrupt("break", 455);
+              case 409:
                 _channel21 = args.channel;
                 log.info('channel frozen  channel ... ', _channel21);
-                return _context.abrupt("break", 449);
-              case 406:
+                return _context.abrupt("break", 455);
+              case 412:
                 _channel22 = args.channel;
                 log.info('channel unfrozen  channel ... ', _channel22);
-                return _context.abrupt("break", 449);
-              case 409:
+                return _context.abrupt("break", 455);
+              case 415:
                 _channelId2 = args.channelId, from = args.from, name = args.name;
                 log.info('channel event received >>>... . . . . . ', args);
                 if (!(from.id === SceytChatClient.user.id)) {
-                  _context.next = 413;
+                  _context.next = 419;
                   break;
                 }
-                return _context.abrupt("break", 449);
-              case 413:
+                return _context.abrupt("break", 455);
+              case 419:
                 if (!(name === 'start_typing')) {
-                  _context.next = 421;
+                  _context.next = 427;
                   break;
                 }
                 if (!usersTimeout[_channelId2]) {
@@ -12748,27 +12816,27 @@ function watchForEvents() {
                 usersTimeout[_channelId2][from.id] = setTimeout(function () {
                   channelListener.onReceivedChannelEvent(_channelId2, from, 'stop_typing');
                 }, 5000);
-                _context.next = 419;
+                _context.next = 425;
                 return effects.put(switchTypingIndicatorAC(true, _channelId2, from));
-              case 419:
-                _context.next = 439;
+              case 425:
+                _context.next = 445;
                 break;
-              case 421:
+              case 427:
                 if (!(name === 'stop_typing')) {
-                  _context.next = 427;
+                  _context.next = 433;
                   break;
                 }
                 if (usersTimeout[_channelId2] && usersTimeout[_channelId2][from.id]) {
                   clearTimeout(usersTimeout[_channelId2][from.id]);
                 }
-                _context.next = 425;
+                _context.next = 431;
                 return effects.put(switchTypingIndicatorAC(false, _channelId2, from));
-              case 425:
-                _context.next = 439;
+              case 431:
+                _context.next = 445;
                 break;
-              case 427:
+              case 433:
                 if (!(name === 'start_recording')) {
-                  _context.next = 435;
+                  _context.next = 441;
                   break;
                 }
                 if (!usersTimeout[_channelId2]) {
@@ -12780,40 +12848,40 @@ function watchForEvents() {
                 usersTimeout[_channelId2][from.id] = setTimeout(function () {
                   channelListener.onReceivedChannelEvent(_channelId2, from, 'stop_recording');
                 }, 5000);
-                _context.next = 433;
-                return effects.put(switchRecordingIndicatorAC(true, _channelId2, from));
-              case 433:
                 _context.next = 439;
+                return effects.put(switchRecordingIndicatorAC(true, _channelId2, from));
+              case 439:
+                _context.next = 445;
                 break;
-              case 435:
+              case 441:
                 if (!(name === 'stop_recording')) {
-                  _context.next = 439;
+                  _context.next = 445;
                   break;
                 }
                 if (usersTimeout[_channelId2] && usersTimeout[_channelId2][from.id]) {
                   clearTimeout(usersTimeout[_channelId2][from.id]);
                 }
-                _context.next = 439;
+                _context.next = 445;
                 return effects.put(switchRecordingIndicatorAC(false, _channelId2, from));
-              case 439:
-                return _context.abrupt("break", 449);
-              case 440:
+              case 445:
+                return _context.abrupt("break", 455);
+              case 446:
                 status = args.status;
                 log.info('connection status changed . . . . . ', status);
-                _context.next = 444;
+                _context.next = 450;
                 return effects.put(setConnectionStatusAC(status));
-              case 444:
+              case 450:
                 if (!(status === CONNECTION_STATUS.CONNECTED)) {
-                  _context.next = 447;
+                  _context.next = 453;
                   break;
                 }
-                _context.next = 447;
+                _context.next = 453;
                 return effects.put(getRolesAC());
-              case 447:
-                return _context.abrupt("break", 449);
-              case 448:
+              case 453:
+                return _context.abrupt("break", 455);
+              case 454:
                 log.warn('UNHANDLED EVENT FROM REDUX-SAGA EVENT-CHANNEL');
-              case 449:
+              case 455:
               case "end":
                 return _context.stop();
             }
@@ -12828,7 +12896,7 @@ function watchForEvents() {
       case "end":
         return _context2.stop();
     }
-  }, _marked);
+  }, _marked$1);
 }
 
 var channelsSelector = function channelsSelector(store) {
@@ -12906,8 +12974,8 @@ var channelMessageDraftIsRemovedSelector = function channelMessageDraftIsRemoved
   return store.ChannelReducer.draftIsRemoved;
 };
 
-var _marked$1 = /*#__PURE__*/_regeneratorRuntime().mark(createChannel),
-  _marked2 = /*#__PURE__*/_regeneratorRuntime().mark(getChannels),
+var _marked$2 = /*#__PURE__*/_regeneratorRuntime().mark(createChannel),
+  _marked2$1 = /*#__PURE__*/_regeneratorRuntime().mark(getChannels),
   _marked3 = /*#__PURE__*/_regeneratorRuntime().mark(searchChannels),
   _marked4 = /*#__PURE__*/_regeneratorRuntime().mark(getChannelsForForward),
   _marked5 = /*#__PURE__*/_regeneratorRuntime().mark(searchChannelsForForward),
@@ -13112,7 +13180,7 @@ function createChannel(action) {
       case "end":
         return _context.stop();
     }
-  }, _marked$1, null, [[0, 53]]);
+  }, _marked$2, null, [[0, 53]]);
 }
 function getChannels(action) {
   var _params$filter, _types, payload, params, SceytChatClient, channelQueryBuilder, channelTypesFilter, types, channelQuery, channelsData, channelList, channelId, activeChannel, _yield$call, mappedChannels, channelsForUpdateLastReactionMessage, channelMessageMap, hiddenList, allChannelsQueryBuilder, allChannelsQuery, hasNext, i, allChannelsData, allChannelList;
@@ -13295,7 +13363,7 @@ function getChannels(action) {
       case "end":
         return _context2.stop();
     }
-  }, _marked2, null, [[0, 89], [72, 81]]);
+  }, _marked2$1, null, [[0, 89], [72, 81]]);
 }
 function searchChannels(action) {
   var payload, params, contactsMap, SceytChatClient, getFromContacts, searchBy, _params$filter2, _types2, channelQueryBuilder, channelTypesFilter, types, allChannels, publicChannels, chatsGroups, contactsList, contactsWithChannelsMap, lowerCaseSearchBy, channelQuery, channelsData, channelsToAdd;
@@ -14412,7 +14480,8 @@ function checkUsersStatus() {
         usersToUpdateMap = {};
         update = false;
         updatedUsers.forEach(function (updatedUser) {
-          if (updatedUser.presence && (updatedUser.presence.state !== usersMap[updatedUser.id].presence.state || updatedUser.presence.status !== usersMap[updatedUser.id].presence.status || updatedUser.presence.lastActiveAt && new Date(updatedUser.presence.lastActiveAt).getTime() !== new Date(usersMap[updatedUser.id].presence.lastActiveAt).getTime() || updatedUser.avatarUrl !== usersMap[updatedUser.id].avatarUrl || updatedUser.firstName !== usersMap[updatedUser.id].firstName || updatedUser.lastName !== usersMap[updatedUser.id].lastName)) {
+          var _usersMap$updatedUser, _usersMap$updatedUser2, _usersMap$updatedUser3, _usersMap$updatedUser4, _usersMap$updatedUser5, _usersMap$updatedUser6, _usersMap$updatedUser7, _usersMap$updatedUser8, _usersMap$updatedUser9;
+          if (updatedUser.presence && (updatedUser.presence.state !== ((_usersMap$updatedUser = usersMap[updatedUser.id]) === null || _usersMap$updatedUser === void 0 ? void 0 : (_usersMap$updatedUser2 = _usersMap$updatedUser.presence) === null || _usersMap$updatedUser2 === void 0 ? void 0 : _usersMap$updatedUser2.state) || updatedUser.presence.status !== ((_usersMap$updatedUser3 = usersMap[updatedUser.id]) === null || _usersMap$updatedUser3 === void 0 ? void 0 : (_usersMap$updatedUser4 = _usersMap$updatedUser3.presence) === null || _usersMap$updatedUser4 === void 0 ? void 0 : _usersMap$updatedUser4.status) || updatedUser.presence.lastActiveAt && new Date(updatedUser.presence.lastActiveAt).getTime() !== new Date(((_usersMap$updatedUser5 = usersMap[updatedUser.id]) === null || _usersMap$updatedUser5 === void 0 ? void 0 : (_usersMap$updatedUser6 = _usersMap$updatedUser5.presence) === null || _usersMap$updatedUser6 === void 0 ? void 0 : _usersMap$updatedUser6.lastActiveAt) || 0).getTime() || updatedUser.avatarUrl !== ((_usersMap$updatedUser7 = usersMap[updatedUser.id]) === null || _usersMap$updatedUser7 === void 0 ? void 0 : _usersMap$updatedUser7.avatarUrl) || updatedUser.firstName !== ((_usersMap$updatedUser8 = usersMap[updatedUser.id]) === null || _usersMap$updatedUser8 === void 0 ? void 0 : _usersMap$updatedUser8.firstName) || updatedUser.lastName !== ((_usersMap$updatedUser9 = usersMap[updatedUser.id]) === null || _usersMap$updatedUser9 === void 0 ? void 0 : _usersMap$updatedUser9.lastName))) {
             updateUserOnMap(updatedUser);
             usersToUpdateMap[updatedUser.id] = updatedUser;
             update = true;
@@ -15355,8 +15424,8 @@ var getFrame = function getFrame(videoSrc, time) {
   }
 };
 
-var _marked$2 = /*#__PURE__*/_regeneratorRuntime().mark(sendMessage),
-  _marked2$1 = /*#__PURE__*/_regeneratorRuntime().mark(sendTextMessage),
+var _marked$3 = /*#__PURE__*/_regeneratorRuntime().mark(sendMessage),
+  _marked2$2 = /*#__PURE__*/_regeneratorRuntime().mark(sendTextMessage),
   _marked3$1 = /*#__PURE__*/_regeneratorRuntime().mark(forwardMessage),
   _marked4$1 = /*#__PURE__*/_regeneratorRuntime().mark(resendMessage),
   _marked5$1 = /*#__PURE__*/_regeneratorRuntime().mark(deleteMessage),
@@ -15954,7 +16023,7 @@ function sendMessage(action) {
       case "end":
         return _context3.stop();
     }
-  }, _marked$2, null, [[2, 80]]);
+  }, _marked$3, null, [[2, 80]]);
 }
 function sendTextMessage(action) {
   var payload, message, connectionState, channelId, channel, sendMessageTid, SceytChatClient, createChannelData, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, messageToSend, pendingMessage, hasNextMessages, messagesToAdd, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam;
@@ -16152,7 +16221,7 @@ function sendTextMessage(action) {
       case "end":
         return _context4.stop();
     }
-  }, _marked2$1, null, [[8, 82]]);
+  }, _marked2$2, null, [[8, 82]]);
 }
 function forwardMessage(action) {
   var payload, message, channelId, connectionState, channel, SceytChatClient, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, messageToSend, pendingMessage, activeChannelId, isCachedChannel, hasNextMessages, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam;
@@ -17682,8 +17751,8 @@ function MessageSaga() {
   }, _marked15$1);
 }
 
-var _marked$3 = /*#__PURE__*/_regeneratorRuntime().mark(getMembers),
-  _marked2$2 = /*#__PURE__*/_regeneratorRuntime().mark(loadMoreMembers),
+var _marked$4 = /*#__PURE__*/_regeneratorRuntime().mark(getMembers),
+  _marked2$3 = /*#__PURE__*/_regeneratorRuntime().mark(loadMoreMembers),
   _marked3$2 = /*#__PURE__*/_regeneratorRuntime().mark(addMembers),
   _marked4$2 = /*#__PURE__*/_regeneratorRuntime().mark(kickMemberFromChannel),
   _marked5$2 = /*#__PURE__*/_regeneratorRuntime().mark(blockMember),
@@ -17731,7 +17800,7 @@ function getMembers(action) {
       case "end":
         return _context.stop();
     }
-  }, _marked$3, null, [[0, 22]]);
+  }, _marked$4, null, [[0, 22]]);
 }
 function loadMoreMembers(action) {
   var payload, limit, membersQuery, _yield$call2, members;
@@ -17759,16 +17828,19 @@ function loadMoreMembers(action) {
         _context2.next = 15;
         return effects.put(setMembersLoadingStateAC(LOADING_STATE.LOADED));
       case 15:
-        _context2.next = 20;
-        break;
+        _context2.next = 17;
+        return updateActiveChannelMembersAdd(members);
       case 17:
-        _context2.prev = 17;
+        _context2.next = 22;
+        break;
+      case 19:
+        _context2.prev = 19;
         _context2.t0 = _context2["catch"](0);
-      case 20:
+      case 22:
       case "end":
         return _context2.stop();
     }
-  }, _marked2$2, null, [[0, 17]]);
+  }, _marked2$3, null, [[0, 19]]);
 }
 function addMembers(action) {
   var payload, members, channelId, channel, membersToAdd, addedMembers, membersIds, messageToSend;
@@ -17783,7 +17855,7 @@ function addMembers(action) {
       case 5:
         channel = _context3.sent;
         if (!channel) {
-          _context3.next = 22;
+          _context3.next = 24;
           break;
         }
         membersToAdd = members.map(function (mem) {
@@ -17825,17 +17897,20 @@ function addMembers(action) {
           memberCount: channel.memberCount + addedMembers.length
         }));
       case 22:
-        _context3.next = 27;
-        break;
+        _context3.next = 24;
+        return updateActiveChannelMembersAdd(addedMembers);
       case 24:
-        _context3.prev = 24;
+        _context3.next = 29;
+        break;
+      case 26:
+        _context3.prev = 26;
         _context3.t0 = _context3["catch"](0);
         log.error('error on add members... ', _context3.t0);
-      case 27:
+      case 29:
       case "end":
         return _context3.stop();
     }
-  }, _marked3$2, null, [[0, 24]]);
+  }, _marked3$2, null, [[0, 26]]);
 }
 function kickMemberFromChannel(action) {
   var payload, memberId, channelId, channel, removedMembers, membersIds, messageToSend;
@@ -17884,16 +17959,19 @@ function kickMemberFromChannel(action) {
           memberCount: channel.memberCount - removedMembers.length
         }));
       case 20:
-        _context4.next = 24;
-        break;
+        _context4.next = 22;
+        return updateActiveChannelMembersRemove(removedMembers);
       case 22:
-        _context4.prev = 22;
-        _context4.t0 = _context4["catch"](0);
+        _context4.next = 26;
+        break;
       case 24:
+        _context4.prev = 24;
+        _context4.t0 = _context4["catch"](0);
+      case 26:
       case "end":
         return _context4.stop();
     }
-  }, _marked4$2, null, [[0, 22]]);
+  }, _marked4$2, null, [[0, 24]]);
 }
 function blockMember(action) {
   var payload, memberId, channelId, channel, removedMembers;
@@ -17922,16 +18000,19 @@ function blockMember(action) {
           memberCount: channel.memberCount - removedMembers.length
         }));
       case 14:
-        _context5.next = 18;
-        break;
+        _context5.next = 16;
+        return updateActiveChannelMembersRemove(removedMembers);
       case 16:
-        _context5.prev = 16;
-        _context5.t0 = _context5["catch"](0);
+        _context5.next = 20;
+        break;
       case 18:
+        _context5.prev = 18;
+        _context5.t0 = _context5["catch"](0);
+      case 20:
       case "end":
         return _context5.stop();
     }
-  }, _marked5$2, null, [[0, 16]]);
+  }, _marked5$2, null, [[0, 18]]);
 }
 function changeMemberRole(action) {
   var payload, channelId, members, channel, updatedMembers;
@@ -18053,8 +18134,8 @@ function MembersSaga() {
   }, _marked9$2);
 }
 
-var _marked$4 = /*#__PURE__*/_regeneratorRuntime().mark(getContacts),
-  _marked2$3 = /*#__PURE__*/_regeneratorRuntime().mark(blockUser),
+var _marked$5 = /*#__PURE__*/_regeneratorRuntime().mark(getContacts),
+  _marked2$4 = /*#__PURE__*/_regeneratorRuntime().mark(blockUser),
   _marked3$3 = /*#__PURE__*/_regeneratorRuntime().mark(unblockUser),
   _marked4$3 = /*#__PURE__*/_regeneratorRuntime().mark(updateProfile),
   _marked5$3 = /*#__PURE__*/_regeneratorRuntime().mark(getUsers),
@@ -18087,7 +18168,7 @@ function getContacts() {
       case "end":
         return _context.stop();
     }
-  }, _marked$4, null, [[0, 11]]);
+  }, _marked$5, null, [[0, 11]]);
 }
 function blockUser(action) {
   var SceytChatClient, payload, userIds, blockedUsers, activeChannelId, activeChannel, isDirectChannel, directChannelUser;
@@ -18149,7 +18230,7 @@ function blockUser(action) {
       case "end":
         return _context2.stop();
     }
-  }, _marked2$3, null, [[0, 21]]);
+  }, _marked2$4, null, [[0, 21]]);
 }
 function unblockUser(action) {
   var SceytChatClient, payload, userIds, unblockedUsers, activeChannelId, activeChannel, isDirectChannel, directChannelUser;
@@ -18407,7 +18488,7 @@ function MembersSaga$1() {
   }, _marked7$3);
 }
 
-var _marked$5 = /*#__PURE__*/_regeneratorRuntime().mark(rootSaga);
+var _marked$6 = /*#__PURE__*/_regeneratorRuntime().mark(rootSaga);
 function rootSaga() {
   return _regeneratorRuntime().wrap(function rootSaga$(_context) {
     while (1) switch (_context.prev = _context.next) {
@@ -18418,7 +18499,7 @@ function rootSaga() {
       case "end":
         return _context.stop();
     }
-  }, _marked$5);
+  }, _marked$6);
 }
 
 var sagaMiddleware = createSagaMiddleware__default();
@@ -18893,9 +18974,10 @@ function useUpdatePresence(channel, isVisible) {
   }
   React.useEffect(function () {
     if (userId && isVisible && directChannelUser) {
+      var _usersMap$userId, _usersMap$userId$pres;
       if (!usersMap[userId]) {
         setUserToMap(directChannelUser);
-      } else if (usersMap[userId].presence.state !== directChannelUser.presence.state) {
+      } else if (((_usersMap$userId = usersMap[userId]) === null || _usersMap$userId === void 0 ? void 0 : (_usersMap$userId$pres = _usersMap$userId.presence) === null || _usersMap$userId$pres === void 0 ? void 0 : _usersMap$userId$pres.state) !== directChannelUser.presence.state) {
         var _updateUserStatusOnCh;
         updateUserOnMap(directChannelUser);
         dispatch(updateUserStatusOnChannelAC((_updateUserStatusOnCh = {}, _updateUserStatusOnCh[directChannelUser.id] = directChannelUser, _updateUserStatusOnCh)));
@@ -18911,7 +18993,8 @@ function useUpdatePresence(channel, isVisible) {
     }
   }, [connectionStatus]);
   React.useEffect(function () {
-    if (directChannelUser && usersMap[directChannelUser.id] && directChannelUser.presence && (directChannelUser.presence.state !== usersMap[directChannelUser.id].state || directChannelUser.presence.lastActiveAt && new Date(directChannelUser.presence.lastActiveAt).getTime() !== new Date(usersMap[directChannelUser.id].lastActiveAt).getTime())) {
+    var _usersMap$directChann, _usersMap$directChann2;
+    if (directChannelUser && usersMap[directChannelUser.id] && directChannelUser.presence && (directChannelUser.presence.state !== usersMap[directChannelUser.id].state || directChannelUser.presence.lastActiveAt && new Date(directChannelUser.presence.lastActiveAt).getTime() !== new Date(((_usersMap$directChann = usersMap[directChannelUser.id]) === null || _usersMap$directChann === void 0 ? void 0 : (_usersMap$directChann2 = _usersMap$directChann.presence) === null || _usersMap$directChann2 === void 0 ? void 0 : _usersMap$directChann2.lastActiveAt) || 0).getTime())) {
       var _updateUserStatusOnCh2;
       dispatch(updateUserStatusOnChannelAC((_updateUserStatusOnCh2 = {}, _updateUserStatusOnCh2[directChannelUser.id] = directChannelUser, _updateUserStatusOnCh2)));
       updateUserOnMap(directChannelUser);
@@ -21671,7 +21754,7 @@ var ChannelList = function ChannelList(_ref) {
     if (getSelectedChannel) {
       getSelectedChannel(activeChannel);
     }
-  }, [activeChannel]);
+  }, [activeChannel && activeChannel.members && activeChannel.members.length]);
   useDidUpdate(function () {
     if (closeSearchChannels) {
       getMyChannels();