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

package/index.js

@@ -7413,6 +7413,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;
@@ -7432,9 +7435,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);
             }
@@ -7730,7 +7734,7 @@ var getCustomUploader = function getCustomUploader() {
 var getCustomDownloader = function getCustomDownloader() {
   return CustomUploader && CustomUploader.download;
 };
-var customUpload = function customUpload(attachment, progress, getUpdatedFilePath) {
+var customUpload = function customUpload(attachment, progress, messageType, getUpdatedFilePath) {
   return new Promise(function (resolve, reject) {
     if (CustomUploader) {
       var uploadTask = {
@@ -7747,7 +7751,7 @@ var customUpload = function customUpload(attachment, progress, getUpdatedFilePat
         resume: function resume() {}
       };
       pendingUploaders[attachment.tid] = uploadTask;
-      CustomUploader.upload(attachment, uploadTask);
+      CustomUploader.upload(attachment, uploadTask, messageType);
     } else {
       reject(new Error('No Custom uploader'));
     }
@@ -7799,7 +7803,7 @@ var filesPromisesOnDownload = {};
 var setDownloadFilePromise = function setDownloadFilePromise(attachmentId, promise) {
   filesPromisesOnDownload[attachmentId] = promise;
 };
-var downloadFile = function downloadFile(attachment, download, done, progressCallback) {
+var downloadFile = function downloadFile(attachment, download, done, progressCallback, messageType) {
   try {
     return Promise.resolve(_catch(function () {
       var customDownloader = getCustomDownloader();
@@ -7810,7 +7814,7 @@ var downloadFile = function downloadFile(attachment, download, done, progressCal
             if (progressCallback) {
               progressCallback(progress);
             }
-          });
+          }, messageType);
           filesPromisesOnDownload[attachment.id] = urlPromise;
           return Promise.resolve(urlPromise).then(function (result) {
             FileSaver.saveAs(result.Body, attachment.name);
@@ -10456,11 +10460,12 @@ function updateMembersPresenceAC(usersMap) {
     }
   };
 }
-function loadMoreMembersAC(limit) {
+function loadMoreMembersAC(limit, channelId) {
   return {
     type: LOAD_MORE_MEMBERS,
     payload: {
-      limit: limit
+      limit: limit,
+      channelId: channelId
     }
   };
 }
@@ -11228,12 +11233,12 @@ var UploadingIcon = styled__default.span(_templateObject35 || (_templateObject35
 });
 var TextInOneLine = styled__default.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__default.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__default.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__default.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) {
@@ -11495,15 +11500,16 @@ function updateActiveChannelMembersAdd(addedMembers) {
         state = _context.sent;
         activeChannel = state.ChannelReducer.activeChannel;
         if (!(activeChannel && activeChannel.id)) {
-          _context.next = 9;
+          _context.next = 8;
           break;
         }
         updatedMembers = [].concat(activeChannel.members || [], addedMembers);
         updatedMembers = Array.from(new Set(updatedMembers));
-        _context.next = 9;
-        return effects.put(updateChannelDataAC(activeChannel.id, {
+        return _context.abrupt("return", {
           members: updatedMembers
-        }));
+        });
+      case 8:
+        return _context.abrupt("return", {});
       case 9:
       case "end":
         return _context.stop();
@@ -11521,7 +11527,7 @@ function updateActiveChannelMembersRemove(removedMembers) {
         state = _context2.sent;
         activeChannel = state.ChannelReducer.activeChannel;
         if (!(activeChannel && activeChannel.id)) {
-          _context2.next = 9;
+          _context2.next = 8;
           break;
         }
         updatedMembers = (activeChannel.members || []).filter(function (member) {
@@ -11530,10 +11536,11 @@ function updateActiveChannelMembersRemove(removedMembers) {
           });
         });
         updatedMembers = Array.from(new Set(updatedMembers));
-        _context2.next = 9;
-        return effects.put(updateChannelDataAC(activeChannel.id, {
+        return _context2.abrupt("return", {
           members: updatedMembers
-        }));
+        });
+      case 8:
+        return _context2.abrupt("return", {});
       case 9:
       case "end":
         return _context2.stop();
@@ -11900,7 +11907,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:
@@ -11911,7 +11918,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 ? 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;
+                _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;
@@ -11945,7 +11952,7 @@ function watchForEvents() {
                   addChannelToAllChannels(createdChannel);
                 }
               case 24:
-                return _context.abrupt("break", 455);
+                return _context.abrupt("break", 462);
               case 25:
                 channel = args.channel;
                 log.info('channel JOIN ... . ', channel);
@@ -11956,7 +11963,7 @@ function watchForEvents() {
                 if (!_chan2) {
                   addChannelToAllChannels(channel);
                 }
-                return _context.abrupt("break", 455);
+                return _context.abrupt("break", 462);
               case 34:
                 _channel = args.channel, member = args.member;
                 log.info('channel LEAVE ... ', _channel, member);
@@ -11974,217 +11981,227 @@ function watchForEvents() {
               case 43:
                 removeChannelFromMap(_channel.id);
                 deleteChannelFromAllChannels(_channel.id);
-                _context.next = 59;
+                _context.next = 61;
                 break;
               case 47:
                 groupName = getChannelGroupName(_channel);
                 if (!_channelExists) {
-                  _context.next = 56;
+                  _context.next = 58;
                   break;
                 }
+                updateChannelData = {};
                 if (!(_activeChannelId === _channel.id)) {
-                  _context.next = 54;
+                  _context.next = 56;
                   break;
                 }
-                _context.next = 52;
+                _context.next = 53;
                 return effects.put(removeMemberFromListAC([member]));
-              case 52:
-                _context.next = 54;
-                return updateActiveChannelMembersRemove([member]);
-              case 54:
-                _context.next = 56;
-                return effects.put(updateChannelDataAC(_channel.id, {
+              case 53:
+                _context.next = 55;
+                return effects.call(updateActiveChannelMembersRemove, [member]) || {};
+              case 55:
+                updateChannelData = _context.sent;
+              case 56:
+                _context.next = 58;
+                return effects.put(updateChannelDataAC(_channel.id, _extends({
                   memberCount: _channel.memberCount,
                   muted: _channel.muted,
                   mutedTill: _channel.mutedTill
-                }));
-              case 56:
-                _context.next = 58;
+                }, updateChannelData)));
+              case 58:
+                _context.next = 60;
                 return effects.put(updateSearchedChannelDataAC(_channel.id, {
                   memberCount: _channel.memberCount,
                   muted: _channel.muted,
                   mutedTill: _channel.mutedTill
                 }, groupName));
-              case 58:
+              case 60:
                 updateChannelOnAllChannels(_channel.id, {
                   memberCount: _channel.memberCount,
                   muted: _channel.muted,
                   mutedTill: _channel.mutedTill
                 });
-              case 59:
-                return _context.abrupt("break", 455);
-              case 60:
+              case 61:
+                return _context.abrupt("break", 462);
+              case 62:
                 log.info('channel BLOCK ... ');
                 _channel2 = args.channel;
                 _channelExists2 = checkChannelExists(_channel2.id);
                 if (!_channelExists2) {
-                  _context.next = 66;
+                  _context.next = 68;
                   break;
                 }
-                _context.next = 66;
+                _context.next = 68;
                 return effects.put(removeChannelAC(_channel2.id));
-              case 66:
-                return _context.abrupt("break", 455);
-              case 67:
-                log.info('channel UNBLOCK ... ');
-                return _context.abrupt("break", 455);
+              case 68:
+                return _context.abrupt("break", 462);
               case 69:
+                log.info('channel UNBLOCK ... ');
+                return _context.abrupt("break", 462);
+              case 71:
                 _channel3 = args.channel, removedMembers = args.removedMembers;
                 log.info('channel KICK_MEMBERS ... ', removedMembers);
-                _context.next = 73;
+                _context.next = 75;
                 return effects.call(getActiveChannelId);
-              case 73:
+              case 75:
                 _activeChannelId2 = _context.sent;
                 _channelExists3 = checkChannelExists(_channel3.id);
                 if (!_channelExists3) {
-                  _context.next = 98;
+                  _context.next = 102;
                   break;
                 }
                 if (!removedMembers.find(function (mem) {
                   return mem.id === SceytChatClient.user.id;
                 })) {
-                  _context.next = 88;
+                  _context.next = 90;
                   break;
                 }
                 removeChannelFromMap(_channel3.id);
-                _context.next = 80;
-                return effects.put(removeChannelAC(_channel3.id));
-              case 80:
                 _context.next = 82;
-                return effects.call(getLastChannelFromMap);
+                return effects.put(removeChannelAC(_channel3.id));
               case 82:
+                _context.next = 84;
+                return effects.call(getLastChannelFromMap);
+              case 84:
                 activeChannel = _context.sent;
                 if (!activeChannel) {
-                  _context.next = 86;
+                  _context.next = 88;
                   break;
                 }
-                _context.next = 86;
+                _context.next = 88;
                 return effects.put(switchChannelActionAC(JSON.parse(JSON.stringify(activeChannel))));
-              case 86:
-                _context.next = 98;
-                break;
               case 88:
+                _context.next = 102;
+                break;
+              case 90:
+                _updateChannelData = {};
                 if (!(_activeChannelId2 === _channel3.id)) {
-                  _context.next = 93;
+                  _context.next = 97;
                   break;
                 }
-                _context.next = 91;
+                _context.next = 94;
                 return effects.put(removeMemberFromListAC(removedMembers));
-              case 91:
-                _context.next = 93;
-                return updateActiveChannelMembersRemove(removedMembers);
-              case 93:
-                _groupName = getChannelGroupName(_channel3);
+              case 94:
                 _context.next = 96;
+                return effects.call(updateActiveChannelMembersRemove, removedMembers) || {};
+              case 96:
+                _updateChannelData = _context.sent;
+              case 97:
+                _groupName = getChannelGroupName(_channel3);
+                _context.next = 100;
                 return effects.put(updateSearchedChannelDataAC(_channel3.id, {
                   memberCount: _channel3.memberCount,
                   muted: _channel3.muted,
                   mutedTill: _channel3.mutedTill
                 }, _groupName));
-              case 96:
-                _context.next = 98;
-                return effects.put(updateChannelDataAC(_channel3.id, {
+              case 100:
+                _context.next = 102;
+                return effects.put(updateChannelDataAC(_channel3.id, _extends({
                   memberCount: _channel3.memberCount,
                   muted: _channel3.muted,
                   mutedTill: _channel3.mutedTill
-                }));
-              case 98:
+                }, _updateChannelData)));
+              case 102:
                 updateChannelOnAllChannels(_channel3.id, {
                   memberCount: _channel3.memberCount,
                   muted: _channel3.muted,
                   mutedTill: _channel3.mutedTill
                 });
-                return _context.abrupt("break", 455);
-              case 100:
+                return _context.abrupt("break", 462);
+              case 104:
                 _channel4 = args.channel, addedMembers = args.addedMembers;
                 log.info('channel ADD_MEMBERS ... ', addedMembers);
-                _context.next = 104;
+                _context.next = 108;
                 return effects.call(getActiveChannelId);
-              case 104:
+              case 108:
                 _activeChannelId3 = _context.sent;
                 _channelExists4 = checkChannelExists(_channel4.id);
                 if (!_channelExists4) {
-                  _context.next = 116;
+                  _context.next = 122;
                   break;
                 }
+                _updateChannelData2 = {};
                 if (!(_activeChannelId3 === _channel4.id)) {
-                  _context.next = 112;
+                  _context.next = 118;
                   break;
                 }
-                _context.next = 110;
+                _context.next = 115;
                 return effects.put(addMembersToListAC(addedMembers));
-              case 110:
-                _context.next = 112;
-                return updateActiveChannelMembersAdd(addedMembers);
-              case 112:
-                _context.next = 114;
-                return effects.put(updateChannelDataAC(_channel4.id, {
+              case 115:
+                _context.next = 117;
+                return effects.call(updateActiveChannelMembersAdd, addedMembers) || {};
+              case 117:
+                _updateChannelData2 = _context.sent;
+              case 118:
+                _context.next = 120;
+                return effects.put(updateChannelDataAC(_channel4.id, _extends({
                   memberCount: _channel4.memberCount,
                   muted: _channel4.muted,
                   mutedTill: _channel4.mutedTill
-                }));
-              case 114:
-                _context.next = 120;
+                }, _updateChannelData2)));
+              case 120:
+                _context.next = 126;
                 break;
-              case 116:
-                _context.next = 118;
+              case 122:
+                _context.next = 124;
                 return effects.call(setChannelInMap, _channel4);
-              case 118:
-                _context.next = 120;
+              case 124:
+                _context.next = 126;
                 return effects.put(setAddedToChannelAC(JSON.parse(JSON.stringify(_channel4))));
-              case 120:
+              case 126:
                 _groupName2 = getChannelGroupName(_channel4);
-                _context.next = 123;
+                _context.next = 129;
                 return effects.put(updateSearchedChannelDataAC(_channel4.id, {
                   memberCount: _channel4.memberCount,
                   muted: _channel4.muted,
                   mutedTill: _channel4.mutedTill
                 }, _groupName2));
-              case 123:
+              case 129:
                 updateChannelOnAllChannels(_channel4.id, {
                   memberCount: _channel4.memberCount,
                   muted: _channel4.muted,
                   mutedTill: _channel4.mutedTill
                 });
-                return _context.abrupt("break", 455);
-              case 125:
+                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 = 137;
+                  _context.next = 144;
                   break;
                 }
-                _context.next = 131;
+                _context.next = 138;
                 return effects.put(updateChannelDataAC(updatedChannel.id, {
                   subject: subject,
                   avatarUrl: avatarUrl,
                   muted: muted,
                   mutedTill: mutedTill
                 }));
-              case 131:
-                _context.next = 133;
+              case 138:
+                _context.next = 140;
                 return effects.call(getActiveChannelId);
-              case 133:
+              case 140:
                 _activeChannelId4 = _context.sent;
                 if (!(_activeChannelId4 === updatedChannel.id)) {
-                  _context.next = 137;
+                  _context.next = 144;
                   break;
                 }
-                _context.next = 137;
+                _context.next = 144;
                 return effects.put(setActiveChannelAC(_extends({}, updatedChannel, {
                   metadata: isJSON(metadata) ? JSON.parse(metadata) : metadata
                 })));
-              case 137:
+              case 144:
                 _groupName3 = getChannelGroupName(updatedChannel);
-                _context.next = 140;
+                _context.next = 147;
                 return effects.put(updateSearchedChannelDataAC(updatedChannel.id, {
                   subject: subject,
                   avatarUrl: avatarUrl,
                   muted: muted,
                   mutedTill: mutedTill
                 }, _groupName3));
-              case 140:
+              case 147:
                 updateChannelOnAllChannels(updatedChannel.id, {
                   subject: subject,
                   avatarUrl: avatarUrl,
@@ -12192,102 +12209,102 @@ function watchForEvents() {
                   mutedTill: mutedTill,
                   metadata: isJSON(metadata) ? JSON.parse(metadata) : metadata
                 });
-                return _context.abrupt("break", 455);
-              case 142:
+                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 = 208;
+                  _context.next = 215;
                   break;
                 }
                 _channel5.metadata = isJSON(_channel5.metadata) ? JSON.parse(_channel5.metadata) : _channel5.metadata;
-                _context.next = 150;
+                _context.next = 157;
                 return effects.call(getActiveChannelId);
-              case 150:
+              case 157:
                 _activeChannelId5 = _context.sent;
                 _channelExists6 = checkChannelExists(_channel5.id);
                 channelForAdd = JSON.parse(JSON.stringify(_channel5));
-                _context.next = 155;
+                _context.next = 162;
                 return effects.put(addChannelAC(channelForAdd));
-              case 155:
+              case 162:
                 if (_channelExists6) {
-                  _context.next = 160;
+                  _context.next = 167;
                   break;
                 }
-                _context.next = 158;
+                _context.next = 165;
                 return effects.call(setChannelInMap, _channel5);
-              case 158:
-                _context.next = 163;
+              case 165:
+                _context.next = 170;
                 break;
-              case 160:
+              case 167:
                 if (message.repliedInThread) {
-                  _context.next = 163;
+                  _context.next = 170;
                   break;
                 }
-                _context.next = 163;
+                _context.next = 170;
                 return effects.put(updateChannelLastMessageAC(message, channelForAdd));
-              case 163:
+              case 170:
                 if (!(_channel5.id === _activeChannelId5)) {
-                  _context.next = 175;
+                  _context.next = 182;
                   break;
                 }
                 if (getHasNextCached()) {
-                  _context.next = 167;
+                  _context.next = 174;
                   break;
                 }
-                _context.next = 167;
+                _context.next = 174;
                 return effects.put(addMessageAC(message));
-              case 167:
+              case 174:
                 addAllMessages([message], MESSAGE_LOAD_DIRECTION.NEXT);
-                _context.next = 171;
+                _context.next = 178;
                 return effects.select(messagesHasNextSelector);
-              case 171:
+              case 178:
                 hasNextMessage = _context.sent;
                 if (!(!getHasNextCached() && !hasNextMessage)) {
-                  _context.next = 175;
+                  _context.next = 182;
                   break;
                 }
-                _context.next = 175;
+                _context.next = 182;
                 return effects.put(scrollToNewMessageAC(true, false, true));
-              case 175:
+              case 182:
                 if (getMessagesFromMap(_channel5.id) && getMessagesFromMap(_channel5.id).length) {
                   addMessageToMap(_channel5.id, message);
                 }
-                _context.next = 178;
-                return effects.put(updateChannelDataAC(_channel5.id, _extends({}, channelForAdd, {
+                _context.next = 185;
+                return effects.put(updateChannelDataAC(_channel5.id, {
                   userMessageReactions: [],
                   lastReactedMessage: null
-                })));
-              case 178:
+                }));
+              case 185:
                 _groupName4 = getChannelGroupName(_channel5);
-                _context.next = 181;
-                return effects.put(updateSearchedChannelDataAC(_channel5.id, _extends({}, channelForAdd, {
+                _context.next = 188;
+                return effects.put(updateSearchedChannelDataAC(_channel5.id, {
                   userMessageReactions: [],
                   lastReactedMessage: null
-                }), _groupName4));
-              case 181:
+                }, _groupName4));
+              case 188:
                 showNotifications = getShowNotifications();
                 if (!(showNotifications && !message.silent && message.user.id !== SceytChatClient.user.id && !_channel5.muted)) {
-                  _context.next = 198;
+                  _context.next = 205;
                   break;
                 }
                 if (!(Notification.permission === 'granted')) {
-                  _context.next = 198;
+                  _context.next = 205;
                   break;
                 }
-                _context.next = 186;
+                _context.next = 193;
                 return effects.select(browserTabIsActiveSelector);
-              case 186:
+              case 193:
                 tabIsActive = _context.sent;
                 if (!(document.visibilityState !== 'visible' || !tabIsActive || _channel5.id !== _activeChannelId5)) {
-                  _context.next = 198;
+                  _context.next = 205;
                   break;
                 }
-                _context.next = 190;
+                _context.next = 197;
                 return effects.select(contactsMapSelector);
-              case 190:
+              case 197:
                 contactsMap = _context.sent;
                 _getFromContacts = getShowOnlyContactUsers();
                 state = store.getState();
@@ -12307,42 +12324,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 198:
+              case 205:
                 log.info('send delivered for message . .. . ', message);
                 if (!(message.repliedInThread && message.parentMessage.id)) {
-                  _context.next = 204;
+                  _context.next = 211;
                   break;
                 }
-                _context.next = 202;
+                _context.next = 209;
                 return effects.put(markMessagesAsDeliveredAC(message.parentMessage.id, [message.id]));
-              case 202:
-                _context.next = 206;
+              case 209:
+                _context.next = 213;
                 break;
-              case 204:
-                _context.next = 206;
+              case 211:
+                _context.next = 213;
                 return effects.put(markMessagesAsDeliveredAC(_channel5.id, [message.id]));
-              case 206:
-                updateChannelOnAllChannels(_channel5.id, _extends({}, channelForAdd, {
+              case 213:
+                updateChannelOnAllChannels(_channel5.id, {
                   userMessageReactions: [],
                   lastReactedMessage: null
-                }));
+                });
                 updateChannelLastMessageOnAllChannels(_channel5.id, _channel5.lastMessage);
-              case 208:
-                return _context.abrupt("break", 455);
-              case 209:
+              case 215:
+                return _context.abrupt("break", 462);
+              case 216:
                 channelId = args.channelId, markerList = args.markerList;
-                _context.next = 212;
+                _context.next = 219;
                 return effects.call(getChannelFromMap, channelId);
-              case 212:
+              case 219:
                 _channel6 = _context.sent;
                 log.info('channel MESSAGE_MARKERS_RECEIVED ... channel: ', _channel6, 'markers list: ', markerList);
                 if (!_channel6) {
-                  _context.next = 231;
+                  _context.next = 238;
                   break;
                 }
-                _context.next = 217;
+                _context.next = 224;
                 return effects.call(getActiveChannelId);
-              case 217:
+              case 224:
                 _activeChannelId6 = _context.sent;
                 updateLastMessage = false;
                 markersMap = {};
@@ -12360,91 +12377,91 @@ function watchForEvents() {
                   });
                 });
                 if (!updateLastMessage) {
-                  _context.next = 226;
+                  _context.next = 233;
                   break;
                 }
                 lastMessage = _extends({}, _channel6.lastMessage, {
                   deliveryStatus: markerList.name
                 });
                 updateChannelLastMessageOnAllChannels(_channel6.id, lastMessage);
-                _context.next = 226;
+                _context.next = 233;
                 return effects.put(updateChannelLastMessageStatusAC(lastMessage, JSON.parse(JSON.stringify(_channel6))));
-              case 226:
+              case 233:
                 if (!(_activeChannelId6 === channelId)) {
-                  _context.next = 230;
+                  _context.next = 237;
                   break;
                 }
-                _context.next = 229;
+                _context.next = 236;
                 return effects.put(updateMessagesStatusAC(markerList.name, markersMap));
-              case 229:
+              case 236:
                 updateMarkersOnAllMessages(markersMap, markerList.name);
-              case 230:
+              case 237:
                 updateMessageStatusOnMap(_channel6.id, {
                   name: markerList.name,
                   markersMap: markersMap
                 });
-              case 231:
-                return _context.abrupt("break", 455);
-              case 232:
+              case 238:
+                return _context.abrupt("break", 462);
+              case 239:
                 _channelId = args.channelId;
                 log.info('channel DELETE ... ');
                 _channel7 = getChannelFromMap(_channelId);
-                _context.next = 237;
+                _context.next = 244;
                 return effects.put(setChannelToRemoveAC(_channel7));
-              case 237:
+              case 244:
                 deleteChannelFromAllChannels(_channelId);
-                return _context.abrupt("break", 455);
-              case 239:
+                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 = 247;
+                  _context.next = 254;
                   break;
                 }
                 updateMessageOnAllMessages(deletedMessage.id, deletedMessage);
-                _context.next = 247;
+                _context.next = 254;
                 return effects.put(updateMessageAC(deletedMessage.id, deletedMessage));
-              case 247:
+              case 254:
                 updateMessageOnMap(_channel8.id, {
                   messageId: deletedMessage.id,
                   params: deletedMessage
                 });
                 if (!_channelExists7) {
-                  _context.next = 254;
+                  _context.next = 261;
                   break;
                 }
-                _context.next = 251;
+                _context.next = 258;
                 return effects.put(updateChannelDataAC(_channel8.id, {
                   newMessageCount: _channel8.newMessageCount,
                   muted: _channel8.muted,
                   mutedTill: _channel8.mutedTill
                 }));
-              case 251:
+              case 258:
                 if (!(_channel8.lastMessage.id === deletedMessage.id)) {
-                  _context.next = 254;
+                  _context.next = 261;
                   break;
                 }
-                _context.next = 254;
+                _context.next = 261;
                 return effects.put(updateChannelLastMessageAC(deletedMessage, _channel8));
-              case 254:
+              case 261:
                 updateChannelOnAllChannels(_channel8.id, {
                   newMessageCount: _channel8.newMessageCount,
                   muted: _channel8.muted,
                   mutedTill: _channel8.mutedTill
                 }, deletedMessage);
-                return _context.abrupt("break", 455);
-              case 256:
+                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 = 264;
+                  _context.next = 271;
                   break;
                 }
-                _context.next = 263;
+                _context.next = 270;
                 return effects.put(updateMessageAC(_message.id, {
                   body: _message.body,
                   state: _message.state,
@@ -12453,7 +12470,7 @@ function watchForEvents() {
                   mentionedUsers: _message.mentionedUsers,
                   updatedAt: _message.updatedAt
                 }));
-              case 263:
+              case 270:
                 updateMessageOnAllMessages(_message.id, {
                   body: _message.body,
                   state: _message.state,
@@ -12462,18 +12479,18 @@ function watchForEvents() {
                   mentionedUsers: _message.mentionedUsers,
                   updatedAt: _message.updatedAt
                 });
-              case 264:
+              case 271:
                 if (!_channelExists8) {
-                  _context.next = 268;
+                  _context.next = 275;
                   break;
                 }
                 if (!(_channel9.lastMessage.id === _message.id)) {
-                  _context.next = 268;
+                  _context.next = 275;
                   break;
                 }
-                _context.next = 268;
+                _context.next = 275;
                 return effects.put(updateChannelLastMessageAC(_message, _channel9));
-              case 268:
+              case 275:
                 if (checkChannelExistsOnMessagesMap(_channel9.id)) {
                   updateMessageOnMap(_channel9.id, {
                     messageId: _message.id,
@@ -12481,36 +12498,36 @@ function watchForEvents() {
                   });
                 }
                 updateChannelOnAllChannels(_channel9.id, {}, _message);
-                return _context.abrupt("break", 455);
-              case 271:
+                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 = 279;
+                  _context.next = 286;
                   break;
                 }
-                _context.next = 278;
+                _context.next = 285;
                 return effects.put(addReactionToMessageAC(_message2, reaction, isSelf));
-              case 278:
+              case 285:
                 addReactionOnAllMessages(_message2, reaction, true);
-              case 279:
+              case 286:
                 if (!(_message2.user.id === SceytChatClient.user.id)) {
-                  _context.next = 297;
+                  _context.next = 304;
                   break;
                 }
                 if (!(!isSelf && Notification.permission === 'granted')) {
-                  _context.next = 292;
+                  _context.next = 299;
                   break;
                 }
                 if (!(document.visibilityState !== 'visible' || _channel0.id !== _activeChannelId9)) {
-                  _context.next = 292;
+                  _context.next = 299;
                   break;
                 }
-                _context.next = 284;
+                _context.next = 291;
                 return effects.select(contactsMapSelector);
-              case 284:
+              case 291:
                 _contactsMap = _context.sent;
                 _getFromContacts2 = getShowOnlyContactUsers();
                 _state = store.getState();
@@ -12530,9 +12547,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 292:
+              case 299:
                 if (!(_channel0.newReactions && _channel0.newReactions.length)) {
-                  _context.next = 296;
+                  _context.next = 303;
                   break;
                 }
                 channelUpdateParams = {
@@ -12542,9 +12559,9 @@ function watchForEvents() {
                   muted: _channel0.muted,
                   mutedTill: _channel0.mutedTill
                 };
-                _context.next = 296;
+                _context.next = 303;
                 return effects.put(updateChannelDataAC(_channel0.id, channelUpdateParams));
-              case 296:
+              case 303:
                 updateChannelOnAllChannels(_channel0.id, {
                   userMessageReactions: _channel0.newReactions,
                   lastReactedMessage: _message2,
@@ -12552,77 +12569,77 @@ function watchForEvents() {
                   muted: _channel0.muted,
                   mutedTill: _channel0.mutedTill
                 });
-              case 297:
+              case 304:
                 if (checkChannelExistsOnMessagesMap(_channel0.id)) {
                   addReactionToMessageOnMap(_channel0.id, _message2, reaction, true);
                 }
-                return _context.abrupt("break", 455);
-              case 299:
+                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 = 308;
+                  _context.next = 315;
                   break;
                 }
-                _context.next = 307;
+                _context.next = 314;
                 return effects.put(deleteReactionFromMessageAC(_message3, _reaction, _isSelf));
-              case 307:
+              case 314:
                 removeReactionOnAllMessages(_message3, _reaction, true);
-              case 308:
+              case 315:
                 _channelUpdateParams = JSON.parse(JSON.stringify(_channel1));
                 if (channelFromMap && channelFromMap.lastReactedMessage && channelFromMap.lastReactedMessage.id === _message3.id) {
                   _channelUpdateParams.lastReactedMessage = null;
                 }
-                _context.next = 312;
+                _context.next = 319;
                 return effects.put(updateChannelDataAC(_channel1.id, _channelUpdateParams));
-              case 312:
+              case 319:
                 updateChannelOnAllChannels(_channel1.id, _channelUpdateParams);
                 if (checkChannelExistsOnMessagesMap(_channel1.id)) {
                   removeReactionToMessageOnMap(_channel1.id, _message3, _reaction, true);
                 }
-                return _context.abrupt("break", 455);
-              case 315:
+                return _context.abrupt("break", 462);
+              case 322:
                 _channel10 = args.channel;
                 if (!_channel10) {
-                  _context.next = 321;
+                  _context.next = 328;
                   break;
                 }
                 _updatedChannel = JSON.parse(JSON.stringify(_channel10));
-                _context.next = 320;
+                _context.next = 327;
                 return effects.put(updateChannelDataAC(_channel10.id, _updatedChannel));
-              case 320:
+              case 327:
                 updateChannelOnAllChannels(_channel10.id, _updatedChannel);
-              case 321:
-                return _context.abrupt("break", 455);
-              case 322:
+              case 328:
+                return _context.abrupt("break", 462);
+              case 329:
                 _channel11 = args.channel;
                 log.info('CLEAR_HISTORY: ', _channel11);
-                _context.next = 326;
+                _context.next = 333;
                 return effects.call(getActiveChannelId);
-              case 326:
+              case 333:
                 _activeChannelId1 = _context.sent;
-                _context.next = 329;
+                _context.next = 336;
                 return effects.call(checkChannelExists, _channel11.id);
-              case 329:
+              case 336:
                 channelExist = _context.sent;
                 if (!(_channel11.id === _activeChannelId1)) {
-                  _context.next = 334;
+                  _context.next = 341;
                   break;
                 }
-                _context.next = 333;
+                _context.next = 340;
                 return effects.put(clearMessagesAC());
-              case 333:
+              case 340:
                 removeAllMessages();
-              case 334:
+              case 341:
                 removeMessagesFromMap(_channel11.id);
                 if (!channelExist) {
-                  _context.next = 338;
+                  _context.next = 345;
                   break;
                 }
-                _context.next = 338;
+                _context.next = 345;
                 return effects.put(updateChannelDataAC(_channel11.id, {
                   lastMessage: null,
                   newMessageCount: 0,
@@ -12630,7 +12647,7 @@ function watchForEvents() {
                   muted: _channel11.muted,
                   mutedTill: _channel11.mutedTill
                 }));
-              case 338:
+              case 345:
                 updateChannelOnAllChannels(_channel11.id, {
                   lastMessage: null,
                   newMessageCount: 0,
@@ -12638,173 +12655,173 @@ function watchForEvents() {
                   muted: _channel11.muted,
                   mutedTill: _channel11.mutedTill
                 });
-                return _context.abrupt("break", 455);
-              case 340:
+                return _context.abrupt("break", 462);
+              case 347:
                 _channel12 = args.channel;
                 log.info('channel MUTE ... ');
-                _context.next = 344;
+                _context.next = 351;
                 return effects.put(updateChannelDataAC(_channel12.id, {
                   muted: _channel12.muted,
                   mutedTill: _channel12.mutedTill
                 }));
-              case 344:
+              case 351:
                 updateChannelOnAllChannels(_channel12.id, {
                   muted: _channel12.muted,
                   mutedTill: _channel12.mutedTill
                 });
-                return _context.abrupt("break", 455);
-              case 346:
+                return _context.abrupt("break", 462);
+              case 353:
                 _channel13 = args.channel;
                 log.info('channel UNMUTE ... ');
-                _context.next = 350;
+                _context.next = 357;
                 return effects.put(updateChannelDataAC(_channel13.id, {
                   muted: _channel13.muted,
                   mutedTill: _channel13.mutedTill
                 }));
-              case 350:
+              case 357:
                 updateChannelOnAllChannels(_channel13.id, {
                   muted: _channel13.muted,
                   mutedTill: _channel13.mutedTill
                 });
-                return _context.abrupt("break", 455);
-              case 352:
+                return _context.abrupt("break", 462);
+              case 359:
                 _channel14 = args.channel;
                 log.info('channel PINED ... ');
-                _context.next = 356;
+                _context.next = 363;
                 return effects.put(updateChannelDataAC(_channel14.id, {
                   pinnedAt: _channel14.pinnedAt
                 }, true));
-              case 356:
+              case 363:
                 updateChannelOnAllChannels(_channel14.id, {
                   pinnedAt: _channel14.pinnedAt
                 });
-                return _context.abrupt("break", 455);
-              case 358:
+                return _context.abrupt("break", 462);
+              case 365:
                 _channel15 = args.channel;
                 log.info('channel UNPINED ... ');
-                _context.next = 362;
+                _context.next = 369;
                 return effects.put(updateChannelDataAC(_channel15.id, {
                   pinnedAt: _channel15.pinnedAt
                 }, false, true));
-              case 362:
+              case 369:
                 updateChannelOnAllChannels(_channel15.id, {
                   pinnedAt: _channel15.pinnedAt
                 });
-                return _context.abrupt("break", 455);
-              case 364:
+                return _context.abrupt("break", 462);
+              case 371:
                 _channel16 = args.channel;
                 log.info('channel HIDE ... ');
-                _context.next = 368;
+                _context.next = 375;
                 return effects.put(setChannelToHideAC(_channel16));
-              case 368:
-                return _context.abrupt("break", 455);
-              case 369:
+              case 375:
+                return _context.abrupt("break", 462);
+              case 376:
                 _channel17 = args.channel;
                 log.info('channel UNHIDE ... ');
-                _context.next = 373;
+                _context.next = 380;
                 return effects.put(setChannelToUnHideAC(_channel17));
-              case 373:
-                return _context.abrupt("break", 455);
-              case 374:
+              case 380:
+                return _context.abrupt("break", 462);
+              case 381:
                 _channel18 = args.channel;
-                _context.next = 377;
+                _context.next = 384;
                 return effects.put(updateChannelDataAC(_channel18.id, {
                   unread: _channel18.unread,
                   muted: _channel18.muted,
                   mutedTill: _channel18.mutedTill
                 }));
-              case 377:
+              case 384:
                 _groupName5 = getChannelGroupName(_channel18);
-                _context.next = 380;
+                _context.next = 387;
                 return effects.put(updateSearchedChannelDataAC(_channel18.id, {
                   unread: _channel18.unread
                 }, _groupName5));
-              case 380:
+              case 387:
                 updateChannelOnAllChannels(_channel18.id, {
                   unread: _channel18.unread
                 });
-                return _context.abrupt("break", 455);
-              case 382:
+                return _context.abrupt("break", 462);
+              case 389:
                 _channel19 = args.channel;
-                _context.next = 385;
+                _context.next = 392;
                 return effects.put(updateChannelDataAC(_channel19.id, {
                   unread: _channel19.unread,
                   muted: _channel19.muted,
                   mutedTill: _channel19.mutedTill
                 }));
-              case 385:
+              case 392:
                 _groupName6 = getChannelGroupName(_channel19);
-                _context.next = 388;
+                _context.next = 395;
                 return effects.put(updateSearchedChannelDataAC(_channel19.id, {
                   unread: _channel19.unread
                 }, _groupName6));
-              case 388:
+              case 395:
                 updateChannelOnAllChannels(_channel19.id, {
                   unread: _channel19.unread
                 });
-                return _context.abrupt("break", 455);
-              case 390:
+                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 = 395;
+                _context.next = 402;
                 return effects.call(getActiveChannelId);
-              case 395:
+              case 402:
                 _activeChannelId10 = _context.sent;
                 if (!(_channel20.id === _activeChannelId10)) {
-                  _context.next = 399;
+                  _context.next = 406;
                   break;
                 }
-                _context.next = 399;
+                _context.next = 406;
                 return effects.put(updateMembersAC(members));
-              case 399:
+              case 406:
                 i = 0;
-              case 400:
+              case 407:
                 if (!(i < members.length)) {
-                  _context.next = 408;
+                  _context.next = 415;
                   break;
                 }
                 if (!(members[i].id === SceytChatClient.user.id)) {
-                  _context.next = 405;
+                  _context.next = 412;
                   break;
                 }
-                _context.next = 404;
+                _context.next = 411;
                 return effects.put(updateChannelDataAC(_channel20.id, {
                   userRole: members[i].role,
                   muted: _channel20.muted,
                   mutedTill: _channel20.mutedTill
                 }));
-              case 404:
+              case 411:
                 updateChannelOnAllChannels(_channel20.id, {
                   userRole: members[i].role,
                   muted: _channel20.muted,
                   mutedTill: _channel20.mutedTill
                 });
-              case 405:
+              case 412:
                 i++;
-                _context.next = 400;
+                _context.next = 407;
                 break;
-              case 408:
-                return _context.abrupt("break", 455);
-              case 409:
+              case 415:
+                return _context.abrupt("break", 462);
+              case 416:
                 _channel21 = args.channel;
                 log.info('channel frozen  channel ... ', _channel21);
-                return _context.abrupt("break", 455);
-              case 412:
+                return _context.abrupt("break", 462);
+              case 419:
                 _channel22 = args.channel;
                 log.info('channel unfrozen  channel ... ', _channel22);
-                return _context.abrupt("break", 455);
-              case 415:
+                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 = 419;
+                  _context.next = 426;
                   break;
                 }
-                return _context.abrupt("break", 455);
-              case 419:
+                return _context.abrupt("break", 462);
+              case 426:
                 if (!(name === 'start_typing')) {
-                  _context.next = 427;
+                  _context.next = 434;
                   break;
                 }
                 if (!usersTimeout[_channelId2]) {
@@ -12816,27 +12833,27 @@ function watchForEvents() {
                 usersTimeout[_channelId2][from.id] = setTimeout(function () {
                   channelListener.onReceivedChannelEvent(_channelId2, from, 'stop_typing');
                 }, 5000);
-                _context.next = 425;
+                _context.next = 432;
                 return effects.put(switchTypingIndicatorAC(true, _channelId2, from));
-              case 425:
-                _context.next = 445;
+              case 432:
+                _context.next = 452;
                 break;
-              case 427:
+              case 434:
                 if (!(name === 'stop_typing')) {
-                  _context.next = 433;
+                  _context.next = 440;
                   break;
                 }
                 if (usersTimeout[_channelId2] && usersTimeout[_channelId2][from.id]) {
                   clearTimeout(usersTimeout[_channelId2][from.id]);
                 }
-                _context.next = 431;
+                _context.next = 438;
                 return effects.put(switchTypingIndicatorAC(false, _channelId2, from));
-              case 431:
-                _context.next = 445;
+              case 438:
+                _context.next = 452;
                 break;
-              case 433:
+              case 440:
                 if (!(name === 'start_recording')) {
-                  _context.next = 441;
+                  _context.next = 448;
                   break;
                 }
                 if (!usersTimeout[_channelId2]) {
@@ -12848,40 +12865,40 @@ function watchForEvents() {
                 usersTimeout[_channelId2][from.id] = setTimeout(function () {
                   channelListener.onReceivedChannelEvent(_channelId2, from, 'stop_recording');
                 }, 5000);
-                _context.next = 439;
+                _context.next = 446;
                 return effects.put(switchRecordingIndicatorAC(true, _channelId2, from));
-              case 439:
-                _context.next = 445;
+              case 446:
+                _context.next = 452;
                 break;
-              case 441:
+              case 448:
                 if (!(name === 'stop_recording')) {
-                  _context.next = 445;
+                  _context.next = 452;
                   break;
                 }
                 if (usersTimeout[_channelId2] && usersTimeout[_channelId2][from.id]) {
                   clearTimeout(usersTimeout[_channelId2][from.id]);
                 }
-                _context.next = 445;
+                _context.next = 452;
                 return effects.put(switchRecordingIndicatorAC(false, _channelId2, from));
-              case 445:
-                return _context.abrupt("break", 455);
-              case 446:
+              case 452:
+                return _context.abrupt("break", 462);
+              case 453:
                 status = args.status;
                 log.info('connection status changed . . . . . ', status);
-                _context.next = 450;
+                _context.next = 457;
                 return effects.put(setConnectionStatusAC(status));
-              case 450:
+              case 457:
                 if (!(status === CONNECTION_STATUS.CONNECTED)) {
-                  _context.next = 453;
+                  _context.next = 460;
                   break;
                 }
-                _context.next = 453;
+                _context.next = 460;
                 return effects.put(getRolesAC());
-              case 453:
-                return _context.abrupt("break", 455);
-              case 454:
+              case 460:
+                return _context.abrupt("break", 462);
+              case 461:
                 log.warn('UNHANDLED EVENT FROM REDUX-SAGA EVENT-CHANNEL');
-              case 455:
+              case 462:
               case "end":
                 return _context.stop();
             }
@@ -15530,7 +15547,7 @@ var handleUploadAttachments = function handleUploadAttachments(attachments, mess
               }
             });
           } else {
-            return Promise.resolve(customUpload(attachment, handleUploadProgress, handleUpdateLocalPath)).then(function (_customUpload) {
+            return Promise.resolve(customUpload(attachment, handleUploadProgress, message.type, handleUpdateLocalPath)).then(function (_customUpload) {
               uri = _customUpload;
             });
           }
@@ -16506,7 +16523,7 @@ function resendMessage(action) {
         messageAttachment.data = pendingAttachment.file;
         messageAttachment.url = pendingAttachment.file;
         _context6.next = 41;
-        return effects.call(customUpload, messageAttachment, handleUploadProgress, handleUpdateLocalPath);
+        return effects.call(customUpload, messageAttachment, handleUploadProgress, message.type, handleUpdateLocalPath);
       case 41:
         uri = _context6.sent;
       case 42:
@@ -17803,47 +17820,52 @@ function getMembers(action) {
   }, _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 effects.put(setMembersLoadingStateAC(LOADING_STATE.LOADING));
-      case 7:
-        _context2.next = 9;
+      case 8:
+        _context2.next = 10;
         return effects.call(membersQuery.loadNextPage);
-      case 9:
+      case 10:
         _yield$call2 = _context2.sent;
         members = _yield$call2.members;
-        _context2.next = 13;
+        _context2.next = 14;
         return effects.put(addMembersToListAC(members));
-      case 13:
-        _context2.next = 15;
+      case 14:
+        _context2.next = 16;
         return effects.put(setMembersLoadingStateAC(LOADING_STATE.LOADED));
-      case 15:
-        _context2.next = 17;
-        return updateActiveChannelMembersAdd(members);
-      case 17:
-        _context2.next = 22;
+      case 16:
+        _context2.next = 18;
+        return effects.call(updateActiveChannelMembersAdd, members) || {};
+      case 18:
+        updateChannelData = _context2.sent;
+        _context2.next = 21;
+        return effects.put(updateChannelDataAC(channelId, _extends({}, updateChannelData)));
+      case 21:
+        _context2.next = 26;
         break;
-      case 19:
-        _context2.prev = 19;
+      case 23:
+        _context2.prev = 23;
         _context2.t0 = _context2["catch"](0);
-      case 22:
+      case 26:
       case "end":
         return _context2.stop();
     }
-  }, _marked2$3, null, [[0, 19]]);
+  }, _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:
@@ -17855,7 +17877,7 @@ function addMembers(action) {
       case 5:
         channel = _context3.sent;
         if (!channel) {
-          _context3.next = 24;
+          _context3.next = 25;
           break;
         }
         membersToAdd = members.map(function (mem) {
@@ -17893,27 +17915,28 @@ function addMembers(action) {
           memberCount: channel.memberCount + addedMembers.length
         });
         _context3.next = 22;
-        return effects.put(updateChannelDataAC(channel.id, {
-          memberCount: channel.memberCount + addedMembers.length
-        }));
+        return effects.call(updateActiveChannelMembersAdd, addedMembers) || {};
       case 22:
-        _context3.next = 24;
-        return updateActiveChannelMembersAdd(addedMembers);
-      case 24:
-        _context3.next = 29;
+        updateChannelData = _context3.sent;
+        _context3.next = 25;
+        return effects.put(updateChannelDataAC(channel.id, _extends({
+          memberCount: channel.memberCount + addedMembers.length
+        }, updateChannelData)));
+      case 25:
+        _context3.next = 30;
         break;
-      case 26:
-        _context3.prev = 26;
+      case 27:
+        _context3.prev = 27;
         _context3.t0 = _context3["catch"](0);
         log.error('error on add members... ', _context3.t0);
-      case 29:
+      case 30:
       case "end":
         return _context3.stop();
     }
-  }, _marked3$2, null, [[0, 26]]);
+  }, _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:
@@ -17955,26 +17978,27 @@ function kickMemberFromChannel(action) {
           memberCount: channel.memberCount - removedMembers.length
         });
         _context4.next = 20;
-        return effects.put(updateChannelDataAC(channel.id, {
-          memberCount: channel.memberCount - removedMembers.length
-        }));
+        return effects.call(updateActiveChannelMembersRemove, removedMembers) || {};
       case 20:
-        _context4.next = 22;
-        return updateActiveChannelMembersRemove(removedMembers);
-      case 22:
-        _context4.next = 26;
+        updateChannelData = _context4.sent;
+        _context4.next = 23;
+        return effects.put(updateChannelDataAC(channel.id, _extends({
+          memberCount: channel.memberCount - removedMembers.length
+        }, updateChannelData)));
+      case 23:
+        _context4.next = 27;
         break;
-      case 24:
-        _context4.prev = 24;
+      case 25:
+        _context4.prev = 25;
         _context4.t0 = _context4["catch"](0);
-      case 26:
+      case 27:
       case "end":
         return _context4.stop();
     }
-  }, _marked4$2, null, [[0, 24]]);
+  }, _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:
@@ -17996,23 +18020,24 @@ function blockMember(action) {
           memberCount: channel.memberCount - removedMembers.length
         });
         _context5.next = 14;
-        return effects.put(updateChannelDataAC(channel.id, {
-          memberCount: channel.memberCount - removedMembers.length
-        }));
+        return effects.call(updateActiveChannelMembersRemove, removedMembers) || {};
       case 14:
-        _context5.next = 16;
-        return updateActiveChannelMembersRemove(removedMembers);
-      case 16:
-        _context5.next = 20;
+        updateChannelData = _context5.sent;
+        _context5.next = 17;
+        return effects.put(updateChannelDataAC(channel.id, _extends({
+          memberCount: channel.memberCount - removedMembers.length
+        }, updateChannelData)));
+      case 17:
+        _context5.next = 21;
         break;
-      case 18:
-        _context5.prev = 18;
+      case 19:
+        _context5.prev = 19;
         _context5.t0 = _context5["catch"](0);
-      case 20:
+      case 21:
       case "end":
         return _context5.stop();
     }
-  }, _marked5$2, null, [[0, 18]]);
+  }, _marked5$2, null, [[0, 19]]);
 }
 function changeMemberRole(action) {
   var payload, channelId, members, channel, updatedMembers;
@@ -19395,7 +19420,8 @@ var Channel = function Channel(_ref2) {
     onlineStatus = _useColor[THEME_COLORS.ONLINE_STATUS],
     backgroundFocused = _useColor[THEME_COLORS.BACKGROUND_FOCUSED],
     iconInactive = _useColor[THEME_COLORS.ICON_INACTIVE],
-    textOnPrimary = _useColor[THEME_COLORS.TEXT_ON_PRIMARY];
+    textOnPrimary = _useColor[THEME_COLORS.TEXT_ON_PRIMARY],
+    background = _useColor[THEME_COLORS.BACKGROUND];
   var dispatch = reactRedux.useDispatch();
   var ChatClient = getClient();
   var getFromContacts = getShowOnlyContactUsers();
@@ -19516,11 +19542,13 @@ var Channel = function Channel(_ref2) {
     textSize: channelAvatarTextSize || 16,
     setDefaultAvatar: isDirectChannel
   }), isDirectChannel && directChannelUser && hideUserPresence && (hideUserPresence(directChannelUser) ? '' : directChannelUser.presence && directChannelUser.presence.state === USER_PRESENCE_STATUS.ONLINE) && (/*#__PURE__*/React__default.createElement(UserStatus, {
-    backgroundColor: onlineStatus
+    backgroundColor: onlineStatus,
+    borderColor: background
   })))), /*#__PURE__*/React__default.createElement(ChannelInfo, {
     theme: theme,
     avatar: showAvatar,
     isMuted: channel.muted,
+    isPinned: !!channel.pinnedAt,
     statusWidth: statusWidth,
     uppercase: directChannelUser && hideUserPresence && hideUserPresence(directChannelUser),
     subjectFontSize: channelSubjectFontSize,
@@ -19607,7 +19635,7 @@ var Container$2 = styled__default.div(_templateObject$4 || (_templateObject$4 =
 var ChannelInfo = styled__default.div(_templateObject2$4 || (_templateObject2$4 = _taggedTemplateLiteralLoose(["\n  text-align: left;\n  margin-left: ", ";\n  width: 100%;\n  max-width: ", ";\n\n  h3 {\n    display: inline-block;\n    margin: 0;\n    font-size: ", ";\n    font-weight: 500;\n    text-overflow: ellipsis;\n    line-height: ", ";\n    letter-spacing: -0.2px;%;\n    max-width: ", ";\n    overflow: hidden;\n    white-space: nowrap;\n    color: ", ";\n    text-transform: ", ";\n  }\n"])), function (props) {
   return props.avatar && '12px';
 }, function (props) {
-  return props.avatarSize ? "calc(100% - " + (props.avatarSize + 52) + "px)" : 'calc(100% - 102px)';
+  return props.avatarSize ? "calc(100% - " + (props.avatarSize + 52) + "px)" : "calc(100% - " + (props.isPinned ? 92 : 72) + "px)";
 }, function (props) {
   return props.subjectFontSize || '15px';
 }, function (props) {
@@ -19632,8 +19660,10 @@ var LastMessage = styled__default.div(_templateObject4$3 || (_templateObject4$3
   return props.height || '20px';
 });
 var AvatarWrapper = styled__default.div(_templateObject5$2 || (_templateObject5$2 = _taggedTemplateLiteralLoose(["\n  display: flex;\n  align-items: center;\n  position: relative;\n"])));
-var UserStatus = styled__default.span(_templateObject6$1 || (_templateObject6$1 = _taggedTemplateLiteralLoose(["\n  position: absolute;\n  width: 14px;\n  height: 14px;\n  right: 0;\n  bottom: 0;\n  border-radius: 50%;\n  background-color: ", ";\n  border: 2.5px solid #ffffff;\n  box-sizing: border-box;\n"])), function (props) {
+var UserStatus = styled__default.span(_templateObject6$1 || (_templateObject6$1 = _taggedTemplateLiteralLoose(["\n  position: absolute;\n  width: 14px;\n  height: 14px;\n  right: 0;\n  bottom: 0;\n  border-radius: 50%;\n  background-color: ", ";\n  border: 2.5px solid ", ";\n  box-sizing: border-box;\n"])), function (props) {
   return props.backgroundColor || '#56E464';
+}, function (props) {
+  return props.borderColor || '#ffffff';
 });
 var DraftMessageTitle = styled__default.span(_templateObject7$1 || (_templateObject7$1 = _taggedTemplateLiteralLoose(["\n  color: ", ";\n"])), function (props) {
   return props.color;
@@ -19774,7 +19804,8 @@ var ContactItem = function ContactItem(_ref) {
   var _useColor = useColors(),
     textPrimary = _useColor[THEME_COLORS.TEXT_PRIMARY],
     online = _useColor[THEME_COLORS.ONLINE_STATUS],
-    backgroundHovered = _useColor[THEME_COLORS.BACKGROUND_HOVERED];
+    backgroundHovered = _useColor[THEME_COLORS.BACKGROUND_HOVERED],
+    background = _useColor[THEME_COLORS.BACKGROUND];
   var getFromContacts = getShowOnlyContactUsers();
   var contactUserName = makeUsername(contact, undefined, getFromContacts);
   return /*#__PURE__*/React__default.createElement(Container$3, {
@@ -19793,7 +19824,8 @@ var ContactItem = function ContactItem(_ref) {
     textSize: channelAvatarTextSize || 16,
     setDefaultAvatar: true
   }), hideUserPresence && (hideUserPresence(contact.user) ? '' : contact.user.presence && contact.user.presence.state === USER_PRESENCE_STATUS.ONLINE) && (/*#__PURE__*/React__default.createElement(UserStatus$1, {
-    backgroundColor: online
+    backgroundColor: online,
+    borderColor: background
   })))), /*#__PURE__*/React__default.createElement(ChannelInfo$1, {
     theme: theme,
     avatar: showAvatar,
@@ -19820,8 +19852,10 @@ var ChannelInfo$1 = styled__default.div(_templateObject2$6 || (_templateObject2$
   return props.subjectColor || props.textColor;
 });
 var AvatarWrapper$1 = styled__default.div(_templateObject3$4 || (_templateObject3$4 = _taggedTemplateLiteralLoose(["\n  display: flex;\n  align-items: center;\n  position: relative;\n"])));
-var UserStatus$1 = styled__default.span(_templateObject4$4 || (_templateObject4$4 = _taggedTemplateLiteralLoose(["\n  position: absolute;\n  width: 14px;\n  height: 14px;\n  right: 0;\n  bottom: 0;\n  border-radius: 50%;\n  background-color: ", ";\n  border: 2.5px solid #ffffff;\n  box-sizing: border-box;\n"])), function (props) {
+var UserStatus$1 = styled__default.span(_templateObject4$4 || (_templateObject4$4 = _taggedTemplateLiteralLoose(["\n  position: absolute;\n  width: 14px;\n  height: 14px;\n  right: 0;\n  bottom: 0;\n  border-radius: 50%;\n  background-color: ", ";\n  border: 2.5px solid ", ";\n  box-sizing: border-box;\n"])), function (props) {
   return props.backgroundColor || '#56E464';
+}, function (props) {
+  return props.borderColor || '#ffffff';
 });
 
 var _path$f;
@@ -23404,7 +23438,8 @@ function ForwardMessagePopup(_ref) {
       onClick: function onClick() {
         return handleChannelSelect(!isSelected, channel);
       },
-      disabled: selectedChannels.length >= 5 && !isSelected
+      disabled: selectedChannels.length >= 5 && !isSelected,
+      backgroundHover: backgroundHovered
     }, /*#__PURE__*/React__default.createElement(Avatar, {
       name: channel.subject || (isDirectChannel && directChannelUser ? directChannelUser.firstName || directChannelUser.id : ''),
       image: channel.avatarUrl || (isDirectChannel && directChannelUser ? directChannelUser.avatarUrl : ''),
@@ -23444,12 +23479,12 @@ function ForwardMessagePopup(_ref) {
     onClick: handleForwardMessage
   }, buttonText || 'Forward'))));
 }
-var ForwardChannelsCont = styled__default.div(_templateObject$l || (_templateObject$l = _taggedTemplateLiteralLoose(["\n  overflow-y: auto;\n  margin-top: 16px;\n  max-height: ", ";\n  padding-right: 22px;\n\n  &::-webkit-scrollbar {\n    width: 8px;\n    background: transparent;\n  }\n  &::-webkit-scrollbar-thumb {\n    background: transparent;\n  }\n\n  &.show-scrollbar::-webkit-scrollbar-thumb {\n    background: ", ";\n    border-radius: 4px;\n  }\n  &.show-scrollbar::-webkit-scrollbar-track {\n    background: transparent;\n  }\n"])), function (props) {
-  return "calc(100% - " + (props.selectedChannelsHeight + 64) + "px)";
+var ForwardChannelsCont = styled__default.div(_templateObject$l || (_templateObject$l = _taggedTemplateLiteralLoose(["\n  overflow-y: auto;\n  margin-top: 16px;\n  max-height: ", ";\n\n  &::-webkit-scrollbar {\n    width: 8px;\n    background: transparent;\n  }\n  &::-webkit-scrollbar-thumb {\n    background: transparent;\n  }\n\n  &.show-scrollbar::-webkit-scrollbar-thumb {\n    background: ", ";\n    border-radius: 4px;\n  }\n  &.show-scrollbar::-webkit-scrollbar-track {\n    background: transparent;\n  }\n"])), function (props) {
+  return "calc(100% - " + (props.selectedChannelsHeight + 82) + "px)";
 }, function (props) {
   return props.thumbColor;
 });
-var ChannelItem = styled__default.div(_templateObject2$i || (_templateObject2$i = _taggedTemplateLiteralLoose(["\n  display: flex;\n  align-items: center;\n  margin-bottom: 8px;\n  cursor: pointer;\n  &:hover {\n    background-color: ", ";\n  }\n  &:disabled {\n    cursor: not-allowed;\n    opacity: 0.5;\n  }\n"])), function (props) {
+var ChannelItem = styled__default.div(_templateObject2$i || (_templateObject2$i = _taggedTemplateLiteralLoose(["\n  display: flex;\n  align-items: center;\n  padding: 8px 12px;\n  cursor: pointer;\n  border-radius: 8px;\n  &:hover {\n    background-color: ", ";\n  }\n  &:disabled {\n    cursor: not-allowed;\n    opacity: 0.5;\n  }\n"])), function (props) {
   return props.backgroundHover;
 });
 var ChannelInfo$3 = styled__default.div(_templateObject3$e || (_templateObject3$e = _taggedTemplateLiteralLoose(["\n  margin-left: 12px;\n  margin-right: auto;\n  max-width: calc(100% - 74px);\n"])));
@@ -23652,9 +23687,11 @@ var SliderPopup = function SliderPopup(_ref) {
     mediaFiles = _ref.mediaFiles,
     currentMediaFile = _ref.currentMediaFile,
     allowEditDeleteIncomingMessage = _ref.allowEditDeleteIncomingMessage,
-    attachmentsPreview = _ref.attachmentsPreview;
+    attachmentsPreview = _ref.attachmentsPreview,
+    messageType = _ref.messageType;
   var _useColor = useColors(),
-    textOnPrimary = _useColor[THEME_COLORS.TEXT_ON_PRIMARY];
+    textOnPrimary = _useColor[THEME_COLORS.TEXT_ON_PRIMARY],
+    overlayBackground2 = _useColor[THEME_COLORS.OVERLAY_BACKGROUND_2];
   var dispatch = reactRedux.useDispatch();
   var getFromContacts = getShowOnlyContactUsers();
   var connectionStatus = reactRedux.useSelector(connectionStatusSelector);
@@ -23726,7 +23763,7 @@ var SliderPopup = function SliderPopup(_ref) {
     delete stateCopy[attachmentId];
     setDownloadingFilesMap(stateCopy);
   };
-  var handleDownloadFile = function handleDownloadFile(attachment) {
+  var handleDownloadFile = function handleDownloadFile(attachment, messageType) {
     if (attachment.id) {
       setDownloadingFilesMap(function (prevState) {
         var _extends3;
@@ -23744,7 +23781,7 @@ var SliderPopup = function SliderPopup(_ref) {
           uploadPercent: uploadPercent
         }, _extends4));
       });
-    });
+    }, messageType);
   };
   var handleClicks = function handleClicks(e) {
     if (!e.target.closest('.custom_carousel_item') && !e.target.closest('.custom_carousel_arrow')) {
@@ -23870,7 +23907,7 @@ var SliderPopup = function SliderPopup(_ref) {
           }
         } else {
           if (customDownloader) {
-            customDownloader(currentFile.url, false).then(function (url) {
+            customDownloader(currentFile.url, false, function () {}, messageType).then(function (url) {
               try {
                 return Promise.resolve(fetch(url)).then(function (response) {
                   setAttachmentToCache(currentFile.url, response);
@@ -23960,7 +23997,7 @@ var SliderPopup = function SliderPopup(_ref) {
           }
         } else {
           if (customDownloader) {
-            customDownloader(currentMediaFile.url, false).then(function (url) {
+            customDownloader(currentMediaFile.url, false, function () {}, messageType).then(function (url) {
               try {
                 return Promise.resolve(fetch(url)).then(function (response) {
                   setAttachmentToCache(currentMediaFile.url, response);
@@ -24018,7 +24055,7 @@ var SliderPopup = function SliderPopup(_ref) {
     color: textOnPrimary
   }, currentFile && currentFile.size && currentFile.size > 0 ? bytesToSize(currentFile.size, 1) : '')))), /*#__PURE__*/React__default.createElement(ActionsWrapper, null, /*#__PURE__*/React__default.createElement(IconWrapper, {
     onClick: function onClick() {
-      return handleDownloadFile(currentFile);
+      return handleDownloadFile(currentFile, messageType);
     },
     color: textOnPrimary
   }, currentFile && downloadingFilesMap[currentFile.id] ? (/*#__PURE__*/React__default.createElement(ProgressWrapper, null, /*#__PURE__*/React__default.createElement(reactCircularProgressbar.CircularProgressbar, {
@@ -24030,7 +24067,7 @@ var SliderPopup = function SliderPopup(_ref) {
     text: '',
     styles: {
       background: {
-        fill: 'transparent'
+        fill: overlayBackground2 + "40"
       },
       path: {
         stroke: textOnPrimary,
@@ -25188,8 +25225,9 @@ var VideoPreview = /*#__PURE__*/React.memo(function VideoPreview(_ref) {
     isDetailsView = _ref.isDetailsView,
     setVideoIsReadyToSend = _ref.setVideoIsReadyToSend;
   var _useColor = useColors(),
-    textPrimary = _useColor.textPrimary,
-    border = _useColor.border;
+    border = _useColor[THEME_COLORS.BORDER],
+    overlayBackground2 = _useColor[THEME_COLORS.OVERLAY_BACKGROUND_2],
+    textOnPrimary = _useColor[THEME_COLORS.TEXT_ON_PRIMARY];
   var _useState = React.useState(0),
     videoDuration = _useState[0],
     setVideoDuration = _useState[1];
@@ -25302,11 +25340,12 @@ var VideoPreview = /*#__PURE__*/React.memo(function VideoPreview(_ref) {
   React__default.createElement(VideoPlayButton, null, /*#__PURE__*/React__default.createElement(SvgPlayVideo, null))), /*#__PURE__*/React__default.createElement(VideoTime, {
     isDetailsView: isDetailsView,
     isRepliedMessage: isPreview || isRepliedMessage,
-    color: textPrimary
+    color: textOnPrimary,
+    messageTimeBackgroundColor: overlayBackground2
   }, !isRepliedMessage && !isPreview && /*#__PURE__*/React__default.createElement(SvgVideoCall, null), videoCurrentTime))));
 });
 var VideoControls = styled__default.div(_templateObject$s || (_templateObject$s = _taggedTemplateLiteralLoose(["\n  position: absolute;\n  left: 0;\n  width: 100%;\n  height: 100%;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n"])));
-var VideoTime = styled__default.div(_templateObject2$o || (_templateObject2$o = _taggedTemplateLiteralLoose(["\n  position: absolute;\n  top: ", ";\n  bottom: ", ";\n  left: ", ";\n  font-size: ", ";\n  display: flex;\n  align-items: center;\n  border-radius: 16px;\n  padding: ", ";\n  background-color: rgba(1, 1, 1, 0.3);\n  line-height: 14px;\n  color: ", ";\n\n  & > svg {\n    color: ", ";\n    margin-right: 4px;\n  }\n"])), function (props) {
+var VideoTime = styled__default.div(_templateObject2$o || (_templateObject2$o = _taggedTemplateLiteralLoose(["\n  position: absolute;\n  top: ", ";\n  bottom: ", ";\n  left: ", ";\n  font-size: ", ";\n  display: flex;\n  align-items: center;\n  border-radius: 16px;\n  padding: ", ";\n  background-color: ", ";\n  line-height: 14px;\n  color: ", ";\n\n  & > svg {\n    color: ", ";\n    margin-right: 4px;\n  }\n"])), function (props) {
   return props.isRepliedMessage ? '3px' : props.isDetailsView ? undefined : '8px';
 }, function (props) {
   return props.isDetailsView ? '8px' : undefined;
@@ -25316,6 +25355,8 @@ var VideoTime = styled__default.div(_templateObject2$o || (_templateObject2$o =
   return props.isRepliedMessage ? '10px' : '12px';
 }, function (props) {
   return props.isRepliedMessage ? '0 3px' : '4px 6px';
+}, function (props) {
+  return props.messageTimeBackgroundColor + "40";
 }, function (props) {
   return props.color;
 }, function (props) {
@@ -27459,7 +27500,8 @@ var Attachment = function Attachment(_ref) {
     imageAttachmentMaxWidth = _ref.imageAttachmentMaxWidth,
     imageAttachmentMaxHeight = _ref.imageAttachmentMaxHeight,
     videoAttachmentMaxWidth = _ref.videoAttachmentMaxWidth,
-    videoAttachmentMaxHeight = _ref.videoAttachmentMaxHeight;
+    videoAttachmentMaxHeight = _ref.videoAttachmentMaxHeight,
+    messageType = _ref.messageType;
   var _useColor = useColors(),
     accentColor = _useColor[THEME_COLORS.ACCENT],
     textPrimary = _useColor[THEME_COLORS.TEXT_PRIMARY],
@@ -27546,7 +27588,7 @@ var Attachment = function Attachment(_ref) {
     if (downloadIsCancelled) {
       setDownloadIsCancelled(false);
       if (customDownloader) {
-        customDownloader(attachment.url, false).then(function (url) {
+        customDownloader(attachment.url, false, function () {}, messageType).then(function (url) {
           downloadImage(url);
         });
       } else {
@@ -27616,7 +27658,7 @@ var Attachment = function Attachment(_ref) {
         loaded: progress.loaded || 0,
         total: progress.total || 0
       });
-    });
+    }, messageType);
   };
   var handleDeleteSelectedAttachment = function handleDeleteSelectedAttachment(attachmentTid) {
     if (removeSelected) {
@@ -27638,7 +27680,7 @@ var Attachment = function Attachment(_ref) {
               total: progress.total || 0
             });
             setProgress(uploadPercent);
-          });
+          }, messageType);
           setDownloadFilePromise(attachment.id, urlPromise);
           return Promise.resolve(urlPromise).then(function (result) {
             var url = URL.createObjectURL(result.Body);
@@ -27685,7 +27727,7 @@ var Attachment = function Attachment(_ref) {
               setIsCached(false);
               setDownloadingFile(true);
               if (customDownloader) {
-                customDownloader(attachment.url, false).then(function (url) {
+                customDownloader(attachment.url, false, function () {}, messageType).then(function (url) {
                   try {
                     downloadImage(url);
                     return Promise.resolve(fetch(url)).then(function (response) {
@@ -27729,7 +27771,7 @@ var Attachment = function Attachment(_ref) {
         log.info('error on get attachment url from cache. .. ', e);
         if (customDownloader) {
           setDownloadingFile(true);
-          customDownloader(attachment.url, false).then(function (url) {
+          customDownloader(attachment.url, false, function () {}, messageType).then(function (url) {
             try {
               return Promise.resolve(fetch(url)).then(function (response) {
                 setAttachmentToCache(attachment.url, response);
@@ -27836,7 +27878,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, {
@@ -27850,7 +27893,7 @@ var Attachment = function Attachment(_ref) {
     text: '',
     styles: {
       background: {
-        fill: overlayBackground2
+        fill: overlayBackground2 + "40"
       },
       path: {
         stroke: textOnPrimary,
@@ -27900,7 +27943,7 @@ var Attachment = function Attachment(_ref) {
     text: '',
     styles: {
       background: {
-        fill: overlayBackground2
+        fill: overlayBackground2 + "40"
       },
       path: {
         stroke: textOnPrimary,
@@ -27995,7 +28038,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(reactCircularProgressbar.CircularProgressbar, {
@@ -28007,7 +28050,7 @@ var Attachment = function Attachment(_ref) {
     text: '',
     styles: {
       background: {
-        fill: 'transparent'
+        fill: overlayBackground2 + "40"
       },
       path: {
         stroke: textOnPrimary,
@@ -28195,7 +28238,8 @@ var RepliedMessage = function RepliedMessage(_ref) {
       imageAttachmentMaxWidth: imageAttachmentMaxWidth,
       imageAttachmentMaxHeight: imageAttachmentMaxHeight,
       videoAttachmentMaxWidth: videoAttachmentMaxWidth,
-      videoAttachmentMaxHeight: videoAttachmentMaxHeight
+      videoAttachmentMaxHeight: videoAttachmentMaxHeight,
+      messageType: message.type
     });
   }), /*#__PURE__*/React__default.createElement(ReplyMessageBody, {
     rtlDirection: ownMessageOnRightSide && !message.incoming,
@@ -29145,7 +29189,8 @@ var MessageStatusAndTime = function MessageStatusAndTime(_ref) {
     accentColor = _useColor[THEME_COLORS.ACCENT],
     textSecondary = _useColor[THEME_COLORS.TEXT_SECONDARY],
     iconPrimary = _useColor[THEME_COLORS.ICON_PRIMARY],
-    textOnPrimary = _useColor[THEME_COLORS.TEXT_ON_PRIMARY];
+    textOnPrimary = _useColor[THEME_COLORS.TEXT_ON_PRIMARY],
+    overlayBackground2 = _useColor[THEME_COLORS.OVERLAY_BACKGROUND_2];
   return /*#__PURE__*/React__default.createElement(MessageStatusAndTimeContainer, {
     lineHeight: messageStatusAndTimeLineHeight,
     showOnlyOnHover: showMessageTimeAndStatusOnlyOnHover,
@@ -29157,7 +29202,8 @@ var MessageStatusAndTime = function MessageStatusAndTime(_ref) {
     bottomOfMessage: bottomOfMessage,
     marginBottom: marginBottom,
     className: 'message_status_time',
-    messageTimeColorOnAttachment: messageTimeColorOnAttachment || textOnPrimary
+    messageTimeColorOnAttachment: messageTimeColorOnAttachment || textOnPrimary,
+    messageTimeBackgroundColor: overlayBackground2
   }, message.state === MESSAGE_STATUS.EDIT ? (/*#__PURE__*/React__default.createElement(MessageStatusUpdated, {
     color: messageStateColor || textSecondary,
     fontSize: messageStateFontSize
@@ -29195,7 +29241,7 @@ var MessageStatusAndTimeContainer = styled__default.span(_templateObject3$o || (
 }, function (props) {
   return props.withAttachment && '4px 6px';
 }, function (props) {
-  return props.withAttachment && !props.fileAttachment && 'rgba(1, 1, 1, 0.3)';
+  return props.withAttachment && !props.fileAttachment && props.messageTimeBackgroundColor + "40";
 }, function (props) {
   return props.lineHeight || '14px';
 }, function (props) {
@@ -29211,7 +29257,7 @@ var MessageStatusAndTimeContainer = styled__default.span(_templateObject3$o || (
 }, function (props) {
   return props.bottomOfMessage && props.rtlDirection && 'flex-end';
 }, HiddenMessageTime, function (props) {
-  return props.fileAttachment ? props.statusColor : props.withAttachment ? props.messageTimeColorOnAttachment : '';
+  return props.withAttachment ? props.messageTimeColorOnAttachment : '';
 }, function (props) {
   return props.withAttachment && "\n    position: absolute;\n    z-index: 3;\n    right: " + (props.fileAttachment ? '6px' : '10px') + ";\n    bottom: " + (props.fileAttachment ? '9px' : '14px') + ";\n  ";
 });
@@ -29614,7 +29660,8 @@ var MessageBody = function MessageBody(_ref) {
       imageAttachmentMaxWidth: imageAttachmentMaxWidth,
       imageAttachmentMaxHeight: imageAttachmentMaxHeight,
       videoAttachmentMaxWidth: videoAttachmentMaxWidth,
-      videoAttachmentMaxHeight: videoAttachmentMaxHeight
+      videoAttachmentMaxHeight: videoAttachmentMaxHeight,
+      messageType: message.type
     });
   }), emojisPopupOpen && emojisPopupPosition && (/*#__PURE__*/React__default.createElement(EmojiContainer, {
     id: message.id + "_emoji_popup_container",
@@ -30295,7 +30342,7 @@ var Message$1 = function Message(_ref) {
     handleDeletePendingMessage: handleDeletePendingMessage,
     handleCreateChat: handleCreateChat,
     messageTextRef: messageTextRef,
-    messageTimeColorOnAttachment: messageTimeColorOnAttachment
+    messageTimeColorOnAttachment: messageTimeColorOnAttachment || textOnPrimary
   })), messageStatusAndTimePosition === 'bottomOfMessage' && (messageStatusVisible || messageTimeVisible) && (/*#__PURE__*/React__default.createElement(MessageStatusAndTime$1, {
     message: message,
     showMessageTimeAndStatusOnlyOnHover: showMessageTimeAndStatusOnlyOnHover,
@@ -34042,7 +34089,8 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     backgroundHovered = _useColor[THEME_COLORS.BACKGROUND_HOVERED],
     background = _useColor[THEME_COLORS.BACKGROUND],
     textFootnote = _useColor[THEME_COLORS.TEXT_FOOTNOTE],
-    highlightedBackground = _useColor[THEME_COLORS.HIGHLIGHTED_BACKGROUND];
+    highlightedBackground = _useColor[THEME_COLORS.HIGHLIGHTED_BACKGROUND],
+    textOnPrimary = _useColor[THEME_COLORS.TEXT_ON_PRIMARY];
   var dispatch = reactRedux.useDispatch();
   var ChatClient = getClient();
   var user = ChatClient.user;
@@ -35264,7 +35312,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     isRepliedMessage: true
   })) : messageForReply.attachments[0].type === attachmentTypes.file && (/*#__PURE__*/React__default.createElement(ReplyIconWrapper, {
     backgroundColor: accentColor,
-    iconColor: textPrimary
+    iconColor: textOnPrimary
   }, /*#__PURE__*/React__default.createElement(SvgChoseFile, null)))), /*#__PURE__*/React__default.createElement(ReplyMessageBody$1, null, /*#__PURE__*/React__default.createElement(EditReplyMessageHeader, {
     color: accentColor
   }, replyMessageIcon || /*#__PURE__*/React__default.createElement(SvgReplyIcon, null), " Reply to", /*#__PURE__*/React__default.createElement(UserName$1, null, user.id === messageForReply.user.id ? user.firstName ? user.firstName + " " + user.lastName : user.id : makeUsername(contactsMap[messageForReply.user.id], messageForReply.user, getFromContacts))), messageForReply.attachments && messageForReply.attachments.length ? messageForReply.attachments[0].type === attachmentTypes.voice ? 'Voice' : messageForReply.attachments[0].type === attachmentTypes.image ? (/*#__PURE__*/React__default.createElement(TextInOneLine, null, messageForReply.body || 'Photo')) : messageForReply.attachments[0].type === attachmentTypes.video ? (/*#__PURE__*/React__default.createElement(TextInOneLine, null, messageForReply.body || 'Video')) : (/*#__PURE__*/React__default.createElement(TextInOneLine, null, messageForReply.body || 'File')) : MessageTextFormat({
@@ -36519,7 +36567,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));
       }
     }
   };
@@ -36906,7 +36954,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 = reactRedux.useDispatch();
   var _useState = React.useState({}),
     downloadingFilesMap = _useState[0],
@@ -36990,7 +37039,7 @@ var Files = function Files(_ref) {
       text: '',
       styles: {
         background: {
-          fill: 'transparent'
+          fill: overlayBackground2 + "40"
         },
         path: {
           stroke: accentColor,
@@ -37205,7 +37254,8 @@ var VoiceItem = function VoiceItem(_ref) {
     voicePreviewPauseHoverIcon = _ref.voicePreviewPauseHoverIcon,
     voicePreviewTitleColor = _ref.voicePreviewTitleColor,
     voicePreviewDateAndTimeColor = _ref.voicePreviewDateAndTimeColor,
-    voicePreviewHoverBackgroundColor = _ref.voicePreviewHoverBackgroundColor;
+    voicePreviewHoverBackgroundColor = _ref.voicePreviewHoverBackgroundColor,
+    messageType = _ref.messageType;
   var _useColor = useColors(),
     textPrimary = _useColor[THEME_COLORS.TEXT_PRIMARY],
     textSecondary = _useColor[THEME_COLORS.TEXT_SECONDARY],
@@ -37272,7 +37322,7 @@ var VoiceItem = function VoiceItem(_ref) {
   }, [playingAudioId]);
   React.useEffect(function () {
     if (customDownloader) {
-      customDownloader(file.url, false).then(function (url) {
+      customDownloader(file.url, false, function () {}, messageType).then(function (url) {
         setFileUrl(url);
       });
     } else {
@@ -37977,7 +38027,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));