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

package/index.modern.js

@@ -4,7 +4,7 @@ import log from 'loglevel';
 import createSagaMiddleware, { eventChannel } from 'redux-saga';
 import { createStore, combineReducers, applyMiddleware, compose } from 'redux';
 import FileSaver from 'file-saver';
-import { put, call, select, take, takeLatest, takeEvery, all } from 'redux-saga/effects';
+import { select, put, call, take, takeLatest, takeEvery, all } from 'redux-saga/effects';
 import { v4 } from 'uuid';
 import styled, { createGlobalStyle, keyframes } from 'styled-components';
 import LinkifyIt from 'linkify-it';
@@ -7390,6 +7390,9 @@ var ChannelReducer = (function (state, _temp) {
         } else {
           newState.channels = newState.channels.map(function (channel) {
             if (channel.id === _channelId) {
+              if (newState.activeChannel && Object.prototype.hasOwnProperty.call(newState.activeChannel, 'id') && channel.id === newState.activeChannel.id) {
+                newState.activeChannel = _extends({}, newState.activeChannel, config);
+              }
               return _extends({}, channel, config);
             }
             return channel;
@@ -7409,9 +7412,10 @@ var ChannelReducer = (function (state, _temp) {
         var updateData = payload.updateData,
           groupName = payload.groupName,
           _channelId2 = payload.channelId;
-        if (newState.searchedChannels[groupName] && newState.searchedChannels[groupName].length) {
+        var groupKey = groupName;
+        if (newState.searchedChannels[groupKey] && newState.searchedChannels[groupKey].length) {
           var _extends2;
-          newState.searchedChannels = _extends({}, newState.searchedChannels, (_extends2 = {}, _extends2[groupName] = [].concat(newState.searchedChannels[groupName]).map(function (channel) {
+          newState.searchedChannels = _extends({}, newState.searchedChannels, (_extends2 = {}, _extends2[groupName] = [].concat(newState.searchedChannels[groupKey]).map(function (channel) {
             if (channel.id === _channelId2) {
               return _extends({}, channel, updateData);
             }
@@ -10433,11 +10437,12 @@ function updateMembersPresenceAC(usersMap) {
     }
   };
 }
-function loadMoreMembersAC(limit) {
+function loadMoreMembersAC(limit, channelId) {
   return {
     type: LOAD_MORE_MEMBERS,
     payload: {
-      limit: limit
+      limit: limit,
+      channelId: channelId
     }
   };
 }
@@ -11205,12 +11210,12 @@ var UploadingIcon = styled.span(_templateObject35 || (_templateObject35 = _tagge
 });
 var TextInOneLine = styled.span(_templateObject36 || (_templateObject36 = _taggedTemplateLiteralLoose(["\n  display: -webkit-box;\n  -webkit-line-clamp: 1;\n  -webkit-box-orient: vertical;\n  overflow: hidden;\n  text-overflow: ellipsis;\n"])));
 var CancelResumeWrapper = styled.span(_templateObject37 || (_templateObject37 = _taggedTemplateLiteralLoose(["\n  position: absolute;\n  width: 20px;\n  height: 20px;\n  z-index: 3;\n\n  > svg {\n    width: 20px;\n    height: 20px;\n  }\n"])));
-var UploadPercent = styled.span(_templateObject38 || (_templateObject38 = _taggedTemplateLiteralLoose(["\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  position: absolute;\n  color: #fff;\n  width: ", ";\n  height: ", ";\n  //background-color: rgba(0,0,0,0.4);\n  background-color: ", ";\n  border-radius: ", ";\n}\n  ", "\n"])), function (props) {
+var UploadPercent = styled.span(_templateObject38 || (_templateObject38 = _taggedTemplateLiteralLoose(["\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  position: absolute;\n  color: #fff;\n  width: ", ";\n  height: ", ";\n  background-color: ", ";\n  border-radius: ", ";\n}\n  ", "\n"])), function (props) {
   return props.fileAttachment || props.isRepliedMessage || props.isDetailsView ? '40px' : '56px';
 }, function (props) {
   return props.fileAttachment || props.isRepliedMessage || props.isDetailsView ? '40px' : '56px';
 }, function (props) {
-  return props.backgroundColor;
+  return props.backgroundColor + "40";
 }, function (props) {
   return props.borderRadius ? props.borderRadius : props.fileAttachment ? '8px' : props.isRepliedMessage ? '4px' : ' 50%';
 }, function (props) {
@@ -11459,7 +11464,68 @@ 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 select();
+      case 2:
+        state = _context.sent;
+        activeChannel = state.ChannelReducer.activeChannel;
+        if (!(activeChannel && activeChannel.id)) {
+          _context.next = 8;
+          break;
+        }
+        updatedMembers = [].concat(activeChannel.members || [], addedMembers);
+        updatedMembers = Array.from(new Set(updatedMembers));
+        return _context.abrupt("return", {
+          members: updatedMembers
+        });
+      case 8:
+        return _context.abrupt("return", {});
+      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 select();
+      case 2:
+        state = _context2.sent;
+        activeChannel = state.ChannelReducer.activeChannel;
+        if (!(activeChannel && activeChannel.id)) {
+          _context2.next = 8;
+          break;
+        }
+        updatedMembers = (activeChannel.members || []).filter(function (member) {
+          return !removedMembers.find(function (removed) {
+            return removed.id === member.id;
+          });
+        });
+        updatedMembers = Array.from(new Set(updatedMembers));
+        return _context2.abrupt("return", {
+          members: updatedMembers
+        });
+      case 8:
+        return _context2.abrupt("return", {});
+      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) {
@@ -11818,7 +11884,7 @@ function watchForEvents() {
           };
         });
         _loop = /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-          var _yield$take, type, args, createdChannel, channelFilterTypes, getFromContacts, channelExists, _chan, channel, _chan2, _channel, member, _channelExists, _activeChannelId, groupName, _channel2, _channelExists2, _channel3, removedMembers, _activeChannelId2, _channelExists3, activeChannel, _groupName, _channel4, addedMembers, _activeChannelId3, _channelExists4, _groupName2, updatedChannel, _channelExists5, subject, avatarUrl, muted, mutedTill, metadata, _activeChannelId4, _groupName3, _channel5, message, messageToHandle, _channelFilterTypes, _activeChannelId5, _channelExists6, channelForAdd, hasNextMessage, _groupName4, showNotifications, tabIsActive, _state$ThemeReducer$n, _state$ThemeReducer$n2, _state$ThemeReducer$n3, _state$ThemeReducer$n4, _state$ThemeReducer$n5, _state$ThemeReducer$n6, contactsMap, _getFromContacts, state, theme, accentColor, textSecondary, messageBody, channelId, markerList, _channel6, _activeChannelId6, updateLastMessage, markersMap, lastMessage, _channelId, _channel7, _channel8, deletedMessage, _activeChannelId7, _channelExists7, _channel9, _message, _activeChannelId8, _channelExists8, _channel0, user, _message2, reaction, isSelf, _activeChannelId9, _state$ThemeReducer$n7, _state$ThemeReducer$n8, _state$ThemeReducer$n9, _state$ThemeReducer$n0, _state$ThemeReducer$n1, _state$ThemeReducer$n10, _contactsMap, _getFromContacts2, _state, _theme, _accentColor, _textSecondary, _messageBody, channelUpdateParams, _channel1, _user, _message3, _reaction, channelFromMap, _isSelf, _activeChannelId0, _channelUpdateParams, _channel10, _updatedChannel, _channel11, _activeChannelId1, channelExist, _channel12, _channel13, _channel14, _channel15, _channel16, _channel17, _channel18, _groupName5, _channel19, _groupName6, _channel20, members, _activeChannelId10, i, _channel21, _channel22, _channelId2, from, name, status;
+          var _yield$take, type, args, createdChannel, channelFilterTypes, getFromContacts, channelExists, _chan, channel, _chan2, _channel, member, _channelExists, _activeChannelId, groupName, updateChannelData, _channel2, _channelExists2, _channel3, removedMembers, _activeChannelId2, _channelExists3, activeChannel, _updateChannelData, _groupName, _channel4, addedMembers, _activeChannelId3, _channelExists4, _updateChannelData2, _groupName2, updatedChannel, _channelExists5, subject, avatarUrl, muted, mutedTill, metadata, _activeChannelId4, _groupName3, _channel5, message, messageToHandle, _channelFilterTypes, _activeChannelId5, _channelExists6, channelForAdd, hasNextMessage, _groupName4, showNotifications, tabIsActive, _state$ThemeReducer$n, _state$ThemeReducer$n2, _state$ThemeReducer$n3, _state$ThemeReducer$n4, _state$ThemeReducer$n5, _state$ThemeReducer$n6, contactsMap, _getFromContacts, state, theme, accentColor, textSecondary, messageBody, channelId, markerList, _channel6, _activeChannelId6, updateLastMessage, markersMap, lastMessage, _channelId, _channel7, _channel8, deletedMessage, _activeChannelId7, _channelExists7, _channel9, _message, _activeChannelId8, _channelExists8, _channel0, user, _message2, reaction, isSelf, _activeChannelId9, _state$ThemeReducer$n7, _state$ThemeReducer$n8, _state$ThemeReducer$n9, _state$ThemeReducer$n0, _state$ThemeReducer$n1, _state$ThemeReducer$n10, _contactsMap, _getFromContacts2, _state, _theme, _accentColor, _textSecondary, _messageBody, channelUpdateParams, _channel1, _user, _message3, _reaction, channelFromMap, _isSelf, _activeChannelId0, _channelUpdateParams, _channel10, _updatedChannel, _channel11, _activeChannelId1, channelExist, _channel12, _channel13, _channel14, _channel15, _channel16, _channel17, _channel18, _groupName5, _channel19, _groupName6, _channel20, members, _activeChannelId10, i, _channel21, _channel22, _channelId2, from, name, status;
           return _regeneratorRuntime().wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
@@ -11829,7 +11895,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 ? 62 : _context.t0 === CHANNEL_EVENT_TYPES.UNBLOCK ? 69 : _context.t0 === CHANNEL_EVENT_TYPES.KICK_MEMBERS ? 71 : _context.t0 === CHANNEL_EVENT_TYPES.ADD_MEMBERS ? 104 : _context.t0 === CHANNEL_EVENT_TYPES.UPDATE_CHANNEL ? 131 : _context.t0 === CHANNEL_EVENT_TYPES.MESSAGE ? 149 : _context.t0 === CHANNEL_EVENT_TYPES.MESSAGE_MARKERS_RECEIVED ? 216 : _context.t0 === CHANNEL_EVENT_TYPES.DELETE ? 239 : _context.t0 === CHANNEL_EVENT_TYPES.DELETE_MESSAGE ? 246 : _context.t0 === CHANNEL_EVENT_TYPES.EDIT_MESSAGE ? 263 : _context.t0 === CHANNEL_EVENT_TYPES.REACTION_ADDED ? 278 : _context.t0 === CHANNEL_EVENT_TYPES.REACTION_DELETED ? 306 : _context.t0 === CHANNEL_EVENT_TYPES.UNREAD_MESSAGES_INFO ? 322 : _context.t0 === CHANNEL_EVENT_TYPES.CLEAR_HISTORY ? 329 : _context.t0 === CHANNEL_EVENT_TYPES.MUTE ? 347 : _context.t0 === CHANNEL_EVENT_TYPES.UNMUTE ? 353 : _context.t0 === CHANNEL_EVENT_TYPES.PINED ? 359 : _context.t0 === CHANNEL_EVENT_TYPES.UNPINED ? 365 : _context.t0 === CHANNEL_EVENT_TYPES.HIDE ? 371 : _context.t0 === CHANNEL_EVENT_TYPES.UNHIDE ? 376 : _context.t0 === CHANNEL_EVENT_TYPES.CHANNEL_MARKED_AS_UNREAD ? 381 : _context.t0 === CHANNEL_EVENT_TYPES.CHANNEL_MARKED_AS_READ ? 389 : _context.t0 === CHANNEL_EVENT_TYPES.CHANGE_ROLE ? 397 : _context.t0 === CHANNEL_EVENT_TYPES.FROZEN ? 416 : _context.t0 === CHANNEL_EVENT_TYPES.UNFROZEN ? 419 : _context.t0 === CHANNEL_EVENT_TYPES.CHANNEL_EVENT ? 422 : _context.t0 === CONNECTION_EVENT_TYPES.CONNECTION_STATUS_CHANGED ? 453 : 461;
                 break;
               case 8:
                 createdChannel = args.createdChannel;
@@ -11863,7 +11929,7 @@ function watchForEvents() {
                   addChannelToAllChannels(createdChannel);
                 }
               case 24:
-                return _context.abrupt("break", 449);
+                return _context.abrupt("break", 462);
               case 25:
                 channel = args.channel;
                 log.info('channel JOIN ... . ', channel);
@@ -11874,7 +11940,7 @@ function watchForEvents() {
                 if (!_chan2) {
                   addChannelToAllChannels(channel);
                 }
-                return _context.abrupt("break", 449);
+                return _context.abrupt("break", 462);
               case 34:
                 _channel = args.channel, member = args.member;
                 log.info('channel LEAVE ... ', _channel, member);
@@ -11892,208 +11958,227 @@ function watchForEvents() {
               case 43:
                 removeChannelFromMap(_channel.id);
                 deleteChannelFromAllChannels(_channel.id);
-                _context.next = 57;
+                _context.next = 61;
                 break;
               case 47:
                 groupName = getChannelGroupName(_channel);
                 if (!_channelExists) {
-                  _context.next = 54;
+                  _context.next = 58;
                   break;
                 }
+                updateChannelData = {};
                 if (!(_activeChannelId === _channel.id)) {
-                  _context.next = 52;
+                  _context.next = 56;
                   break;
                 }
-                _context.next = 52;
+                _context.next = 53;
                 return put(removeMemberFromListAC([member]));
-              case 52:
-                _context.next = 54;
-                return put(updateChannelDataAC(_channel.id, {
+              case 53:
+                _context.next = 55;
+                return call(updateActiveChannelMembersRemove, [member]) || {};
+              case 55:
+                updateChannelData = _context.sent;
+              case 56:
+                _context.next = 58;
+                return put(updateChannelDataAC(_channel.id, _extends({
                   memberCount: _channel.memberCount,
                   muted: _channel.muted,
                   mutedTill: _channel.mutedTill
-                }));
-              case 54:
-                _context.next = 56;
+                }, updateChannelData)));
+              case 58:
+                _context.next = 60;
                 return put(updateSearchedChannelDataAC(_channel.id, {
                   memberCount: _channel.memberCount,
                   muted: _channel.muted,
                   mutedTill: _channel.mutedTill
                 }, groupName));
-              case 56:
+              case 60:
                 updateChannelOnAllChannels(_channel.id, {
                   memberCount: _channel.memberCount,
                   muted: _channel.muted,
                   mutedTill: _channel.mutedTill
                 });
-              case 57:
-                return _context.abrupt("break", 449);
-              case 58:
+              case 61:
+                return _context.abrupt("break", 462);
+              case 62:
                 log.info('channel BLOCK ... ');
                 _channel2 = args.channel;
                 _channelExists2 = checkChannelExists(_channel2.id);
                 if (!_channelExists2) {
-                  _context.next = 64;
+                  _context.next = 68;
                   break;
                 }
-                _context.next = 64;
+                _context.next = 68;
                 return put(removeChannelAC(_channel2.id));
-              case 64:
-                return _context.abrupt("break", 449);
-              case 65:
+              case 68:
+                return _context.abrupt("break", 462);
+              case 69:
                 log.info('channel UNBLOCK ... ');
-                return _context.abrupt("break", 449);
-              case 67:
+                return _context.abrupt("break", 462);
+              case 71:
                 _channel3 = args.channel, removedMembers = args.removedMembers;
                 log.info('channel KICK_MEMBERS ... ', removedMembers);
-                _context.next = 71;
+                _context.next = 75;
                 return call(getActiveChannelId);
-              case 71:
+              case 75:
                 _activeChannelId2 = _context.sent;
                 _channelExists3 = checkChannelExists(_channel3.id);
                 if (!_channelExists3) {
-                  _context.next = 94;
+                  _context.next = 102;
                   break;
                 }
                 if (!removedMembers.find(function (mem) {
                   return mem.id === SceytChatClient.user.id;
                 })) {
-                  _context.next = 86;
+                  _context.next = 90;
                   break;
                 }
                 removeChannelFromMap(_channel3.id);
-                _context.next = 78;
+                _context.next = 82;
                 return put(removeChannelAC(_channel3.id));
-              case 78:
-                _context.next = 80;
+              case 82:
+                _context.next = 84;
                 return call(getLastChannelFromMap);
-              case 80:
+              case 84:
                 activeChannel = _context.sent;
                 if (!activeChannel) {
-                  _context.next = 84;
+                  _context.next = 88;
                   break;
                 }
-                _context.next = 84;
+                _context.next = 88;
                 return put(switchChannelActionAC(JSON.parse(JSON.stringify(activeChannel))));
-              case 84:
-                _context.next = 94;
+              case 88:
+                _context.next = 102;
                 break;
-              case 86:
+              case 90:
+                _updateChannelData = {};
                 if (!(_activeChannelId2 === _channel3.id)) {
-                  _context.next = 89;
+                  _context.next = 97;
                   break;
                 }
-                _context.next = 89;
+                _context.next = 94;
                 return put(removeMemberFromListAC(removedMembers));
-              case 89:
+              case 94:
+                _context.next = 96;
+                return call(updateActiveChannelMembersRemove, removedMembers) || {};
+              case 96:
+                _updateChannelData = _context.sent;
+              case 97:
                 _groupName = getChannelGroupName(_channel3);
-                _context.next = 92;
+                _context.next = 100;
                 return put(updateSearchedChannelDataAC(_channel3.id, {
                   memberCount: _channel3.memberCount,
                   muted: _channel3.muted,
                   mutedTill: _channel3.mutedTill
                 }, _groupName));
-              case 92:
-                _context.next = 94;
-                return put(updateChannelDataAC(_channel3.id, {
+              case 100:
+                _context.next = 102;
+                return put(updateChannelDataAC(_channel3.id, _extends({
                   memberCount: _channel3.memberCount,
                   muted: _channel3.muted,
                   mutedTill: _channel3.mutedTill
-                }));
-              case 94:
+                }, _updateChannelData)));
+              case 102:
                 updateChannelOnAllChannels(_channel3.id, {
                   memberCount: _channel3.memberCount,
                   muted: _channel3.muted,
                   mutedTill: _channel3.mutedTill
                 });
-                return _context.abrupt("break", 449);
-              case 96:
+                return _context.abrupt("break", 462);
+              case 104:
                 _channel4 = args.channel, addedMembers = args.addedMembers;
                 log.info('channel ADD_MEMBERS ... ', addedMembers);
-                _context.next = 100;
+                _context.next = 108;
                 return call(getActiveChannelId);
-              case 100:
+              case 108:
                 _activeChannelId3 = _context.sent;
                 _channelExists4 = checkChannelExists(_channel4.id);
                 if (!_channelExists4) {
-                  _context.next = 110;
+                  _context.next = 122;
                   break;
                 }
+                _updateChannelData2 = {};
                 if (!(_activeChannelId3 === _channel4.id)) {
-                  _context.next = 106;
+                  _context.next = 118;
                   break;
                 }
-                _context.next = 106;
+                _context.next = 115;
                 return put(addMembersToListAC(addedMembers));
-              case 106:
-                _context.next = 108;
-                return put(updateChannelDataAC(_channel4.id, {
+              case 115:
+                _context.next = 117;
+                return call(updateActiveChannelMembersAdd, addedMembers) || {};
+              case 117:
+                _updateChannelData2 = _context.sent;
+              case 118:
+                _context.next = 120;
+                return put(updateChannelDataAC(_channel4.id, _extends({
                   memberCount: _channel4.memberCount,
                   muted: _channel4.muted,
                   mutedTill: _channel4.mutedTill
-                }));
-              case 108:
-                _context.next = 114;
+                }, _updateChannelData2)));
+              case 120:
+                _context.next = 126;
                 break;
-              case 110:
-                _context.next = 112;
+              case 122:
+                _context.next = 124;
                 return call(setChannelInMap, _channel4);
-              case 112:
-                _context.next = 114;
+              case 124:
+                _context.next = 126;
                 return put(setAddedToChannelAC(JSON.parse(JSON.stringify(_channel4))));
-              case 114:
+              case 126:
                 _groupName2 = getChannelGroupName(_channel4);
-                _context.next = 117;
+                _context.next = 129;
                 return put(updateSearchedChannelDataAC(_channel4.id, {
                   memberCount: _channel4.memberCount,
                   muted: _channel4.muted,
                   mutedTill: _channel4.mutedTill
                 }, _groupName2));
-              case 117:
+              case 129:
                 updateChannelOnAllChannels(_channel4.id, {
                   memberCount: _channel4.memberCount,
                   muted: _channel4.muted,
                   mutedTill: _channel4.mutedTill
                 });
-                return _context.abrupt("break", 449);
-              case 119:
+                return _context.abrupt("break", 462);
+              case 131:
+                log.info('channel UPDATE_CHANNEL ... ');
                 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 = 144;
                   break;
                 }
-                _context.next = 125;
+                _context.next = 138;
                 return put(updateChannelDataAC(updatedChannel.id, {
                   subject: subject,
                   avatarUrl: avatarUrl,
                   muted: muted,
                   mutedTill: mutedTill
                 }));
-              case 125:
-                _context.next = 127;
+              case 138:
+                _context.next = 140;
                 return call(getActiveChannelId);
-              case 127:
+              case 140:
                 _activeChannelId4 = _context.sent;
                 if (!(_activeChannelId4 === updatedChannel.id)) {
-                  _context.next = 131;
+                  _context.next = 144;
                   break;
                 }
-                _context.next = 131;
+                _context.next = 144;
                 return put(setActiveChannelAC(_extends({}, updatedChannel, {
                   metadata: isJSON(metadata) ? JSON.parse(metadata) : metadata
                 })));
-              case 131:
+              case 144:
                 _groupName3 = getChannelGroupName(updatedChannel);
-                _context.next = 134;
+                _context.next = 147;
                 return put(updateSearchedChannelDataAC(updatedChannel.id, {
                   subject: subject,
                   avatarUrl: avatarUrl,
                   muted: muted,
                   mutedTill: mutedTill
                 }, _groupName3));
-              case 134:
+              case 147:
                 updateChannelOnAllChannels(updatedChannel.id, {
                   subject: subject,
                   avatarUrl: avatarUrl,
@@ -12101,102 +12186,102 @@ function watchForEvents() {
                   mutedTill: mutedTill,
                   metadata: isJSON(metadata) ? JSON.parse(metadata) : metadata
                 });
-                return _context.abrupt("break", 449);
-              case 136:
+                return _context.abrupt("break", 462);
+              case 149:
                 _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 = 215;
                   break;
                 }
                 _channel5.metadata = isJSON(_channel5.metadata) ? JSON.parse(_channel5.metadata) : _channel5.metadata;
-                _context.next = 144;
+                _context.next = 157;
                 return call(getActiveChannelId);
-              case 144:
+              case 157:
                 _activeChannelId5 = _context.sent;
                 _channelExists6 = checkChannelExists(_channel5.id);
                 channelForAdd = JSON.parse(JSON.stringify(_channel5));
-                _context.next = 149;
+                _context.next = 162;
                 return put(addChannelAC(channelForAdd));
-              case 149:
+              case 162:
                 if (_channelExists6) {
-                  _context.next = 154;
+                  _context.next = 167;
                   break;
                 }
-                _context.next = 152;
+                _context.next = 165;
                 return call(setChannelInMap, _channel5);
-              case 152:
-                _context.next = 157;
+              case 165:
+                _context.next = 170;
                 break;
-              case 154:
+              case 167:
                 if (message.repliedInThread) {
-                  _context.next = 157;
+                  _context.next = 170;
                   break;
                 }
-                _context.next = 157;
+                _context.next = 170;
                 return put(updateChannelLastMessageAC(message, channelForAdd));
-              case 157:
+              case 170:
                 if (!(_channel5.id === _activeChannelId5)) {
-                  _context.next = 169;
+                  _context.next = 182;
                   break;
                 }
                 if (getHasNextCached()) {
-                  _context.next = 161;
+                  _context.next = 174;
                   break;
                 }
-                _context.next = 161;
+                _context.next = 174;
                 return put(addMessageAC(message));
-              case 161:
+              case 174:
                 addAllMessages([message], MESSAGE_LOAD_DIRECTION.NEXT);
-                _context.next = 165;
+                _context.next = 178;
                 return select(messagesHasNextSelector);
-              case 165:
+              case 178:
                 hasNextMessage = _context.sent;
                 if (!(!getHasNextCached() && !hasNextMessage)) {
-                  _context.next = 169;
+                  _context.next = 182;
                   break;
                 }
-                _context.next = 169;
+                _context.next = 182;
                 return put(scrollToNewMessageAC(true, false, true));
-              case 169:
+              case 182:
                 if (getMessagesFromMap(_channel5.id) && getMessagesFromMap(_channel5.id).length) {
                   addMessageToMap(_channel5.id, message);
                 }
-                _context.next = 172;
-                return put(updateChannelDataAC(_channel5.id, _extends({}, channelForAdd, {
+                _context.next = 185;
+                return put(updateChannelDataAC(_channel5.id, {
                   userMessageReactions: [],
                   lastReactedMessage: null
-                })));
-              case 172:
+                }));
+              case 185:
                 _groupName4 = getChannelGroupName(_channel5);
-                _context.next = 175;
-                return put(updateSearchedChannelDataAC(_channel5.id, _extends({}, channelForAdd, {
+                _context.next = 188;
+                return put(updateSearchedChannelDataAC(_channel5.id, {
                   userMessageReactions: [],
                   lastReactedMessage: null
-                }), _groupName4));
-              case 175:
+                }, _groupName4));
+              case 188:
                 showNotifications = getShowNotifications();
                 if (!(showNotifications && !message.silent && message.user.id !== SceytChatClient.user.id && !_channel5.muted)) {
-                  _context.next = 192;
+                  _context.next = 205;
                   break;
                 }
                 if (!(Notification.permission === 'granted')) {
-                  _context.next = 192;
+                  _context.next = 205;
                   break;
                 }
-                _context.next = 180;
+                _context.next = 193;
                 return select(browserTabIsActiveSelector);
-              case 180:
+              case 193:
                 tabIsActive = _context.sent;
                 if (!(document.visibilityState !== 'visible' || !tabIsActive || _channel5.id !== _activeChannelId5)) {
-                  _context.next = 192;
+                  _context.next = 205;
                   break;
                 }
-                _context.next = 184;
+                _context.next = 197;
                 return select(contactsMapSelector);
-              case 184:
+              case 197:
                 contactsMap = _context.sent;
                 _getFromContacts = getShowOnlyContactUsers();
                 state = store.getState();
@@ -12216,42 +12301,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 205:
                 log.info('send delivered for message . .. . ', message);
                 if (!(message.repliedInThread && message.parentMessage.id)) {
-                  _context.next = 198;
+                  _context.next = 211;
                   break;
                 }
-                _context.next = 196;
+                _context.next = 209;
                 return put(markMessagesAsDeliveredAC(message.parentMessage.id, [message.id]));
-              case 196:
-                _context.next = 200;
+              case 209:
+                _context.next = 213;
                 break;
-              case 198:
-                _context.next = 200;
+              case 211:
+                _context.next = 213;
                 return put(markMessagesAsDeliveredAC(_channel5.id, [message.id]));
-              case 200:
-                updateChannelOnAllChannels(_channel5.id, _extends({}, channelForAdd, {
+              case 213:
+                updateChannelOnAllChannels(_channel5.id, {
                   userMessageReactions: [],
                   lastReactedMessage: null
-                }));
+                });
                 updateChannelLastMessageOnAllChannels(_channel5.id, _channel5.lastMessage);
-              case 202:
-                return _context.abrupt("break", 449);
-              case 203:
+              case 215:
+                return _context.abrupt("break", 462);
+              case 216:
                 channelId = args.channelId, markerList = args.markerList;
-                _context.next = 206;
+                _context.next = 219;
                 return call(getChannelFromMap, channelId);
-              case 206:
+              case 219:
                 _channel6 = _context.sent;
                 log.info('channel MESSAGE_MARKERS_RECEIVED ... channel: ', _channel6, 'markers list: ', markerList);
                 if (!_channel6) {
-                  _context.next = 225;
+                  _context.next = 238;
                   break;
                 }
-                _context.next = 211;
+                _context.next = 224;
                 return call(getActiveChannelId);
-              case 211:
+              case 224:
                 _activeChannelId6 = _context.sent;
                 updateLastMessage = false;
                 markersMap = {};
@@ -12269,91 +12354,91 @@ function watchForEvents() {
                   });
                 });
                 if (!updateLastMessage) {
-                  _context.next = 220;
+                  _context.next = 233;
                   break;
                 }
                 lastMessage = _extends({}, _channel6.lastMessage, {
                   deliveryStatus: markerList.name
                 });
                 updateChannelLastMessageOnAllChannels(_channel6.id, lastMessage);
-                _context.next = 220;
+                _context.next = 233;
                 return put(updateChannelLastMessageStatusAC(lastMessage, JSON.parse(JSON.stringify(_channel6))));
-              case 220:
+              case 233:
                 if (!(_activeChannelId6 === channelId)) {
-                  _context.next = 224;
+                  _context.next = 237;
                   break;
                 }
-                _context.next = 223;
+                _context.next = 236;
                 return put(updateMessagesStatusAC(markerList.name, markersMap));
-              case 223:
+              case 236:
                 updateMarkersOnAllMessages(markersMap, markerList.name);
-              case 224:
+              case 237:
                 updateMessageStatusOnMap(_channel6.id, {
                   name: markerList.name,
                   markersMap: markersMap
                 });
-              case 225:
-                return _context.abrupt("break", 449);
-              case 226:
+              case 238:
+                return _context.abrupt("break", 462);
+              case 239:
                 _channelId = args.channelId;
                 log.info('channel DELETE ... ');
                 _channel7 = getChannelFromMap(_channelId);
-                _context.next = 231;
+                _context.next = 244;
                 return put(setChannelToRemoveAC(_channel7));
-              case 231:
+              case 244:
                 deleteChannelFromAllChannels(_channelId);
-                return _context.abrupt("break", 449);
-              case 233:
+                return _context.abrupt("break", 462);
+              case 246:
                 _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 = 254;
                   break;
                 }
                 updateMessageOnAllMessages(deletedMessage.id, deletedMessage);
-                _context.next = 241;
+                _context.next = 254;
                 return put(updateMessageAC(deletedMessage.id, deletedMessage));
-              case 241:
+              case 254:
                 updateMessageOnMap(_channel8.id, {
                   messageId: deletedMessage.id,
                   params: deletedMessage
                 });
                 if (!_channelExists7) {
-                  _context.next = 248;
+                  _context.next = 261;
                   break;
                 }
-                _context.next = 245;
+                _context.next = 258;
                 return put(updateChannelDataAC(_channel8.id, {
                   newMessageCount: _channel8.newMessageCount,
                   muted: _channel8.muted,
                   mutedTill: _channel8.mutedTill
                 }));
-              case 245:
+              case 258:
                 if (!(_channel8.lastMessage.id === deletedMessage.id)) {
-                  _context.next = 248;
+                  _context.next = 261;
                   break;
                 }
-                _context.next = 248;
+                _context.next = 261;
                 return put(updateChannelLastMessageAC(deletedMessage, _channel8));
-              case 248:
+              case 261:
                 updateChannelOnAllChannels(_channel8.id, {
                   newMessageCount: _channel8.newMessageCount,
                   muted: _channel8.muted,
                   mutedTill: _channel8.mutedTill
                 }, deletedMessage);
-                return _context.abrupt("break", 449);
-              case 250:
+                return _context.abrupt("break", 462);
+              case 263:
                 _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 = 271;
                   break;
                 }
-                _context.next = 257;
+                _context.next = 270;
                 return put(updateMessageAC(_message.id, {
                   body: _message.body,
                   state: _message.state,
@@ -12362,7 +12447,7 @@ function watchForEvents() {
                   mentionedUsers: _message.mentionedUsers,
                   updatedAt: _message.updatedAt
                 }));
-              case 257:
+              case 270:
                 updateMessageOnAllMessages(_message.id, {
                   body: _message.body,
                   state: _message.state,
@@ -12371,18 +12456,18 @@ function watchForEvents() {
                   mentionedUsers: _message.mentionedUsers,
                   updatedAt: _message.updatedAt
                 });
-              case 258:
+              case 271:
                 if (!_channelExists8) {
-                  _context.next = 262;
+                  _context.next = 275;
                   break;
                 }
                 if (!(_channel9.lastMessage.id === _message.id)) {
-                  _context.next = 262;
+                  _context.next = 275;
                   break;
                 }
-                _context.next = 262;
+                _context.next = 275;
                 return put(updateChannelLastMessageAC(_message, _channel9));
-              case 262:
+              case 275:
                 if (checkChannelExistsOnMessagesMap(_channel9.id)) {
                   updateMessageOnMap(_channel9.id, {
                     messageId: _message.id,
@@ -12390,36 +12475,36 @@ function watchForEvents() {
                   });
                 }
                 updateChannelOnAllChannels(_channel9.id, {}, _message);
-                return _context.abrupt("break", 449);
-              case 265:
+                return _context.abrupt("break", 462);
+              case 278:
                 _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 = 286;
                   break;
                 }
-                _context.next = 272;
+                _context.next = 285;
                 return put(addReactionToMessageAC(_message2, reaction, isSelf));
-              case 272:
+              case 285:
                 addReactionOnAllMessages(_message2, reaction, true);
-              case 273:
+              case 286:
                 if (!(_message2.user.id === SceytChatClient.user.id)) {
-                  _context.next = 291;
+                  _context.next = 304;
                   break;
                 }
                 if (!(!isSelf && Notification.permission === 'granted')) {
-                  _context.next = 286;
+                  _context.next = 299;
                   break;
                 }
                 if (!(document.visibilityState !== 'visible' || _channel0.id !== _activeChannelId9)) {
-                  _context.next = 286;
+                  _context.next = 299;
                   break;
                 }
-                _context.next = 278;
+                _context.next = 291;
                 return select(contactsMapSelector);
-              case 278:
+              case 291:
                 _contactsMap = _context.sent;
                 _getFromContacts2 = getShowOnlyContactUsers();
                 _state = store.getState();
@@ -12439,9 +12524,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 299:
                 if (!(_channel0.newReactions && _channel0.newReactions.length)) {
-                  _context.next = 290;
+                  _context.next = 303;
                   break;
                 }
                 channelUpdateParams = {
@@ -12451,9 +12536,9 @@ function watchForEvents() {
                   muted: _channel0.muted,
                   mutedTill: _channel0.mutedTill
                 };
-                _context.next = 290;
+                _context.next = 303;
                 return put(updateChannelDataAC(_channel0.id, channelUpdateParams));
-              case 290:
+              case 303:
                 updateChannelOnAllChannels(_channel0.id, {
                   userMessageReactions: _channel0.newReactions,
                   lastReactedMessage: _message2,
@@ -12461,77 +12546,77 @@ function watchForEvents() {
                   muted: _channel0.muted,
                   mutedTill: _channel0.mutedTill
                 });
-              case 291:
+              case 304:
                 if (checkChannelExistsOnMessagesMap(_channel0.id)) {
                   addReactionToMessageOnMap(_channel0.id, _message2, reaction, true);
                 }
-                return _context.abrupt("break", 449);
-              case 293:
+                return _context.abrupt("break", 462);
+              case 306:
                 _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 = 315;
                   break;
                 }
-                _context.next = 301;
+                _context.next = 314;
                 return put(deleteReactionFromMessageAC(_message3, _reaction, _isSelf));
-              case 301:
+              case 314:
                 removeReactionOnAllMessages(_message3, _reaction, true);
-              case 302:
+              case 315:
                 _channelUpdateParams = JSON.parse(JSON.stringify(_channel1));
                 if (channelFromMap && channelFromMap.lastReactedMessage && channelFromMap.lastReactedMessage.id === _message3.id) {
                   _channelUpdateParams.lastReactedMessage = null;
                 }
-                _context.next = 306;
+                _context.next = 319;
                 return put(updateChannelDataAC(_channel1.id, _channelUpdateParams));
-              case 306:
+              case 319:
                 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", 462);
+              case 322:
                 _channel10 = args.channel;
                 if (!_channel10) {
-                  _context.next = 315;
+                  _context.next = 328;
                   break;
                 }
                 _updatedChannel = JSON.parse(JSON.stringify(_channel10));
-                _context.next = 314;
+                _context.next = 327;
                 return put(updateChannelDataAC(_channel10.id, _updatedChannel));
-              case 314:
+              case 327:
                 updateChannelOnAllChannels(_channel10.id, _updatedChannel);
-              case 315:
-                return _context.abrupt("break", 449);
-              case 316:
+              case 328:
+                return _context.abrupt("break", 462);
+              case 329:
                 _channel11 = args.channel;
                 log.info('CLEAR_HISTORY: ', _channel11);
-                _context.next = 320;
+                _context.next = 333;
                 return call(getActiveChannelId);
-              case 320:
+              case 333:
                 _activeChannelId1 = _context.sent;
-                _context.next = 323;
+                _context.next = 336;
                 return call(checkChannelExists, _channel11.id);
-              case 323:
+              case 336:
                 channelExist = _context.sent;
                 if (!(_channel11.id === _activeChannelId1)) {
-                  _context.next = 328;
+                  _context.next = 341;
                   break;
                 }
-                _context.next = 327;
+                _context.next = 340;
                 return put(clearMessagesAC());
-              case 327:
+              case 340:
                 removeAllMessages();
-              case 328:
+              case 341:
                 removeMessagesFromMap(_channel11.id);
                 if (!channelExist) {
-                  _context.next = 332;
+                  _context.next = 345;
                   break;
                 }
-                _context.next = 332;
+                _context.next = 345;
                 return put(updateChannelDataAC(_channel11.id, {
                   lastMessage: null,
                   newMessageCount: 0,
@@ -12539,7 +12624,7 @@ function watchForEvents() {
                   muted: _channel11.muted,
                   mutedTill: _channel11.mutedTill
                 }));
-              case 332:
+              case 345:
                 updateChannelOnAllChannels(_channel11.id, {
                   lastMessage: null,
                   newMessageCount: 0,
@@ -12547,173 +12632,173 @@ function watchForEvents() {
                   muted: _channel11.muted,
                   mutedTill: _channel11.mutedTill
                 });
-                return _context.abrupt("break", 449);
-              case 334:
+                return _context.abrupt("break", 462);
+              case 347:
                 _channel12 = args.channel;
                 log.info('channel MUTE ... ');
-                _context.next = 338;
+                _context.next = 351;
                 return put(updateChannelDataAC(_channel12.id, {
                   muted: _channel12.muted,
                   mutedTill: _channel12.mutedTill
                 }));
-              case 338:
+              case 351:
                 updateChannelOnAllChannels(_channel12.id, {
                   muted: _channel12.muted,
                   mutedTill: _channel12.mutedTill
                 });
-                return _context.abrupt("break", 449);
-              case 340:
+                return _context.abrupt("break", 462);
+              case 353:
                 _channel13 = args.channel;
                 log.info('channel UNMUTE ... ');
-                _context.next = 344;
+                _context.next = 357;
                 return put(updateChannelDataAC(_channel13.id, {
                   muted: _channel13.muted,
                   mutedTill: _channel13.mutedTill
                 }));
-              case 344:
+              case 357:
                 updateChannelOnAllChannels(_channel13.id, {
                   muted: _channel13.muted,
                   mutedTill: _channel13.mutedTill
                 });
-                return _context.abrupt("break", 449);
-              case 346:
+                return _context.abrupt("break", 462);
+              case 359:
                 _channel14 = args.channel;
                 log.info('channel PINED ... ');
-                _context.next = 350;
+                _context.next = 363;
                 return put(updateChannelDataAC(_channel14.id, {
                   pinnedAt: _channel14.pinnedAt
                 }, true));
-              case 350:
+              case 363:
                 updateChannelOnAllChannels(_channel14.id, {
                   pinnedAt: _channel14.pinnedAt
                 });
-                return _context.abrupt("break", 449);
-              case 352:
+                return _context.abrupt("break", 462);
+              case 365:
                 _channel15 = args.channel;
                 log.info('channel UNPINED ... ');
-                _context.next = 356;
+                _context.next = 369;
                 return put(updateChannelDataAC(_channel15.id, {
                   pinnedAt: _channel15.pinnedAt
                 }, false, true));
-              case 356:
+              case 369:
                 updateChannelOnAllChannels(_channel15.id, {
                   pinnedAt: _channel15.pinnedAt
                 });
-                return _context.abrupt("break", 449);
-              case 358:
+                return _context.abrupt("break", 462);
+              case 371:
                 _channel16 = args.channel;
                 log.info('channel HIDE ... ');
-                _context.next = 362;
+                _context.next = 375;
                 return put(setChannelToHideAC(_channel16));
-              case 362:
-                return _context.abrupt("break", 449);
-              case 363:
+              case 375:
+                return _context.abrupt("break", 462);
+              case 376:
                 _channel17 = args.channel;
                 log.info('channel UNHIDE ... ');
-                _context.next = 367;
+                _context.next = 380;
                 return put(setChannelToUnHideAC(_channel17));
-              case 367:
-                return _context.abrupt("break", 449);
-              case 368:
+              case 380:
+                return _context.abrupt("break", 462);
+              case 381:
                 _channel18 = args.channel;
-                _context.next = 371;
+                _context.next = 384;
                 return put(updateChannelDataAC(_channel18.id, {
                   unread: _channel18.unread,
                   muted: _channel18.muted,
                   mutedTill: _channel18.mutedTill
                 }));
-              case 371:
+              case 384:
                 _groupName5 = getChannelGroupName(_channel18);
-                _context.next = 374;
+                _context.next = 387;
                 return put(updateSearchedChannelDataAC(_channel18.id, {
                   unread: _channel18.unread
                 }, _groupName5));
-              case 374:
+              case 387:
                 updateChannelOnAllChannels(_channel18.id, {
                   unread: _channel18.unread
                 });
-                return _context.abrupt("break", 449);
-              case 376:
+                return _context.abrupt("break", 462);
+              case 389:
                 _channel19 = args.channel;
-                _context.next = 379;
+                _context.next = 392;
                 return put(updateChannelDataAC(_channel19.id, {
                   unread: _channel19.unread,
                   muted: _channel19.muted,
                   mutedTill: _channel19.mutedTill
                 }));
-              case 379:
+              case 392:
                 _groupName6 = getChannelGroupName(_channel19);
-                _context.next = 382;
+                _context.next = 395;
                 return put(updateSearchedChannelDataAC(_channel19.id, {
                   unread: _channel19.unread
                 }, _groupName6));
-              case 382:
+              case 395:
                 updateChannelOnAllChannels(_channel19.id, {
                   unread: _channel19.unread
                 });
-                return _context.abrupt("break", 449);
-              case 384:
+                return _context.abrupt("break", 462);
+              case 397:
                 _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 = 402;
                 return call(getActiveChannelId);
-              case 389:
+              case 402:
                 _activeChannelId10 = _context.sent;
                 if (!(_channel20.id === _activeChannelId10)) {
-                  _context.next = 393;
+                  _context.next = 406;
                   break;
                 }
-                _context.next = 393;
+                _context.next = 406;
                 return put(updateMembersAC(members));
-              case 393:
+              case 406:
                 i = 0;
-              case 394:
+              case 407:
                 if (!(i < members.length)) {
-                  _context.next = 402;
+                  _context.next = 415;
                   break;
                 }
                 if (!(members[i].id === SceytChatClient.user.id)) {
-                  _context.next = 399;
+                  _context.next = 412;
                   break;
                 }
-                _context.next = 398;
+                _context.next = 411;
                 return put(updateChannelDataAC(_channel20.id, {
                   userRole: members[i].role,
                   muted: _channel20.muted,
                   mutedTill: _channel20.mutedTill
                 }));
-              case 398:
+              case 411:
                 updateChannelOnAllChannels(_channel20.id, {
                   userRole: members[i].role,
                   muted: _channel20.muted,
                   mutedTill: _channel20.mutedTill
                 });
-              case 399:
+              case 412:
                 i++;
-                _context.next = 394;
+                _context.next = 407;
                 break;
-              case 402:
-                return _context.abrupt("break", 449);
-              case 403:
+              case 415:
+                return _context.abrupt("break", 462);
+              case 416:
                 _channel21 = args.channel;
                 log.info('channel frozen  channel ... ', _channel21);
-                return _context.abrupt("break", 449);
-              case 406:
+                return _context.abrupt("break", 462);
+              case 419:
                 _channel22 = args.channel;
                 log.info('channel unfrozen  channel ... ', _channel22);
-                return _context.abrupt("break", 449);
-              case 409:
+                return _context.abrupt("break", 462);
+              case 422:
                 _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 = 426;
                   break;
                 }
-                return _context.abrupt("break", 449);
-              case 413:
+                return _context.abrupt("break", 462);
+              case 426:
                 if (!(name === 'start_typing')) {
-                  _context.next = 421;
+                  _context.next = 434;
                   break;
                 }
                 if (!usersTimeout[_channelId2]) {
@@ -12725,27 +12810,27 @@ function watchForEvents() {
                 usersTimeout[_channelId2][from.id] = setTimeout(function () {
                   channelListener.onReceivedChannelEvent(_channelId2, from, 'stop_typing');
                 }, 5000);
-                _context.next = 419;
+                _context.next = 432;
                 return put(switchTypingIndicatorAC(true, _channelId2, from));
-              case 419:
-                _context.next = 439;
+              case 432:
+                _context.next = 452;
                 break;
-              case 421:
+              case 434:
                 if (!(name === 'stop_typing')) {
-                  _context.next = 427;
+                  _context.next = 440;
                   break;
                 }
                 if (usersTimeout[_channelId2] && usersTimeout[_channelId2][from.id]) {
                   clearTimeout(usersTimeout[_channelId2][from.id]);
                 }
-                _context.next = 425;
+                _context.next = 438;
                 return put(switchTypingIndicatorAC(false, _channelId2, from));
-              case 425:
-                _context.next = 439;
+              case 438:
+                _context.next = 452;
                 break;
-              case 427:
+              case 440:
                 if (!(name === 'start_recording')) {
-                  _context.next = 435;
+                  _context.next = 448;
                   break;
                 }
                 if (!usersTimeout[_channelId2]) {
@@ -12757,40 +12842,40 @@ function watchForEvents() {
                 usersTimeout[_channelId2][from.id] = setTimeout(function () {
                   channelListener.onReceivedChannelEvent(_channelId2, from, 'stop_recording');
                 }, 5000);
-                _context.next = 433;
+                _context.next = 446;
                 return put(switchRecordingIndicatorAC(true, _channelId2, from));
-              case 433:
-                _context.next = 439;
+              case 446:
+                _context.next = 452;
                 break;
-              case 435:
+              case 448:
                 if (!(name === 'stop_recording')) {
-                  _context.next = 439;
+                  _context.next = 452;
                   break;
                 }
                 if (usersTimeout[_channelId2] && usersTimeout[_channelId2][from.id]) {
                   clearTimeout(usersTimeout[_channelId2][from.id]);
                 }
-                _context.next = 439;
+                _context.next = 452;
                 return put(switchRecordingIndicatorAC(false, _channelId2, from));
-              case 439:
-                return _context.abrupt("break", 449);
-              case 440:
+              case 452:
+                return _context.abrupt("break", 462);
+              case 453:
                 status = args.status;
                 log.info('connection status changed . . . . . ', status);
-                _context.next = 444;
+                _context.next = 457;
                 return put(setConnectionStatusAC(status));
-              case 444:
+              case 457:
                 if (!(status === CONNECTION_STATUS.CONNECTED)) {
-                  _context.next = 447;
+                  _context.next = 460;
                   break;
                 }
-                _context.next = 447;
+                _context.next = 460;
                 return put(getRolesAC());
-              case 447:
-                return _context.abrupt("break", 449);
-              case 448:
+              case 460:
+                return _context.abrupt("break", 462);
+              case 461:
                 log.warn('UNHANDLED EVENT FROM REDUX-SAGA EVENT-CHANNEL');
-              case 449:
+              case 462:
               case "end":
                 return _context.stop();
             }
@@ -12805,7 +12890,7 @@ function watchForEvents() {
       case "end":
         return _context2.stop();
     }
-  }, _marked);
+  }, _marked$1);
 }
 
 var channelsSelector = function channelsSelector(store) {
@@ -12883,8 +12968,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),
@@ -13089,7 +13174,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;
@@ -13272,7 +13357,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;
@@ -14389,7 +14474,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;
@@ -15332,8 +15418,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),
@@ -15931,7 +16017,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;
@@ -16129,7 +16215,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;
@@ -17659,8 +17745,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),
@@ -17708,47 +17794,55 @@ 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;
+  var payload, limit, channelId, membersQuery, _yield$call2, members, updateChannelData;
   return _regeneratorRuntime().wrap(function loadMoreMembers$(_context2) {
     while (1) switch (_context2.prev = _context2.next) {
       case 0:
         _context2.prev = 0;
         payload = action.payload;
         limit = payload.limit;
+        channelId = payload.channelId;
         membersQuery = query.membersQuery;
         if (limit && membersQuery) {
           membersQuery.limit = limit;
         }
-        _context2.next = 7;
+        _context2.next = 8;
         return put(setMembersLoadingStateAC(LOADING_STATE.LOADING));
-      case 7:
-        _context2.next = 9;
+      case 8:
+        _context2.next = 10;
         return call(membersQuery.loadNextPage);
-      case 9:
+      case 10:
         _yield$call2 = _context2.sent;
         members = _yield$call2.members;
-        _context2.next = 13;
+        _context2.next = 14;
         return put(addMembersToListAC(members));
-      case 13:
-        _context2.next = 15;
+      case 14:
+        _context2.next = 16;
         return put(setMembersLoadingStateAC(LOADING_STATE.LOADED));
-      case 15:
-        _context2.next = 20;
+      case 16:
+        _context2.next = 18;
+        return call(updateActiveChannelMembersAdd, members) || {};
+      case 18:
+        updateChannelData = _context2.sent;
+        _context2.next = 21;
+        return put(updateChannelDataAC(channelId, _extends({}, updateChannelData)));
+      case 21:
+        _context2.next = 26;
         break;
-      case 17:
-        _context2.prev = 17;
+      case 23:
+        _context2.prev = 23;
         _context2.t0 = _context2["catch"](0);
-      case 20:
+      case 26:
       case "end":
         return _context2.stop();
     }
-  }, _marked2$2, null, [[0, 17]]);
+  }, _marked2$3, null, [[0, 23]]);
 }
 function addMembers(action) {
-  var payload, members, channelId, channel, membersToAdd, addedMembers, membersIds, messageToSend;
+  var payload, members, channelId, channel, membersToAdd, addedMembers, membersIds, messageToSend, updateChannelData;
   return _regeneratorRuntime().wrap(function addMembers$(_context3) {
     while (1) switch (_context3.prev = _context3.next) {
       case 0:
@@ -17760,7 +17854,7 @@ function addMembers(action) {
       case 5:
         channel = _context3.sent;
         if (!channel) {
-          _context3.next = 22;
+          _context3.next = 25;
           break;
         }
         membersToAdd = members.map(function (mem) {
@@ -17798,24 +17892,28 @@ function addMembers(action) {
           memberCount: channel.memberCount + addedMembers.length
         });
         _context3.next = 22;
-        return put(updateChannelDataAC(channel.id, {
-          memberCount: channel.memberCount + addedMembers.length
-        }));
+        return call(updateActiveChannelMembersAdd, addedMembers) || {};
       case 22:
-        _context3.next = 27;
+        updateChannelData = _context3.sent;
+        _context3.next = 25;
+        return put(updateChannelDataAC(channel.id, _extends({
+          memberCount: channel.memberCount + addedMembers.length
+        }, updateChannelData)));
+      case 25:
+        _context3.next = 30;
         break;
-      case 24:
-        _context3.prev = 24;
+      case 27:
+        _context3.prev = 27;
         _context3.t0 = _context3["catch"](0);
         log.error('error on add members... ', _context3.t0);
-      case 27:
+      case 30:
       case "end":
         return _context3.stop();
     }
-  }, _marked3$2, null, [[0, 24]]);
+  }, _marked3$2, null, [[0, 27]]);
 }
 function kickMemberFromChannel(action) {
-  var payload, memberId, channelId, channel, removedMembers, membersIds, messageToSend;
+  var payload, memberId, channelId, channel, removedMembers, membersIds, messageToSend, updateChannelData;
   return _regeneratorRuntime().wrap(function kickMemberFromChannel$(_context4) {
     while (1) switch (_context4.prev = _context4.next) {
       case 0:
@@ -17857,23 +17955,27 @@ function kickMemberFromChannel(action) {
           memberCount: channel.memberCount - removedMembers.length
         });
         _context4.next = 20;
-        return put(updateChannelDataAC(channel.id, {
-          memberCount: channel.memberCount - removedMembers.length
-        }));
+        return call(updateActiveChannelMembersRemove, removedMembers) || {};
       case 20:
-        _context4.next = 24;
+        updateChannelData = _context4.sent;
+        _context4.next = 23;
+        return put(updateChannelDataAC(channel.id, _extends({
+          memberCount: channel.memberCount - removedMembers.length
+        }, updateChannelData)));
+      case 23:
+        _context4.next = 27;
         break;
-      case 22:
-        _context4.prev = 22;
+      case 25:
+        _context4.prev = 25;
         _context4.t0 = _context4["catch"](0);
-      case 24:
+      case 27:
       case "end":
         return _context4.stop();
     }
-  }, _marked4$2, null, [[0, 22]]);
+  }, _marked4$2, null, [[0, 25]]);
 }
 function blockMember(action) {
-  var payload, memberId, channelId, channel, removedMembers;
+  var payload, memberId, channelId, channel, removedMembers, updateChannelData;
   return _regeneratorRuntime().wrap(function blockMember$(_context5) {
     while (1) switch (_context5.prev = _context5.next) {
       case 0:
@@ -17895,20 +17997,24 @@ function blockMember(action) {
           memberCount: channel.memberCount - removedMembers.length
         });
         _context5.next = 14;
-        return put(updateChannelDataAC(channel.id, {
-          memberCount: channel.memberCount - removedMembers.length
-        }));
+        return call(updateActiveChannelMembersRemove, removedMembers) || {};
       case 14:
-        _context5.next = 18;
+        updateChannelData = _context5.sent;
+        _context5.next = 17;
+        return put(updateChannelDataAC(channel.id, _extends({
+          memberCount: channel.memberCount - removedMembers.length
+        }, updateChannelData)));
+      case 17:
+        _context5.next = 21;
         break;
-      case 16:
-        _context5.prev = 16;
+      case 19:
+        _context5.prev = 19;
         _context5.t0 = _context5["catch"](0);
-      case 18:
+      case 21:
       case "end":
         return _context5.stop();
     }
-  }, _marked5$2, null, [[0, 16]]);
+  }, _marked5$2, null, [[0, 19]]);
 }
 function changeMemberRole(action) {
   var payload, channelId, members, channel, updatedMembers;
@@ -18030,8 +18136,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),
@@ -18064,7 +18170,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;
@@ -18126,7 +18232,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;
@@ -18384,7 +18490,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) {
@@ -18395,7 +18501,7 @@ function rootSaga() {
       case "end":
         return _context.stop();
     }
-  }, _marked$5);
+  }, _marked$6);
 }
 
 var sagaMiddleware = createSagaMiddleware();
