sceyt-chat-react-uikit 1.7.8-beta.5 → 1.7.8-beta.7

package/index.js

@@ -10740,6 +10740,12 @@ function setPendingPollActionsMapAC(messageId, event) {
     event: event
   });
 }
+function updatePendingPollActionAC(messageId, message) {
+  return updatePendingPollAction({
+    messageId: messageId,
+    message: message
+  });
+}
 function setPendingMessageAC(channelId, message) {
   return setPendingMessage$1({
     channelId: channelId,
@@ -11841,10 +11847,24 @@ var messageSlice = createSlice({
       }
       state.pendingPollActions[messageId] = [].concat(state.pendingPollActions[messageId], [event]);
     },
-    setPendingMessage: function setPendingMessage(state, action) {
+    updatePendingPollAction: function updatePendingPollAction(state, action) {
       var _action$payload20 = action.payload,
-        channelId = _action$payload20.channelId,
+        messageId = _action$payload20.messageId,
         message = _action$payload20.message;
+      if (!state.pendingPollActions[messageId]) {
+        return;
+      }
+      state.pendingPollActions[messageId] = state.pendingPollActions[messageId].map(function (action) {
+        var _action$message, _action$message2;
+        return ((_action$message = action.message) === null || _action$message === void 0 ? void 0 : _action$message.id) === messageId || ((_action$message2 = action.message) === null || _action$message2 === void 0 ? void 0 : _action$message2.tid) === messageId ? _extends({}, action, {
+          message: message
+        }) : action;
+      });
+    },
+    setPendingMessage: function setPendingMessage(state, action) {
+      var _action$payload21 = action.payload,
+        channelId = _action$payload21.channelId,
+        message = _action$payload21.message;
       if (!state.pendingMessagesMap[channelId]) {
         state.pendingMessagesMap[channelId] = [];
       }
@@ -11856,9 +11876,9 @@ var messageSlice = createSlice({
       }
     },
     removePendingMessage: function removePendingMessage(state, action) {
-      var _action$payload21 = action.payload,
-        channelId = _action$payload21.channelId,
-        messageId = _action$payload21.messageId;
+      var _action$payload22 = action.payload,
+        channelId = _action$payload22.channelId,
+        messageId = _action$payload22.messageId;
       if (state.pendingMessagesMap[channelId]) {
         state.pendingMessagesMap[channelId] = state.pendingMessagesMap[channelId].filter(function (msg) {
           return !(msg.id === messageId || msg.tid === messageId);
@@ -11869,10 +11889,10 @@ var messageSlice = createSlice({
       }
     },
     updatePendingMessage: function updatePendingMessage(state, action) {
-      var _action$payload22 = action.payload,
-        channelId = _action$payload22.channelId,
-        messageId = _action$payload22.messageId,
-        updatedMessage = _action$payload22.updatedMessage;
+      var _action$payload23 = action.payload,
+        channelId = _action$payload23.channelId,
+        messageId = _action$payload23.messageId,
+        updatedMessage = _action$payload23.updatedMessage;
       if (state.pendingMessagesMap[channelId]) {
         state.pendingMessagesMap[channelId] = state.pendingMessagesMap[channelId].map(function (msg) {
           if (msg.id === messageId || msg.tid === messageId) {
@@ -11947,7 +11967,8 @@ var _messageSlice$actions = messageSlice.actions,
   setPendingPollActionsMap = _messageSlice$actions.setPendingPollActionsMap,
   setPendingMessage$1 = _messageSlice$actions.setPendingMessage,
   removePendingMessage = _messageSlice$actions.removePendingMessage,
-  updatePendingMessage = _messageSlice$actions.updatePendingMessage;
+  updatePendingMessage = _messageSlice$actions.updatePendingMessage,
+  updatePendingPollAction = _messageSlice$actions.updatePendingPollAction;
 var MessageReducer = messageSlice.reducer;
 
 var initialState$2 = {
@@ -15425,6 +15446,7 @@ function watchForEvents() {
                 }
                 return _context.a(3, 183);
               case 99:
+                console.log('CHANNEL_EVENT_TYPES.POLL_ADDED ... ');
                 _channel10 = args.channel, pollDetails = args.pollDetails, _messageId = args.messageId;
                 pollDetailsData = pollDetails;
                 _context.n = 100;
@@ -15509,6 +15531,7 @@ function watchForEvents() {
               case 108:
                 return _context.a(3, 183);
               case 109:
+                console.log('CHANNEL_EVENT_TYPES.POLL_DELETED ... ');
                 _channel11 = args.channel, _pollDetails = args.pollDetails, _messageId2 = args.messageId;
                 _pollDetailsData = _pollDetails;
                 _context.n = 110;
@@ -15568,6 +15591,7 @@ function watchForEvents() {
               case 116:
                 return _context.a(3, 183);
               case 117:
+                console.log('CHANNEL_EVENT_TYPES.POLL_RETRACTED ... ');
                 _channel12 = args.channel, _pollDetails2 = args.pollDetails, _messageId3 = args.messageId;
                 _context.n = 118;
                 return effects.call(getActiveChannelId);
@@ -15626,6 +15650,7 @@ function watchForEvents() {
               case 124:
                 return _context.a(3, 183);
               case 125:
+                console.log('CHANNEL_EVENT_TYPES.POLL_CLOSED ... ');
                 _channel13 = args.channel, _messageId4 = args.messageId;
                 _context.n = 126;
                 return effects.call(getActiveChannelId);
@@ -19143,6 +19168,10 @@ var updateMessage$1 = function updateMessage(actionType, pending, channelId, scr
           _context.n = 7;
           break;
         case 6:
+          if (!(channel !== null && channel !== void 0 && channel.id)) {
+            _context.n = 7;
+            break;
+          }
           _context.n = 7;
           return effects.put(getMessagesAC(channel, false, channel === null || channel === void 0 ? void 0 : (_channel$lastMessage3 = channel.lastMessage) === null || _channel$lastMessage3 === void 0 ? void 0 : _channel$lastMessage3.id, undefined, false, 'smooth', true));
         case 7:
@@ -19358,7 +19387,7 @@ function sendMessage(action) {
         messagesToSend.push(messageToSend);
       case 12:
         _loop2 = /*#__PURE__*/_regenerator().m(function _callee3() {
-          var messageAttachment, messageToSend, messageCopy, _attachmentsToSend, linkAttachmentToSend, linkAttachmentBuilder, messageResponse, k, pendingAttachment, attachmentsToUpdate, currentAttachmentsMap, messageUpdateData, activeChannelId, messageToUpdate, channelUpdateParam, isErrorResendable, _t;
+          var messageAttachment, messageToSend, messageCopy, _attachmentsToSend, linkAttachmentToSend, linkAttachmentBuilder, messageResponse, k, pendingAttachment, attachmentsToUpdate, currentAttachmentsMap, messageUpdateData, stringifiedMessageUpdateData, activeChannelId, channelUpdateParam, isErrorResendable, _t;
           return _regenerator().w(function (_context3) {
             while (1) switch (_context3.p = _context3.n) {
               case 0:
@@ -19460,23 +19489,23 @@ function sendMessage(action) {
                   createdAt: messageResponse.createdAt,
                   channelId: channel.id
                 };
+                stringifiedMessageUpdateData = JSON.parse(JSON.stringify(messageUpdateData));
                 activeChannelId = getActiveChannelId();
                 if (!(activeChannelId === channel.id)) {
                   _context3.n = 9;
                   break;
                 }
                 _context3.n = 9;
-                return effects.put(updateMessageAC(messageToSend.tid, JSON.parse(JSON.stringify(messageUpdateData)), true));
+                return effects.put(updateMessageAC(messageToSend.tid, stringifiedMessageUpdateData, true));
               case 9:
                 _context3.n = 10;
                 return effects.put(removePendingMessageAC(channel.id, messageToSend.tid));
               case 10:
-                addMessageToMap(channel.id, JSON.parse(JSON.stringify(messageUpdateData)));
+                addMessageToMap(channel.id, stringifiedMessageUpdateData);
                 updateMessageOnAllMessages(messageToSend.tid, messageUpdateData);
-                messageToUpdate = JSON.parse(JSON.stringify(messageResponse));
-                updateChannelLastMessageOnAllChannels(channel.id, messageToUpdate);
+                updateChannelLastMessageOnAllChannels(channel.id, stringifiedMessageUpdateData);
                 channelUpdateParam = {
-                  lastMessage: messageToUpdate,
+                  lastMessage: stringifiedMessageUpdateData,
                   lastReactedMessage: null
                 };
                 if (!channel.unread) {
@@ -19567,7 +19596,7 @@ function sendMessage(action) {
   }, _marked$3, null, [[1, 16, 17, 19]]);
 }
 function sendTextMessage(action) {
-  var payload, message, connectionState, channelId, channel, sendMessageTid, pendingMessage, SceytChatClient, createChannelData, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, createdMessage, messageToSend, _messageResponse, messageResponse, messageUpdateData, activeChannelId, messageToUpdate, channelUpdateParam, isErrorResendable, _activeChannelId, _t3;
+  var payload, message, connectionState, channelId, channel, sendMessageTid, pendingMessage, SceytChatClient, createChannelData, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, createdMessage, messageToSend, _messageResponse, messageResponse, messageUpdateData, activeChannelId, stringifiedMessageUpdateData, messageToUpdate, channelUpdateParam, isErrorResendable, _activeChannelId, _t3;
   return _regenerator().w(function (_context5) {
     while (1) switch (_context5.p = _context5.n) {
       case 0:
@@ -19655,7 +19684,7 @@ function sendTextMessage(action) {
         return effects.call(updateMessage$1, action.type, pendingMessage, channel.id, true, message);
       case 8:
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context5.n = 17;
+          _context5.n = 18;
           break;
         }
         if (!sendMessageHandler) {
@@ -19699,10 +19728,14 @@ function sendTextMessage(action) {
         _context5.n = 13;
         return effects.put(updateMessageAC(messageToSend.tid, messageUpdateData, true));
       case 13:
+        stringifiedMessageUpdateData = JSON.parse(JSON.stringify(messageUpdateData));
         _context5.n = 14;
-        return effects.put(removePendingMessageAC(channel.id, messageToSend.tid));
+        return effects.put(updatePendingPollActionAC(messageToSend.tid, stringifiedMessageUpdateData));
       case 14:
-        addMessageToMap(channel.id, JSON.parse(JSON.stringify(messageUpdateData)));
+        _context5.n = 15;
+        return effects.put(removePendingMessageAC(channel.id, messageToSend.tid));
+      case 15:
+        addMessageToMap(channel.id, stringifiedMessageUpdateData);
         if (activeChannelId === channel.id) {
           updateMessageOnAllMessages(messageToSend.tid, messageUpdateData);
         }
@@ -19712,42 +19745,42 @@ function sendTextMessage(action) {
           lastMessage: messageToUpdate,
           lastReactedMessage: null
         };
-        _context5.n = 15;
+        _context5.n = 16;
         return effects.put(updateChannelDataAC(channel.id, channelUpdateParam, true));
-      case 15:
+      case 16:
         updateChannelOnAllChannels(channel.id, channelUpdateParam);
         if (!channel.unread) {
-          _context5.n = 16;
+          _context5.n = 17;
           break;
         }
-        _context5.n = 16;
+        _context5.n = 17;
         return effects.put(markChannelAsReadAC(channel.id));
-      case 16:
+      case 17:
         channel.lastMessage = messageToUpdate;
-        _context5.n = 18;
+        _context5.n = 19;
         break;
-      case 17:
-        throw new Error('Connection required to send message');
       case 18:
-        _context5.n = 22;
-        break;
+        throw new Error('Connection required to send message');
       case 19:
-        _context5.p = 19;
+        _context5.n = 23;
+        break;
+      case 20:
+        _context5.p = 20;
         _t3 = _context5.v;
         log.error('error on send text message ... ', _t3 === null || _t3 === void 0 ? void 0 : _t3.type);
         isErrorResendable = isResendableError(_t3 === null || _t3 === void 0 ? void 0 : _t3.type);
         if (!(!isErrorResendable && channel.id && sendMessageTid)) {
-          _context5.n = 21;
+          _context5.n = 22;
           break;
         }
-        _context5.n = 20;
+        _context5.n = 21;
         return effects.put(removePendingMessageAC(channel.id, sendMessageTid));
-      case 20:
-        _context5.n = 22;
-        break;
       case 21:
+        _context5.n = 23;
+        break;
+      case 22:
         if (!(channel.id && sendMessageTid)) {
-          _context5.n = 22;
+          _context5.n = 23;
           break;
         }
         updateMessageOnMap(channel.id, {
@@ -19758,26 +19791,26 @@ function sendTextMessage(action) {
         });
         _activeChannelId = getActiveChannelId();
         if (!(_activeChannelId === channel.id)) {
-          _context5.n = 22;
+          _context5.n = 23;
           break;
         }
         updateMessageOnAllMessages(sendMessageTid, {
           state: MESSAGE_STATUS.FAILED
         });
-        _context5.n = 22;
+        _context5.n = 23;
         return effects.put(updateMessageAC(sendMessageTid, {
           state: MESSAGE_STATUS.FAILED
         }));
-      case 22:
-        _context5.p = 22;
-        _context5.n = 23;
-        return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
       case 23:
-        return _context5.f(22);
+        _context5.p = 23;
+        _context5.n = 24;
+        return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
       case 24:
+        return _context5.f(23);
+      case 25:
         return _context5.a(2);
     }
-  }, _marked2$2, null, [[3, 19, 22, 24]]);
+  }, _marked2$2, null, [[3, 20, 23, 25]]);
 }
 function forwardMessage(action) {
   var payload, message, channelId, connectionState, isForward, pendingMessage, channel, activeChannelId, messageTid, SceytChatClient, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, pollDetails, messageToSend, hasNextMessages, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, isErrorResendable, _activeChannelId2, _t4;
@@ -21447,9 +21480,9 @@ function getMessageMarkers(action) {
     }
   }, _marked16$1, null, [[0, 5, 6, 8]]);
 }
-function executeAddPollVote(channelId, pollId, optionId, message, isResend) {
+function executeAddPollVote(channelId, pollId, optionId, message) {
   var _user$presence, _message$pollDetails, _message$pollDetails2, _message$pollDetails3, _message$pollDetails4;
-  var channel, user, vote, objs, _message$pollDetails5, _message$pollDetails6, _message$pollDetails7, _iterator2, _step2, obj;
+  var channel, user, vote, objs, _message$pollDetails5, _message$pollDetails6, _message$pollDetails7;
   return _regenerator().w(function (_context22) {
     while (1) switch (_context22.n) {
       case 0:
@@ -21498,38 +21531,16 @@ function executeAddPollVote(channelId, pollId, optionId, message, isResend) {
           vote: vote,
           incrementVotesPerOptionCount: 1
         });
-        if (isResend) {
-          _context22.n = 5;
-          break;
-        }
-        _iterator2 = _createForOfIteratorHelperLoose(objs);
-      case 3:
-        if ((_step2 = _iterator2()).done) {
-          _context22.n = 5;
+        if (!(channel && message.id)) {
+          _context22.n = 4;
           break;
         }
-        obj = _step2.value;
-        updateMessageOnMap(channel.id, {
-          messageId: message.id,
-          params: {}
-        }, obj);
-        updateMessageOnAllMessages(message.id, {}, obj);
-        _context22.n = 4;
-        return effects.put(updateMessageAC(message.id, {}, undefined, obj));
-      case 4:
         _context22.n = 3;
-        break;
-      case 5:
-        if (!channel) {
-          _context22.n = 7;
-          break;
-        }
-        _context22.n = 6;
         return effects.call(channel.addVote, message.id, pollId, [optionId]);
-      case 6:
-        _context22.n = 7;
+      case 3:
+        _context22.n = 4;
         return effects.put(removePendingPollActionAC(message.id, 'ADD_POLL_VOTE', optionId));
-      case 7:
+      case 4:
         return _context22.a(2);
     }
   }, _marked17$1);
@@ -21573,7 +21584,7 @@ function updateMessageOptimisticallyForAddPollVote(channelId, message, vote) {
   }, _marked18$1);
 }
 function addPollVote(action) {
-  var payload, channelId, pollId, optionId, message, isResend, sceytChatClient, _user$presence2, connectionState, user, vote, pendingAction, conflictCheck, channel, _Object$values, _store$getState$Messa, _currentMessage$pollD, _currentMessage$pollD2, _currentMessage$pollD3, currentMessage, hasNext, obj, _t32;
+  var payload, channelId, pollId, optionId, message, isResend, sceytChatClient, _user$presence2, user, vote, pendingAction, conflictCheck, channel, _Object$values, _store$getState$Messa, _currentMessage$pollD, _currentMessage$pollD2, _currentMessage$pollD3, currentMessage, hasNext, obj, _t32;
   return _regenerator().w(function (_context24) {
     while (1) switch (_context24.p = _context24.n) {
       case 0:
@@ -21582,10 +21593,9 @@ function addPollVote(action) {
         channelId = payload.channelId, pollId = payload.pollId, optionId = payload.optionId, message = payload.message, isResend = payload.isResend;
         sceytChatClient = getClient();
         if (!sceytChatClient) {
-          _context24.n = 7;
+          _context24.n = 6;
           break;
         }
-        connectionState = sceytChatClient.connectionState;
         user = sceytChatClient.user;
         vote = {
           optionId: optionId,
@@ -21608,10 +21618,6 @@ function addPollVote(action) {
             createdAt: new Date().getTime()
           }
         };
-        if (!(connectionState !== CONNECTION_STATUS.CONNECTED)) {
-          _context24.n = 6;
-          break;
-        }
         pendingAction = {
           type: 'ADD_POLL_VOTE',
           channelId: channelId,
@@ -21661,27 +21667,25 @@ function addPollVote(action) {
         }
         return _context24.d(_regeneratorValues(updateMessageOptimisticallyForAddPollVote(channelId, message, vote)), 5);
       case 5:
-        if (!conflictCheck.shouldSkip) {
+        if (!conflictCheck.shouldSkip && !isResend) {
           setPendingPollAction(pendingAction);
         }
-        return _context24.a(2);
+        return _context24.d(_regeneratorValues(executeAddPollVote(channelId, pollId, optionId, message)), 6);
       case 6:
-        return _context24.d(_regeneratorValues(executeAddPollVote(channelId, pollId, optionId, message, isResend)), 7);
-      case 7:
-        _context24.n = 9;
+        _context24.n = 8;
         break;
-      case 8:
-        _context24.p = 8;
+      case 7:
+        _context24.p = 7;
         _t32 = _context24.v;
         log.error('error in add poll vote', _t32);
-      case 9:
+      case 8:
         return _context24.a(2);
     }
-  }, _marked19$1, null, [[0, 8]]);
+  }, _marked19$1, null, [[0, 7]]);
 }
-function executeDeletePollVote(channelId, pollId, optionId, message, isResend) {
+function executeDeletePollVote(channelId, pollId, optionId, message) {
   var _message$pollDetails8, _message$pollDetails9, _message$pollDetails0;
-  var channel, vote, obj;
+  var channel, vote;
   return _regenerator().w(function (_context25) {
     while (1) switch (_context25.n) {
       case 0:
@@ -21704,33 +21708,16 @@ function executeDeletePollVote(channelId, pollId, optionId, message, isResend) {
         }
         return _context25.a(2);
       case 3:
-        obj = {
-          type: 'deleteOwn',
-          vote: vote,
-          incrementVotesPerOptionCount: -1
-        };
-        if (isResend) {
-          _context25.n = 4;
+        if (!(channel && message.id)) {
+          _context25.n = 5;
           break;
         }
-        updateMessageOnMap(channel.id, {
-          messageId: message.id,
-          params: {}
-        }, obj);
-        updateMessageOnAllMessages(message.id, {}, obj);
         _context25.n = 4;
-        return effects.put(updateMessageAC(message.id, {}, undefined, obj));
+        return effects.call(channel.deleteVote, message.id, pollId, [optionId]);
       case 4:
-        if (!channel) {
-          _context25.n = 6;
-          break;
-        }
         _context25.n = 5;
-        return effects.call(channel.deleteVote, message.id, pollId, [optionId]);
-      case 5:
-        _context25.n = 6;
         return effects.put(removePendingPollActionAC(message.id, 'DELETE_POLL_VOTE', optionId));
-      case 6:
+      case 5:
         return _context25.a(2);
     }
   }, _marked20$1);
@@ -21774,7 +21761,7 @@ function updateMessageOptimisticallyForDeletePollVote(channelId, message, vote)
   }, _marked21$1);
 }
 function deletePollVote(action) {
-  var payload, channelId, pollId, optionId, message, isResend, sceytChatClient, _message$pollDetails1, _message$pollDetails10, _message$pollDetails11, connectionState, vote, pendingAction, conflictCheck, channel, _Object$values2, _currentMessage$pollD4, _currentMessage$pollD5, _currentMessage$pollD6, currentMessage, obj, _t33;
+  var payload, channelId, pollId, optionId, message, isResend, sceytChatClient, _message$pollDetails1, _message$pollDetails10, _message$pollDetails11, vote, pendingAction, conflictCheck, channel, _Object$values2, _currentMessage$pollD4, _currentMessage$pollD5, _currentMessage$pollD6, currentMessage, obj, _t33;
   return _regenerator().w(function (_context27) {
     while (1) switch (_context27.p = _context27.n) {
       case 0:
@@ -21783,10 +21770,9 @@ function deletePollVote(action) {
         channelId = payload.channelId, pollId = payload.pollId, optionId = payload.optionId, message = payload.message, isResend = payload.isResend;
         sceytChatClient = getClient();
         if (!sceytChatClient) {
-          _context27.n = 8;
+          _context27.n = 7;
           break;
         }
-        connectionState = sceytChatClient.connectionState;
         vote = (_message$pollDetails1 = message.pollDetails) === null || _message$pollDetails1 === void 0 ? void 0 : (_message$pollDetails10 = _message$pollDetails1.voteDetails) === null || _message$pollDetails10 === void 0 ? void 0 : (_message$pollDetails11 = _message$pollDetails10.ownVotes) === null || _message$pollDetails11 === void 0 ? void 0 : _message$pollDetails11.find(function (vote) {
           return vote.optionId === optionId;
         });
@@ -21796,10 +21782,6 @@ function deletePollVote(action) {
         }
         return _context27.a(2);
       case 1:
-        if (!(connectionState !== CONNECTION_STATUS.CONNECTED)) {
-          _context27.n = 7;
-          break;
-        }
         pendingAction = {
           type: 'DELETE_POLL_VOTE',
           channelId: channelId,
@@ -21848,23 +21830,21 @@ function deletePollVote(action) {
         }
         return _context27.d(_regeneratorValues(updateMessageOptimisticallyForDeletePollVote(channelId, message, vote)), 6);
       case 6:
-        if (!conflictCheck.shouldSkip) {
+        if (!conflictCheck.shouldSkip && !isResend) {
           setPendingPollAction(pendingAction);
         }
-        return _context27.a(2);
+        return _context27.d(_regeneratorValues(executeDeletePollVote(channelId, pollId, optionId, message)), 7);
       case 7:
-        return _context27.d(_regeneratorValues(executeDeletePollVote(channelId, pollId, optionId, message, isResend)), 8);
-      case 8:
-        _context27.n = 10;
+        _context27.n = 9;
         break;
-      case 9:
-        _context27.p = 9;
+      case 8:
+        _context27.p = 8;
         _t33 = _context27.v;
         log.error('error in delete poll vote', _t33);
-      case 10:
+      case 9:
         return _context27.a(2);
     }
-  }, _marked22$1, null, [[0, 9]]);
+  }, _marked22$1, null, [[0, 8]]);
 }
 function executeClosePoll(channelId, pollId, message) {
   var channel, obj;
@@ -21887,7 +21867,7 @@ function executeClosePoll(channelId, pollId, message) {
         _context28.n = 2;
         return effects.put(updateMessageAC(message.id, {}, undefined, obj));
       case 2:
-        if (!channel) {
+        if (!(channel && message.id)) {
           _context28.n = 4;
           break;
         }
@@ -21979,7 +21959,7 @@ function closePoll(action) {
   }, _marked25$1, null, [[0, 4]]);
 }
 function executeRetractPollVote(channelId, pollId, message, objs, isResend) {
-  var channel, _iterator3, _step3, obj;
+  var channel, _iterator2, _step2, obj;
   return _regenerator().w(function (_context31) {
     while (1) switch (_context31.n) {
       case 0:
@@ -21991,13 +21971,13 @@ function executeRetractPollVote(channelId, pollId, message, objs, isResend) {
           _context31.n = 4;
           break;
         }
-        _iterator3 = _createForOfIteratorHelperLoose(objs);
+        _iterator2 = _createForOfIteratorHelperLoose(objs);
       case 2:
-        if ((_step3 = _iterator3()).done) {
+        if ((_step2 = _iterator2()).done) {
           _context31.n = 4;
           break;
         }
-        obj = _step3.value;
+        obj = _step2.value;
         updateMessageOnMap(channelId, {
           messageId: message.id,
           params: {}
@@ -22009,7 +21989,7 @@ function executeRetractPollVote(channelId, pollId, message, objs, isResend) {
         _context31.n = 2;
         break;
       case 4:
-        if (!channel) {
+        if (!(channel && message.id)) {
           _context31.n = 6;
           break;
         }
@@ -22024,7 +22004,7 @@ function executeRetractPollVote(channelId, pollId, message, objs, isResend) {
   }, _marked26$1);
 }
 function updateMessageOptimisticallyForRetractPollVote(channelId, message, objs) {
-  var channel, _iterator4, _step4, obj;
+  var channel, _iterator3, _step3, obj;
   return _regenerator().w(function (_context32) {
     while (1) switch (_context32.n) {
       case 0:
@@ -22038,13 +22018,13 @@ function updateMessageOptimisticallyForRetractPollVote(channelId, message, objs)
         }
         return _context32.a(2);
       case 2:
-        _iterator4 = _createForOfIteratorHelperLoose(objs);
+        _iterator3 = _createForOfIteratorHelperLoose(objs);
       case 3:
-        if ((_step4 = _iterator4()).done) {
+        if ((_step3 = _iterator3()).done) {
           _context32.n = 5;
           break;
         }
-        obj = _step4.value;
+        obj = _step3.value;
         updateMessageOnMap(channelId, {
           messageId: message.id,
           params: {}
@@ -22061,7 +22041,7 @@ function updateMessageOptimisticallyForRetractPollVote(channelId, message, objs)
   }, _marked27$1);
 }
 function retractPollVote(action) {
-  var payload, channelId, pollId, message, isResend, sceytChatClient, connectionState, objs, _iterator5, _step5, _message$pollDetails12, _message$pollDetails13, vote, _t35;
+  var payload, channelId, pollId, message, isResend, sceytChatClient, connectionState, objs, _iterator4, _step4, _message$pollDetails12, _message$pollDetails13, vote, _t35;
   return _regenerator().w(function (_context33) {
     while (1) switch (_context33.p = _context33.n) {
       case 0:
@@ -22075,8 +22055,8 @@ function retractPollVote(action) {
         }
         connectionState = sceytChatClient.connectionState;
         objs = [];
-        for (_iterator5 = _createForOfIteratorHelperLoose(((_message$pollDetails12 = message.pollDetails) === null || _message$pollDetails12 === void 0 ? void 0 : (_message$pollDetails13 = _message$pollDetails12.voteDetails) === null || _message$pollDetails13 === void 0 ? void 0 : _message$pollDetails13.ownVotes) || []); !(_step5 = _iterator5()).done;) {
-          vote = _step5.value;
+        for (_iterator4 = _createForOfIteratorHelperLoose(((_message$pollDetails12 = message.pollDetails) === null || _message$pollDetails12 === void 0 ? void 0 : (_message$pollDetails13 = _message$pollDetails12.voteDetails) === null || _message$pollDetails13 === void 0 ? void 0 : _message$pollDetails13.ownVotes) || []); !(_step4 = _iterator4()).done;) {
+          vote = _step4.value;
           objs.push({
             type: 'deleteOwn',
             vote: vote,
@@ -38528,7 +38508,7 @@ var MessageList = function MessageList(_ref2) {
       if (unreadScrollTo) {
         return Promise.resolve();
       }
-      if (target.scrollTop === 0 && scrollToNewMessage.scrollToBottom && scrollToNewMessage.updateMessageList && messagesLoading !== LOADING_STATE.LOADING) {
+      if (target.scrollTop === 0 && scrollToNewMessage.scrollToBottom && scrollToNewMessage.updateMessageList && messagesLoading !== LOADING_STATE.LOADING && channel !== null && channel !== void 0 && channel.id) {
         dispatch(getMessagesAC(channel, true));
       }
       if (target.scrollTop <= -50) {
@@ -38617,7 +38597,7 @@ var MessageList = function MessageList(_ref2) {
             nextDisableRef.current = false;
           }, 1000 + positiveValue * 0.1);
         }
-      } else {
+      } else if (channel !== null && channel !== void 0 && channel.id) {
         dispatch(getMessagesAC(channel, undefined, messageId, undefined, true, 'smooth', true));
       }
       return Promise.resolve();
@@ -38801,7 +38781,7 @@ var MessageList = function MessageList(_ref2) {
     prevDisableRef.current = false;
     shouldLoadMessagesRef.current = '';
     loadingRef.current = false;
-    if (channel.backToLinkedChannel) {
+    if (channel.backToLinkedChannel && channel !== null && channel !== void 0 && channel.id) {
       var visibleMessages = getVisibleMessagesMap();
       var visibleMessagesIds = Object.keys(visibleMessages);
       var messageId = visibleMessagesIds[visibleMessagesIds.length - 1];
@@ -38811,7 +38791,7 @@ var MessageList = function MessageList(_ref2) {
       if (!channel.isLinkedChannel) {
         clearVisibleMessagesMap();
       }
-      if (channel) {
+      if (channel && channel !== null && channel !== void 0 && channel.id) {
         dispatch(getMessagesAC(channel, undefined, undefined, undefined, true));
       }
       if (channel.id) {
@@ -38980,7 +38960,7 @@ var MessageList = function MessageList(_ref2) {
       setScrollIntoView(true);
       var lastReadMessageNode = document.getElementById(channel.lastDisplayedMessageId) || null;
       var newLastDisplayedMessageId = channel.lastDisplayedMessageId;
-      if (!lastReadMessageNode) {
+      if (!lastReadMessageNode && channel.lastDisplayedMessageId && channel.lastDisplayedMessageId !== '0') {
         for (var index = 0; index < messages.length; index++) {
           var message = messages[index];
           if (channel.lastDisplayedMessageId >= message.id && (messages.length < index + 2 || channel.lastDisplayedMessageId <= messages[index + 1].id)) {
@@ -38989,6 +38969,9 @@ var MessageList = function MessageList(_ref2) {
             break;
           }
         }
+      } else if (!lastReadMessageNode && (!channel.lastDisplayedMessageId || channel.lastDisplayedMessageId === '0') && messages !== null && messages !== void 0 && messages.length) {
+        newLastDisplayedMessageId = messages[0].id;
+        lastReadMessageNode = document.getElementById(newLastDisplayedMessageId);
       }
       if (lastReadMessageNode && scrollElement) {
         dispatch(scrollToNewMessageAC(false));
@@ -48301,7 +48284,7 @@ var MessagesScrollToBottomButton = function MessagesScrollToBottomButton(_ref) {
             });
           }
         }
-      } else {
+      } else if (channel !== null && channel !== void 0 && channel.id) {
         dispatch(getMessagesAC(channel, true, messageId, undefined, false, 'smooth', true));
       }
       return Promise.resolve();
@@ -48490,7 +48473,7 @@ var MessagesScrollToUnreadMentionsButton = function MessagesScrollToUnreadMentio
             repliedMessage.classList.remove('highlight');
           }, 1500);
         }
-      } else {
+      } else if (channel !== null && channel !== void 0 && channel.id) {
         dispatch(getMessagesAC(channel, undefined, messageId));
       }
       return Promise.resolve();

package/index.modern.js

@@ -10739,6 +10739,12 @@ function setPendingPollActionsMapAC(messageId, event) {
     event: event
   });
 }
+function updatePendingPollActionAC(messageId, message) {
+  return updatePendingPollAction({
+    messageId: messageId,
+    message: message
+  });
+}
 function setPendingMessageAC(channelId, message) {
   return setPendingMessage$1({
     channelId: channelId,
@@ -11840,10 +11846,24 @@ var messageSlice = createSlice({
       }
       state.pendingPollActions[messageId] = [].concat(state.pendingPollActions[messageId], [event]);
     },
-    setPendingMessage: function setPendingMessage(state, action) {
+    updatePendingPollAction: function updatePendingPollAction(state, action) {
       var _action$payload20 = action.payload,
-        channelId = _action$payload20.channelId,
+        messageId = _action$payload20.messageId,
         message = _action$payload20.message;
+      if (!state.pendingPollActions[messageId]) {
+        return;
+      }
+      state.pendingPollActions[messageId] = state.pendingPollActions[messageId].map(function (action) {
+        var _action$message, _action$message2;
+        return ((_action$message = action.message) === null || _action$message === void 0 ? void 0 : _action$message.id) === messageId || ((_action$message2 = action.message) === null || _action$message2 === void 0 ? void 0 : _action$message2.tid) === messageId ? _extends({}, action, {
+          message: message
+        }) : action;
+      });
+    },
+    setPendingMessage: function setPendingMessage(state, action) {
+      var _action$payload21 = action.payload,
+        channelId = _action$payload21.channelId,
+        message = _action$payload21.message;
       if (!state.pendingMessagesMap[channelId]) {
         state.pendingMessagesMap[channelId] = [];
       }
@@ -11855,9 +11875,9 @@ var messageSlice = createSlice({
       }
     },
     removePendingMessage: function removePendingMessage(state, action) {
-      var _action$payload21 = action.payload,
-        channelId = _action$payload21.channelId,
-        messageId = _action$payload21.messageId;
+      var _action$payload22 = action.payload,
+        channelId = _action$payload22.channelId,
+        messageId = _action$payload22.messageId;
       if (state.pendingMessagesMap[channelId]) {
         state.pendingMessagesMap[channelId] = state.pendingMessagesMap[channelId].filter(function (msg) {
           return !(msg.id === messageId || msg.tid === messageId);
@@ -11868,10 +11888,10 @@ var messageSlice = createSlice({
       }
     },
     updatePendingMessage: function updatePendingMessage(state, action) {
-      var _action$payload22 = action.payload,
-        channelId = _action$payload22.channelId,
-        messageId = _action$payload22.messageId,
-        updatedMessage = _action$payload22.updatedMessage;
+      var _action$payload23 = action.payload,
+        channelId = _action$payload23.channelId,
+        messageId = _action$payload23.messageId,
+        updatedMessage = _action$payload23.updatedMessage;
       if (state.pendingMessagesMap[channelId]) {
         state.pendingMessagesMap[channelId] = state.pendingMessagesMap[channelId].map(function (msg) {
           if (msg.id === messageId || msg.tid === messageId) {
@@ -11946,7 +11966,8 @@ var _messageSlice$actions = messageSlice.actions,
   setPendingPollActionsMap = _messageSlice$actions.setPendingPollActionsMap,
   setPendingMessage$1 = _messageSlice$actions.setPendingMessage,
   removePendingMessage = _messageSlice$actions.removePendingMessage,
-  updatePendingMessage = _messageSlice$actions.updatePendingMessage;
+  updatePendingMessage = _messageSlice$actions.updatePendingMessage,
+  updatePendingPollAction = _messageSlice$actions.updatePendingPollAction;
 var MessageReducer = messageSlice.reducer;
 
 var initialState$2 = {
@@ -15424,6 +15445,7 @@ function watchForEvents() {
                 }
                 return _context.a(3, 183);
               case 99:
+                console.log('CHANNEL_EVENT_TYPES.POLL_ADDED ... ');
                 _channel10 = args.channel, pollDetails = args.pollDetails, _messageId = args.messageId;
                 pollDetailsData = pollDetails;
                 _context.n = 100;
@@ -15508,6 +15530,7 @@ function watchForEvents() {
               case 108:
                 return _context.a(3, 183);
               case 109:
+                console.log('CHANNEL_EVENT_TYPES.POLL_DELETED ... ');
                 _channel11 = args.channel, _pollDetails = args.pollDetails, _messageId2 = args.messageId;
                 _pollDetailsData = _pollDetails;
                 _context.n = 110;
@@ -15567,6 +15590,7 @@ function watchForEvents() {
               case 116:
                 return _context.a(3, 183);
               case 117:
+                console.log('CHANNEL_EVENT_TYPES.POLL_RETRACTED ... ');
                 _channel12 = args.channel, _pollDetails2 = args.pollDetails, _messageId3 = args.messageId;
                 _context.n = 118;
                 return call(getActiveChannelId);
@@ -15625,6 +15649,7 @@ function watchForEvents() {
               case 124:
                 return _context.a(3, 183);
               case 125:
+                console.log('CHANNEL_EVENT_TYPES.POLL_CLOSED ... ');
                 _channel13 = args.channel, _messageId4 = args.messageId;
                 _context.n = 126;
                 return call(getActiveChannelId);
@@ -19142,6 +19167,10 @@ var updateMessage$1 = function updateMessage(actionType, pending, channelId, scr
           _context.n = 7;
           break;
         case 6:
+          if (!(channel !== null && channel !== void 0 && channel.id)) {
+            _context.n = 7;
+            break;
+          }
           _context.n = 7;
           return put(getMessagesAC(channel, false, channel === null || channel === void 0 ? void 0 : (_channel$lastMessage3 = channel.lastMessage) === null || _channel$lastMessage3 === void 0 ? void 0 : _channel$lastMessage3.id, undefined, false, 'smooth', true));
         case 7:
@@ -19357,7 +19386,7 @@ function sendMessage(action) {
         messagesToSend.push(messageToSend);
       case 12:
         _loop2 = /*#__PURE__*/_regenerator().m(function _callee3() {
-          var messageAttachment, messageToSend, messageCopy, _attachmentsToSend, linkAttachmentToSend, linkAttachmentBuilder, messageResponse, k, pendingAttachment, attachmentsToUpdate, currentAttachmentsMap, messageUpdateData, activeChannelId, messageToUpdate, channelUpdateParam, isErrorResendable, _t;
+          var messageAttachment, messageToSend, messageCopy, _attachmentsToSend, linkAttachmentToSend, linkAttachmentBuilder, messageResponse, k, pendingAttachment, attachmentsToUpdate, currentAttachmentsMap, messageUpdateData, stringifiedMessageUpdateData, activeChannelId, channelUpdateParam, isErrorResendable, _t;
           return _regenerator().w(function (_context3) {
             while (1) switch (_context3.p = _context3.n) {
               case 0:
@@ -19459,23 +19488,23 @@ function sendMessage(action) {
                   createdAt: messageResponse.createdAt,
                   channelId: channel.id
                 };
+                stringifiedMessageUpdateData = JSON.parse(JSON.stringify(messageUpdateData));
                 activeChannelId = getActiveChannelId();
                 if (!(activeChannelId === channel.id)) {
                   _context3.n = 9;
                   break;
                 }
                 _context3.n = 9;
-                return put(updateMessageAC(messageToSend.tid, JSON.parse(JSON.stringify(messageUpdateData)), true));
+                return put(updateMessageAC(messageToSend.tid, stringifiedMessageUpdateData, true));
               case 9:
                 _context3.n = 10;
                 return put(removePendingMessageAC(channel.id, messageToSend.tid));
               case 10:
-                addMessageToMap(channel.id, JSON.parse(JSON.stringify(messageUpdateData)));
+                addMessageToMap(channel.id, stringifiedMessageUpdateData);
                 updateMessageOnAllMessages(messageToSend.tid, messageUpdateData);
-                messageToUpdate = JSON.parse(JSON.stringify(messageResponse));
-                updateChannelLastMessageOnAllChannels(channel.id, messageToUpdate);
+                updateChannelLastMessageOnAllChannels(channel.id, stringifiedMessageUpdateData);
                 channelUpdateParam = {
-                  lastMessage: messageToUpdate,
+                  lastMessage: stringifiedMessageUpdateData,
                   lastReactedMessage: null
                 };
                 if (!channel.unread) {
@@ -19566,7 +19595,7 @@ function sendMessage(action) {
   }, _marked$3, null, [[1, 16, 17, 19]]);
 }
 function sendTextMessage(action) {
-  var payload, message, connectionState, channelId, channel, sendMessageTid, pendingMessage, SceytChatClient, createChannelData, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, createdMessage, messageToSend, _messageResponse, messageResponse, messageUpdateData, activeChannelId, messageToUpdate, channelUpdateParam, isErrorResendable, _activeChannelId, _t3;
+  var payload, message, connectionState, channelId, channel, sendMessageTid, pendingMessage, SceytChatClient, createChannelData, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, createdMessage, messageToSend, _messageResponse, messageResponse, messageUpdateData, activeChannelId, stringifiedMessageUpdateData, messageToUpdate, channelUpdateParam, isErrorResendable, _activeChannelId, _t3;
   return _regenerator().w(function (_context5) {
     while (1) switch (_context5.p = _context5.n) {
       case 0:
@@ -19654,7 +19683,7 @@ function sendTextMessage(action) {
         return call(updateMessage$1, action.type, pendingMessage, channel.id, true, message);
       case 8:
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context5.n = 17;
+          _context5.n = 18;
           break;
         }
         if (!sendMessageHandler) {
@@ -19698,10 +19727,14 @@ function sendTextMessage(action) {
         _context5.n = 13;
         return put(updateMessageAC(messageToSend.tid, messageUpdateData, true));
       case 13:
+        stringifiedMessageUpdateData = JSON.parse(JSON.stringify(messageUpdateData));
         _context5.n = 14;
-        return put(removePendingMessageAC(channel.id, messageToSend.tid));
+        return put(updatePendingPollActionAC(messageToSend.tid, stringifiedMessageUpdateData));
       case 14:
-        addMessageToMap(channel.id, JSON.parse(JSON.stringify(messageUpdateData)));
+        _context5.n = 15;
+        return put(removePendingMessageAC(channel.id, messageToSend.tid));
+      case 15:
+        addMessageToMap(channel.id, stringifiedMessageUpdateData);
         if (activeChannelId === channel.id) {
           updateMessageOnAllMessages(messageToSend.tid, messageUpdateData);
         }
@@ -19711,42 +19744,42 @@ function sendTextMessage(action) {
           lastMessage: messageToUpdate,
           lastReactedMessage: null
         };
-        _context5.n = 15;
+        _context5.n = 16;
         return put(updateChannelDataAC(channel.id, channelUpdateParam, true));
-      case 15:
+      case 16:
         updateChannelOnAllChannels(channel.id, channelUpdateParam);
         if (!channel.unread) {
-          _context5.n = 16;
+          _context5.n = 17;
           break;
         }
-        _context5.n = 16;
+        _context5.n = 17;
         return put(markChannelAsReadAC(channel.id));
-      case 16:
+      case 17:
         channel.lastMessage = messageToUpdate;
-        _context5.n = 18;
+        _context5.n = 19;
         break;
-      case 17:
-        throw new Error('Connection required to send message');
       case 18:
-        _context5.n = 22;
-        break;
+        throw new Error('Connection required to send message');
       case 19:
-        _context5.p = 19;
+        _context5.n = 23;
+        break;
+      case 20:
+        _context5.p = 20;
         _t3 = _context5.v;
         log.error('error on send text message ... ', _t3 === null || _t3 === void 0 ? void 0 : _t3.type);
         isErrorResendable = isResendableError(_t3 === null || _t3 === void 0 ? void 0 : _t3.type);
         if (!(!isErrorResendable && channel.id && sendMessageTid)) {
-          _context5.n = 21;
+          _context5.n = 22;
           break;
         }
-        _context5.n = 20;
+        _context5.n = 21;
         return put(removePendingMessageAC(channel.id, sendMessageTid));
-      case 20:
-        _context5.n = 22;
-        break;
       case 21:
+        _context5.n = 23;
+        break;
+      case 22:
         if (!(channel.id && sendMessageTid)) {
-          _context5.n = 22;
+          _context5.n = 23;
           break;
         }
         updateMessageOnMap(channel.id, {
@@ -19757,26 +19790,26 @@ function sendTextMessage(action) {
         });
         _activeChannelId = getActiveChannelId();
         if (!(_activeChannelId === channel.id)) {
-          _context5.n = 22;
+          _context5.n = 23;
           break;
         }
         updateMessageOnAllMessages(sendMessageTid, {
           state: MESSAGE_STATUS.FAILED
         });
-        _context5.n = 22;
+        _context5.n = 23;
         return put(updateMessageAC(sendMessageTid, {
           state: MESSAGE_STATUS.FAILED
         }));
-      case 22:
-        _context5.p = 22;
-        _context5.n = 23;
-        return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
       case 23:
-        return _context5.f(22);
+        _context5.p = 23;
+        _context5.n = 24;
+        return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
       case 24:
+        return _context5.f(23);
+      case 25:
         return _context5.a(2);
     }
-  }, _marked2$2, null, [[3, 19, 22, 24]]);
+  }, _marked2$2, null, [[3, 20, 23, 25]]);
 }
 function forwardMessage(action) {
   var payload, message, channelId, connectionState, isForward, pendingMessage, channel, activeChannelId, messageTid, SceytChatClient, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, pollDetails, messageToSend, hasNextMessages, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, isErrorResendable, _activeChannelId2, _t4;
@@ -21446,9 +21479,9 @@ function getMessageMarkers(action) {
     }
   }, _marked16$1, null, [[0, 5, 6, 8]]);
 }
-function executeAddPollVote(channelId, pollId, optionId, message, isResend) {
+function executeAddPollVote(channelId, pollId, optionId, message) {
   var _user$presence, _message$pollDetails, _message$pollDetails2, _message$pollDetails3, _message$pollDetails4;
-  var channel, user, vote, objs, _message$pollDetails5, _message$pollDetails6, _message$pollDetails7, _iterator2, _step2, obj;
+  var channel, user, vote, objs, _message$pollDetails5, _message$pollDetails6, _message$pollDetails7;
   return _regenerator().w(function (_context22) {
     while (1) switch (_context22.n) {
       case 0:
@@ -21497,38 +21530,16 @@ function executeAddPollVote(channelId, pollId, optionId, message, isResend) {
           vote: vote,
           incrementVotesPerOptionCount: 1
         });
-        if (isResend) {
-          _context22.n = 5;
-          break;
-        }
-        _iterator2 = _createForOfIteratorHelperLoose(objs);
-      case 3:
-        if ((_step2 = _iterator2()).done) {
-          _context22.n = 5;
+        if (!(channel && message.id)) {
+          _context22.n = 4;
           break;
         }
-        obj = _step2.value;
-        updateMessageOnMap(channel.id, {
-          messageId: message.id,
-          params: {}
-        }, obj);
-        updateMessageOnAllMessages(message.id, {}, obj);
-        _context22.n = 4;
-        return put(updateMessageAC(message.id, {}, undefined, obj));
-      case 4:
         _context22.n = 3;
-        break;
-      case 5:
-        if (!channel) {
-          _context22.n = 7;
-          break;
-        }
-        _context22.n = 6;
         return call(channel.addVote, message.id, pollId, [optionId]);
-      case 6:
-        _context22.n = 7;
+      case 3:
+        _context22.n = 4;
         return put(removePendingPollActionAC(message.id, 'ADD_POLL_VOTE', optionId));
-      case 7:
+      case 4:
         return _context22.a(2);
     }
   }, _marked17$1);
@@ -21572,7 +21583,7 @@ function updateMessageOptimisticallyForAddPollVote(channelId, message, vote) {
   }, _marked18$1);
 }
 function addPollVote(action) {
-  var payload, channelId, pollId, optionId, message, isResend, sceytChatClient, _user$presence2, connectionState, user, vote, pendingAction, conflictCheck, channel, _Object$values, _store$getState$Messa, _currentMessage$pollD, _currentMessage$pollD2, _currentMessage$pollD3, currentMessage, hasNext, obj, _t32;
+  var payload, channelId, pollId, optionId, message, isResend, sceytChatClient, _user$presence2, user, vote, pendingAction, conflictCheck, channel, _Object$values, _store$getState$Messa, _currentMessage$pollD, _currentMessage$pollD2, _currentMessage$pollD3, currentMessage, hasNext, obj, _t32;
   return _regenerator().w(function (_context24) {
     while (1) switch (_context24.p = _context24.n) {
       case 0:
@@ -21581,10 +21592,9 @@ function addPollVote(action) {
         channelId = payload.channelId, pollId = payload.pollId, optionId = payload.optionId, message = payload.message, isResend = payload.isResend;
         sceytChatClient = getClient();
         if (!sceytChatClient) {
-          _context24.n = 7;
+          _context24.n = 6;
           break;
         }
-        connectionState = sceytChatClient.connectionState;
         user = sceytChatClient.user;
         vote = {
           optionId: optionId,
@@ -21607,10 +21617,6 @@ function addPollVote(action) {
             createdAt: new Date().getTime()
           }
         };
-        if (!(connectionState !== CONNECTION_STATUS.CONNECTED)) {
-          _context24.n = 6;
-          break;
-        }
         pendingAction = {
           type: 'ADD_POLL_VOTE',
           channelId: channelId,
@@ -21660,27 +21666,25 @@ function addPollVote(action) {
         }
         return _context24.d(_regeneratorValues(updateMessageOptimisticallyForAddPollVote(channelId, message, vote)), 5);
       case 5:
-        if (!conflictCheck.shouldSkip) {
+        if (!conflictCheck.shouldSkip && !isResend) {
           setPendingPollAction(pendingAction);
         }
-        return _context24.a(2);
+        return _context24.d(_regeneratorValues(executeAddPollVote(channelId, pollId, optionId, message)), 6);
       case 6:
-        return _context24.d(_regeneratorValues(executeAddPollVote(channelId, pollId, optionId, message, isResend)), 7);
-      case 7:
-        _context24.n = 9;
+        _context24.n = 8;
         break;
-      case 8:
-        _context24.p = 8;
+      case 7:
+        _context24.p = 7;
         _t32 = _context24.v;
         log.error('error in add poll vote', _t32);
-      case 9:
+      case 8:
         return _context24.a(2);
     }
-  }, _marked19$1, null, [[0, 8]]);
+  }, _marked19$1, null, [[0, 7]]);
 }
-function executeDeletePollVote(channelId, pollId, optionId, message, isResend) {
+function executeDeletePollVote(channelId, pollId, optionId, message) {
   var _message$pollDetails8, _message$pollDetails9, _message$pollDetails0;
-  var channel, vote, obj;
+  var channel, vote;
   return _regenerator().w(function (_context25) {
     while (1) switch (_context25.n) {
       case 0:
@@ -21703,33 +21707,16 @@ function executeDeletePollVote(channelId, pollId, optionId, message, isResend) {
         }
         return _context25.a(2);
       case 3:
-        obj = {
-          type: 'deleteOwn',
-          vote: vote,
-          incrementVotesPerOptionCount: -1
-        };
-        if (isResend) {
-          _context25.n = 4;
+        if (!(channel && message.id)) {
+          _context25.n = 5;
           break;
         }
-        updateMessageOnMap(channel.id, {
-          messageId: message.id,
-          params: {}
-        }, obj);
-        updateMessageOnAllMessages(message.id, {}, obj);
         _context25.n = 4;
-        return put(updateMessageAC(message.id, {}, undefined, obj));
+        return call(channel.deleteVote, message.id, pollId, [optionId]);
       case 4:
-        if (!channel) {
-          _context25.n = 6;
-          break;
-        }
         _context25.n = 5;
-        return call(channel.deleteVote, message.id, pollId, [optionId]);
-      case 5:
-        _context25.n = 6;
         return put(removePendingPollActionAC(message.id, 'DELETE_POLL_VOTE', optionId));
-      case 6:
+      case 5:
         return _context25.a(2);
     }
   }, _marked20$1);
@@ -21773,7 +21760,7 @@ function updateMessageOptimisticallyForDeletePollVote(channelId, message, vote)
   }, _marked21$1);
 }
 function deletePollVote(action) {
-  var payload, channelId, pollId, optionId, message, isResend, sceytChatClient, _message$pollDetails1, _message$pollDetails10, _message$pollDetails11, connectionState, vote, pendingAction, conflictCheck, channel, _Object$values2, _currentMessage$pollD4, _currentMessage$pollD5, _currentMessage$pollD6, currentMessage, obj, _t33;
+  var payload, channelId, pollId, optionId, message, isResend, sceytChatClient, _message$pollDetails1, _message$pollDetails10, _message$pollDetails11, vote, pendingAction, conflictCheck, channel, _Object$values2, _currentMessage$pollD4, _currentMessage$pollD5, _currentMessage$pollD6, currentMessage, obj, _t33;
   return _regenerator().w(function (_context27) {
     while (1) switch (_context27.p = _context27.n) {
       case 0:
@@ -21782,10 +21769,9 @@ function deletePollVote(action) {
         channelId = payload.channelId, pollId = payload.pollId, optionId = payload.optionId, message = payload.message, isResend = payload.isResend;
         sceytChatClient = getClient();
         if (!sceytChatClient) {
-          _context27.n = 8;
+          _context27.n = 7;
           break;
         }
-        connectionState = sceytChatClient.connectionState;
         vote = (_message$pollDetails1 = message.pollDetails) === null || _message$pollDetails1 === void 0 ? void 0 : (_message$pollDetails10 = _message$pollDetails1.voteDetails) === null || _message$pollDetails10 === void 0 ? void 0 : (_message$pollDetails11 = _message$pollDetails10.ownVotes) === null || _message$pollDetails11 === void 0 ? void 0 : _message$pollDetails11.find(function (vote) {
           return vote.optionId === optionId;
         });
@@ -21795,10 +21781,6 @@ function deletePollVote(action) {
         }
         return _context27.a(2);
       case 1:
-        if (!(connectionState !== CONNECTION_STATUS.CONNECTED)) {
-          _context27.n = 7;
-          break;
-        }
         pendingAction = {
           type: 'DELETE_POLL_VOTE',
           channelId: channelId,
@@ -21847,23 +21829,21 @@ function deletePollVote(action) {
         }
         return _context27.d(_regeneratorValues(updateMessageOptimisticallyForDeletePollVote(channelId, message, vote)), 6);
       case 6:
-        if (!conflictCheck.shouldSkip) {
+        if (!conflictCheck.shouldSkip && !isResend) {
           setPendingPollAction(pendingAction);
         }
-        return _context27.a(2);
+        return _context27.d(_regeneratorValues(executeDeletePollVote(channelId, pollId, optionId, message)), 7);
       case 7:
-        return _context27.d(_regeneratorValues(executeDeletePollVote(channelId, pollId, optionId, message, isResend)), 8);
-      case 8:
-        _context27.n = 10;
+        _context27.n = 9;
         break;
-      case 9:
-        _context27.p = 9;
+      case 8:
+        _context27.p = 8;
         _t33 = _context27.v;
         log.error('error in delete poll vote', _t33);
-      case 10:
+      case 9:
         return _context27.a(2);
     }
-  }, _marked22$1, null, [[0, 9]]);
+  }, _marked22$1, null, [[0, 8]]);
 }
 function executeClosePoll(channelId, pollId, message) {
   var channel, obj;
@@ -21886,7 +21866,7 @@ function executeClosePoll(channelId, pollId, message) {
         _context28.n = 2;
         return put(updateMessageAC(message.id, {}, undefined, obj));
       case 2:
-        if (!channel) {
+        if (!(channel && message.id)) {
           _context28.n = 4;
           break;
         }
@@ -21978,7 +21958,7 @@ function closePoll(action) {
   }, _marked25$1, null, [[0, 4]]);
 }
 function executeRetractPollVote(channelId, pollId, message, objs, isResend) {
-  var channel, _iterator3, _step3, obj;
+  var channel, _iterator2, _step2, obj;
   return _regenerator().w(function (_context31) {
     while (1) switch (_context31.n) {
       case 0:
@@ -21990,13 +21970,13 @@ function executeRetractPollVote(channelId, pollId, message, objs, isResend) {
           _context31.n = 4;
           break;
         }
-        _iterator3 = _createForOfIteratorHelperLoose(objs);
+        _iterator2 = _createForOfIteratorHelperLoose(objs);
       case 2:
-        if ((_step3 = _iterator3()).done) {
+        if ((_step2 = _iterator2()).done) {
           _context31.n = 4;
           break;
         }
-        obj = _step3.value;
+        obj = _step2.value;
         updateMessageOnMap(channelId, {
           messageId: message.id,
           params: {}
@@ -22008,7 +21988,7 @@ function executeRetractPollVote(channelId, pollId, message, objs, isResend) {
         _context31.n = 2;
         break;
       case 4:
-        if (!channel) {
+        if (!(channel && message.id)) {
           _context31.n = 6;
           break;
         }
@@ -22023,7 +22003,7 @@ function executeRetractPollVote(channelId, pollId, message, objs, isResend) {
   }, _marked26$1);
 }
 function updateMessageOptimisticallyForRetractPollVote(channelId, message, objs) {
-  var channel, _iterator4, _step4, obj;
+  var channel, _iterator3, _step3, obj;
   return _regenerator().w(function (_context32) {
     while (1) switch (_context32.n) {
       case 0:
@@ -22037,13 +22017,13 @@ function updateMessageOptimisticallyForRetractPollVote(channelId, message, objs)
         }
         return _context32.a(2);
       case 2:
-        _iterator4 = _createForOfIteratorHelperLoose(objs);
+        _iterator3 = _createForOfIteratorHelperLoose(objs);
       case 3:
-        if ((_step4 = _iterator4()).done) {
+        if ((_step3 = _iterator3()).done) {
           _context32.n = 5;
           break;
         }
-        obj = _step4.value;
+        obj = _step3.value;
         updateMessageOnMap(channelId, {
           messageId: message.id,
           params: {}
@@ -22060,7 +22040,7 @@ function updateMessageOptimisticallyForRetractPollVote(channelId, message, objs)
   }, _marked27$1);
 }
 function retractPollVote(action) {
-  var payload, channelId, pollId, message, isResend, sceytChatClient, connectionState, objs, _iterator5, _step5, _message$pollDetails12, _message$pollDetails13, vote, _t35;
+  var payload, channelId, pollId, message, isResend, sceytChatClient, connectionState, objs, _iterator4, _step4, _message$pollDetails12, _message$pollDetails13, vote, _t35;
   return _regenerator().w(function (_context33) {
     while (1) switch (_context33.p = _context33.n) {
       case 0:
@@ -22074,8 +22054,8 @@ function retractPollVote(action) {
         }
         connectionState = sceytChatClient.connectionState;
         objs = [];
-        for (_iterator5 = _createForOfIteratorHelperLoose(((_message$pollDetails12 = message.pollDetails) === null || _message$pollDetails12 === void 0 ? void 0 : (_message$pollDetails13 = _message$pollDetails12.voteDetails) === null || _message$pollDetails13 === void 0 ? void 0 : _message$pollDetails13.ownVotes) || []); !(_step5 = _iterator5()).done;) {
-          vote = _step5.value;
+        for (_iterator4 = _createForOfIteratorHelperLoose(((_message$pollDetails12 = message.pollDetails) === null || _message$pollDetails12 === void 0 ? void 0 : (_message$pollDetails13 = _message$pollDetails12.voteDetails) === null || _message$pollDetails13 === void 0 ? void 0 : _message$pollDetails13.ownVotes) || []); !(_step4 = _iterator4()).done;) {
+          vote = _step4.value;
           objs.push({
             type: 'deleteOwn',
             vote: vote,
@@ -38527,7 +38507,7 @@ var MessageList = function MessageList(_ref2) {
       if (unreadScrollTo) {
         return Promise.resolve();
       }
-      if (target.scrollTop === 0 && scrollToNewMessage.scrollToBottom && scrollToNewMessage.updateMessageList && messagesLoading !== LOADING_STATE.LOADING) {
+      if (target.scrollTop === 0 && scrollToNewMessage.scrollToBottom && scrollToNewMessage.updateMessageList && messagesLoading !== LOADING_STATE.LOADING && channel !== null && channel !== void 0 && channel.id) {
         dispatch(getMessagesAC(channel, true));
       }
       if (target.scrollTop <= -50) {
@@ -38616,7 +38596,7 @@ var MessageList = function MessageList(_ref2) {
             nextDisableRef.current = false;
           }, 1000 + positiveValue * 0.1);
         }
-      } else {
+      } else if (channel !== null && channel !== void 0 && channel.id) {
         dispatch(getMessagesAC(channel, undefined, messageId, undefined, true, 'smooth', true));
       }
       return Promise.resolve();
@@ -38800,7 +38780,7 @@ var MessageList = function MessageList(_ref2) {
     prevDisableRef.current = false;
     shouldLoadMessagesRef.current = '';
     loadingRef.current = false;
-    if (channel.backToLinkedChannel) {
+    if (channel.backToLinkedChannel && channel !== null && channel !== void 0 && channel.id) {
       var visibleMessages = getVisibleMessagesMap();
       var visibleMessagesIds = Object.keys(visibleMessages);
       var messageId = visibleMessagesIds[visibleMessagesIds.length - 1];
@@ -38810,7 +38790,7 @@ var MessageList = function MessageList(_ref2) {
       if (!channel.isLinkedChannel) {
         clearVisibleMessagesMap();
       }
-      if (channel) {
+      if (channel && channel !== null && channel !== void 0 && channel.id) {
         dispatch(getMessagesAC(channel, undefined, undefined, undefined, true));
       }
       if (channel.id) {
@@ -38979,7 +38959,7 @@ var MessageList = function MessageList(_ref2) {
       setScrollIntoView(true);
       var lastReadMessageNode = document.getElementById(channel.lastDisplayedMessageId) || null;
       var newLastDisplayedMessageId = channel.lastDisplayedMessageId;
-      if (!lastReadMessageNode) {
+      if (!lastReadMessageNode && channel.lastDisplayedMessageId && channel.lastDisplayedMessageId !== '0') {
         for (var index = 0; index < messages.length; index++) {
           var message = messages[index];
           if (channel.lastDisplayedMessageId >= message.id && (messages.length < index + 2 || channel.lastDisplayedMessageId <= messages[index + 1].id)) {
@@ -38988,6 +38968,9 @@ var MessageList = function MessageList(_ref2) {
             break;
           }
         }
+      } else if (!lastReadMessageNode && (!channel.lastDisplayedMessageId || channel.lastDisplayedMessageId === '0') && messages !== null && messages !== void 0 && messages.length) {
+        newLastDisplayedMessageId = messages[0].id;
+        lastReadMessageNode = document.getElementById(newLastDisplayedMessageId);
       }
       if (lastReadMessageNode && scrollElement) {
         dispatch(scrollToNewMessageAC(false));
@@ -48300,7 +48283,7 @@ var MessagesScrollToBottomButton = function MessagesScrollToBottomButton(_ref) {
             });
           }
         }
-      } else {
+      } else if (channel !== null && channel !== void 0 && channel.id) {
         dispatch(getMessagesAC(channel, true, messageId, undefined, false, 'smooth', true));
       }
       return Promise.resolve();
@@ -48489,7 +48472,7 @@ var MessagesScrollToUnreadMentionsButton = function MessagesScrollToUnreadMentio
             repliedMessage.classList.remove('highlight');
           }, 1500);
         }
-      } else {
+      } else if (channel !== null && channel !== void 0 && channel.id) {
         dispatch(getMessagesAC(channel, undefined, messageId));
       }
       return Promise.resolve();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sceyt-chat-react-uikit",
-  "version": "1.7.8-beta.5",
+  "version": "1.7.8-beta.7",
   "description": "Interactive React UI Components for Sceyt Chat.",
   "author": "Sceyt",
   "license": "MIT",