sceyt-chat-react-uikit 1.7.7-beta.6 → 1.7.7-beta.8

package/index.modern.js

@@ -9033,6 +9033,7 @@ var showChannelDetails = false;
 var channelTypesFilter = [];
 var memberCount = 10;
 var disableFrowardMentionsCount = false;
+var onUpdateChannel = function onUpdateChannel() {};
 var useInviteLink = false;
 var inviteLinkOptions = null;
 function setBaseUrlForInviteMembers(url) {
@@ -9147,6 +9148,12 @@ function setDisableFrowardMentionsCount(disable) {
 function getDisableFrowardMentionsCount() {
   return disableFrowardMentionsCount;
 }
+function setOnUpdateChannel(callback) {
+  onUpdateChannel = callback;
+}
+function getOnUpdateChannel() {
+  return onUpdateChannel;
+}
 var handleNewMessages;
 function setHandleNewMessages(callback) {
   handleNewMessages = callback;
@@ -14520,7 +14527,7 @@ function watchForEvents() {
           };
         });
         _loop = /*#__PURE__*/_regenerator().m(function _callee() {
-          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, activeChannelMessages, _iterator, _step, messageId, isPendingMessage, 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, _pollDetailsData$chan, _pollDetailsData$chan2, _channel1, pollDetails, _messageId, pollDetailsData, _activeChannelId0, addedVotes, deletedVotes, objs, _iterator2, _step2, vote, _iterator3, _step3, _vote, _i, _objs, obj, _store$getState$Messa, key, hasNext, _i2, _objs2, _obj, _pollDetailsData$chan3, _channel10, _pollDetails, _messageId2, _pollDetailsData, _activeChannelId1, _deletedVotes, _objs3, _iterator4, _step4, _vote2, _i3, _objs4, _obj2, _i4, _objs5, _obj3, _pollDetailsData2$cha, _channel11, _pollDetails2, _messageId3, _activeChannelId10, _pollDetailsData2, retractedVotes, _objs6, _iterator5, _step5, _vote4, _i5, _objs7, _obj4, _iterator6, _step6, _vote3, _channel12, _messageId4, _activeChannelId11, _obj5, _channel13, _user, _message3, _reaction, channelFromMap, _isSelf, _activeChannelId12, _channelUpdateParams, _channel14, _updatedChannel, _channel15, _activeChannelId13, channelExist, _channel16, _channel17, _channel18, _channel19, _channel20, _channel21, _channel22, _groupName5, _channel23, _groupName6, _channel24, members, _activeChannelId14, i, _channel25, _channel26, _channelId2, from, name, status, _t, _t2;
+          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, onUpdateChannel, updatedChannel, _channelExists5, subject, avatarUrl, muted, mutedTill, metadata, _channel5, fields, _activeChannelId4, _groupName3, _channel6, 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, _channel7, _activeChannelId6, updateLastMessage, markersMap, activeChannelMessages, _iterator, _step, messageId, isPendingMessage, lastMessage, _channelId, _channel8, _channel9, deletedMessage, _activeChannelId7, _channelExists7, _channel0, _message, _activeChannelId8, _channelExists8, _channel1, 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, _pollDetailsData$chan, _pollDetailsData$chan2, _channel10, pollDetails, _messageId, pollDetailsData, _activeChannelId0, addedVotes, deletedVotes, objs, _iterator2, _step2, vote, _iterator3, _step3, _vote, _i, _objs, obj, _store$getState$Messa, key, hasNext, _i2, _objs2, _obj, _pollDetailsData$chan3, _channel11, _pollDetails, _messageId2, _pollDetailsData, _activeChannelId1, _deletedVotes, _objs3, _iterator4, _step4, _vote2, _i3, _objs4, _obj2, _i4, _objs5, _obj3, _pollDetailsData2$cha, _channel12, _pollDetails2, _messageId3, _activeChannelId10, _pollDetailsData2, retractedVotes, _objs6, _iterator5, _step5, _vote4, _i5, _objs7, _obj4, _iterator6, _step6, _vote3, _channel13, _messageId4, _activeChannelId11, _obj5, _channel14, _user, _message3, _reaction, channelFromMap, _isSelf, _activeChannelId12, _channelUpdateParams, _channel15, _updatedChannel, _channel16, _activeChannelId13, channelExist, _channel17, _channel18, _channel19, _channel20, _channel21, _channel22, _channel23, _groupName5, _channel24, _groupName6, _channel25, members, _activeChannelId14, i, _channel26, _channel27, _channelId2, from, name, status, _t, _t2;
           return _regenerator().w(function (_context) {
             while (1) switch (_context.p = _context.n) {
               case 0:
@@ -14787,10 +14794,33 @@ function watchForEvents() {
                 });
                 return _context.a(3, 183);
               case 46:
+                onUpdateChannel = getOnUpdateChannel();
                 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;
+                _channel5 = getChannelFromMap(updatedChannel.id);
+                fields = [];
+                if (_channel5) {
+                  if (_channel5.subject !== subject) {
+                    fields.push('subject');
+                  }
+                  if (_channel5.avatarUrl !== avatarUrl) {
+                    fields.push('avatarUrl');
+                  }
+                  if (_channel5.muted !== muted) {
+                    fields.push('muted');
+                  }
+                  if (_channel5.mutedTill !== mutedTill) {
+                    fields.push('mutedTill');
+                  }
+                  if (_channel5.metadata !== isJSON(metadata) ? JSON.parse(metadata) : metadata) {
+                    fields.push('metadata');
+                  }
+                }
+                if (onUpdateChannel) {
+                  onUpdateChannel(updatedChannel, fields);
+                }
                 if (!_channelExists5) {
                   _context.n = 49;
                   break;
@@ -14834,18 +14864,18 @@ function watchForEvents() {
                 });
                 return _context.a(3, 183);
               case 51:
-                _channel5 = args.channel, message = args.message;
-                log.info('channel MESSAGE ... id : ', message.id, ', channel.id: ', _channel5.id);
-                messageToHandle = handleNewMessages ? handleNewMessages(message, _channel5) : message;
+                _channel6 = args.channel, message = args.message;
+                log.info('channel MESSAGE ... id : ', message.id, ', channel.id: ', _channel6.id);
+                messageToHandle = handleNewMessages ? handleNewMessages(message, _channel6) : message;
                 _channelFilterTypes = getChannelTypesFilter();
-                if (!(messageToHandle && _channel5 && (_channelFilterTypes !== null && _channelFilterTypes !== void 0 && _channelFilterTypes.length ? _channelFilterTypes.includes(_channel5.type) : true))) {
+                if (!(messageToHandle && _channel6 && (_channelFilterTypes !== null && _channelFilterTypes !== void 0 && _channelFilterTypes.length ? _channelFilterTypes.includes(_channel6.type) : true))) {
                   _context.n = 65;
                   break;
                 }
-                _channel5.metadata = isJSON(_channel5.metadata) ? JSON.parse(_channel5.metadata) : _channel5.metadata;
+                _channel6.metadata = isJSON(_channel6.metadata) ? JSON.parse(_channel6.metadata) : _channel6.metadata;
                 _activeChannelId5 = getActiveChannelId();
-                _channelExists6 = checkChannelExists(_channel5.id);
-                channelForAdd = JSON.parse(JSON.stringify(_channel5));
+                _channelExists6 = checkChannelExists(_channel6.id);
+                channelForAdd = JSON.parse(JSON.stringify(_channel6));
                 _context.n = 52;
                 return put(addChannelAC(channelForAdd));
               case 52:
@@ -14853,7 +14883,7 @@ function watchForEvents() {
                   _context.n = 53;
                   break;
                 }
-                setChannelInMap(_channel5);
+                setChannelInMap(_channel6);
                 _context.n = 54;
                 break;
               case 53:
@@ -14864,7 +14894,7 @@ function watchForEvents() {
                 _context.n = 54;
                 return put(updateChannelLastMessageAC(message, channelForAdd));
               case 54:
-                if (!(_channel5.id === _activeChannelId5)) {
+                if (!(_channel6.id === _activeChannelId5)) {
                   _context.n = 56;
                   break;
                 }
@@ -14884,9 +14914,9 @@ function watchForEvents() {
                 _context.n = 56;
                 return put(scrollToNewMessageAC(true, false, true));
               case 56:
-                addMessageToMap(_channel5.id, message);
+                addMessageToMap(_channel6.id, message);
                 _context.n = 57;
-                return put(updateChannelDataAC(_channel5.id, {
+                return put(updateChannelDataAC(_channel6.id, {
                   messageCount: channelForAdd.messageCount,
                   unread: channelForAdd.unread,
                   newMessageCount: channelForAdd.newMessageCount,
@@ -14902,9 +14932,9 @@ function watchForEvents() {
                   lastReactedMessage: null
                 }));
               case 57:
-                _groupName4 = getChannelGroupName(_channel5);
+                _groupName4 = getChannelGroupName(_channel6);
                 _context.n = 58;
-                return put(updateSearchedChannelDataAC(_channel5.id, {
+                return put(updateSearchedChannelDataAC(_channel6.id, {
                   messageCount: channelForAdd.messageCount,
                   unread: channelForAdd.unread,
                   newMessageCount: channelForAdd.newMessageCount,
@@ -14921,7 +14951,7 @@ function watchForEvents() {
                 }, _groupName4));
               case 58:
                 showNotifications = getShowNotifications();
-                if (!(showNotifications && !message.silent && message.user.id !== SceytChatClient.user.id && !_channel5.muted)) {
+                if (!(showNotifications && !message.silent && message.user.id !== SceytChatClient.user.id && !_channel6.muted)) {
                   _context.n = 61;
                   break;
                 }
@@ -14933,7 +14963,7 @@ function watchForEvents() {
                 return select(browserTabIsActiveSelector);
               case 59:
                 tabIsActive = _context.v;
-                if (!(document.visibilityState !== 'visible' || !tabIsActive || _channel5.id !== _activeChannelId5)) {
+                if (!(document.visibilityState !== 'visible' || !tabIsActive || _channel6.id !== _activeChannelId5)) {
                   _context.n = 61;
                   break;
                 }
@@ -14956,7 +14986,7 @@ function watchForEvents() {
                   accentColor: accentColor,
                   textSecondary: textSecondary
                 });
-                setNotification(messageBody, message.user, _channel5, undefined, message.attachments && message.attachments.length ? message.attachments.find(function (att) {
+                setNotification(messageBody, message.user, _channel6, undefined, message.attachments && message.attachments.length ? message.attachments.find(function (att) {
                   return att.type !== attachmentTypes.link;
                 }) : undefined);
               case 61:
@@ -14971,9 +15001,9 @@ function watchForEvents() {
                 break;
               case 63:
                 _context.n = 64;
-                return put(markMessagesAsDeliveredAC(_channel5.id, [message.id]));
+                return put(markMessagesAsDeliveredAC(_channel6.id, [message.id]));
               case 64:
-                updateChannelOnAllChannels(_channel5.id, {
+                updateChannelOnAllChannels(_channel6.id, {
                   messageCount: channelForAdd.messageCount,
                   unread: channelForAdd.unread,
                   newMessageCount: channelForAdd.newMessageCount,
@@ -14985,10 +15015,10 @@ function watchForEvents() {
                   lastMessage: channelForAdd.lastMessage,
                   messages: channelForAdd.messages,
                   newReactions: channelForAdd.newReactions,
-                  lastReactedMessage: _channel5.lastReactedMessage,
-                  userMessageReactions: _channel5.userMessageReactions
+                  lastReactedMessage: _channel6.lastReactedMessage,
+                  userMessageReactions: _channel6.userMessageReactions
                 });
-                updateChannelLastMessageOnAllChannels(_channel5.id, _channel5.lastMessage);
+                updateChannelLastMessageOnAllChannels(_channel6.id, _channel6.lastMessage);
               case 65:
                 return _context.a(3, 183);
               case 66:
@@ -14996,9 +15026,9 @@ function watchForEvents() {
                 _context.n = 67;
                 return call(getChannelFromMap, channelId);
               case 67:
-                _channel6 = _context.v;
-                log.info('channel MESSAGE_MARKERS_RECEIVED ... channel: ', _channel6, 'markers list: ', markerList);
-                if (!_channel6) {
+                _channel7 = _context.v;
+                log.info('channel MESSAGE_MARKERS_RECEIVED ... channel: ', _channel7, 'markers list: ', markerList);
+                if (!_channel7) {
                   _context.n = 78;
                   break;
                 }
@@ -15034,8 +15064,8 @@ function watchForEvents() {
                 }
               case 72:
                 markersMap[messageId] = true;
-                if (_channel6) {
-                  if (_channel6.lastMessage && messageId === _channel6.lastMessage.id) {
+                if (_channel7) {
+                  if (_channel7.lastMessage && messageId === _channel7.lastMessage.id) {
                     updateLastMessage = true;
                   }
                 }
@@ -15051,10 +15081,10 @@ function watchForEvents() {
                   _context.n = 75;
                   break;
                 }
-                lastMessage = _extends({}, _channel6.lastMessage, updateMessageDeliveryStatusAndMarkers(_channel6.lastMessage, markerList.name));
-                updateChannelLastMessageOnAllChannels(_channel6.id, lastMessage);
+                lastMessage = _extends({}, _channel7.lastMessage, updateMessageDeliveryStatusAndMarkers(_channel7.lastMessage, markerList.name));
+                updateChannelLastMessageOnAllChannels(_channel7.id, lastMessage);
                 _context.n = 75;
-                return put(updateChannelLastMessageStatusAC(lastMessage, _channel6));
+                return put(updateChannelLastMessageStatusAC(lastMessage, _channel7));
               case 75:
                 if (!(_activeChannelId6 === channelId)) {
                   _context.n = 77;
@@ -15065,7 +15095,7 @@ function watchForEvents() {
               case 76:
                 updateMarkersOnAllMessages(markersMap, markerList.name);
               case 77:
-                updateMessageStatusOnMap(_channel6.id, {
+                updateMessageStatusOnMap(_channel7.id, {
                   name: markerList.name,
                   markersMap: markersMap
                 });
@@ -15077,21 +15107,21 @@ function watchForEvents() {
               case 79:
                 _channelId = args.channelId;
                 log.info('channel DELETE ... ');
-                _channel7 = getChannelFromMap(_channelId);
+                _channel8 = getChannelFromMap(_channelId);
                 _context.n = 80;
-                return put(setChannelToRemoveAC(_channel7));
+                return put(setChannelToRemoveAC(_channel8));
               case 80:
                 deleteChannelFromAllChannels(_channelId);
                 return _context.a(3, 183);
               case 81:
-                _channel8 = args.channel, deletedMessage = args.deletedMessage;
+                _channel9 = args.channel, deletedMessage = args.deletedMessage;
                 _context.n = 82;
                 return call(getActiveChannelId);
               case 82:
                 _activeChannelId7 = _context.v;
                 log.info('channel DELETE_MESSAGE ... ');
-                _channelExists7 = checkChannelExists(_channel8.id);
-                if (!(_channel8.id === _activeChannelId7)) {
+                _channelExists7 = checkChannelExists(_channel9.id);
+                if (!(_channel9.id === _activeChannelId7)) {
                   _context.n = 83;
                   break;
                 }
@@ -15099,7 +15129,7 @@ function watchForEvents() {
                 _context.n = 83;
                 return put(updateMessageAC(deletedMessage.id, deletedMessage));
               case 83:
-                updateMessageOnMap(_channel8.id, {
+                updateMessageOnMap(_channel9.id, {
                   messageId: deletedMessage.id,
                   params: deletedMessage
                 });
@@ -15108,33 +15138,33 @@ function watchForEvents() {
                   break;
                 }
                 _context.n = 84;
-                return put(updateChannelDataAC(_channel8.id, {
-                  newMessageCount: _channel8.newMessageCount,
-                  muted: _channel8.muted,
-                  mutedTill: _channel8.mutedTill
+                return put(updateChannelDataAC(_channel9.id, {
+                  newMessageCount: _channel9.newMessageCount,
+                  muted: _channel9.muted,
+                  mutedTill: _channel9.mutedTill
                 }));
               case 84:
-                if (!(_channel8.lastMessage.id === deletedMessage.id)) {
+                if (!(_channel9.lastMessage.id === deletedMessage.id)) {
                   _context.n = 85;
                   break;
                 }
                 _context.n = 85;
-                return put(updateChannelLastMessageAC(deletedMessage, _channel8));
+                return put(updateChannelLastMessageAC(deletedMessage, _channel9));
               case 85:
-                updateChannelOnAllChannels(_channel8.id, {
-                  newMessageCount: _channel8.newMessageCount,
-                  muted: _channel8.muted,
-                  mutedTill: _channel8.mutedTill
+                updateChannelOnAllChannels(_channel9.id, {
+                  newMessageCount: _channel9.newMessageCount,
+                  muted: _channel9.muted,
+                  mutedTill: _channel9.mutedTill
                 }, deletedMessage);
                 return _context.a(3, 183);
               case 86:
-                _channel9 = args.channel, _message = args.message;
+                _channel0 = args.channel, _message = args.message;
                 _context.n = 87;
                 return call(getActiveChannelId);
               case 87:
                 _activeChannelId8 = _context.v;
-                _channelExists8 = checkChannelExists(_channel9.id);
-                if (!(_channel9.id === _activeChannelId8)) {
+                _channelExists8 = checkChannelExists(_channel0.id);
+                if (!(_channel0.id === _activeChannelId8)) {
                   _context.n = 89;
                   break;
                 }
@@ -15161,29 +15191,29 @@ function watchForEvents() {
                   _context.n = 90;
                   break;
                 }
-                if (!(_channel9.lastMessage.id === _message.id)) {
+                if (!(_channel0.lastMessage.id === _message.id)) {
                   _context.n = 90;
                   break;
                 }
                 _context.n = 90;
-                return put(updateChannelLastMessageAC(_message, _channel9));
+                return put(updateChannelLastMessageAC(_message, _channel0));
               case 90:
-                if (checkChannelExistsOnMessagesMap(_channel9.id)) {
-                  updateMessageOnMap(_channel9.id, {
+                if (checkChannelExistsOnMessagesMap(_channel0.id)) {
+                  updateMessageOnMap(_channel0.id, {
                     messageId: _message.id,
                     params: _message
                   });
                 }
-                updateChannelOnAllChannels(_channel9.id, {}, _message);
+                updateChannelOnAllChannels(_channel0.id, {}, _message);
                 return _context.a(3, 183);
               case 91:
-                _channel0 = args.channel, user = args.user, _message2 = args.message, reaction = args.reaction;
+                _channel1 = args.channel, user = args.user, _message2 = args.message, reaction = args.reaction;
                 isSelf = user.id === SceytChatClient.user.id;
                 _context.n = 92;
                 return call(getActiveChannelId);
               case 92:
                 _activeChannelId9 = _context.v;
-                if (!(_channel0.id === _activeChannelId9)) {
+                if (!(_channel1.id === _activeChannelId9)) {
                   _context.n = 94;
                   break;
                 }
@@ -15200,7 +15230,7 @@ function watchForEvents() {
                   _context.n = 96;
                   break;
                 }
-                if (!(document.visibilityState !== 'visible' || _channel0.id !== _activeChannelId9)) {
+                if (!(document.visibilityState !== 'visible' || _channel1.id !== _activeChannelId9)) {
                   _context.n = 96;
                   break;
                 }
@@ -15223,38 +15253,38 @@ function watchForEvents() {
                   accentColor: _accentColor,
                   textSecondary: _textSecondary
                 });
-                setNotification(_messageBody, reaction.user, _channel0, reaction.key, _message2.attachments && _message2.attachments.length ? _message2.attachments.find(function (att) {
+                setNotification(_messageBody, reaction.user, _channel1, reaction.key, _message2.attachments && _message2.attachments.length ? _message2.attachments.find(function (att) {
                   return att.type !== attachmentTypes.link;
                 }) : undefined);
               case 96:
-                if (!(_channel0.newReactions && _channel0.newReactions.length)) {
+                if (!(_channel1.newReactions && _channel1.newReactions.length)) {
                   _context.n = 97;
                   break;
                 }
                 channelUpdateParams = {
-                  userMessageReactions: _channel0.newReactions,
+                  userMessageReactions: _channel1.newReactions,
                   lastReactedMessage: _message2,
-                  newReactions: _channel0.newReactions,
-                  muted: _channel0.muted,
-                  mutedTill: _channel0.mutedTill
+                  newReactions: _channel1.newReactions,
+                  muted: _channel1.muted,
+                  mutedTill: _channel1.mutedTill
                 };
                 _context.n = 97;
-                return put(updateChannelDataAC(_channel0.id, channelUpdateParams));
+                return put(updateChannelDataAC(_channel1.id, channelUpdateParams));
               case 97:
-                updateChannelOnAllChannels(_channel0.id, {
-                  userMessageReactions: _channel0.newReactions,
+                updateChannelOnAllChannels(_channel1.id, {
+                  userMessageReactions: _channel1.newReactions,
                   lastReactedMessage: _message2,
-                  newReactions: _channel0.newReactions,
-                  muted: _channel0.muted,
-                  mutedTill: _channel0.mutedTill
+                  newReactions: _channel1.newReactions,
+                  muted: _channel1.muted,
+                  mutedTill: _channel1.mutedTill
                 });
               case 98:
-                if (checkChannelExistsOnMessagesMap(_channel0.id)) {
-                  addReactionToMessageOnMap(_channel0.id, _message2, reaction, true);
+                if (checkChannelExistsOnMessagesMap(_channel1.id)) {
+                  addReactionToMessageOnMap(_channel1.id, _message2, reaction, true);
                 }
                 return _context.a(3, 183);
               case 99:
-                _channel1 = args.channel, pollDetails = args.pollDetails, _messageId = args.messageId;
+                _channel10 = args.channel, pollDetails = args.pollDetails, _messageId = args.messageId;
                 pollDetailsData = pollDetails;
                 _context.n = 100;
                 return call(getActiveChannelId);
@@ -15316,7 +15346,7 @@ function watchForEvents() {
                   break;
                 }
                 _obj = _objs2[_i2];
-                updateMessageOnMap(_channel1.id, {
+                updateMessageOnMap(_channel10.id, {
                   messageId: _messageId,
                   params: {}
                 }, {
@@ -15324,7 +15354,7 @@ function watchForEvents() {
                   vote: _obj.vote,
                   incrementVotesPerOptionCount: _obj.incrementVotesPerOptionCount
                 });
-                if (!(_channel1.id === _activeChannelId0)) {
+                if (!(_channel10.id === _activeChannelId0)) {
                   _context.n = 107;
                   break;
                 }
@@ -15338,7 +15368,7 @@ function watchForEvents() {
               case 108:
                 return _context.a(3, 183);
               case 109:
-                _channel10 = args.channel, _pollDetails = args.pollDetails, _messageId2 = args.messageId;
+                _channel11 = args.channel, _pollDetails = args.pollDetails, _messageId2 = args.messageId;
                 _pollDetailsData = _pollDetails;
                 _context.n = 110;
                 return call(getActiveChannelId);
@@ -15379,11 +15409,11 @@ function watchForEvents() {
                   break;
                 }
                 _obj3 = _objs5[_i4];
-                updateMessageOnMap(_channel10.id, {
+                updateMessageOnMap(_channel11.id, {
                   messageId: _messageId2,
                   params: {}
                 }, _obj3);
-                if (!(_channel10.id === _activeChannelId1)) {
+                if (!(_channel11.id === _activeChannelId1)) {
                   _context.n = 115;
                   break;
                 }
@@ -15397,7 +15427,7 @@ function watchForEvents() {
               case 116:
                 return _context.a(3, 183);
               case 117:
-                _channel11 = args.channel, _pollDetails2 = args.pollDetails, _messageId3 = args.messageId;
+                _channel12 = args.channel, _pollDetails2 = args.pollDetails, _messageId3 = args.messageId;
                 _context.n = 118;
                 return call(getActiveChannelId);
               case 118:
@@ -15420,7 +15450,7 @@ function watchForEvents() {
                   break;
                 }
                 _obj4 = _objs7[_i5];
-                updateMessageOnMap(_channel11.id, {
+                updateMessageOnMap(_channel12.id, {
                   messageId: _messageId3,
                   params: {}
                 }, _obj4);
@@ -15441,7 +15471,7 @@ function watchForEvents() {
                 _context.n = 120;
                 break;
               case 122:
-                if (!(_channel11.id === _activeChannelId10)) {
+                if (!(_channel12.id === _activeChannelId10)) {
                   _context.n = 123;
                   break;
                 }
@@ -15455,7 +15485,7 @@ function watchForEvents() {
               case 124:
                 return _context.a(3, 183);
               case 125:
-                _channel12 = args.channel, _messageId4 = args.messageId;
+                _channel13 = args.channel, _messageId4 = args.messageId;
                 _context.n = 126;
                 return call(getActiveChannelId);
               case 126:
@@ -15464,11 +15494,11 @@ function watchForEvents() {
                   type: 'close',
                   incrementVotesPerOptionCount: 0
                 };
-                updateMessageOnMap(_channel12.id, {
+                updateMessageOnMap(_channel13.id, {
                   messageId: _messageId4,
                   params: {}
                 }, _obj5);
-                if (!(_channel12.id === _activeChannelId11)) {
+                if (!(_channel13.id === _activeChannelId11)) {
                   _context.n = 128;
                   break;
                 }
@@ -15480,15 +15510,15 @@ function watchForEvents() {
               case 128:
                 return _context.a(3, 183);
               case 129:
-                _channel13 = args.channel, _user = args.user, _message3 = args.message, _reaction = args.reaction;
-                log.info('channel REACTION_DELETED ... ', _channel13);
-                channelFromMap = getChannelFromMap(_channel13.id);
+                _channel14 = args.channel, _user = args.user, _message3 = args.message, _reaction = args.reaction;
+                log.info('channel REACTION_DELETED ... ', _channel14);
+                channelFromMap = getChannelFromMap(_channel14.id);
                 _isSelf = _user.id === SceytChatClient.user.id;
                 _context.n = 130;
                 return call(getActiveChannelId);
               case 130:
                 _activeChannelId12 = _context.v;
-                if (!(_channel13.id === _activeChannelId12)) {
+                if (!(_channel14.id === _activeChannelId12)) {
                   _context.n = 132;
                   break;
                 }
@@ -15497,54 +15527,54 @@ function watchForEvents() {
               case 131:
                 removeReactionOnAllMessages(_message3, _reaction, true);
               case 132:
-                _channelUpdateParams = JSON.parse(JSON.stringify(_channel13));
+                _channelUpdateParams = JSON.parse(JSON.stringify(_channel14));
                 if (channelFromMap && channelFromMap.lastReactedMessage && channelFromMap.lastReactedMessage.id === _message3.id) {
                   _channelUpdateParams.lastReactedMessage = null;
                 }
                 _context.n = 133;
-                return put(updateChannelDataAC(_channel13.id, _channelUpdateParams));
+                return put(updateChannelDataAC(_channel14.id, _channelUpdateParams));
               case 133:
-                updateChannelOnAllChannels(_channel13.id, _channelUpdateParams);
-                if (checkChannelExistsOnMessagesMap(_channel13.id)) {
-                  removeReactionToMessageOnMap(_channel13.id, _message3, _reaction, true);
+                updateChannelOnAllChannels(_channel14.id, _channelUpdateParams);
+                if (checkChannelExistsOnMessagesMap(_channel14.id)) {
+                  removeReactionToMessageOnMap(_channel14.id, _message3, _reaction, true);
                 }
                 return _context.a(3, 183);
               case 134:
-                _channel14 = args.channel;
-                if (!_channel14) {
+                _channel15 = args.channel;
+                if (!_channel15) {
                   _context.n = 136;
                   break;
                 }
-                _updatedChannel = JSON.parse(JSON.stringify(_channel14));
+                _updatedChannel = JSON.parse(JSON.stringify(_channel15));
                 _context.n = 135;
-                return put(updateChannelDataAC(_channel14.id, {
-                  lastMessage: _channel14.lastMessage,
-                  newMessageCount: _channel14.newMessageCount,
-                  newMentionCount: _channel14.newMentionCount,
-                  unread: _channel14.unread,
-                  newReactedMessageCount: _channel14.newReactedMessageCount,
-                  newReactions: _channel14.newReactions,
-                  lastReactedMessage: _channel14.lastReactedMessage,
-                  lastReceivedMsgId: _channel14.lastReceivedMsgId,
-                  lastDisplayedMessageId: _channel14.lastDisplayedMessageId,
-                  messageRetentionPeriod: _channel14.messageRetentionPeriod
+                return put(updateChannelDataAC(_channel15.id, {
+                  lastMessage: _channel15.lastMessage,
+                  newMessageCount: _channel15.newMessageCount,
+                  newMentionCount: _channel15.newMentionCount,
+                  unread: _channel15.unread,
+                  newReactedMessageCount: _channel15.newReactedMessageCount,
+                  newReactions: _channel15.newReactions,
+                  lastReactedMessage: _channel15.lastReactedMessage,
+                  lastReceivedMsgId: _channel15.lastReceivedMsgId,
+                  lastDisplayedMessageId: _channel15.lastDisplayedMessageId,
+                  messageRetentionPeriod: _channel15.messageRetentionPeriod
                 }));
               case 135:
-                updateChannelOnAllChannels(_channel14.id, _updatedChannel);
+                updateChannelOnAllChannels(_channel15.id, _updatedChannel);
               case 136:
                 return _context.a(3, 183);
               case 137:
-                _channel15 = args.channel;
-                log.info('CLEAR_HISTORY: ', _channel15);
+                _channel16 = args.channel;
+                log.info('CLEAR_HISTORY: ', _channel16);
                 _context.n = 138;
                 return call(getActiveChannelId);
               case 138:
                 _activeChannelId13 = _context.v;
                 _context.n = 139;
-                return call(checkChannelExists, _channel15.id);
+                return call(checkChannelExists, _channel16.id);
               case 139:
                 channelExist = _context.v;
-                if (!(_channel15.id === _activeChannelId13)) {
+                if (!(_channel16.id === _activeChannelId13)) {
                   _context.n = 141;
                   break;
                 }
@@ -15553,141 +15583,141 @@ function watchForEvents() {
               case 140:
                 removeAllMessages();
               case 141:
-                removeMessagesFromMap(_channel15.id);
+                removeMessagesFromMap(_channel16.id);
                 if (!channelExist) {
                   _context.n = 142;
                   break;
                 }
                 _context.n = 142;
-                return put(updateChannelDataAC(_channel15.id, {
+                return put(updateChannelDataAC(_channel16.id, {
                   lastMessage: null,
                   newMessageCount: 0,
                   newMentionCount: 0,
-                  muted: _channel15.muted,
-                  mutedTill: _channel15.mutedTill
+                  muted: _channel16.muted,
+                  mutedTill: _channel16.mutedTill
                 }));
               case 142:
-                updateChannelOnAllChannels(_channel15.id, {
+                updateChannelOnAllChannels(_channel16.id, {
                   lastMessage: null,
                   newMessageCount: 0,
                   newMentionCount: 0,
-                  muted: _channel15.muted,
-                  mutedTill: _channel15.mutedTill
+                  muted: _channel16.muted,
+                  mutedTill: _channel16.mutedTill
                 });
                 return _context.a(3, 183);
               case 143:
-                _channel16 = args.channel;
+                _channel17 = args.channel;
                 log.info('channel MUTE ... ');
                 _context.n = 144;
-                return put(updateChannelDataAC(_channel16.id, {
-                  muted: _channel16.muted,
-                  mutedTill: _channel16.mutedTill
+                return put(updateChannelDataAC(_channel17.id, {
+                  muted: _channel17.muted,
+                  mutedTill: _channel17.mutedTill
                 }));
               case 144:
-                updateChannelOnAllChannels(_channel16.id, {
-                  muted: _channel16.muted,
-                  mutedTill: _channel16.mutedTill
+                updateChannelOnAllChannels(_channel17.id, {
+                  muted: _channel17.muted,
+                  mutedTill: _channel17.mutedTill
                 });
                 return _context.a(3, 183);
               case 145:
-                _channel17 = args.channel;
+                _channel18 = args.channel;
                 log.info('channel UNMUTE ... ');
                 _context.n = 146;
-                return put(updateChannelDataAC(_channel17.id, {
-                  muted: _channel17.muted,
-                  mutedTill: _channel17.mutedTill
+                return put(updateChannelDataAC(_channel18.id, {
+                  muted: _channel18.muted,
+                  mutedTill: _channel18.mutedTill
                 }));
               case 146:
-                updateChannelOnAllChannels(_channel17.id, {
-                  muted: _channel17.muted,
-                  mutedTill: _channel17.mutedTill
+                updateChannelOnAllChannels(_channel18.id, {
+                  muted: _channel18.muted,
+                  mutedTill: _channel18.mutedTill
                 });
                 return _context.a(3, 183);
               case 147:
-                _channel18 = args.channel;
+                _channel19 = args.channel;
                 log.info('channel PINED ... ');
                 _context.n = 148;
-                return put(updateChannelDataAC(_channel18.id, {
-                  pinnedAt: _channel18.pinnedAt
+                return put(updateChannelDataAC(_channel19.id, {
+                  pinnedAt: _channel19.pinnedAt
                 }, true));
               case 148:
-                updateChannelOnAllChannels(_channel18.id, {
-                  pinnedAt: _channel18.pinnedAt
+                updateChannelOnAllChannels(_channel19.id, {
+                  pinnedAt: _channel19.pinnedAt
                 });
                 return _context.a(3, 183);
               case 149:
-                _channel19 = args.channel;
+                _channel20 = args.channel;
                 log.info('channel UNPINED ... ');
                 _context.n = 150;
-                return put(updateChannelDataAC(_channel19.id, {
-                  pinnedAt: _channel19.pinnedAt
+                return put(updateChannelDataAC(_channel20.id, {
+                  pinnedAt: _channel20.pinnedAt
                 }, false, true));
               case 150:
-                updateChannelOnAllChannels(_channel19.id, {
-                  pinnedAt: _channel19.pinnedAt
+                updateChannelOnAllChannels(_channel20.id, {
+                  pinnedAt: _channel20.pinnedAt
                 });
                 return _context.a(3, 183);
               case 151:
-                _channel20 = args.channel;
+                _channel21 = args.channel;
                 log.info('channel HIDE ... ');
                 _context.n = 152;
-                return put(setChannelToHideAC(_channel20));
+                return put(setChannelToHideAC(_channel21));
               case 152:
                 return _context.a(3, 183);
               case 153:
-                _channel21 = args.channel;
+                _channel22 = args.channel;
                 log.info('channel UNHIDE ... ');
                 _context.n = 154;
-                return put(setChannelToUnHideAC(_channel21));
+                return put(setChannelToUnHideAC(_channel22));
               case 154:
                 return _context.a(3, 183);
               case 155:
-                _channel22 = args.channel;
+                _channel23 = args.channel;
                 _context.n = 156;
-                return put(updateChannelDataAC(_channel22.id, {
-                  unread: _channel22.unread,
-                  muted: _channel22.muted,
-                  mutedTill: _channel22.mutedTill
+                return put(updateChannelDataAC(_channel23.id, {
+                  unread: _channel23.unread,
+                  muted: _channel23.muted,
+                  mutedTill: _channel23.mutedTill
                 }));
               case 156:
-                _groupName5 = getChannelGroupName(_channel22);
+                _groupName5 = getChannelGroupName(_channel23);
                 _context.n = 157;
-                return put(updateSearchedChannelDataAC(_channel22.id, {
-                  unread: _channel22.unread
+                return put(updateSearchedChannelDataAC(_channel23.id, {
+                  unread: _channel23.unread
                 }, _groupName5));
               case 157:
-                updateChannelOnAllChannels(_channel22.id, {
-                  unread: _channel22.unread
+                updateChannelOnAllChannels(_channel23.id, {
+                  unread: _channel23.unread
                 });
                 return _context.a(3, 183);
               case 158:
-                _channel23 = args.channel;
+                _channel24 = args.channel;
                 _context.n = 159;
-                return put(updateChannelDataAC(_channel23.id, {
-                  unread: _channel23.unread,
-                  muted: _channel23.muted,
-                  mutedTill: _channel23.mutedTill
+                return put(updateChannelDataAC(_channel24.id, {
+                  unread: _channel24.unread,
+                  muted: _channel24.muted,
+                  mutedTill: _channel24.mutedTill
                 }));
               case 159:
-                _groupName6 = getChannelGroupName(_channel23);
+                _groupName6 = getChannelGroupName(_channel24);
                 _context.n = 160;
-                return put(updateSearchedChannelDataAC(_channel23.id, {
-                  unread: _channel23.unread
+                return put(updateSearchedChannelDataAC(_channel24.id, {
+                  unread: _channel24.unread
                 }, _groupName6));
               case 160:
-                updateChannelOnAllChannels(_channel23.id, {
-                  unread: _channel23.unread
+                updateChannelOnAllChannels(_channel24.id, {
+                  unread: _channel24.unread
                 });
                 return _context.a(3, 183);
               case 161:
-                _channel24 = args.channel, members = args.members;
-                log.info('channel CHANGE_ROLE  channel ... ', _channel24);
+                _channel25 = args.channel, members = args.members;
+                log.info('channel CHANGE_ROLE  channel ... ', _channel25);
                 log.info('channel CHANGE_ROLE  member ... ', members);
                 _context.n = 162;
                 return call(getActiveChannelId);
               case 162:
                 _activeChannelId14 = _context.v;
-                if (!(_channel24.id === _activeChannelId14)) {
+                if (!(_channel25.id === _activeChannelId14)) {
                   _context.n = 163;
                   break;
                 }
@@ -15705,16 +15735,16 @@ function watchForEvents() {
                   break;
                 }
                 _context.n = 165;
-                return put(updateChannelDataAC(_channel24.id, {
+                return put(updateChannelDataAC(_channel25.id, {
                   userRole: members[i].role,
-                  muted: _channel24.muted,
-                  mutedTill: _channel24.mutedTill
+                  muted: _channel25.muted,
+                  mutedTill: _channel25.mutedTill
                 }));
               case 165:
-                updateChannelOnAllChannels(_channel24.id, {
+                updateChannelOnAllChannels(_channel25.id, {
                   userRole: members[i].role,
-                  muted: _channel24.muted,
-                  mutedTill: _channel24.mutedTill
+                  muted: _channel25.muted,
+                  mutedTill: _channel25.mutedTill
                 });
               case 166:
                 i++;
@@ -15723,12 +15753,12 @@ function watchForEvents() {
               case 167:
                 return _context.a(3, 183);
               case 168:
-                _channel25 = args.channel;
-                log.info('channel frozen  channel ... ', _channel25);
+                _channel26 = args.channel;
+                log.info('channel frozen  channel ... ', _channel26);
                 return _context.a(3, 183);
               case 169:
-                _channel26 = args.channel;
-                log.info('channel unfrozen  channel ... ', _channel26);
+                _channel27 = args.channel;
+                log.info('channel unfrozen  channel ... ', _channel27);
                 return _context.a(3, 183);
               case 170:
                 _channelId2 = args.channelId, from = args.from, name = args.name;
@@ -16064,7 +16094,7 @@ function createChannel(action) {
   }, _marked$2, null, [[0, 17]]);
 }
 function getChannels(action) {
-  var _params$filter, _types, _activeChannel, _mappedChannels, _mappedChannels3, _mappedChannels4, payload, params, SceytChatClient, connectionStatus, channelQueryBuilder, channelTypesFilter, types, limit, channelQuery, channelsData, channelList, channelId, activeChannel, _yield$call, mappedChannels, channelsForUpdateLastReactionMessage, _Object$keys, _mappedChannels2, channelMessageMap, _activeChannel2, _activeChannel3, hiddenList, allChannelsQueryBuilder, allChannelsQuery, hasNext, totalAllChannelsAdded, i, allChannelsData, allChannelList, _t2, _t3, _t4;
+  var _params$filter, _types, _activeChannel, _mappedChannels, _mappedChannels3, _mappedChannels4, payload, params, SceytChatClient, connectionStatus, channelQueryBuilder, channelTypesFilter, types, limit, channelQuery, channelsData, channelList, channelId, activeChannel, _yield$call, mappedChannels, channelsForUpdateLastReactionMessage, _Object$keys, _mappedChannels2, channelMessageMap, _activeChannel2, _activeChannel3, hiddenList, allChannelsQueryBuilder, allChannelsQuery, hasNext, totalAllChannelsAdded, i, _connectionStatus, allChannelsData, allChannelList, _t2, _t3, _t4;
   return _regenerator().w(function (_context2) {
     while (1) switch (_context2.p = _context2.n) {
       case 0:
@@ -16222,7 +16252,7 @@ function getChannels(action) {
         hiddenList = store.getState().ChannelReducer.hideChannelList;
         log.info('[getChannels] hiddenList state:', hiddenList);
         if (hiddenList) {
-          _context2.n = 27;
+          _context2.n = 28;
           break;
         }
         log.info('[getChannels] starting all channels query (hiddenList is false)');
@@ -16247,18 +16277,26 @@ function getChannels(action) {
         i = 0;
       case 19:
         if (!(i <= 4)) {
-          _context2.n = 26;
+          _context2.n = 27;
           break;
         }
         if (!hasNext) {
-          _context2.n = 24;
+          _context2.n = 25;
           break;
         }
         _context2.p = 20;
+        _connectionStatus = store.getState().UserReducer.connectionStatus;
+        if (!(_connectionStatus !== CONNECTION_STATUS.CONNECTED)) {
+          _context2.n = 21;
+          break;
+        }
+        log.warn('[getChannels] connection not ready, aborting. Status:', _connectionStatus);
+        return _context2.a(3, 27);
+      case 21:
         log.info('[getChannels] loading all channels page:', i + 1);
-        _context2.n = 21;
+        _context2.n = 22;
         return call(allChannelsQuery.loadNextPage);
-      case 21:
+      case 22:
         allChannelsData = _context2.v;
         hasNext = allChannelsData.hasNext;
         allChannelList = allChannelsData.channels;
@@ -16269,33 +16307,34 @@ function getChannels(action) {
         addChannelsToAllChannels(allChannelList);
         totalAllChannelsAdded += (allChannelList === null || allChannelList === void 0 ? void 0 : allChannelList.length) || 0;
         log.info('[getChannels] total all channels added so far:', totalAllChannelsAdded);
-        _context2.n = 23;
+        _context2.n = 24;
         break;
-      case 22:
-        _context2.p = 22;
+      case 23:
+        _context2.p = 23;
         _t3 = _context2.v;
         log.error(_t3, 'Error on get all channels page:', i + 1);
-      case 23:
-        _context2.n = 25;
-        break;
+        return _context2.a(3, 27);
       case 24:
-        log.info('[getChannels] no more pages available, stopping at iteration:', i);
+        _context2.n = 26;
+        break;
       case 25:
+        log.info('[getChannels] no more pages available, stopping at iteration:', i);
+      case 26:
         i++;
         _context2.n = 19;
         break;
-      case 26:
+      case 27:
         log.info('[getChannels] all channels query completed, total channels added:', totalAllChannelsAdded);
-        _context2.n = 28;
+        _context2.n = 29;
         break;
-      case 27:
-        log.info('[getChannels] skipping all channels query (hiddenList is true)');
       case 28:
+        log.info('[getChannels] skipping all channels query (hiddenList is true)');
+      case 29:
         log.info('[getChannels] completed successfully. Final mapped channels count:', ((_mappedChannels4 = mappedChannels) === null || _mappedChannels4 === void 0 ? void 0 : _mappedChannels4.length) || 0);
-        _context2.n = 30;
+        _context2.n = 31;
         break;
-      case 29:
-        _context2.p = 29;
+      case 30:
+        _context2.p = 30;
         _t4 = _context2.v;
         log.error('[getChannels] error occurred:', JSON.stringify(_t4), 'Error on get channels');
         log.error('[getChannels] error details:', {
@@ -16303,10 +16342,10 @@ function getChannels(action) {
           code: _t4.code,
           stack: _t4.stack
         });
-      case 30:
+      case 31:
         return _context2.a(2);
     }
-  }, _marked2$1, null, [[20, 22], [1, 29]]);
+  }, _marked2$1, null, [[20, 23], [1, 30]]);
 }
 function searchChannels(action) {
   var payload, params, contactsMap, SceytChatClient, getFromContacts, searchBy, _params$filter2, _types2, channelQueryBuilder, channelTypesFilter, types, allChannels, publicChannels, chatsGroups, contactsList, contactsWithChannelsMap, lowerCaseSearchBy, handleChannels, channelsMap, _iterator, _step, channel, channelQuery, channelsData, _iterator2, _step2, _channel, channelsToAdd, _t5;
@@ -16629,39 +16668,66 @@ function searchChannelsForForward(action) {
   }, _marked5, null, [[0, 7]]);
 }
 function channelsLoadMore(action) {
-  var payload, limit, channelQuery, channelsData, _yield$call3, mappedChannels, channelsForUpdateLastReactionMessage, channelMessageMap, _t8;
+  var _mappedChannels5, _mappedChannels7, _mappedChannels8, payload, limit, channelQuery, channelsData, channelList, _yield$call3, mappedChannels, channelsForUpdateLastReactionMessage, _Object$keys2, _mappedChannels6, channelMessageMap, _t8;
   return _regenerator().w(function (_context6) {
     while (1) switch (_context6.p = _context6.n) {
       case 0:
-        _context6.p = 0;
+        log.info('[channelsLoadMore] start load more channels');
+        _context6.p = 1;
         payload = action.payload;
         limit = payload.limit;
+        log.info('[channelsLoadMore] input payload:', JSON.stringify({
+          limit: limit
+        }));
         channelQuery = query.channelQuery;
+        log.info('[channelsLoadMore] channelQuery exists:', !!channelQuery);
+        if (channelQuery) {
+          _context6.n = 2;
+          break;
+        }
+        log.error('[channelsLoadMore] channelQuery is null or undefined, cannot load more');
+        return _context6.a(2);
+      case 2:
         if (limit) {
+          log.info('[channelsLoadMore] setting query limit to:', limit);
           channelQuery.limit = limit;
+        } else {
+          log.info('[channelsLoadMore] no limit provided, using existing query limit');
         }
-        _context6.n = 1;
+        _context6.n = 3;
         return put(setChannelsLoadingStateAC(LOADING_STATE.LOADING));
-      case 1:
-        _context6.n = 2;
+      case 3:
+        log.info('[channelsLoadMore] loading next page...');
+        _context6.n = 4;
         return call(channelQuery.loadNextPage);
-      case 2:
+      case 4:
         channelsData = _context6.v;
-        _context6.n = 3;
+        channelList = channelsData.channels;
+        log.info('[channelsLoadMore] channelsData received:', JSON.stringify({
+          channelsCount: (channelList === null || channelList === void 0 ? void 0 : channelList.length) || 0,
+          hasNext: channelsData.hasNext
+        }));
+        _context6.n = 5;
         return put(channelHasNextAC(channelsData.hasNext));
-      case 3:
-        _context6.n = 4;
+      case 5:
+        log.info('[channelsLoadMore] hasNext set to:', channelsData.hasNext);
+        _context6.n = 6;
         return call(setChannelsInMap, channelsData.channels);
-      case 4:
+      case 6:
         _yield$call3 = _context6.v;
         mappedChannels = _yield$call3.channels;
         channelsForUpdateLastReactionMessage = _yield$call3.channelsForUpdateLastReactionMessage;
-        if (!channelsForUpdateLastReactionMessage.length) {
-          _context6.n = 6;
+        log.info('[channelsLoadMore] setChannelsInMap result:', JSON.stringify({
+          mappedChannelsCount: ((_mappedChannels5 = mappedChannels) === null || _mappedChannels5 === void 0 ? void 0 : _mappedChannels5.length) || 0,
+          channelsForUpdateLastReactionMessageCount: (channelsForUpdateLastReactionMessage === null || channelsForUpdateLastReactionMessage === void 0 ? void 0 : channelsForUpdateLastReactionMessage.length) || 0
+        }));
+        if (!(channelsForUpdateLastReactionMessage !== null && channelsForUpdateLastReactionMessage !== void 0 && channelsForUpdateLastReactionMessage.length)) {
+          _context6.n = 8;
           break;
         }
+        log.info('[channelsLoadMore] processing channels for reaction message update:', channelsForUpdateLastReactionMessage === null || channelsForUpdateLastReactionMessage === void 0 ? void 0 : channelsForUpdateLastReactionMessage.length);
         channelMessageMap = {};
-        _context6.n = 5;
+        _context6.n = 7;
         return call(function () {
           try {
             return Promise.resolve(Promise.all(channelsForUpdateLastReactionMessage.map(function (channel) {
@@ -16669,9 +16735,10 @@ function channelsLoadMore(action) {
                 return Promise.resolve(new Promise(function (resolve) {
                   channel.getMessagesById([channel.newReactions[0].messageId]).then(function (messages) {
                     channelMessageMap[channel.id] = messages[0];
+                    log.info('[channelsLoadMore] successfully fetched reaction message for channel:', channel === null || channel === void 0 ? void 0 : channel.id);
                     resolve(true);
                   })["catch"](function (e) {
-                    log.error(e, 'Error on getMessagesById');
+                    log.error(e, 'Error on getMessagesById for channel:', channel === null || channel === void 0 ? void 0 : channel.id);
                     resolve(true);
                   });
                 }));
@@ -16683,30 +16750,43 @@ function channelsLoadMore(action) {
             return Promise.reject(e);
           }
         });
-      case 5:
+      case 7:
+        log.info('[channelsLoadMore] reaction messages fetched:', channelMessageMap ? (_Object$keys2 = Object.keys(channelMessageMap)) === null || _Object$keys2 === void 0 ? void 0 : _Object$keys2.length : 0);
         mappedChannels = mappedChannels.map(function (channel) {
           if (channelMessageMap[channel.id]) {
             channel.lastReactedMessage = channelMessageMap[channel.id];
           }
           return channel;
         });
-      case 6:
-        _context6.n = 7;
-        return put(addChannelsAC(mappedChannels));
-      case 7:
-        _context6.n = 8;
-        return put(setChannelsLoadingStateAC(LOADING_STATE.LOADED));
+        log.info('[channelsLoadMore] mappedChannels updated with reaction messages, final count:', ((_mappedChannels6 = mappedChannels) === null || _mappedChannels6 === void 0 ? void 0 : _mappedChannels6.length) || 0);
+        _context6.n = 9;
+        break;
       case 8:
+        log.info('[channelsLoadMore] no channels need reaction message update');
+      case 9:
+        log.info('[channelsLoadMore] adding channels to state, count:', ((_mappedChannels7 = mappedChannels) === null || _mappedChannels7 === void 0 ? void 0 : _mappedChannels7.length) || 0);
         _context6.n = 10;
+        return put(addChannelsAC(mappedChannels));
+      case 10:
+        _context6.n = 11;
+        return put(setChannelsLoadingStateAC(LOADING_STATE.LOADED));
+      case 11:
+        log.info('[channelsLoadMore] completed successfully. Total channels added:', ((_mappedChannels8 = mappedChannels) === null || _mappedChannels8 === void 0 ? void 0 : _mappedChannels8.length) || 0);
+        _context6.n = 13;
         break;
-      case 9:
-        _context6.p = 9;
+      case 12:
+        _context6.p = 12;
         _t8 = _context6.v;
-        log.error(_t8, 'Error in load more channels');
-      case 10:
+        log.error('[channelsLoadMore] error occurred:', _t8);
+        log.error('[channelsLoadMore] error details:', JSON.stringify({
+          message: _t8 === null || _t8 === void 0 ? void 0 : _t8.message,
+          code: _t8 === null || _t8 === void 0 ? void 0 : _t8.code,
+          stack: _t8 === null || _t8 === void 0 ? void 0 : _t8.stack
+        }));
+      case 13:
         return _context6.a(2);
     }
-  }, _marked6, null, [[0, 9]]);
+  }, _marked6, null, [[1, 12]]);
 }
 function getChannelMentions(action) {
   var payload, channelId, _SceytChatClient3, mentionsQueryBuilder, mentionsQuery, mentions, _t9;
@@ -17418,7 +17498,7 @@ function blockChannel(action) {
   }, _marked20, null, [[0, 5]]);
 }
 function updateChannel(action) {
-  var payload, channelId, config, _SceytChatClient6, channel, paramsToUpdate, fileToUpload, _yield$call5, subject, avatarUrl, metadata, _t22;
+  var payload, channelId, config, _SceytChatClient6, channel, paramsToUpdate, fileToUpload, _yield$call5, subject, avatarUrl, metadata, onUpdateChannel, _channel3, _channel4, _channel5, fields, updatedChannel, _t22;
   return _regenerator().w(function (_context21) {
     while (1) switch (_context21.p = _context21.n) {
       case 0:
@@ -17482,16 +17562,37 @@ function updateChannel(action) {
           avatarUrl: avatarUrl,
           metadata: isJSON(metadata) ? JSON.parse(metadata) : metadata
         });
-        _context21.n = 7;
-        break;
+        onUpdateChannel = getOnUpdateChannel();
+        if (!onUpdateChannel) {
+          _context21.n = 7;
+          break;
+        }
+        fields = [];
+        if (((_channel3 = channel) === null || _channel3 === void 0 ? void 0 : _channel3.subject) !== subject) {
+          fields.push('subject');
+        }
+        if (((_channel4 = channel) === null || _channel4 === void 0 ? void 0 : _channel4.avatarUrl) !== avatarUrl) {
+          fields.push('avatarUrl');
+        }
+        if (JSON.stringify((_channel5 = channel) === null || _channel5 === void 0 ? void 0 : _channel5.metadata) !== metadata) {
+          fields.push('metadata');
+        }
+        _context21.n = 6;
+        return call(getChannelFromMap, channelId);
       case 6:
-        _context21.p = 6;
+        updatedChannel = _context21.v;
+        onUpdateChannel(updatedChannel, fields);
+      case 7:
+        _context21.n = 9;
+        break;
+      case 8:
+        _context21.p = 8;
         _t22 = _context21.v;
         log.error('ERROR in update channel', _t22.message);
-      case 7:
+      case 9:
         return _context21.a(2);
     }
-  }, _marked21, null, [[0, 6]]);
+  }, _marked21, null, [[0, 8]]);
 }
 function checkUsersStatus() {
   var _SceytChatClient7, usersForUpdate, updatedUsers, usersToUpdateMap, update, updateData, _t23;
@@ -23318,7 +23419,8 @@ var SceytChat = function SceytChat(_ref) {
     disableFrowardMentionsCount = _ref$disableFrowardMe === void 0 ? false : _ref$disableFrowardMe,
     chatMinWidth = _ref.chatMinWidth,
     _ref$embeddedJoinGrou = _ref.embeddedJoinGroupPopup,
-    embeddedJoinGroupPopup = _ref$embeddedJoinGrou === void 0 ? false : _ref$embeddedJoinGrou;
+    embeddedJoinGroupPopup = _ref$embeddedJoinGrou === void 0 ? false : _ref$embeddedJoinGrou,
+    onUpdateChannel = _ref.onUpdateChannel;
   var useInviteLink = getUseInviteLink();
   var _useColor = useColors(),
     backgroundColor = _useColor[THEME_COLORS.BACKGROUND],
@@ -23561,6 +23663,11 @@ var SceytChat = function SceytChat(_ref) {
     onJoin: handleJoinChannel,
     channel: joinableChannel
   })) : null;
+  useEffect(function () {
+    if (onUpdateChannel) {
+      setOnUpdateChannel(onUpdateChannel);
+    }
+  }, [onUpdateChannel]);
   return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, SceytChatClient ? (/*#__PURE__*/React__default.createElement(ChatContainer, {
     onDrop: handleDropFile,
     onDragOver: handleDragOver,
@@ -23623,7 +23730,8 @@ var SceytChatContainer = function SceytChatContainer(_ref) {
       ResetLinkConfirmModal: {}
     } : _ref$inviteLinkOption,
     _ref$embeddedJoinGrou = _ref.embeddedJoinGroupPopup,
-    embeddedJoinGroupPopup = _ref$embeddedJoinGrou === void 0 ? false : _ref$embeddedJoinGrou;
+    embeddedJoinGroupPopup = _ref$embeddedJoinGrou === void 0 ? false : _ref$embeddedJoinGrou,
+    onUpdateChannel = _ref.onUpdateChannel;
   useEffect(function () {
     log.setLevel(logLevel);
     if (baseUrlForInviteMembers) {
@@ -23660,7 +23768,8 @@ var SceytChatContainer = function SceytChatContainer(_ref) {
     memberCount: memberCount,
     disableFrowardMentionsCount: disableFrowardMentionsCount,
     chatMinWidth: chatMinWidth,
-    embeddedJoinGroupPopup: embeddedJoinGroupPopup
+    embeddedJoinGroupPopup: embeddedJoinGroupPopup,
+    onUpdateChannel: onUpdateChannel
   }));
 };
 
@@ -32558,7 +32667,7 @@ var AudioPlayer = function AudioPlayer(_ref) {
               wavesurfer.current.seekTo(0);
               var audioDuration = wavesurfer.current.getDuration();
               setDuration(audioDuration);
-              setCurrentTime(formatAudioVideoTime(0));
+              setCurrentTime(formatAudioVideoTime(audioDuration));
               setCurrentTimeSeconds(0);
               if (playingAudioId === file.id) {
                 dispatch(setPlayingAudioIdAC(null));
@@ -35247,7 +35356,7 @@ var OGMetadata = function OGMetadata(_ref) {
         metadataGetSuccessCallback === null || metadataGetSuccessCallback === void 0 ? void 0 : metadataGetSuccessCallback(attachment === null || attachment === void 0 ? void 0 : attachment.url, false, false, metadata);
       }
     }
-  }, [metadataLoaded, oGMetadata, attachment === null || attachment === void 0 ? void 0 : attachment.url, metadata, showOGMetadata, showImage, metadataGetSuccessCallback]);
+  }, [metadataLoaded, oGMetadata, attachment === null || attachment === void 0 ? void 0 : attachment.url, metadata, showOGMetadata, showImage]);
   var elements = useMemo(function () {
     var _resolvedOrder$image, _metadata$og17, _metadata$og17$image, _metadata$og17$image$, _resolvedOrder$title, _metadata$og18, _metadata$og18$title, _resolvedOrder$descri, _metadata$og19, _metadata$og19$descri, _resolvedOrder$link;
     return [showImage ? {