sceyt-chat-react-uikit 1.7.5-beta.13 → 1.7.5-beta.14

package/index.js

@@ -14357,10 +14357,11 @@ 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, 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, pollDetails, messageId, _activeChannelId0, addedVotes, obj, _store$getState$Messa, key, hasNext, _iterator, _step, vote, _channel10, _pollDetails, _messageId, _activeChannelId1, deletedVotes, _iterator2, _step2, _vote, _channel11, _pollDetails2, _messageId2, _activeChannelId10, retractedVotes, _iterator3, _step3, _vote2, _channel12, _messageId3, _activeChannelId11, _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;
+          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, 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, pollDetails, messageId, _activeChannelId0, addedVotes, obj, _store$getState$Messa, key, hasNext, _iterator, _step, vote, _channel10, _pollDetails, _messageId, _activeChannelId1, deletedVotes, _iterator2, _step2, _vote, _channel11, _pollDetails2, _messageId2, _activeChannelId10, retractedVotes, _iterator3, _step3, _vote2, _channel12, _messageId3, _activeChannelId11, _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;
           return _regenerator().w(function (_context) {
-            while (1) switch (_context.n) {
+            while (1) switch (_context.p = _context.n) {
               case 0:
+                _context.p = 0;
                 _context.n = 1;
                 return effects.take(chan);
               case 1:
@@ -14368,7 +14369,7 @@ function watchForEvents() {
                 type = _yield$take.type;
                 args = _yield$take.args;
                 _t = type;
-                _context.n = _t === CHANNEL_EVENT_TYPES.CREATE ? 2 : _t === CHANNEL_EVENT_TYPES.JOIN ? 7 : _t === CHANNEL_EVENT_TYPES.LEAVE ? 9 : _t === CHANNEL_EVENT_TYPES.BLOCK ? 19 : _t === CHANNEL_EVENT_TYPES.UNBLOCK ? 21 : _t === CHANNEL_EVENT_TYPES.KICK_MEMBERS ? 22 : _t === CHANNEL_EVENT_TYPES.ADD_MEMBERS ? 33 : _t === CHANNEL_EVENT_TYPES.UPDATE_CHANNEL ? 43 : _t === CHANNEL_EVENT_TYPES.MESSAGE ? 48 : _t === CHANNEL_EVENT_TYPES.MESSAGE_MARKERS_RECEIVED ? 65 : _t === CHANNEL_EVENT_TYPES.DELETE ? 72 : _t === CHANNEL_EVENT_TYPES.DELETE_MESSAGE ? 74 : _t === CHANNEL_EVENT_TYPES.EDIT_MESSAGE ? 78 : _t === CHANNEL_EVENT_TYPES.REACTION_ADDED ? 82 : _t === CHANNEL_EVENT_TYPES.POLL_ADDED ? 89 : _t === CHANNEL_EVENT_TYPES.POLL_DELETED ? 94 : _t === CHANNEL_EVENT_TYPES.POLL_RETRACTED ? 99 : _t === CHANNEL_EVENT_TYPES.POLL_CLOSED ? 104 : _t === CHANNEL_EVENT_TYPES.REACTION_DELETED ? 107 : _t === CHANNEL_EVENT_TYPES.UNREAD_MESSAGES_INFO ? 111 : _t === CHANNEL_EVENT_TYPES.CLEAR_HISTORY ? 114 : _t === CHANNEL_EVENT_TYPES.MUTE ? 120 : _t === CHANNEL_EVENT_TYPES.UNMUTE ? 122 : _t === CHANNEL_EVENT_TYPES.PINED ? 124 : _t === CHANNEL_EVENT_TYPES.UNPINED ? 126 : _t === CHANNEL_EVENT_TYPES.HIDE ? 128 : _t === CHANNEL_EVENT_TYPES.UNHIDE ? 130 : _t === CHANNEL_EVENT_TYPES.CHANNEL_MARKED_AS_UNREAD ? 132 : _t === CHANNEL_EVENT_TYPES.CHANNEL_MARKED_AS_READ ? 135 : _t === CHANNEL_EVENT_TYPES.CHANGE_ROLE ? 138 : _t === CHANNEL_EVENT_TYPES.FROZEN ? 145 : _t === CHANNEL_EVENT_TYPES.UNFROZEN ? 146 : _t === CHANNEL_EVENT_TYPES.CHANNEL_EVENT ? 147 : _t === CONNECTION_EVENT_TYPES.CONNECTION_STATUS_CHANGED ? 156 : 159;
+                _context.n = _t === CHANNEL_EVENT_TYPES.CREATE ? 2 : _t === CHANNEL_EVENT_TYPES.JOIN ? 7 : _t === CHANNEL_EVENT_TYPES.LEAVE ? 9 : _t === CHANNEL_EVENT_TYPES.BLOCK ? 22 : _t === CHANNEL_EVENT_TYPES.UNBLOCK ? 24 : _t === CHANNEL_EVENT_TYPES.KICK_MEMBERS ? 25 : _t === CHANNEL_EVENT_TYPES.ADD_MEMBERS ? 36 : _t === CHANNEL_EVENT_TYPES.UPDATE_CHANNEL ? 46 : _t === CHANNEL_EVENT_TYPES.MESSAGE ? 51 : _t === CHANNEL_EVENT_TYPES.MESSAGE_MARKERS_RECEIVED ? 68 : _t === CHANNEL_EVENT_TYPES.DELETE ? 75 : _t === CHANNEL_EVENT_TYPES.DELETE_MESSAGE ? 77 : _t === CHANNEL_EVENT_TYPES.EDIT_MESSAGE ? 82 : _t === CHANNEL_EVENT_TYPES.REACTION_ADDED ? 87 : _t === CHANNEL_EVENT_TYPES.POLL_ADDED ? 95 : _t === CHANNEL_EVENT_TYPES.POLL_DELETED ? 101 : _t === CHANNEL_EVENT_TYPES.POLL_RETRACTED ? 107 : _t === CHANNEL_EVENT_TYPES.POLL_CLOSED ? 113 : _t === CHANNEL_EVENT_TYPES.REACTION_DELETED ? 117 : _t === CHANNEL_EVENT_TYPES.UNREAD_MESSAGES_INFO ? 122 : _t === CHANNEL_EVENT_TYPES.CLEAR_HISTORY ? 125 : _t === CHANNEL_EVENT_TYPES.MUTE ? 131 : _t === CHANNEL_EVENT_TYPES.UNMUTE ? 133 : _t === CHANNEL_EVENT_TYPES.PINED ? 135 : _t === CHANNEL_EVENT_TYPES.UNPINED ? 137 : _t === CHANNEL_EVENT_TYPES.HIDE ? 139 : _t === CHANNEL_EVENT_TYPES.UNHIDE ? 141 : _t === CHANNEL_EVENT_TYPES.CHANNEL_MARKED_AS_UNREAD ? 143 : _t === CHANNEL_EVENT_TYPES.CHANNEL_MARKED_AS_READ ? 146 : _t === CHANNEL_EVENT_TYPES.CHANGE_ROLE ? 149 : _t === CHANNEL_EVENT_TYPES.FROZEN ? 156 : _t === CHANNEL_EVENT_TYPES.UNFROZEN ? 157 : _t === CHANNEL_EVENT_TYPES.CHANNEL_EVENT ? 158 : _t === CONNECTION_EVENT_TYPES.CONNECTION_STATUS_CHANGED ? 167 : 170;
                 break;
               case 2:
                 createdChannel = args.createdChannel;
@@ -14402,7 +14403,7 @@ function watchForEvents() {
                   addChannelToAllChannels(createdChannel);
                 }
               case 6:
-                return _context.a(3, 160);
+                return _context.a(3, 171);
               case 7:
                 channel = args.channel;
                 log.info('channel JOIN ... . ', channel);
@@ -14413,7 +14414,7 @@ function watchForEvents() {
                 if (!_chan2) {
                   addChannelToAllChannels(channel);
                 }
-                return _context.a(3, 160);
+                return _context.a(3, 171);
               case 9:
                 _channel = args.channel, member = args.member;
                 log.info('channel LEAVE ... ', _channel, member);
@@ -14423,235 +14424,244 @@ function watchForEvents() {
               case 10:
                 _activeChannelId = _context.v;
                 if (!(member.id === SceytChatClient.user.id)) {
-                  _context.n = 12;
+                  _context.n = 15;
                   break;
                 }
                 _context.n = 11;
-                return effects.put(removeChannelAC(_channel.id));
+                return effects.put(switchChannelActionAC(null));
               case 11:
+                _context.n = 12;
+                return effects.put(removeChannelAC(_channel.id));
+              case 12:
                 removeChannelFromMap(_channel.id);
                 deleteChannelFromAllChannels(_channel.id);
-                _context.n = 18;
+                _context.n = 13;
+                return effects.put(setChannelToRemoveAC(_channel));
+              case 13:
+                _context.n = 14;
+                return effects.put(removeChannelCachesAC(_channel.id));
+              case 14:
+                _context.n = 21;
                 break;
-              case 12:
+              case 15:
                 groupName = getChannelGroupName(_channel);
                 if (!_channelExists) {
-                  _context.n = 16;
+                  _context.n = 19;
                   break;
                 }
                 updateChannelData = {};
                 if (!(_activeChannelId === _channel.id)) {
-                  _context.n = 15;
+                  _context.n = 18;
                   break;
                 }
-                _context.n = 13;
+                _context.n = 16;
                 return effects.put(removeMemberFromListAC([member]));
-              case 13:
-                _context.n = 14;
+              case 16:
+                _context.n = 17;
                 return effects.call(updateActiveChannelMembersRemove, [member]) || {};
-              case 14:
+              case 17:
                 updateChannelData = _context.v;
-              case 15:
-                _context.n = 16;
+              case 18:
+                _context.n = 19;
                 return effects.put(updateChannelDataAC(_channel.id, _extends({
                   memberCount: _channel.memberCount,
                   muted: _channel.muted,
                   mutedTill: _channel.mutedTill
                 }, updateChannelData)));
-              case 16:
-                _context.n = 17;
+              case 19:
+                _context.n = 20;
                 return effects.put(updateSearchedChannelDataAC(_channel.id, {
                   memberCount: _channel.memberCount,
                   muted: _channel.muted,
                   mutedTill: _channel.mutedTill
                 }, groupName));
-              case 17:
+              case 20:
                 updateChannelOnAllChannels(_channel.id, {
                   memberCount: _channel.memberCount,
                   muted: _channel.muted,
                   mutedTill: _channel.mutedTill
                 });
-              case 18:
-                return _context.a(3, 160);
-              case 19:
+              case 21:
+                return _context.a(3, 171);
+              case 22:
                 log.info('channel BLOCK ... ');
                 _channel2 = args.channel;
                 _channelExists2 = checkChannelExists(_channel2.id);
                 if (!_channelExists2) {
-                  _context.n = 20;
+                  _context.n = 23;
                   break;
                 }
-                _context.n = 20;
+                _context.n = 23;
                 return effects.put(removeChannelAC(_channel2.id));
-              case 20:
-                return _context.a(3, 160);
-              case 21:
+              case 23:
+                return _context.a(3, 171);
+              case 24:
                 log.info('channel UNBLOCK ... ');
-                return _context.a(3, 160);
-              case 22:
+                return _context.a(3, 171);
+              case 25:
                 _channel3 = args.channel, removedMembers = args.removedMembers;
                 log.info('channel KICK_MEMBERS ... ', removedMembers);
-                _context.n = 23;
+                _context.n = 26;
                 return effects.call(getActiveChannelId);
-              case 23:
+              case 26:
                 _activeChannelId2 = _context.v;
                 _channelExists3 = checkChannelExists(_channel3.id);
                 if (!_channelExists3) {
-                  _context.n = 32;
+                  _context.n = 35;
                   break;
                 }
                 if (!removedMembers.find(function (mem) {
                   return mem.id === SceytChatClient.user.id;
                 })) {
-                  _context.n = 27;
+                  _context.n = 30;
                   break;
                 }
                 removeChannelFromMap(_channel3.id);
-                _context.n = 24;
+                _context.n = 27;
                 return effects.put(removeChannelAC(_channel3.id));
-              case 24:
-                _context.n = 25;
+              case 27:
+                _context.n = 28;
                 return effects.call(getLastChannelFromMap);
-              case 25:
+              case 28:
                 activeChannel = _context.v;
                 if (!activeChannel) {
-                  _context.n = 26;
+                  _context.n = 29;
                   break;
                 }
-                _context.n = 26;
+                _context.n = 29;
                 return effects.put(switchChannelActionAC(JSON.parse(JSON.stringify(activeChannel))));
-              case 26:
-                _context.n = 32;
+              case 29:
+                _context.n = 35;
                 break;
-              case 27:
+              case 30:
                 _updateChannelData = {};
                 if (!(_activeChannelId2 === _channel3.id)) {
-                  _context.n = 30;
+                  _context.n = 33;
                   break;
                 }
-                _context.n = 28;
+                _context.n = 31;
                 return effects.put(removeMemberFromListAC(removedMembers));
-              case 28:
-                _context.n = 29;
+              case 31:
+                _context.n = 32;
                 return effects.call(updateActiveChannelMembersRemove, removedMembers) || {};
-              case 29:
+              case 32:
                 _updateChannelData = _context.v;
-              case 30:
+              case 33:
                 _groupName = getChannelGroupName(_channel3);
-                _context.n = 31;
+                _context.n = 34;
                 return effects.put(updateSearchedChannelDataAC(_channel3.id, {
                   memberCount: _channel3.memberCount,
                   muted: _channel3.muted,
                   mutedTill: _channel3.mutedTill
                 }, _groupName));
-              case 31:
-                _context.n = 32;
+              case 34:
+                _context.n = 35;
                 return effects.put(updateChannelDataAC(_channel3.id, _extends({
                   memberCount: _channel3.memberCount,
                   muted: _channel3.muted,
                   mutedTill: _channel3.mutedTill
                 }, _updateChannelData)));
-              case 32:
+              case 35:
                 updateChannelOnAllChannels(_channel3.id, {
                   memberCount: _channel3.memberCount,
                   muted: _channel3.muted,
                   mutedTill: _channel3.mutedTill
                 });
-                return _context.a(3, 160);
-              case 33:
+                return _context.a(3, 171);
+              case 36:
                 _channel4 = args.channel, addedMembers = args.addedMembers;
                 log.info('channel ADD_MEMBERS ... ', addedMembers);
-                _context.n = 34;
+                _context.n = 37;
                 return effects.call(getActiveChannelId);
-              case 34:
+              case 37:
                 _activeChannelId3 = _context.v;
                 _channelExists4 = checkChannelExists(_channel4.id);
                 if (!_channelExists4) {
-                  _context.n = 39;
+                  _context.n = 42;
                   break;
                 }
                 _updateChannelData2 = {};
                 if (!(_activeChannelId3 === _channel4.id)) {
-                  _context.n = 37;
+                  _context.n = 40;
                   break;
                 }
-                _context.n = 35;
+                _context.n = 38;
                 return effects.put(addMembersToListAC(addedMembers));
-              case 35:
-                _context.n = 36;
+              case 38:
+                _context.n = 39;
                 return effects.call(updateActiveChannelMembersAdd, addedMembers) || {};
-              case 36:
+              case 39:
                 _updateChannelData2 = _context.v;
-              case 37:
-                _context.n = 38;
+              case 40:
+                _context.n = 41;
                 return effects.put(updateChannelDataAC(_channel4.id, _extends({
                   memberCount: _channel4.memberCount,
                   muted: _channel4.muted,
                   mutedTill: _channel4.mutedTill
                 }, _updateChannelData2)));
-              case 38:
-                _context.n = 41;
+              case 41:
+                _context.n = 44;
                 break;
-              case 39:
-                _context.n = 40;
+              case 42:
+                _context.n = 43;
                 return effects.call(setChannelInMap, _channel4);
-              case 40:
-                _context.n = 41;
+              case 43:
+                _context.n = 44;
                 return effects.put(setAddedToChannelAC(JSON.parse(JSON.stringify(_channel4))));
-              case 41:
+              case 44:
                 _groupName2 = getChannelGroupName(_channel4);
-                _context.n = 42;
+                _context.n = 45;
                 return effects.put(updateSearchedChannelDataAC(_channel4.id, {
                   memberCount: _channel4.memberCount,
                   muted: _channel4.muted,
                   mutedTill: _channel4.mutedTill
                 }, _groupName2));
-              case 42:
+              case 45:
                 updateChannelOnAllChannels(_channel4.id, {
                   memberCount: _channel4.memberCount,
                   muted: _channel4.muted,
                   mutedTill: _channel4.mutedTill
                 });
-                return _context.a(3, 160);
-              case 43:
+                return _context.a(3, 171);
+              case 46:
                 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.n = 46;
+                  _context.n = 49;
                   break;
                 }
-                _context.n = 44;
+                _context.n = 47;
                 return effects.put(updateChannelDataAC(updatedChannel.id, {
                   subject: subject,
                   avatarUrl: avatarUrl,
                   muted: muted,
                   mutedTill: mutedTill
                 }));
-              case 44:
-                _context.n = 45;
+              case 47:
+                _context.n = 48;
                 return effects.call(getActiveChannelId);
-              case 45:
+              case 48:
                 _activeChannelId4 = _context.v;
                 if (!(_activeChannelId4 === updatedChannel.id)) {
-                  _context.n = 46;
+                  _context.n = 49;
                   break;
                 }
-                _context.n = 46;
+                _context.n = 49;
                 return effects.put(setActiveChannelAC(_extends({}, updatedChannel, {
                   metadata: isJSON(metadata) ? JSON.parse(metadata) : metadata
                 })));
-              case 46:
+              case 49:
                 _groupName3 = getChannelGroupName(updatedChannel);
-                _context.n = 47;
+                _context.n = 50;
                 return effects.put(updateSearchedChannelDataAC(updatedChannel.id, {
                   subject: subject,
                   avatarUrl: avatarUrl,
                   muted: muted,
                   mutedTill: mutedTill
                 }, _groupName3));
-              case 47:
+              case 50:
                 updateChannelOnAllChannels(updatedChannel.id, {
                   subject: subject,
                   avatarUrl: avatarUrl,
@@ -14659,67 +14669,67 @@ function watchForEvents() {
                   mutedTill: mutedTill,
                   metadata: isJSON(metadata) ? JSON.parse(metadata) : metadata
                 });
-                return _context.a(3, 160);
-              case 48:
+                return _context.a(3, 171);
+              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;
                 _channelFilterTypes = getChannelTypesFilter();
                 if (!(messageToHandle && _channel5 && (_channelFilterTypes !== null && _channelFilterTypes !== void 0 && _channelFilterTypes.length ? _channelFilterTypes.includes(_channel5.type) : true))) {
-                  _context.n = 64;
+                  _context.n = 67;
                   break;
                 }
                 _channel5.metadata = isJSON(_channel5.metadata) ? JSON.parse(_channel5.metadata) : _channel5.metadata;
-                _context.n = 49;
+                _context.n = 52;
                 return effects.call(getActiveChannelId);
-              case 49:
+              case 52:
                 _activeChannelId5 = _context.v;
                 _channelExists6 = checkChannelExists(_channel5.id);
                 channelForAdd = JSON.parse(JSON.stringify(_channel5));
-                _context.n = 50;
+                _context.n = 53;
                 return effects.put(addChannelAC(channelForAdd));
-              case 50:
+              case 53:
                 if (_channelExists6) {
-                  _context.n = 52;
+                  _context.n = 55;
                   break;
                 }
-                _context.n = 51;
+                _context.n = 54;
                 return effects.call(setChannelInMap, _channel5);
-              case 51:
-                _context.n = 53;
+              case 54:
+                _context.n = 56;
                 break;
-              case 52:
+              case 55:
                 if (message.repliedInThread) {
-                  _context.n = 53;
+                  _context.n = 56;
                   break;
                 }
-                _context.n = 53;
+                _context.n = 56;
                 return effects.put(updateChannelLastMessageAC(message, channelForAdd));
-              case 53:
+              case 56:
                 if (!(_channel5.id === _activeChannelId5)) {
-                  _context.n = 55;
+                  _context.n = 58;
                   break;
                 }
                 if (getHasNextCached()) {
-                  _context.n = 54;
+                  _context.n = 57;
                   break;
                 }
-                _context.n = 54;
+                _context.n = 57;
                 return effects.put(addMessageAC(message));
-              case 54:
+              case 57:
                 addAllMessages([message], MESSAGE_LOAD_DIRECTION.NEXT);
                 hasNextMessage = store.getState().MessageReducer.messagesHasNext;
                 if (!(!getHasNextCached() && !hasNextMessage)) {
-                  _context.n = 55;
+                  _context.n = 58;
                   break;
                 }
-                _context.n = 55;
+                _context.n = 58;
                 return effects.put(scrollToNewMessageAC(true, false, true));
-              case 55:
+              case 58:
                 if (getMessagesFromMap(_channel5.id) && getMessagesFromMap(_channel5.id).length) {
                   addMessageToMap(_channel5.id, message);
                 }
-                _context.n = 56;
+                _context.n = 59;
                 return effects.put(updateChannelDataAC(_channel5.id, {
                   messageCount: channelForAdd.messageCount,
                   unread: channelForAdd.unread,
@@ -14735,9 +14745,9 @@ function watchForEvents() {
                   userMessageReactions: [],
                   lastReactedMessage: null
                 }));
-              case 56:
+              case 59:
                 _groupName4 = getChannelGroupName(_channel5);
-                _context.n = 57;
+                _context.n = 60;
                 return effects.put(updateSearchedChannelDataAC(_channel5.id, {
                   messageCount: channelForAdd.messageCount,
                   unread: channelForAdd.unread,
@@ -14753,27 +14763,27 @@ function watchForEvents() {
                   userMessageReactions: [],
                   lastReactedMessage: null
                 }, _groupName4));
-              case 57:
+              case 60:
                 showNotifications = getShowNotifications();
                 if (!(showNotifications && !message.silent && message.user.id !== SceytChatClient.user.id && !_channel5.muted)) {
-                  _context.n = 60;
+                  _context.n = 63;
                   break;
                 }
                 if (!(Notification.permission === 'granted')) {
-                  _context.n = 60;
+                  _context.n = 63;
                   break;
                 }
-                _context.n = 58;
+                _context.n = 61;
                 return effects.select(browserTabIsActiveSelector);
-              case 58:
+              case 61:
                 tabIsActive = _context.v;
                 if (!(document.visibilityState !== 'visible' || !tabIsActive || _channel5.id !== _activeChannelId5)) {
-                  _context.n = 60;
+                  _context.n = 63;
                   break;
                 }
-                _context.n = 59;
+                _context.n = 62;
                 return effects.select(contactsMapSelector);
-              case 59:
+              case 62:
                 contactsMap = _context.v;
                 _getFromContacts = getShowOnlyContactUsers();
                 state = store.getState();
@@ -14793,20 +14803,20 @@ 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 60:
+              case 63:
                 if (!(message.repliedInThread && message.parentMessage.id)) {
-                  _context.n = 62;
+                  _context.n = 65;
                   break;
                 }
-                _context.n = 61;
+                _context.n = 64;
                 return effects.put(markMessagesAsDeliveredAC(message.parentMessage.id, [message.id]));
-              case 61:
-                _context.n = 63;
+              case 64:
+                _context.n = 66;
                 break;
-              case 62:
-                _context.n = 63;
+              case 65:
+                _context.n = 66;
                 return effects.put(markMessagesAsDeliveredAC(_channel5.id, [message.id]));
-              case 63:
+              case 66:
                 updateChannelOnAllChannels(_channel5.id, {
                   messageCount: channelForAdd.messageCount,
                   unread: channelForAdd.unread,
@@ -14823,22 +14833,22 @@ function watchForEvents() {
                   userMessageReactions: _channel5.userMessageReactions
                 });
                 updateChannelLastMessageOnAllChannels(_channel5.id, _channel5.lastMessage);
-              case 64:
-                return _context.a(3, 160);
-              case 65:
+              case 67:
+                return _context.a(3, 171);
+              case 68:
                 channelId = args.channelId, markerList = args.markerList;
-                _context.n = 66;
+                _context.n = 69;
                 return effects.call(getChannelFromMap, channelId);
-              case 66:
+              case 69:
                 _channel6 = _context.v;
                 log.info('channel MESSAGE_MARKERS_RECEIVED ... channel: ', _channel6, 'markers list: ', markerList);
                 if (!_channel6) {
-                  _context.n = 71;
+                  _context.n = 74;
                   break;
                 }
-                _context.n = 67;
+                _context.n = 70;
                 return effects.call(getActiveChannelId);
-              case 67:
+              case 70:
                 _activeChannelId6 = _context.v;
                 updateLastMessage = false;
                 markersMap = {};
@@ -14868,92 +14878,98 @@ function watchForEvents() {
                   });
                 });
                 if (!updateLastMessage) {
-                  _context.n = 68;
+                  _context.n = 71;
                   break;
                 }
                 lastMessage = _extends({}, _channel6.lastMessage, {
                   deliveryStatus: markerList.name
                 });
                 updateChannelLastMessageOnAllChannels(_channel6.id, lastMessage);
-                _context.n = 68;
+                _context.n = 71;
                 return effects.put(updateChannelLastMessageStatusAC(lastMessage, _channel6));
-              case 68:
+              case 71:
                 if (!(_activeChannelId6 === channelId)) {
-                  _context.n = 70;
+                  _context.n = 73;
                   break;
                 }
-                _context.n = 69;
+                _context.n = 72;
                 return effects.put(updateMessagesStatusAC(markerList.name, markersMap));
-              case 69:
+              case 72:
                 updateMarkersOnAllMessages(markersMap, markerList.name);
-              case 70:
+              case 73:
                 updateMessageStatusOnMap(_channel6.id, {
                   name: markerList.name,
                   markersMap: markersMap
                 });
-                _context.n = 71;
+                _context.n = 74;
                 return effects.put(updateMessagesMarkersAC(channelId, markerList.name, markerList));
-              case 71:
-                return _context.a(3, 160);
-              case 72:
+              case 74:
+                return _context.a(3, 171);
+              case 75:
                 _channelId = args.channelId;
                 log.info('channel DELETE ... ');
                 _channel7 = getChannelFromMap(_channelId);
-                _context.n = 73;
+                _context.n = 76;
                 return effects.put(setChannelToRemoveAC(_channel7));
-              case 73:
+              case 76:
                 deleteChannelFromAllChannels(_channelId);
-                return _context.a(3, 160);
-              case 74:
+                return _context.a(3, 171);
+              case 77:
                 _channel8 = args.channel, deletedMessage = args.deletedMessage;
-                _activeChannelId7 = getActiveChannelId();
+                _context.n = 78;
+                return effects.call(getActiveChannelId);
+              case 78:
+                _activeChannelId7 = _context.v;
                 log.info('channel DELETE_MESSAGE ... ');
                 _channelExists7 = checkChannelExists(_channel8.id);
                 if (!(_channel8.id === _activeChannelId7)) {
-                  _context.n = 75;
+                  _context.n = 79;
                   break;
                 }
                 updateMessageOnAllMessages(deletedMessage.id, deletedMessage);
-                _context.n = 75;
+                _context.n = 79;
                 return effects.put(updateMessageAC(deletedMessage.id, deletedMessage));
-              case 75:
+              case 79:
                 updateMessageOnMap(_channel8.id, {
                   messageId: deletedMessage.id,
                   params: deletedMessage
                 });
                 if (!_channelExists7) {
-                  _context.n = 77;
+                  _context.n = 81;
                   break;
                 }
-                _context.n = 76;
+                _context.n = 80;
                 return effects.put(updateChannelDataAC(_channel8.id, {
                   newMessageCount: _channel8.newMessageCount,
                   muted: _channel8.muted,
                   mutedTill: _channel8.mutedTill
                 }));
-              case 76:
+              case 80:
                 if (!(_channel8.lastMessage.id === deletedMessage.id)) {
-                  _context.n = 77;
+                  _context.n = 81;
                   break;
                 }
-                _context.n = 77;
+                _context.n = 81;
                 return effects.put(updateChannelLastMessageAC(deletedMessage, _channel8));
-              case 77:
+              case 81:
                 updateChannelOnAllChannels(_channel8.id, {
                   newMessageCount: _channel8.newMessageCount,
                   muted: _channel8.muted,
                   mutedTill: _channel8.mutedTill
                 }, deletedMessage);
-                return _context.a(3, 160);
-              case 78:
+                return _context.a(3, 171);
+              case 82:
                 _channel9 = args.channel, _message = args.message;
-                _activeChannelId8 = getActiveChannelId();
+                _context.n = 83;
+                return effects.call(getActiveChannelId);
+              case 83:
+                _activeChannelId8 = _context.v;
                 _channelExists8 = checkChannelExists(_channel9.id);
                 if (!(_channel9.id === _activeChannelId8)) {
-                  _context.n = 80;
+                  _context.n = 85;
                   break;
                 }
-                _context.n = 79;
+                _context.n = 84;
                 return effects.put(updateMessageAC(_message.id, {
                   body: _message.body,
                   state: _message.state,
@@ -14962,7 +14978,7 @@ function watchForEvents() {
                   mentionedUsers: _message.mentionedUsers,
                   updatedAt: _message.updatedAt
                 }));
-              case 79:
+              case 84:
                 updateMessageOnAllMessages(_message.id, {
                   body: _message.body,
                   state: _message.state,
@@ -14971,18 +14987,18 @@ function watchForEvents() {
                   mentionedUsers: _message.mentionedUsers,
                   updatedAt: _message.updatedAt
                 });
-              case 80:
+              case 85:
                 if (!_channelExists8) {
-                  _context.n = 81;
+                  _context.n = 86;
                   break;
                 }
                 if (!(_channel9.lastMessage.id === _message.id)) {
-                  _context.n = 81;
+                  _context.n = 86;
                   break;
                 }
-                _context.n = 81;
+                _context.n = 86;
                 return effects.put(updateChannelLastMessageAC(_message, _channel9));
-              case 81:
+              case 86:
                 if (checkChannelExistsOnMessagesMap(_channel9.id)) {
                   updateMessageOnMap(_channel9.id, {
                     messageId: _message.id,
@@ -14990,35 +15006,38 @@ function watchForEvents() {
                   });
                 }
                 updateChannelOnAllChannels(_channel9.id, {}, _message);
-                return _context.a(3, 160);
-              case 82:
+                return _context.a(3, 171);
+              case 87:
                 _channel0 = args.channel, user = args.user, _message2 = args.message, reaction = args.reaction;
                 isSelf = user.id === SceytChatClient.user.id;
-                _activeChannelId9 = getActiveChannelId();
+                _context.n = 88;
+                return effects.call(getActiveChannelId);
+              case 88:
+                _activeChannelId9 = _context.v;
                 if (!(_channel0.id === _activeChannelId9)) {
-                  _context.n = 84;
+                  _context.n = 90;
                   break;
                 }
-                _context.n = 83;
+                _context.n = 89;
                 return effects.put(addReactionToMessageAC(_message2, reaction, isSelf));
-              case 83:
+              case 89:
                 addReactionOnAllMessages(_message2, reaction, true);
-              case 84:
+              case 90:
                 if (!(_message2.user.id === SceytChatClient.user.id)) {
-                  _context.n = 88;
+                  _context.n = 94;
                   break;
                 }
                 if (!(!isSelf && Notification.permission === 'granted')) {
-                  _context.n = 86;
+                  _context.n = 92;
                   break;
                 }
                 if (!(document.visibilityState !== 'visible' || _channel0.id !== _activeChannelId9)) {
-                  _context.n = 86;
+                  _context.n = 92;
                   break;
                 }
-                _context.n = 85;
+                _context.n = 91;
                 return effects.select(contactsMapSelector);
-              case 85:
+              case 91:
                 _contactsMap = _context.v;
                 _getFromContacts2 = getShowOnlyContactUsers();
                 _state = store.getState();
@@ -15038,9 +15057,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 86:
+              case 92:
                 if (!(_channel0.newReactions && _channel0.newReactions.length)) {
-                  _context.n = 87;
+                  _context.n = 93;
                   break;
                 }
                 channelUpdateParams = {
@@ -15050,9 +15069,9 @@ function watchForEvents() {
                   muted: _channel0.muted,
                   mutedTill: _channel0.mutedTill
                 };
-                _context.n = 87;
+                _context.n = 93;
                 return effects.put(updateChannelDataAC(_channel0.id, channelUpdateParams));
-              case 87:
+              case 93:
                 updateChannelOnAllChannels(_channel0.id, {
                   userMessageReactions: _channel0.newReactions,
                   lastReactedMessage: _message2,
@@ -15060,14 +15079,17 @@ function watchForEvents() {
                   muted: _channel0.muted,
                   mutedTill: _channel0.mutedTill
                 });
-              case 88:
+              case 94:
                 if (checkChannelExistsOnMessagesMap(_channel0.id)) {
                   addReactionToMessageOnMap(_channel0.id, _message2, reaction, true);
                 }
-                return _context.a(3, 160);
-              case 89:
+                return _context.a(3, 171);
+              case 95:
                 _channel1 = args.channel, pollDetails = args.pollDetails, messageId = args.messageId;
-                _activeChannelId0 = getActiveChannelId();
+                _context.n = 96;
+                return effects.call(getActiveChannelId);
+              case 96:
+                _activeChannelId0 = _context.v;
                 addedVotes = (pollDetails === null || pollDetails === void 0 ? void 0 : pollDetails.votes) || [];
                 obj = {
                   votes: addedVotes,
@@ -15075,58 +15097,61 @@ function watchForEvents() {
                   multipleVotes: pollDetails.allowMultipleVotes || false
                 };
                 if (!(pollDetails !== null && pollDetails !== void 0 && pollDetails.id && addedVotes.length > 0)) {
-                  _context.n = 92;
+                  _context.n = 99;
                   break;
                 }
                 key = pollDetails.id + "_" + addedVotes[0].optionId;
                 hasNext = ((_store$getState$Messa = store.getState().MessageReducer.pollVotesHasMore) === null || _store$getState$Messa === void 0 ? void 0 : _store$getState$Messa[key]) || false;
                 _iterator = _createForOfIteratorHelperLoose(addedVotes);
-              case 90:
+              case 97:
                 if ((_step = _iterator()).done) {
-                  _context.n = 92;
+                  _context.n = 99;
                   break;
                 }
                 vote = _step.value;
-                _context.n = 91;
+                _context.n = 98;
                 return effects.put(addPollVotesToListAC(pollDetails.id, vote.optionId, [vote], hasNext, undefined));
-              case 91:
-                _context.n = 90;
+              case 98:
+                _context.n = 97;
                 break;
-              case 92:
+              case 99:
                 updateMessageOnMap(_channel1.id, {
                   messageId: messageId,
                   params: {}
                 }, obj);
                 if (!(_channel1.id === _activeChannelId0)) {
-                  _context.n = 93;
+                  _context.n = 100;
                   break;
                 }
                 updateMessageOnAllMessages(messageId, {}, obj);
-                _context.n = 93;
+                _context.n = 100;
                 return effects.put(updateMessageAC(messageId, {}, undefined, obj));
-              case 93:
-                return _context.a(3, 160);
-              case 94:
+              case 100:
+                return _context.a(3, 171);
+              case 101:
                 _channel10 = args.channel, _pollDetails = args.pollDetails, _messageId = args.messageId;
-                _activeChannelId1 = getActiveChannelId();
+                _context.n = 102;
+                return effects.call(getActiveChannelId);
+              case 102:
+                _activeChannelId1 = _context.v;
                 deletedVotes = (_pollDetails === null || _pollDetails === void 0 ? void 0 : _pollDetails.votes) || [];
                 if (!(_pollDetails !== null && _pollDetails !== void 0 && _pollDetails.id && deletedVotes.length > 0)) {
-                  _context.n = 97;
+                  _context.n = 105;
                   break;
                 }
                 _iterator2 = _createForOfIteratorHelperLoose(deletedVotes);
-              case 95:
+              case 103:
                 if ((_step2 = _iterator2()).done) {
-                  _context.n = 97;
+                  _context.n = 105;
                   break;
                 }
                 _vote = _step2.value;
-                _context.n = 96;
+                _context.n = 104;
                 return effects.put(deletePollVotesFromListAC(_pollDetails.id, _vote.optionId, [_vote], _messageId));
-              case 96:
-                _context.n = 95;
+              case 104:
+                _context.n = 103;
                 break;
-              case 97:
+              case 105:
                 updateMessageOnMap(_channel10.id, {
                   messageId: _messageId,
                   params: {}
@@ -15135,23 +15160,26 @@ function watchForEvents() {
                   votesPerOption: _pollDetails.votesPerOption
                 });
                 if (!(_channel10.id === _activeChannelId1)) {
-                  _context.n = 98;
+                  _context.n = 106;
                   break;
                 }
                 updateMessageOnAllMessages(_messageId, {}, {
                   deletedVotes: deletedVotes,
                   votesPerOption: _pollDetails.votesPerOption || {}
                 });
-                _context.n = 98;
+                _context.n = 106;
                 return effects.put(updateMessageAC(_messageId, {}, undefined, {
                   deletedVotes: deletedVotes,
                   votesPerOption: _pollDetails.votesPerOption || {}
                 }));
-              case 98:
-                return _context.a(3, 160);
-              case 99:
+              case 106:
+                return _context.a(3, 171);
+              case 107:
                 _channel11 = args.channel, _pollDetails2 = args.pollDetails, _messageId2 = args.messageId;
-                _activeChannelId10 = getActiveChannelId();
+                _context.n = 108;
+                return effects.call(getActiveChannelId);
+              case 108:
+                _activeChannelId10 = _context.v;
                 retractedVotes = (_pollDetails2 === null || _pollDetails2 === void 0 ? void 0 : _pollDetails2.votes) || [];
                 updateMessageOnMap(_channel11.id, {
                   messageId: _messageId2,
@@ -15161,40 +15189,43 @@ function watchForEvents() {
                   votesPerOption: _pollDetails2.votesPerOption
                 });
                 if (!(_pollDetails2 !== null && _pollDetails2 !== void 0 && _pollDetails2.id && retractedVotes.length > 0)) {
-                  _context.n = 102;
+                  _context.n = 111;
                   break;
                 }
                 _iterator3 = _createForOfIteratorHelperLoose(retractedVotes);
-              case 100:
+              case 109:
                 if ((_step3 = _iterator3()).done) {
-                  _context.n = 102;
+                  _context.n = 111;
                   break;
                 }
                 _vote2 = _step3.value;
-                _context.n = 101;
+                _context.n = 110;
                 return effects.put(deletePollVotesFromListAC(_pollDetails2.id, _vote2.optionId, [_vote2], _messageId2));
-              case 101:
-                _context.n = 100;
+              case 110:
+                _context.n = 109;
                 break;
-              case 102:
+              case 111:
                 if (!(_channel11.id === _activeChannelId10)) {
-                  _context.n = 103;
+                  _context.n = 112;
                   break;
                 }
                 updateMessageOnAllMessages(_messageId2, {}, {
                   deletedVotes: retractedVotes,
                   votesPerOption: _pollDetails2.votesPerOption || {}
                 });
-                _context.n = 103;
+                _context.n = 112;
                 return effects.put(updateMessageAC(_messageId2, {}, undefined, {
                   deletedVotes: retractedVotes,
                   votesPerOption: _pollDetails2.votesPerOption || {}
                 }));
-              case 103:
-                return _context.a(3, 160);
-              case 104:
+              case 112:
+                return _context.a(3, 171);
+              case 113:
                 _channel12 = args.channel, _messageId3 = args.messageId;
-                _activeChannelId11 = getActiveChannelId();
+                _context.n = 114;
+                return effects.call(getActiveChannelId);
+              case 114:
+                _activeChannelId11 = _context.v;
                 updateMessageOnMap(_channel12.id, {
                   messageId: _messageId3,
                   params: {}
@@ -15202,55 +15233,58 @@ function watchForEvents() {
                   closed: true
                 });
                 if (!(_channel12.id === _activeChannelId11)) {
-                  _context.n = 106;
+                  _context.n = 116;
                   break;
                 }
                 updateMessageOnAllMessages(_messageId3, {}, {
                   closed: true
                 });
-                _context.n = 105;
+                _context.n = 115;
                 return effects.put(updateMessageAC(_messageId3, {}, undefined, {
                   closed: true
                 }));
-              case 105:
-                return _context.a(3, 160);
-              case 106:
-                return _context.a(3, 160);
-              case 107:
+              case 115:
+                return _context.a(3, 171);
+              case 116:
+                return _context.a(3, 171);
+              case 117:
                 _channel13 = args.channel, _user = args.user, _message3 = args.message, _reaction = args.reaction;
                 log.info('channel REACTION_DELETED ... ', _channel13);
                 channelFromMap = getChannelFromMap(_channel13.id);
                 _isSelf = _user.id === SceytChatClient.user.id;
-                _activeChannelId12 = getActiveChannelId();
+                _context.n = 118;
+                return effects.call(getActiveChannelId);
+              case 118:
+                _activeChannelId12 = _context.v;
                 if (!(_channel13.id === _activeChannelId12)) {
-                  _context.n = 109;
+                  _context.n = 120;
                   break;
                 }
-                _context.n = 108;
+                _context.n = 119;
                 return effects.put(deleteReactionFromMessageAC(_message3, _reaction, _isSelf));
-              case 108:
+              case 119:
                 removeReactionOnAllMessages(_message3, _reaction, true);
-              case 109:
+              case 120:
                 _channelUpdateParams = JSON.parse(JSON.stringify(_channel13));
                 if (channelFromMap && channelFromMap.lastReactedMessage && channelFromMap.lastReactedMessage.id === _message3.id) {
                   _channelUpdateParams.lastReactedMessage = null;
                 }
-                _context.n = 110;
+                _context.n = 121;
                 return effects.put(updateChannelDataAC(_channel13.id, _channelUpdateParams));
-              case 110:
+              case 121:
                 updateChannelOnAllChannels(_channel13.id, _channelUpdateParams);
                 if (checkChannelExistsOnMessagesMap(_channel13.id)) {
                   removeReactionToMessageOnMap(_channel13.id, _message3, _reaction, true);
                 }
-                return _context.a(3, 160);
-              case 111:
+                return _context.a(3, 171);
+              case 122:
                 _channel14 = args.channel;
                 if (!_channel14) {
-                  _context.n = 113;
+                  _context.n = 124;
                   break;
                 }
                 _updatedChannel = JSON.parse(JSON.stringify(_channel14));
-                _context.n = 112;
+                _context.n = 123;
                 return effects.put(updateChannelDataAC(_channel14.id, {
                   lastMessage: _channel14.lastMessage,
                   newMessageCount: _channel14.newMessageCount,
@@ -15263,36 +15297,36 @@ function watchForEvents() {
                   lastDisplayedMessageId: _channel14.lastDisplayedMessageId,
                   messageRetentionPeriod: _channel14.messageRetentionPeriod
                 }));
-              case 112:
+              case 123:
                 updateChannelOnAllChannels(_channel14.id, _updatedChannel);
-              case 113:
-                return _context.a(3, 160);
-              case 114:
+              case 124:
+                return _context.a(3, 171);
+              case 125:
                 _channel15 = args.channel;
                 log.info('CLEAR_HISTORY: ', _channel15);
-                _context.n = 115;
+                _context.n = 126;
                 return effects.call(getActiveChannelId);
-              case 115:
+              case 126:
                 _activeChannelId13 = _context.v;
-                _context.n = 116;
+                _context.n = 127;
                 return effects.call(checkChannelExists, _channel15.id);
-              case 116:
+              case 127:
                 channelExist = _context.v;
                 if (!(_channel15.id === _activeChannelId13)) {
-                  _context.n = 118;
+                  _context.n = 129;
                   break;
                 }
-                _context.n = 117;
+                _context.n = 128;
                 return effects.put(clearMessagesAC());
-              case 117:
+              case 128:
                 removeAllMessages();
-              case 118:
+              case 129:
                 removeMessagesFromMap(_channel15.id);
                 if (!channelExist) {
-                  _context.n = 119;
+                  _context.n = 130;
                   break;
                 }
-                _context.n = 119;
+                _context.n = 130;
                 return effects.put(updateChannelDataAC(_channel15.id, {
                   lastMessage: null,
                   newMessageCount: 0,
@@ -15300,7 +15334,7 @@ function watchForEvents() {
                   muted: _channel15.muted,
                   mutedTill: _channel15.mutedTill
                 }));
-              case 119:
+              case 130:
                 updateChannelOnAllChannels(_channel15.id, {
                   lastMessage: null,
                   newMessageCount: 0,
@@ -15308,173 +15342,173 @@ function watchForEvents() {
                   muted: _channel15.muted,
                   mutedTill: _channel15.mutedTill
                 });
-                return _context.a(3, 160);
-              case 120:
+                return _context.a(3, 171);
+              case 131:
                 _channel16 = args.channel;
                 log.info('channel MUTE ... ');
-                _context.n = 121;
+                _context.n = 132;
                 return effects.put(updateChannelDataAC(_channel16.id, {
                   muted: _channel16.muted,
                   mutedTill: _channel16.mutedTill
                 }));
-              case 121:
+              case 132:
                 updateChannelOnAllChannels(_channel16.id, {
                   muted: _channel16.muted,
                   mutedTill: _channel16.mutedTill
                 });
-                return _context.a(3, 160);
-              case 122:
+                return _context.a(3, 171);
+              case 133:
                 _channel17 = args.channel;
                 log.info('channel UNMUTE ... ');
-                _context.n = 123;
+                _context.n = 134;
                 return effects.put(updateChannelDataAC(_channel17.id, {
                   muted: _channel17.muted,
                   mutedTill: _channel17.mutedTill
                 }));
-              case 123:
+              case 134:
                 updateChannelOnAllChannels(_channel17.id, {
                   muted: _channel17.muted,
                   mutedTill: _channel17.mutedTill
                 });
-                return _context.a(3, 160);
-              case 124:
+                return _context.a(3, 171);
+              case 135:
                 _channel18 = args.channel;
                 log.info('channel PINED ... ');
-                _context.n = 125;
+                _context.n = 136;
                 return effects.put(updateChannelDataAC(_channel18.id, {
                   pinnedAt: _channel18.pinnedAt
                 }, true));
-              case 125:
+              case 136:
                 updateChannelOnAllChannels(_channel18.id, {
                   pinnedAt: _channel18.pinnedAt
                 });
-                return _context.a(3, 160);
-              case 126:
+                return _context.a(3, 171);
+              case 137:
                 _channel19 = args.channel;
                 log.info('channel UNPINED ... ');
-                _context.n = 127;
+                _context.n = 138;
                 return effects.put(updateChannelDataAC(_channel19.id, {
                   pinnedAt: _channel19.pinnedAt
                 }, false, true));
-              case 127:
+              case 138:
                 updateChannelOnAllChannels(_channel19.id, {
                   pinnedAt: _channel19.pinnedAt
                 });
-                return _context.a(3, 160);
-              case 128:
+                return _context.a(3, 171);
+              case 139:
                 _channel20 = args.channel;
                 log.info('channel HIDE ... ');
-                _context.n = 129;
+                _context.n = 140;
                 return effects.put(setChannelToHideAC(_channel20));
-              case 129:
-                return _context.a(3, 160);
-              case 130:
+              case 140:
+                return _context.a(3, 171);
+              case 141:
                 _channel21 = args.channel;
                 log.info('channel UNHIDE ... ');
-                _context.n = 131;
+                _context.n = 142;
                 return effects.put(setChannelToUnHideAC(_channel21));
-              case 131:
-                return _context.a(3, 160);
-              case 132:
+              case 142:
+                return _context.a(3, 171);
+              case 143:
                 _channel22 = args.channel;
-                _context.n = 133;
+                _context.n = 144;
                 return effects.put(updateChannelDataAC(_channel22.id, {
                   unread: _channel22.unread,
                   muted: _channel22.muted,
                   mutedTill: _channel22.mutedTill
                 }));
-              case 133:
+              case 144:
                 _groupName5 = getChannelGroupName(_channel22);
-                _context.n = 134;
+                _context.n = 145;
                 return effects.put(updateSearchedChannelDataAC(_channel22.id, {
                   unread: _channel22.unread
                 }, _groupName5));
-              case 134:
+              case 145:
                 updateChannelOnAllChannels(_channel22.id, {
                   unread: _channel22.unread
                 });
-                return _context.a(3, 160);
-              case 135:
+                return _context.a(3, 171);
+              case 146:
                 _channel23 = args.channel;
-                _context.n = 136;
+                _context.n = 147;
                 return effects.put(updateChannelDataAC(_channel23.id, {
                   unread: _channel23.unread,
                   muted: _channel23.muted,
                   mutedTill: _channel23.mutedTill
                 }));
-              case 136:
+              case 147:
                 _groupName6 = getChannelGroupName(_channel23);
-                _context.n = 137;
+                _context.n = 148;
                 return effects.put(updateSearchedChannelDataAC(_channel23.id, {
                   unread: _channel23.unread
                 }, _groupName6));
-              case 137:
+              case 148:
                 updateChannelOnAllChannels(_channel23.id, {
                   unread: _channel23.unread
                 });
-                return _context.a(3, 160);
-              case 138:
+                return _context.a(3, 171);
+              case 149:
                 _channel24 = args.channel, members = args.members;
                 log.info('channel CHANGE_ROLE  channel ... ', _channel24);
                 log.info('channel CHANGE_ROLE  member ... ', members);
-                _context.n = 139;
+                _context.n = 150;
                 return effects.call(getActiveChannelId);
-              case 139:
+              case 150:
                 _activeChannelId14 = _context.v;
                 if (!(_channel24.id === _activeChannelId14)) {
-                  _context.n = 140;
+                  _context.n = 151;
                   break;
                 }
-                _context.n = 140;
+                _context.n = 151;
                 return effects.put(updateMembersAC(members));
-              case 140:
+              case 151:
                 i = 0;
-              case 141:
+              case 152:
                 if (!(i < members.length)) {
-                  _context.n = 144;
+                  _context.n = 155;
                   break;
                 }
                 if (!(members[i].id === SceytChatClient.user.id)) {
-                  _context.n = 143;
+                  _context.n = 154;
                   break;
                 }
-                _context.n = 142;
+                _context.n = 153;
                 return effects.put(updateChannelDataAC(_channel24.id, {
                   userRole: members[i].role,
                   muted: _channel24.muted,
                   mutedTill: _channel24.mutedTill
                 }));
-              case 142:
+              case 153:
                 updateChannelOnAllChannels(_channel24.id, {
                   userRole: members[i].role,
                   muted: _channel24.muted,
                   mutedTill: _channel24.mutedTill
                 });
-              case 143:
+              case 154:
                 i++;
-                _context.n = 141;
+                _context.n = 152;
                 break;
-              case 144:
-                return _context.a(3, 160);
-              case 145:
+              case 155:
+                return _context.a(3, 171);
+              case 156:
                 _channel25 = args.channel;
                 log.info('channel frozen  channel ... ', _channel25);
-                return _context.a(3, 160);
-              case 146:
+                return _context.a(3, 171);
+              case 157:
                 _channel26 = args.channel;
                 log.info('channel unfrozen  channel ... ', _channel26);
-                return _context.a(3, 160);
-              case 147:
+                return _context.a(3, 171);
+              case 158:
                 _channelId2 = args.channelId, from = args.from, name = args.name;
                 log.info('channel event received >>>... . . . . . ', args);
                 if (!(from.id === SceytChatClient.user.id)) {
-                  _context.n = 148;
+                  _context.n = 159;
                   break;
                 }
-                return _context.a(3, 160);
-              case 148:
+                return _context.a(3, 171);
+              case 159:
                 if (!(name === 'start_typing')) {
-                  _context.n = 150;
+                  _context.n = 161;
                   break;
                 }
                 if (!usersTimeout[_channelId2]) {
@@ -15486,27 +15520,27 @@ function watchForEvents() {
                 usersTimeout[_channelId2][from.id] = setTimeout(function () {
                   channelListener.onReceivedChannelEvent(_channelId2, from, 'stop_typing');
                 }, 5000);
-                _context.n = 149;
+                _context.n = 160;
                 return effects.put(switchTypingIndicatorAC(true, _channelId2, from));
-              case 149:
-                _context.n = 155;
+              case 160:
+                _context.n = 166;
                 break;
-              case 150:
+              case 161:
                 if (!(name === 'stop_typing')) {
-                  _context.n = 152;
+                  _context.n = 163;
                   break;
                 }
                 if (usersTimeout[_channelId2] && usersTimeout[_channelId2][from.id]) {
                   clearTimeout(usersTimeout[_channelId2][from.id]);
                 }
-                _context.n = 151;
+                _context.n = 162;
                 return effects.put(switchTypingIndicatorAC(false, _channelId2, from));
-              case 151:
-                _context.n = 155;
+              case 162:
+                _context.n = 166;
                 break;
-              case 152:
+              case 163:
                 if (!(name === 'start_recording')) {
-                  _context.n = 154;
+                  _context.n = 165;
                   break;
                 }
                 if (!usersTimeout[_channelId2]) {
@@ -15518,43 +15552,50 @@ function watchForEvents() {
                 usersTimeout[_channelId2][from.id] = setTimeout(function () {
                   channelListener.onReceivedChannelEvent(_channelId2, from, 'stop_recording');
                 }, 5000);
-                _context.n = 153;
+                _context.n = 164;
                 return effects.put(switchRecordingIndicatorAC(true, _channelId2, from));
-              case 153:
-                _context.n = 155;
+              case 164:
+                _context.n = 166;
                 break;
-              case 154:
+              case 165:
                 if (!(name === 'stop_recording')) {
-                  _context.n = 155;
+                  _context.n = 166;
                   break;
                 }
                 if (usersTimeout[_channelId2] && usersTimeout[_channelId2][from.id]) {
                   clearTimeout(usersTimeout[_channelId2][from.id]);
                 }
-                _context.n = 155;
+                _context.n = 166;
                 return effects.put(switchRecordingIndicatorAC(false, _channelId2, from));
-              case 155:
-                return _context.a(3, 160);
-              case 156:
+              case 166:
+                return _context.a(3, 171);
+              case 167:
                 status = args.status;
                 log.info('connection status changed . . . . . ', status);
-                _context.n = 157;
+                _context.n = 168;
                 return effects.put(setConnectionStatusAC(status));
-              case 157:
+              case 168:
                 if (!(status === CONNECTION_STATUS.CONNECTED)) {
-                  _context.n = 158;
+                  _context.n = 169;
                   break;
                 }
-                _context.n = 158;
+                _context.n = 169;
                 return effects.put(getRolesAC());
-              case 158:
-                return _context.a(3, 160);
-              case 159:
+              case 169:
+                return _context.a(3, 171);
+              case 170:
                 log.warn('UNHANDLED EVENT FROM REDUX-SAGA EVENT-CHANNEL');
-              case 160:
+              case 171:
+                _context.n = 173;
+                break;
+              case 172:
+                _context.p = 172;
+                _t2 = _context.v;
+                log.error('Error in watchForEvents:', _t2);
+              case 173:
                 return _context.a(2);
             }
-          }, _callee);
+          }, _callee, null, [[0, 172]]);
         });
       case 1:
         return _context2.d(_regeneratorValues(_loop()), 2);
@@ -26169,7 +26210,7 @@ var ChannelList = function ChannelList(_ref) {
   }, [searchValue]);
   useDidUpdate(function () {
     if (getSelectedChannel) {
-      if (!(activeChannel !== null && activeChannel !== void 0 && activeChannel.mentionsIds)) {
+      if (!(activeChannel !== null && activeChannel !== void 0 && activeChannel.mentionsIds) && activeChannel !== null && activeChannel !== void 0 && activeChannel.id) {
         dispatch(getChannelMentionsAC(activeChannel.id));
       }
       getSelectedChannel(activeChannel);