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

package/index.js

@@ -14409,7 +14409,7 @@ function watchForEvents() {
           };
         });
         _loop = /*#__PURE__*/_regenerator().m(function _callee2() {
-          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, _pollDetailsData$chan, _pollDetailsData$chan2, _channel1, pollDetails, messageId, pollDetailsData, _activeChannelId0, addedVotes, deletedVotes, objs, _iterator, _step, vote, _iterator2, _step2, _vote, _i, _objs, obj, _store$getState$Messa, key, hasNext, _i2, _objs2, _obj, _pollDetailsData$chan3, _channel10, _pollDetails, _messageId, _pollDetailsData, _activeChannelId1, _deletedVotes, _objs3, _iterator3, _step3, _vote2, _i3, _objs4, _obj2, _i4, _objs5, _obj3, _pollDetailsData2$cha, _channel11, _pollDetails2, _messageId2, _activeChannelId10, _pollDetailsData2, retractedVotes, _objs6, _iterator4, _step4, _vote4, _i5, _objs7, _obj4, _iterator5, _step5, _vote3, _channel12, _messageId3, _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, 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, _loop2, _iterator, _step, 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, _messageId, _pollDetailsData, _activeChannelId1, _deletedVotes, _objs3, _iterator4, _step4, _vote2, _i3, _objs4, _obj2, _i4, _objs5, _obj3, _pollDetailsData2$cha, _channel11, _pollDetails2, _messageId2, _activeChannelId10, _pollDetailsData2, retractedVotes, _objs6, _iterator5, _step5, _vote4, _i5, _objs7, _obj4, _iterator6, _step6, _vote3, _channel12, _messageId3, _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;
           return _regenerator().w(function (_context2) {
             while (1) switch (_context2.p = _context2.n) {
               case 0:
@@ -14421,7 +14421,7 @@ function watchForEvents() {
                 type = _yield$take.type;
                 args = _yield$take.args;
                 _t = type;
-                _context2.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 ? 105 : _t === CHANNEL_EVENT_TYPES.POLL_RETRACTED ? 113 : _t === CHANNEL_EVENT_TYPES.POLL_CLOSED ? 121 : _t === CHANNEL_EVENT_TYPES.REACTION_DELETED ? 125 : _t === CHANNEL_EVENT_TYPES.UNREAD_MESSAGES_INFO ? 130 : _t === CHANNEL_EVENT_TYPES.CLEAR_HISTORY ? 133 : _t === CHANNEL_EVENT_TYPES.MUTE ? 139 : _t === CHANNEL_EVENT_TYPES.UNMUTE ? 141 : _t === CHANNEL_EVENT_TYPES.PINED ? 143 : _t === CHANNEL_EVENT_TYPES.UNPINED ? 145 : _t === CHANNEL_EVENT_TYPES.HIDE ? 147 : _t === CHANNEL_EVENT_TYPES.UNHIDE ? 149 : _t === CHANNEL_EVENT_TYPES.CHANNEL_MARKED_AS_UNREAD ? 151 : _t === CHANNEL_EVENT_TYPES.CHANNEL_MARKED_AS_READ ? 154 : _t === CHANNEL_EVENT_TYPES.CHANGE_ROLE ? 157 : _t === CHANNEL_EVENT_TYPES.FROZEN ? 164 : _t === CHANNEL_EVENT_TYPES.UNFROZEN ? 165 : _t === CHANNEL_EVENT_TYPES.CHANNEL_EVENT ? 166 : _t === CONNECTION_EVENT_TYPES.CONNECTION_STATUS_CHANGED ? 175 : 178;
+                _context2.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 ? 78 : _t === CHANNEL_EVENT_TYPES.DELETE_MESSAGE ? 80 : _t === CHANNEL_EVENT_TYPES.EDIT_MESSAGE ? 85 : _t === CHANNEL_EVENT_TYPES.REACTION_ADDED ? 90 : _t === CHANNEL_EVENT_TYPES.POLL_ADDED ? 98 : _t === CHANNEL_EVENT_TYPES.POLL_DELETED ? 108 : _t === CHANNEL_EVENT_TYPES.POLL_RETRACTED ? 116 : _t === CHANNEL_EVENT_TYPES.POLL_CLOSED ? 124 : _t === CHANNEL_EVENT_TYPES.REACTION_DELETED ? 128 : _t === CHANNEL_EVENT_TYPES.UNREAD_MESSAGES_INFO ? 133 : _t === CHANNEL_EVENT_TYPES.CLEAR_HISTORY ? 136 : _t === CHANNEL_EVENT_TYPES.MUTE ? 142 : _t === CHANNEL_EVENT_TYPES.UNMUTE ? 144 : _t === CHANNEL_EVENT_TYPES.PINED ? 146 : _t === CHANNEL_EVENT_TYPES.UNPINED ? 148 : _t === CHANNEL_EVENT_TYPES.HIDE ? 150 : _t === CHANNEL_EVENT_TYPES.UNHIDE ? 152 : _t === CHANNEL_EVENT_TYPES.CHANNEL_MARKED_AS_UNREAD ? 154 : _t === CHANNEL_EVENT_TYPES.CHANNEL_MARKED_AS_READ ? 157 : _t === CHANNEL_EVENT_TYPES.CHANGE_ROLE ? 160 : _t === CHANNEL_EVENT_TYPES.FROZEN ? 167 : _t === CHANNEL_EVENT_TYPES.UNFROZEN ? 168 : _t === CHANNEL_EVENT_TYPES.CHANNEL_EVENT ? 169 : _t === CONNECTION_EVENT_TYPES.CONNECTION_STATUS_CHANGED ? 178 : 181;
                 break;
               case 2:
                 createdChannel = args.createdChannel;
@@ -14455,7 +14455,7 @@ function watchForEvents() {
                   addChannelToAllChannels(createdChannel);
                 }
               case 6:
-                return _context2.a(3, 179);
+                return _context2.a(3, 182);
               case 7:
                 channel = args.channel;
                 log.info('channel JOIN ... . ', channel);
@@ -14466,7 +14466,7 @@ function watchForEvents() {
                 if (!_chan2) {
                   addChannelToAllChannels(channel);
                 }
-                return _context2.a(3, 179);
+                return _context2.a(3, 182);
               case 9:
                 _channel = args.channel, member = args.member;
                 log.info('channel LEAVE ... ', _channel, member);
@@ -14534,7 +14534,7 @@ function watchForEvents() {
                   mutedTill: _channel.mutedTill
                 });
               case 21:
-                return _context2.a(3, 179);
+                return _context2.a(3, 182);
               case 22:
                 log.info('channel BLOCK ... ');
                 _channel2 = args.channel;
@@ -14546,10 +14546,10 @@ function watchForEvents() {
                 _context2.n = 23;
                 return effects.put(removeChannelAC(_channel2.id));
               case 23:
-                return _context2.a(3, 179);
+                return _context2.a(3, 182);
               case 24:
                 log.info('channel UNBLOCK ... ');
-                return _context2.a(3, 179);
+                return _context2.a(3, 182);
               case 25:
                 _channel3 = args.channel, removedMembers = args.removedMembers;
                 log.info('channel KICK_MEMBERS ... ', removedMembers);
@@ -14619,7 +14619,7 @@ function watchForEvents() {
                   muted: _channel3.muted,
                   mutedTill: _channel3.mutedTill
                 });
-                return _context2.a(3, 179);
+                return _context2.a(3, 182);
               case 36:
                 _channel4 = args.channel, addedMembers = args.addedMembers;
                 log.info('channel ADD_MEMBERS ... ', addedMembers);
@@ -14674,7 +14674,7 @@ function watchForEvents() {
                   muted: _channel4.muted,
                   mutedTill: _channel4.mutedTill
                 });
-                return _context2.a(3, 179);
+                return _context2.a(3, 182);
               case 46:
                 log.info('channel UPDATE_CHANNEL ... ');
                 updatedChannel = args.updatedChannel;
@@ -14721,7 +14721,7 @@ function watchForEvents() {
                   mutedTill: mutedTill,
                   metadata: isJSON(metadata) ? JSON.parse(metadata) : metadata
                 });
-                return _context2.a(3, 179);
+                return _context2.a(3, 182);
               case 51:
                 _channel5 = args.channel, message = args.message;
                 log.info('channel MESSAGE ... id : ', message.id, ', channel.id: ', _channel5.id);
@@ -14886,7 +14886,7 @@ function watchForEvents() {
                 });
                 updateChannelLastMessageOnAllChannels(_channel5.id, _channel5.lastMessage);
               case 67:
-                return _context2.a(3, 179);
+                return _context2.a(3, 182);
               case 68:
                 channelId = args.channelId, markerList = args.markerList;
                 _context2.n = 69;
@@ -14895,7 +14895,7 @@ function watchForEvents() {
                 _channel6 = _context2.v;
                 log.info('channel MESSAGE_MARKERS_RECEIVED ... channel: ', _channel6, 'markers list: ', markerList);
                 if (!_channel6) {
-                  _context2.n = 74;
+                  _context2.n = 77;
                   break;
                 }
                 _context2.n = 70;
@@ -14905,11 +14905,12 @@ function watchForEvents() {
                 updateLastMessage = false;
                 markersMap = {};
                 activeChannelMessages = getMessagesFromMap(_activeChannelId6);
-                markerList.messageIds.forEach(/*#__PURE__*/_regenerator().m(function _callee(messageId) {
-                  var isPendingMessage;
+                _loop2 = /*#__PURE__*/_regenerator().m(function _callee() {
+                  var messageId, isPendingMessage;
                   return _regenerator().w(function (_context) {
                     while (1) switch (_context.n) {
                       case 0:
+                        messageId = _step.value;
                         if (!(activeChannelMessages !== null && activeChannelMessages !== void 0 && activeChannelMessages.find(function (message) {
                           return message.id === messageId;
                         }))) {
@@ -14943,100 +14944,111 @@ function watchForEvents() {
                         return _context.a(2);
                     }
                   }, _callee);
-                }));
+                });
+                _iterator = _createForOfIteratorHelperLoose(markerList.messageIds);
+              case 71:
+                if ((_step = _iterator()).done) {
+                  _context2.n = 73;
+                  break;
+                }
+                return _context2.d(_regeneratorValues(_loop2()), 72);
+              case 72:
+                _context2.n = 71;
+                break;
+              case 73:
                 if (!updateLastMessage) {
-                  _context2.n = 71;
+                  _context2.n = 74;
                   break;
                 }
                 lastMessage = _extends({}, _channel6.lastMessage, {
                   deliveryStatus: markerList.name
                 });
                 updateChannelLastMessageOnAllChannels(_channel6.id, lastMessage);
-                _context2.n = 71;
+                _context2.n = 74;
                 return effects.put(updateChannelLastMessageStatusAC(lastMessage, _channel6));
-              case 71:
+              case 74:
                 if (!(_activeChannelId6 === channelId)) {
-                  _context2.n = 73;
+                  _context2.n = 76;
                   break;
                 }
-                _context2.n = 72;
+                _context2.n = 75;
                 return effects.put(updateMessagesStatusAC(markerList.name, markersMap));
-              case 72:
+              case 75:
                 updateMarkersOnAllMessages(markersMap, markerList.name);
-              case 73:
+              case 76:
                 updateMessageStatusOnMap(_channel6.id, {
                   name: markerList.name,
                   markersMap: markersMap
                 });
-                _context2.n = 74;
+                _context2.n = 77;
                 return effects.put(updateMessagesMarkersAC(channelId, markerList.name, markerList));
-              case 74:
-                return _context2.a(3, 179);
-              case 75:
+              case 77:
+                return _context2.a(3, 182);
+              case 78:
                 _channelId = args.channelId;
                 log.info('channel DELETE ... ');
                 _channel7 = getChannelFromMap(_channelId);
-                _context2.n = 76;
+                _context2.n = 79;
                 return effects.put(setChannelToRemoveAC(_channel7));
-              case 76:
+              case 79:
                 deleteChannelFromAllChannels(_channelId);
-                return _context2.a(3, 179);
-              case 77:
+                return _context2.a(3, 182);
+              case 80:
                 _channel8 = args.channel, deletedMessage = args.deletedMessage;
-                _context2.n = 78;
+                _context2.n = 81;
                 return effects.call(getActiveChannelId);
-              case 78:
+              case 81:
                 _activeChannelId7 = _context2.v;
                 log.info('channel DELETE_MESSAGE ... ');
                 _channelExists7 = checkChannelExists(_channel8.id);
                 if (!(_channel8.id === _activeChannelId7)) {
-                  _context2.n = 79;
+                  _context2.n = 82;
                   break;
                 }
                 updateMessageOnAllMessages(deletedMessage.id, deletedMessage);
-                _context2.n = 79;
+                _context2.n = 82;
                 return effects.put(updateMessageAC(deletedMessage.id, deletedMessage));
-              case 79:
+              case 82:
                 updateMessageOnMap(_channel8.id, {
                   messageId: deletedMessage.id,
                   params: deletedMessage
                 });
                 if (!_channelExists7) {
-                  _context2.n = 81;
+                  _context2.n = 84;
                   break;
                 }
-                _context2.n = 80;
+                _context2.n = 83;
                 return effects.put(updateChannelDataAC(_channel8.id, {
                   newMessageCount: _channel8.newMessageCount,
                   muted: _channel8.muted,
                   mutedTill: _channel8.mutedTill
                 }));
-              case 80:
+              case 83:
                 if (!(_channel8.lastMessage.id === deletedMessage.id)) {
-                  _context2.n = 81;
+                  _context2.n = 84;
                   break;
                 }
-                _context2.n = 81;
+                _context2.n = 84;
                 return effects.put(updateChannelLastMessageAC(deletedMessage, _channel8));
-              case 81:
+              case 84:
                 updateChannelOnAllChannels(_channel8.id, {
                   newMessageCount: _channel8.newMessageCount,
                   muted: _channel8.muted,
                   mutedTill: _channel8.mutedTill
                 }, deletedMessage);
-                return _context2.a(3, 179);
-              case 82:
+                return _context2.a(3, 182);
+              case 85:
                 _channel9 = args.channel, _message = args.message;
-                _context2.n = 83;
+                _context2.n = 86;
                 return effects.call(getActiveChannelId);
-              case 83:
+              case 86:
                 _activeChannelId8 = _context2.v;
                 _channelExists8 = checkChannelExists(_channel9.id);
                 if (!(_channel9.id === _activeChannelId8)) {
-                  _context2.n = 85;
+                  _context2.n = 88;
                   break;
                 }
-                _context2.n = 84;
+                _context2.n = 87;
                 return effects.put(updateMessageAC(_message.id, {
                   body: _message.body,
                   state: _message.state,
@@ -15045,7 +15057,7 @@ function watchForEvents() {
                   mentionedUsers: _message.mentionedUsers,
                   updatedAt: _message.updatedAt
                 }));
-              case 84:
+              case 87:
                 updateMessageOnAllMessages(_message.id, {
                   body: _message.body,
                   state: _message.state,
@@ -15054,18 +15066,18 @@ function watchForEvents() {
                   mentionedUsers: _message.mentionedUsers,
                   updatedAt: _message.updatedAt
                 });
-              case 85:
+              case 88:
                 if (!_channelExists8) {
-                  _context2.n = 86;
+                  _context2.n = 89;
                   break;
                 }
                 if (!(_channel9.lastMessage.id === _message.id)) {
-                  _context2.n = 86;
+                  _context2.n = 89;
                   break;
                 }
-                _context2.n = 86;
+                _context2.n = 89;
                 return effects.put(updateChannelLastMessageAC(_message, _channel9));
-              case 86:
+              case 89:
                 if (checkChannelExistsOnMessagesMap(_channel9.id)) {
                   updateMessageOnMap(_channel9.id, {
                     messageId: _message.id,
@@ -15073,38 +15085,38 @@ function watchForEvents() {
                   });
                 }
                 updateChannelOnAllChannels(_channel9.id, {}, _message);
-                return _context2.a(3, 179);
-              case 87:
+                return _context2.a(3, 182);
+              case 90:
                 _channel0 = args.channel, user = args.user, _message2 = args.message, reaction = args.reaction;
                 isSelf = user.id === SceytChatClient.user.id;
-                _context2.n = 88;
+                _context2.n = 91;
                 return effects.call(getActiveChannelId);
-              case 88:
+              case 91:
                 _activeChannelId9 = _context2.v;
                 if (!(_channel0.id === _activeChannelId9)) {
-                  _context2.n = 90;
+                  _context2.n = 93;
                   break;
                 }
-                _context2.n = 89;
+                _context2.n = 92;
                 return effects.put(addReactionToMessageAC(_message2, reaction, isSelf));
-              case 89:
+              case 92:
                 addReactionOnAllMessages(_message2, reaction, true);
-              case 90:
+              case 93:
                 if (!(_message2.user.id === SceytChatClient.user.id)) {
-                  _context2.n = 94;
+                  _context2.n = 97;
                   break;
                 }
                 if (!(!isSelf && Notification.permission === 'granted')) {
-                  _context2.n = 92;
+                  _context2.n = 95;
                   break;
                 }
                 if (!(document.visibilityState !== 'visible' || _channel0.id !== _activeChannelId9)) {
-                  _context2.n = 92;
+                  _context2.n = 95;
                   break;
                 }
-                _context2.n = 91;
+                _context2.n = 94;
                 return effects.select(contactsMapSelector);
-              case 91:
+              case 94:
                 _contactsMap = _context2.v;
                 _getFromContacts2 = getShowOnlyContactUsers();
                 _state = store.getState();
@@ -15124,9 +15136,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 92:
+              case 95:
                 if (!(_channel0.newReactions && _channel0.newReactions.length)) {
-                  _context2.n = 93;
+                  _context2.n = 96;
                   break;
                 }
                 channelUpdateParams = {
@@ -15136,9 +15148,9 @@ function watchForEvents() {
                   muted: _channel0.muted,
                   mutedTill: _channel0.mutedTill
                 };
-                _context2.n = 93;
+                _context2.n = 96;
                 return effects.put(updateChannelDataAC(_channel0.id, channelUpdateParams));
-              case 93:
+              case 96:
                 updateChannelOnAllChannels(_channel0.id, {
                   userMessageReactions: _channel0.newReactions,
                   lastReactedMessage: _message2,
@@ -15146,31 +15158,31 @@ function watchForEvents() {
                   muted: _channel0.muted,
                   mutedTill: _channel0.mutedTill
                 });
-              case 94:
+              case 97:
                 if (checkChannelExistsOnMessagesMap(_channel0.id)) {
                   addReactionToMessageOnMap(_channel0.id, _message2, reaction, true);
                 }
-                return _context2.a(3, 179);
-              case 95:
+                return _context2.a(3, 182);
+              case 98:
                 _channel1 = args.channel, pollDetails = args.pollDetails, messageId = args.messageId;
                 pollDetailsData = pollDetails;
-                _context2.n = 96;
+                _context2.n = 99;
                 return effects.call(getActiveChannelId);
-              case 96:
+              case 99:
                 _activeChannelId0 = _context2.v;
                 addedVotes = (pollDetailsData === null || pollDetailsData === void 0 ? void 0 : (_pollDetailsData$chan = pollDetailsData.changedVotes) === null || _pollDetailsData$chan === void 0 ? void 0 : _pollDetailsData$chan.addedVotes) || [];
                 deletedVotes = (pollDetailsData === null || pollDetailsData === void 0 ? void 0 : (_pollDetailsData$chan2 = pollDetailsData.changedVotes) === null || _pollDetailsData$chan2 === void 0 ? void 0 : _pollDetailsData$chan2.removedVotes) || [];
                 objs = [];
-                for (_iterator = _createForOfIteratorHelperLoose(deletedVotes); !(_step = _iterator()).done;) {
-                  vote = _step.value;
+                for (_iterator2 = _createForOfIteratorHelperLoose(deletedVotes); !(_step2 = _iterator2()).done;) {
+                  vote = _step2.value;
                   objs.push({
                     type: vote.user.id === SceytChatClient.user.id ? 'deleteOwn' : 'delete',
                     vote: vote,
                     incrementVotesPerOptionCount: -((deletedVotes === null || deletedVotes === void 0 ? void 0 : deletedVotes.length) || 0)
                   });
                 }
-                for (_iterator2 = _createForOfIteratorHelperLoose(addedVotes); !(_step2 = _iterator2()).done;) {
-                  _vote = _step2.value;
+                for (_iterator3 = _createForOfIteratorHelperLoose(addedVotes); !(_step3 = _iterator3()).done;) {
+                  _vote = _step3.value;
                   objs.push({
                     type: _vote.user.id === SceytChatClient.user.id ? 'addOwn' : 'add',
                     vote: _vote,
@@ -15178,39 +15190,39 @@ function watchForEvents() {
                   });
                 }
                 _i = 0, _objs = objs;
-              case 97:
+              case 100:
                 if (!(_i < _objs.length)) {
-                  _context2.n = 101;
+                  _context2.n = 104;
                   break;
                 }
                 obj = _objs[_i];
                 if (!(pollDetailsData !== null && pollDetailsData !== void 0 && pollDetailsData.id && obj.vote)) {
-                  _context2.n = 100;
+                  _context2.n = 103;
                   break;
                 }
                 key = pollDetailsData.id + "_" + obj.vote.optionId;
                 hasNext = ((_store$getState$Messa = store.getState().MessageReducer.pollVotesHasMore) === null || _store$getState$Messa === void 0 ? void 0 : _store$getState$Messa[key]) || false;
                 if (!(obj.type === 'addOwn')) {
-                  _context2.n = 99;
+                  _context2.n = 102;
                   break;
                 }
-                _context2.n = 98;
+                _context2.n = 101;
                 return effects.put(addPollVotesToListAC(pollDetailsData.id, obj.vote.optionId, [obj.vote], hasNext, undefined));
-              case 98:
-                _context2.n = 100;
+              case 101:
+                _context2.n = 103;
                 break;
-              case 99:
-                _context2.n = 100;
+              case 102:
+                _context2.n = 103;
                 return effects.put(deletePollVotesFromListAC(pollDetailsData.id, obj.vote.optionId, [obj.vote], messageId));
-              case 100:
+              case 103:
                 _i++;
-                _context2.n = 97;
+                _context2.n = 100;
                 break;
-              case 101:
+              case 104:
                 _i2 = 0, _objs2 = objs;
-              case 102:
+              case 105:
                 if (!(_i2 < _objs2.length)) {
-                  _context2.n = 104;
+                  _context2.n = 107;
                   break;
                 }
                 _obj = _objs2[_i2];
@@ -15223,29 +15235,29 @@ function watchForEvents() {
                   incrementVotesPerOptionCount: _obj.incrementVotesPerOptionCount
                 });
                 if (!(_channel1.id === _activeChannelId0)) {
-                  _context2.n = 103;
+                  _context2.n = 106;
                   break;
                 }
                 updateMessageOnAllMessages(messageId, {}, _obj);
-                _context2.n = 103;
+                _context2.n = 106;
                 return effects.put(updateMessageAC(messageId, {}, undefined, _obj));
-              case 103:
+              case 106:
                 _i2++;
-                _context2.n = 102;
+                _context2.n = 105;
                 break;
-              case 104:
-                return _context2.a(3, 179);
-              case 105:
+              case 107:
+                return _context2.a(3, 182);
+              case 108:
                 _channel10 = args.channel, _pollDetails = args.pollDetails, _messageId = args.messageId;
                 _pollDetailsData = _pollDetails;
-                _context2.n = 106;
+                _context2.n = 109;
                 return effects.call(getActiveChannelId);
-              case 106:
+              case 109:
                 _activeChannelId1 = _context2.v;
                 _deletedVotes = (_pollDetailsData === null || _pollDetailsData === void 0 ? void 0 : (_pollDetailsData$chan3 = _pollDetailsData.changedVotes) === null || _pollDetailsData$chan3 === void 0 ? void 0 : _pollDetailsData$chan3.removedVotes) || [];
                 _objs3 = [];
-                for (_iterator3 = _createForOfIteratorHelperLoose(_deletedVotes); !(_step3 = _iterator3()).done;) {
-                  _vote2 = _step3.value;
+                for (_iterator4 = _createForOfIteratorHelperLoose(_deletedVotes); !(_step4 = _iterator4()).done;) {
+                  _vote2 = _step4.value;
                   _objs3.push({
                     type: _vote2.user.id === SceytChatClient.user.id ? 'deleteOwn' : 'delete',
                     vote: _vote2,
@@ -15253,27 +15265,27 @@ function watchForEvents() {
                   });
                 }
                 _i3 = 0, _objs4 = _objs3;
-              case 107:
+              case 110:
                 if (!(_i3 < _objs4.length)) {
-                  _context2.n = 109;
+                  _context2.n = 112;
                   break;
                 }
                 _obj2 = _objs4[_i3];
                 if (!(_pollDetailsData !== null && _pollDetailsData !== void 0 && _pollDetailsData.id && _obj2.vote)) {
-                  _context2.n = 108;
+                  _context2.n = 111;
                   break;
                 }
-                _context2.n = 108;
+                _context2.n = 111;
                 return effects.put(deletePollVotesFromListAC(_pollDetailsData.id, _obj2.vote.optionId, [_obj2.vote], _messageId));
-              case 108:
+              case 111:
                 _i3++;
-                _context2.n = 107;
+                _context2.n = 110;
                 break;
-              case 109:
+              case 112:
                 _i4 = 0, _objs5 = _objs3;
-              case 110:
+              case 113:
                 if (!(_i4 < _objs5.length)) {
-                  _context2.n = 112;
+                  _context2.n = 115;
                   break;
                 }
                 _obj3 = _objs5[_i4];
@@ -15282,29 +15294,29 @@ function watchForEvents() {
                   params: {}
                 }, _obj3);
                 if (!(_channel10.id === _activeChannelId1)) {
-                  _context2.n = 111;
+                  _context2.n = 114;
                   break;
                 }
                 updateMessageOnAllMessages(_messageId, {}, _obj3);
-                _context2.n = 111;
+                _context2.n = 114;
                 return effects.put(updateMessageAC(_messageId, {}, undefined, _obj3));
-              case 111:
+              case 114:
                 _i4++;
-                _context2.n = 110;
+                _context2.n = 113;
                 break;
-              case 112:
-                return _context2.a(3, 179);
-              case 113:
+              case 115:
+                return _context2.a(3, 182);
+              case 116:
                 _channel11 = args.channel, _pollDetails2 = args.pollDetails, _messageId2 = args.messageId;
-                _context2.n = 114;
+                _context2.n = 117;
                 return effects.call(getActiveChannelId);
-              case 114:
+              case 117:
                 _activeChannelId10 = _context2.v;
                 _pollDetailsData2 = _pollDetails2;
                 retractedVotes = (_pollDetailsData2 === null || _pollDetailsData2 === void 0 ? void 0 : (_pollDetailsData2$cha = _pollDetailsData2.changedVotes) === null || _pollDetailsData2$cha === void 0 ? void 0 : _pollDetailsData2$cha.removedVotes) || [];
                 _objs6 = [];
-                for (_iterator4 = _createForOfIteratorHelperLoose(retractedVotes); !(_step4 = _iterator4()).done;) {
-                  _vote4 = _step4.value;
+                for (_iterator5 = _createForOfIteratorHelperLoose(retractedVotes); !(_step5 = _iterator5()).done;) {
+                  _vote4 = _step5.value;
                   _objs6.push({
                     type: _vote4.user.id === SceytChatClient.user.id ? 'deleteOwn' : 'delete',
                     vote: _vote4,
@@ -15312,9 +15324,9 @@ function watchForEvents() {
                   });
                 }
                 _i5 = 0, _objs7 = _objs6;
-              case 115:
+              case 118:
                 if (!(_i5 < _objs7.length)) {
-                  _context2.n = 120;
+                  _context2.n = 123;
                   break;
                 }
                 _obj4 = _objs7[_i5];
@@ -15323,40 +15335,40 @@ function watchForEvents() {
                   params: {}
                 }, _obj4);
                 if (!(_pollDetailsData2 !== null && _pollDetailsData2 !== void 0 && _pollDetailsData2.id && retractedVotes.length > 0)) {
-                  _context2.n = 118;
+                  _context2.n = 121;
                   break;
                 }
-                _iterator5 = _createForOfIteratorHelperLoose(retractedVotes);
-              case 116:
-                if ((_step5 = _iterator5()).done) {
-                  _context2.n = 118;
+                _iterator6 = _createForOfIteratorHelperLoose(retractedVotes);
+              case 119:
+                if ((_step6 = _iterator6()).done) {
+                  _context2.n = 121;
                   break;
                 }
-                _vote3 = _step5.value;
-                _context2.n = 117;
+                _vote3 = _step6.value;
+                _context2.n = 120;
                 return effects.put(deletePollVotesFromListAC(_pollDetailsData2.id, _vote3.optionId, [_vote3], _messageId2));
-              case 117:
-                _context2.n = 116;
+              case 120:
+                _context2.n = 119;
                 break;
-              case 118:
+              case 121:
                 if (!(_channel11.id === _activeChannelId10)) {
-                  _context2.n = 119;
+                  _context2.n = 122;
                   break;
                 }
                 updateMessageOnAllMessages(_messageId2, {}, _obj4);
-                _context2.n = 119;
+                _context2.n = 122;
                 return effects.put(updateMessageAC(_messageId2, {}, undefined, _obj4));
-              case 119:
+              case 122:
                 _i5++;
-                _context2.n = 115;
+                _context2.n = 118;
                 break;
-              case 120:
-                return _context2.a(3, 179);
-              case 121:
+              case 123:
+                return _context2.a(3, 182);
+              case 124:
                 _channel12 = args.channel, _messageId3 = args.messageId;
-                _context2.n = 122;
+                _context2.n = 125;
                 return effects.call(getActiveChannelId);
-              case 122:
+              case 125:
                 _activeChannelId11 = _context2.v;
                 _obj5 = {
                   type: 'close',
@@ -15367,54 +15379,54 @@ function watchForEvents() {
                   params: {}
                 }, _obj5);
                 if (!(_channel12.id === _activeChannelId11)) {
-                  _context2.n = 124;
+                  _context2.n = 127;
                   break;
                 }
                 updateMessageOnAllMessages(_messageId3, {}, _obj5);
-                _context2.n = 123;
+                _context2.n = 126;
                 return effects.put(updateMessageAC(_messageId3, {}, undefined, _obj5));
-              case 123:
-                return _context2.a(3, 179);
-              case 124:
-                return _context2.a(3, 179);
-              case 125:
+              case 126:
+                return _context2.a(3, 182);
+              case 127:
+                return _context2.a(3, 182);
+              case 128:
                 _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;
-                _context2.n = 126;
+                _context2.n = 129;
                 return effects.call(getActiveChannelId);
-              case 126:
+              case 129:
                 _activeChannelId12 = _context2.v;
                 if (!(_channel13.id === _activeChannelId12)) {
-                  _context2.n = 128;
+                  _context2.n = 131;
                   break;
                 }
-                _context2.n = 127;
+                _context2.n = 130;
                 return effects.put(deleteReactionFromMessageAC(_message3, _reaction, _isSelf));
-              case 127:
+              case 130:
                 removeReactionOnAllMessages(_message3, _reaction, true);
-              case 128:
+              case 131:
                 _channelUpdateParams = JSON.parse(JSON.stringify(_channel13));
                 if (channelFromMap && channelFromMap.lastReactedMessage && channelFromMap.lastReactedMessage.id === _message3.id) {
                   _channelUpdateParams.lastReactedMessage = null;
                 }
-                _context2.n = 129;
+                _context2.n = 132;
                 return effects.put(updateChannelDataAC(_channel13.id, _channelUpdateParams));
-              case 129:
+              case 132:
                 updateChannelOnAllChannels(_channel13.id, _channelUpdateParams);
                 if (checkChannelExistsOnMessagesMap(_channel13.id)) {
                   removeReactionToMessageOnMap(_channel13.id, _message3, _reaction, true);
                 }
-                return _context2.a(3, 179);
-              case 130:
+                return _context2.a(3, 182);
+              case 133:
                 _channel14 = args.channel;
                 if (!_channel14) {
-                  _context2.n = 132;
+                  _context2.n = 135;
                   break;
                 }
                 _updatedChannel = JSON.parse(JSON.stringify(_channel14));
-                _context2.n = 131;
+                _context2.n = 134;
                 return effects.put(updateChannelDataAC(_channel14.id, {
                   lastMessage: _channel14.lastMessage,
                   newMessageCount: _channel14.newMessageCount,
@@ -15427,36 +15439,36 @@ function watchForEvents() {
                   lastDisplayedMessageId: _channel14.lastDisplayedMessageId,
                   messageRetentionPeriod: _channel14.messageRetentionPeriod
                 }));
-              case 131:
+              case 134:
                 updateChannelOnAllChannels(_channel14.id, _updatedChannel);
-              case 132:
-                return _context2.a(3, 179);
-              case 133:
+              case 135:
+                return _context2.a(3, 182);
+              case 136:
                 _channel15 = args.channel;
                 log.info('CLEAR_HISTORY: ', _channel15);
-                _context2.n = 134;
+                _context2.n = 137;
                 return effects.call(getActiveChannelId);
-              case 134:
+              case 137:
                 _activeChannelId13 = _context2.v;
-                _context2.n = 135;
+                _context2.n = 138;
                 return effects.call(checkChannelExists, _channel15.id);
-              case 135:
+              case 138:
                 channelExist = _context2.v;
                 if (!(_channel15.id === _activeChannelId13)) {
-                  _context2.n = 137;
+                  _context2.n = 140;
                   break;
                 }
-                _context2.n = 136;
+                _context2.n = 139;
                 return effects.put(clearMessagesAC());
-              case 136:
+              case 139:
                 removeAllMessages();
-              case 137:
+              case 140:
                 removeMessagesFromMap(_channel15.id);
                 if (!channelExist) {
-                  _context2.n = 138;
+                  _context2.n = 141;
                   break;
                 }
-                _context2.n = 138;
+                _context2.n = 141;
                 return effects.put(updateChannelDataAC(_channel15.id, {
                   lastMessage: null,
                   newMessageCount: 0,
@@ -15464,7 +15476,7 @@ function watchForEvents() {
                   muted: _channel15.muted,
                   mutedTill: _channel15.mutedTill
                 }));
-              case 138:
+              case 141:
                 updateChannelOnAllChannels(_channel15.id, {
                   lastMessage: null,
                   newMessageCount: 0,
@@ -15472,173 +15484,173 @@ function watchForEvents() {
                   muted: _channel15.muted,
                   mutedTill: _channel15.mutedTill
                 });
-                return _context2.a(3, 179);
-              case 139:
+                return _context2.a(3, 182);
+              case 142:
                 _channel16 = args.channel;
                 log.info('channel MUTE ... ');
-                _context2.n = 140;
+                _context2.n = 143;
                 return effects.put(updateChannelDataAC(_channel16.id, {
                   muted: _channel16.muted,
                   mutedTill: _channel16.mutedTill
                 }));
-              case 140:
+              case 143:
                 updateChannelOnAllChannels(_channel16.id, {
                   muted: _channel16.muted,
                   mutedTill: _channel16.mutedTill
                 });
-                return _context2.a(3, 179);
-              case 141:
+                return _context2.a(3, 182);
+              case 144:
                 _channel17 = args.channel;
                 log.info('channel UNMUTE ... ');
-                _context2.n = 142;
+                _context2.n = 145;
                 return effects.put(updateChannelDataAC(_channel17.id, {
                   muted: _channel17.muted,
                   mutedTill: _channel17.mutedTill
                 }));
-              case 142:
+              case 145:
                 updateChannelOnAllChannels(_channel17.id, {
                   muted: _channel17.muted,
                   mutedTill: _channel17.mutedTill
                 });
-                return _context2.a(3, 179);
-              case 143:
+                return _context2.a(3, 182);
+              case 146:
                 _channel18 = args.channel;
                 log.info('channel PINED ... ');
-                _context2.n = 144;
+                _context2.n = 147;
                 return effects.put(updateChannelDataAC(_channel18.id, {
                   pinnedAt: _channel18.pinnedAt
                 }, true));
-              case 144:
+              case 147:
                 updateChannelOnAllChannels(_channel18.id, {
                   pinnedAt: _channel18.pinnedAt
                 });
-                return _context2.a(3, 179);
-              case 145:
+                return _context2.a(3, 182);
+              case 148:
                 _channel19 = args.channel;
                 log.info('channel UNPINED ... ');
-                _context2.n = 146;
+                _context2.n = 149;
                 return effects.put(updateChannelDataAC(_channel19.id, {
                   pinnedAt: _channel19.pinnedAt
                 }, false, true));
-              case 146:
+              case 149:
                 updateChannelOnAllChannels(_channel19.id, {
                   pinnedAt: _channel19.pinnedAt
                 });
-                return _context2.a(3, 179);
-              case 147:
+                return _context2.a(3, 182);
+              case 150:
                 _channel20 = args.channel;
                 log.info('channel HIDE ... ');
-                _context2.n = 148;
+                _context2.n = 151;
                 return effects.put(setChannelToHideAC(_channel20));
-              case 148:
-                return _context2.a(3, 179);
-              case 149:
+              case 151:
+                return _context2.a(3, 182);
+              case 152:
                 _channel21 = args.channel;
                 log.info('channel UNHIDE ... ');
-                _context2.n = 150;
+                _context2.n = 153;
                 return effects.put(setChannelToUnHideAC(_channel21));
-              case 150:
-                return _context2.a(3, 179);
-              case 151:
+              case 153:
+                return _context2.a(3, 182);
+              case 154:
                 _channel22 = args.channel;
-                _context2.n = 152;
+                _context2.n = 155;
                 return effects.put(updateChannelDataAC(_channel22.id, {
                   unread: _channel22.unread,
                   muted: _channel22.muted,
                   mutedTill: _channel22.mutedTill
                 }));
-              case 152:
+              case 155:
                 _groupName5 = getChannelGroupName(_channel22);
-                _context2.n = 153;
+                _context2.n = 156;
                 return effects.put(updateSearchedChannelDataAC(_channel22.id, {
                   unread: _channel22.unread
                 }, _groupName5));
-              case 153:
+              case 156:
                 updateChannelOnAllChannels(_channel22.id, {
                   unread: _channel22.unread
                 });
-                return _context2.a(3, 179);
-              case 154:
+                return _context2.a(3, 182);
+              case 157:
                 _channel23 = args.channel;
-                _context2.n = 155;
+                _context2.n = 158;
                 return effects.put(updateChannelDataAC(_channel23.id, {
                   unread: _channel23.unread,
                   muted: _channel23.muted,
                   mutedTill: _channel23.mutedTill
                 }));
-              case 155:
+              case 158:
                 _groupName6 = getChannelGroupName(_channel23);
-                _context2.n = 156;
+                _context2.n = 159;
                 return effects.put(updateSearchedChannelDataAC(_channel23.id, {
                   unread: _channel23.unread
                 }, _groupName6));
-              case 156:
+              case 159:
                 updateChannelOnAllChannels(_channel23.id, {
                   unread: _channel23.unread
                 });
-                return _context2.a(3, 179);
-              case 157:
+                return _context2.a(3, 182);
+              case 160:
                 _channel24 = args.channel, members = args.members;
                 log.info('channel CHANGE_ROLE  channel ... ', _channel24);
                 log.info('channel CHANGE_ROLE  member ... ', members);
-                _context2.n = 158;
+                _context2.n = 161;
                 return effects.call(getActiveChannelId);
-              case 158:
+              case 161:
                 _activeChannelId14 = _context2.v;
                 if (!(_channel24.id === _activeChannelId14)) {
-                  _context2.n = 159;
+                  _context2.n = 162;
                   break;
                 }
-                _context2.n = 159;
+                _context2.n = 162;
                 return effects.put(updateMembersAC(members));
-              case 159:
+              case 162:
                 i = 0;
-              case 160:
+              case 163:
                 if (!(i < members.length)) {
-                  _context2.n = 163;
+                  _context2.n = 166;
                   break;
                 }
                 if (!(members[i].id === SceytChatClient.user.id)) {
-                  _context2.n = 162;
+                  _context2.n = 165;
                   break;
                 }
-                _context2.n = 161;
+                _context2.n = 164;
                 return effects.put(updateChannelDataAC(_channel24.id, {
                   userRole: members[i].role,
                   muted: _channel24.muted,
                   mutedTill: _channel24.mutedTill
                 }));
-              case 161:
+              case 164:
                 updateChannelOnAllChannels(_channel24.id, {
                   userRole: members[i].role,
                   muted: _channel24.muted,
                   mutedTill: _channel24.mutedTill
                 });
-              case 162:
+              case 165:
                 i++;
-                _context2.n = 160;
+                _context2.n = 163;
                 break;
-              case 163:
-                return _context2.a(3, 179);
-              case 164:
+              case 166:
+                return _context2.a(3, 182);
+              case 167:
                 _channel25 = args.channel;
                 log.info('channel frozen  channel ... ', _channel25);
-                return _context2.a(3, 179);
-              case 165:
+                return _context2.a(3, 182);
+              case 168:
                 _channel26 = args.channel;
                 log.info('channel unfrozen  channel ... ', _channel26);
-                return _context2.a(3, 179);
-              case 166:
+                return _context2.a(3, 182);
+              case 169:
                 _channelId2 = args.channelId, from = args.from, name = args.name;
                 log.info('channel event received >>>... . . . . . ', args);
                 if (!(from.id === SceytChatClient.user.id)) {
-                  _context2.n = 167;
+                  _context2.n = 170;
                   break;
                 }
-                return _context2.a(3, 179);
-              case 167:
+                return _context2.a(3, 182);
+              case 170:
                 if (!(name === 'start_typing')) {
-                  _context2.n = 169;
+                  _context2.n = 172;
                   break;
                 }
                 if (!usersTimeout[_channelId2]) {
@@ -15650,27 +15662,27 @@ function watchForEvents() {
                 usersTimeout[_channelId2][from.id] = setTimeout(function () {
                   channelListener.onReceivedChannelEvent(_channelId2, from, 'stop_typing');
                 }, 5000);
-                _context2.n = 168;
+                _context2.n = 171;
                 return effects.put(switchTypingIndicatorAC(true, _channelId2, from));
-              case 168:
-                _context2.n = 174;
+              case 171:
+                _context2.n = 177;
                 break;
-              case 169:
+              case 172:
                 if (!(name === 'stop_typing')) {
-                  _context2.n = 171;
+                  _context2.n = 174;
                   break;
                 }
                 if (usersTimeout[_channelId2] && usersTimeout[_channelId2][from.id]) {
                   clearTimeout(usersTimeout[_channelId2][from.id]);
                 }
-                _context2.n = 170;
+                _context2.n = 173;
                 return effects.put(switchTypingIndicatorAC(false, _channelId2, from));
-              case 170:
-                _context2.n = 174;
+              case 173:
+                _context2.n = 177;
                 break;
-              case 171:
+              case 174:
                 if (!(name === 'start_recording')) {
-                  _context2.n = 173;
+                  _context2.n = 176;
                   break;
                 }
                 if (!usersTimeout[_channelId2]) {
@@ -15682,50 +15694,50 @@ function watchForEvents() {
                 usersTimeout[_channelId2][from.id] = setTimeout(function () {
                   channelListener.onReceivedChannelEvent(_channelId2, from, 'stop_recording');
                 }, 5000);
-                _context2.n = 172;
+                _context2.n = 175;
                 return effects.put(switchRecordingIndicatorAC(true, _channelId2, from));
-              case 172:
-                _context2.n = 174;
+              case 175:
+                _context2.n = 177;
                 break;
-              case 173:
+              case 176:
                 if (!(name === 'stop_recording')) {
-                  _context2.n = 174;
+                  _context2.n = 177;
                   break;
                 }
                 if (usersTimeout[_channelId2] && usersTimeout[_channelId2][from.id]) {
                   clearTimeout(usersTimeout[_channelId2][from.id]);
                 }
-                _context2.n = 174;
+                _context2.n = 177;
                 return effects.put(switchRecordingIndicatorAC(false, _channelId2, from));
-              case 174:
-                return _context2.a(3, 179);
-              case 175:
+              case 177:
+                return _context2.a(3, 182);
+              case 178:
                 status = args.status;
                 log.info('connection status changed . . . . . ', status);
-                _context2.n = 176;
+                _context2.n = 179;
                 return effects.put(setConnectionStatusAC(status));
-              case 176:
+              case 179:
                 if (!(status === CONNECTION_STATUS.CONNECTED)) {
-                  _context2.n = 177;
+                  _context2.n = 180;
                   break;
                 }
-                _context2.n = 177;
+                _context2.n = 180;
                 return effects.put(getRolesAC());
-              case 177:
-                return _context2.a(3, 179);
-              case 178:
+              case 180:
+                return _context2.a(3, 182);
+              case 181:
                 log.warn('UNHANDLED EVENT FROM REDUX-SAGA EVENT-CHANNEL');
-              case 179:
-                _context2.n = 181;
+              case 182:
+                _context2.n = 184;
                 break;
-              case 180:
-                _context2.p = 180;
+              case 183:
+                _context2.p = 183;
                 _t2 = _context2.v;
                 log.error('Error in watchForEvents:', _t2);
-              case 181:
+              case 184:
                 return _context2.a(2);
             }
-          }, _callee2, null, [[0, 180]]);
+          }, _callee2, null, [[0, 183]]);
         });
       case 1:
         return _context3.d(_regeneratorValues(_loop()), 2);
@@ -19047,7 +19059,7 @@ function sendMessage(action) {
   }, _marked$3, null, [[1, 18]]);
 }
 function sendTextMessage(action) {
-  var payload, message, connectionState, channelId, channel, sendMessageTid, activeChannelId, SceytChatClient, createChannelData, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, messageToSend, pendingMessage, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, _t3;
+  var payload, message, connectionState, channelId, channel, sendMessageTid, activeChannelId, SceytChatClient, createChannelData, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, messageToSend, pendingMessage, _messageResponse, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, _t3;
   return _regenerator().w(function (_context4) {
     while (1) switch (_context4.p = _context4.n) {
       case 0:
@@ -19160,6 +19172,7 @@ function sendTextMessage(action) {
           parentMessage: messageResponse.parentMessage,
           repliedInThread: messageResponse.repliedInThread,
           createdAt: messageResponse.createdAt,
+          pollDetails: (_messageResponse = messageResponse) === null || _messageResponse === void 0 ? void 0 : _messageResponse.pollDetails,
           channelId: channel.id
         };
         if (!(activeChannelId === channel.id)) {
@@ -19440,7 +19453,7 @@ function forwardMessage(action) {
   }, _marked3$1, null, [[0, 20]]);
 }
 function resendMessage(action) {
-  var payload, message, connectionState, channelId, channel, customUploader, attachmentCompilation, messageAttachment, messageCopy, handleUploadProgress, uri, filePath, handleUpdateLocalPath, pendingAttachment, thumbnailMetas, fileSize, meta, attachmentMeta, attachmentBuilder, attachmentToSend, messageResponse, messageUpdateData, fileType, messageToUpdate, _messageCopy2, _getMessagesFromMap, _messageResponse, _messageUpdateData, isInActiveChannel, activeChannelId, _messageToUpdate, _t5, _t6;
+  var payload, message, connectionState, channelId, channel, customUploader, attachmentCompilation, messageAttachment, messageCopy, handleUploadProgress, uri, filePath, handleUpdateLocalPath, pendingAttachment, thumbnailMetas, fileSize, meta, attachmentMeta, attachmentBuilder, attachmentToSend, messageResponse, messageUpdateData, fileType, messageToUpdate, _messageCopy2, _getMessagesFromMap, _messageResponse2, _messageUpdateData, isInActiveChannel, activeChannelId, _messageToUpdate, _t5, _t6;
   return _regenerator().w(function (_context6) {
     while (1) switch (_context6.p = _context6.n) {
       case 0:
@@ -19693,24 +19706,24 @@ function resendMessage(action) {
         _context6.n = 27;
         return effects.call(channel.sendMessage, _messageCopy2);
       case 27:
-        _messageResponse = _context6.v;
+        _messageResponse2 = _context6.v;
         _context6.n = 28;
         return effects.put(removePendingMessageAC(channel.id, _messageCopy2.tid || _messageCopy2.id));
       case 28:
         _messageUpdateData = {
-          id: _messageResponse.id,
-          body: _messageResponse.body,
-          type: _messageResponse.type,
-          state: _messageResponse.state,
-          displayCount: _messageResponse.displayCount,
-          deliveryStatus: _messageResponse.deliveryStatus,
+          id: _messageResponse2.id,
+          body: _messageResponse2.body,
+          type: _messageResponse2.type,
+          state: _messageResponse2.state,
+          displayCount: _messageResponse2.displayCount,
+          deliveryStatus: _messageResponse2.deliveryStatus,
           attachments: [],
-          mentionedUsers: _messageResponse.mentionedUsers,
-          metadata: _messageResponse.metadata,
-          parentMessage: _messageResponse.parentMessage,
-          repliedInThread: _messageResponse.repliedInThread,
-          bodyAttributes: _messageResponse.bodyAttributes,
-          createdAt: _messageResponse.createdAt,
+          mentionedUsers: _messageResponse2.mentionedUsers,
+          metadata: _messageResponse2.metadata,
+          parentMessage: _messageResponse2.parentMessage,
+          repliedInThread: _messageResponse2.repliedInThread,
+          bodyAttributes: _messageResponse2.bodyAttributes,
+          createdAt: _messageResponse2.createdAt,
           channelId: channel.id
         };
         isInActiveChannel = (_getMessagesFromMap = getMessagesFromMap(channelId)) === null || _getMessagesFromMap === void 0 ? void 0 : _getMessagesFromMap.find(function (message) {
@@ -19736,7 +19749,7 @@ function resendMessage(action) {
           break;
         }
         _context6.n = 31;
-        return effects.put(updateMessageAC(_messageCopy2.tid, JSON.parse(JSON.stringify(_messageResponse))));
+        return effects.put(updateMessageAC(_messageCopy2.tid, JSON.parse(JSON.stringify(_messageResponse2))));
       case 31:
         updateMessageOnMap(channel.id, {
           messageId: _messageCopy2.tid,
@@ -19745,7 +19758,7 @@ function resendMessage(action) {
         updateMessageOnAllMessages(_messageCopy2.tid, _messageUpdateData);
       case 32:
         updateChannelOnAllChannels(channel.id, channel);
-        _messageToUpdate = JSON.parse(JSON.stringify(_messageResponse));
+        _messageToUpdate = JSON.parse(JSON.stringify(_messageResponse2));
         updateChannelLastMessageOnAllChannels(channel.id, _messageToUpdate);
         _context6.n = 33;
         return effects.put(updateChannelLastMessageAC(_messageToUpdate, {
@@ -36532,7 +36545,7 @@ var Message$1 = function Message(_ref) {
     })) {
       if (message.userMarkers && message.userMarkers.length && message.userMarkers.find(function (marker) {
         return marker.name === MESSAGE_DELIVERY_STATUS.READ;
-      })) {
+      }) && message.incoming) {
         dispatch(markMessagesAsDeliveredAC(channel.id, [message.id]));
       }
     }