@@ -18870,9 +18976,10 @@ function useUpdatePresence(channel, isVisible) {
   }
   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)));
@@ -18888,7 +18995,8 @@ function useUpdatePresence(channel, isVisible) {
     }
   }, [connectionStatus]);
   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);
@@ -21648,7 +21756,7 @@ var ChannelList = function ChannelList(_ref) {
     if (getSelectedChannel) {
       getSelectedChannel(activeChannel);
     }
-  }, [activeChannel]);
+  }, [activeChannel && activeChannel.members && activeChannel.members.length]);
   useDidUpdate(function () {
     if (closeSearchChannels) {
       getMyChannels();
@@ -27730,7 +27838,8 @@ var Attachment = function Attachment(_ref) {
     borderColor: borderColor
   }, /*#__PURE__*/React__default.createElement(UploadPercent, {
     isRepliedMessage: isRepliedMessage,
-    isDetailsView: isDetailsView
+    isDetailsView: isDetailsView,
+    backgroundColor: overlayBackground2
   }, isInUploadingState ? (/*#__PURE__*/React__default.createElement(CancelResumeWrapper, {
     onClick: handlePauseResumeUpload
   }, attachmentCompilationState[attachment.tid] === UPLOAD_STATE.UPLOADING ? (/*#__PURE__*/React__default.createElement(SvgCancel, null)) : (/*#__PURE__*/React__default.createElement(SvgUpload, null)))) : !isCached && (/*#__PURE__*/React__default.createElement(CancelResumeWrapper, {
@@ -27744,7 +27853,7 @@ var Attachment = function Attachment(_ref) {
     text: '',
     styles: {
       background: {
-        fill: overlayBackground2
+        fill: overlayBackground2 + "40"
       },
       path: {
         stroke: textOnPrimary,
@@ -27794,7 +27903,7 @@ var Attachment = function Attachment(_ref) {
     text: '',
     styles: {
       background: {
-        fill: overlayBackground2
+        fill: overlayBackground2 + "40"
       },
       path: {
         stroke: textOnPrimary,
@@ -27889,7 +27998,7 @@ var Attachment = function Attachment(_ref) {
     fileAttachment: true,
     borderRadius: !(attachmentThumb || attachment.attachmentUrl && isPreview) ? '50%' : undefined,
     isDetailsView: isDetailsView,
-    backgroundColor: downloadingFile ? '' : attachment.attachmentUrl || attachmentThumb ? overlayBackground2 : accentColor
+    backgroundColor: overlayBackground2
   }, (isInUploadingState || downloadingFile) && (/*#__PURE__*/React__default.createElement(CancelResumeWrapper, {
     onClick: handlePauseResumeUpload
   }, attachmentCompilationState[attachment.tid] === UPLOAD_STATE.UPLOADING || downloadingFile ? (/*#__PURE__*/React__default.createElement(SvgCancel, null)) : isInUploadingState && /*#__PURE__*/React__default.createElement(SvgUpload, null))), (attachmentCompilationState[attachment.tid] === UPLOAD_STATE.UPLOADING || downloadingFile) && (/*#__PURE__*/React__default.createElement(ProgressWrapper$1, null, /*#__PURE__*/React__default.createElement(CircularProgressbar, {
@@ -27901,7 +28010,7 @@ var Attachment = function Attachment(_ref) {
     text: '',
     styles: {
       background: {
-        fill: 'transparent'
+        fill: overlayBackground2 + "40"
       },
       path: {
         stroke: textOnPrimary,
@@ -36413,7 +36522,7 @@ var Members = function Members(_ref) {
   var handleMembersListScroll = function handleMembersListScroll(event) {
     if (event.target.scrollTop >= event.target.scrollHeight - event.target.offsetHeight - 100) {
       if (membersLoading === LOADING_STATE.LOADED) {
-        dispatch(loadMoreMembersAC(15));
+        dispatch(loadMoreMembersAC(15, channel.id));
       }
     }
   };
@@ -36800,7 +36909,8 @@ var Files = function Files(_ref) {
     textPrimary = _useColor[THEME_COLORS.TEXT_PRIMARY],
     textSecondary = _useColor[THEME_COLORS.TEXT_SECONDARY],
     backgroundHovered = _useColor[THEME_COLORS.BACKGROUND_HOVERED],
-    surface1 = _useColor[THEME_COLORS.SURFACE_1];
+    surface1 = _useColor[THEME_COLORS.SURFACE_1],
+    overlayBackground2 = _useColor[THEME_COLORS.OVERLAY_BACKGROUND_2];
   var dispatch = useDispatch();
   var _useState = useState({}),
     downloadingFilesMap = _useState[0],
@@ -36884,7 +36994,7 @@ var Files = function Files(_ref) {
       text: '',
       styles: {
         background: {
-          fill: 'transparent'
+          fill: overlayBackground2 + "40"
         },
         path: {
           stroke: accentColor,
@@ -37871,7 +37981,7 @@ var Details = function Details(_ref) {
     if (event.target.scrollTop >= event.target.scrollHeight - event.target.offsetHeight - 100) {
       if (activeTab === channelDetailsTabs.member) {
         if (membersLoading === LOADING_STATE.LOADED) {
-          dispatch(loadMoreMembersAC(15));
+          dispatch(loadMoreMembersAC(15, activeChannel.id));
         }
       } else if (messagesLoading === LOADING_STATE.LOADED && attachmentsHasNex) {
         dispatch(loadMoreAttachmentsAC(20));