sceyt-chat-react-uikit 1.7.5-beta.17 → 1.7.5-beta.19

package/index.js

@@ -8958,21 +8958,59 @@ var EditorTheme = {
 var isMessageUnsupported = function isMessageUnsupported(message) {
   return (message === null || message === void 0 ? void 0 : message.type) !== exports.MESSAGE_TYPE.TEXT && (message === null || message === void 0 ? void 0 : message.type) !== exports.MESSAGE_TYPE.MEDIA && (message === null || message === void 0 ? void 0 : message.type) !== exports.MESSAGE_TYPE.FILE && (message === null || message === void 0 ? void 0 : message.type) !== exports.MESSAGE_TYPE.LINK && (message === null || message === void 0 ? void 0 : message.type) !== exports.MESSAGE_TYPE.POLL && (message === null || message === void 0 ? void 0 : message.type) !== exports.MESSAGE_TYPE.DELETED && (message === null || message === void 0 ? void 0 : message.type) !== exports.MESSAGE_TYPE.SYSTEM;
 };
-var deleteVotesFromPollDetails = function deleteVotesFromPollDetails(votes, deletedVotes) {
+var deleteVoteFromPollDetails = function deleteVoteFromPollDetails(votes, deletedVote) {
   var newVotes = [];
-  var _loop = function _loop() {
+  for (var _iterator = _createForOfIteratorHelperLoose(votes), _step; !(_step = _iterator()).done;) {
     var vote = _step.value;
-    if (!deletedVotes.find(function (deletedVote) {
-      return deletedVote.optionId === vote.optionId && deletedVote.user.id === vote.user.id;
-    })) {
+    if (deletedVote.optionId !== vote.optionId || deletedVote.user.id !== vote.user.id) {
       newVotes.push(vote);
     }
-  };
-  for (var _iterator = _createForOfIteratorHelperLoose(votes), _step; !(_step = _iterator()).done;) {
-    _loop();
   }
   return newVotes;
 };
+var handleVoteDetails = function handleVoteDetails(voteDetails, message) {
+  var _extends2;
+  if (!voteDetails || !(message !== null && message !== void 0 && message.pollDetails)) {
+    return undefined;
+  }
+  var existingPollDetails = message.pollDetails;
+  var existingVoteDetails = existingPollDetails.voteDetails || {
+    votesPerOption: {},
+    votes: [],
+    ownVotes: []
+  };
+  if (voteDetails.type === 'close') {
+    return _extends({}, existingPollDetails, {
+      closed: true
+    });
+  }
+  if (!voteDetails.vote) {
+    return existingPollDetails;
+  }
+  var vote = voteDetails.vote;
+  var optionId = vote.optionId;
+  var currentVotesPerOption = existingVoteDetails.votesPerOption || {};
+  var newVotesPerOption = _extends({}, currentVotesPerOption, (_extends2 = {}, _extends2[optionId] = (currentVotesPerOption[optionId] || 0) + voteDetails.incrementVotesPerOptionCount, _extends2));
+  var newVotes = existingVoteDetails.votes || [];
+  var newOwnVotes = existingVoteDetails.ownVotes || [];
+  if (voteDetails.type === 'add') {
+    newVotes = [].concat(newVotes, [vote]);
+  } else if (voteDetails.type === 'delete') {
+    newVotes = deleteVoteFromPollDetails(newVotes, vote);
+  } else if (voteDetails.type === 'addOwn') {
+    newOwnVotes = [].concat(newOwnVotes, [vote]);
+  } else if (voteDetails.type === 'deleteOwn') {
+    newOwnVotes = deleteVoteFromPollDetails(newOwnVotes, vote);
+  }
+  var newVoteDetails = {
+    votesPerOption: newVotesPerOption,
+    votes: newVotes,
+    ownVotes: newOwnVotes
+  };
+  return _extends({}, existingPollDetails, {
+    voteDetails: newVoteDetails
+  });
+};
 
 var baseUrlForInviteMembers = '';
 var autoSelectFitsChannel = false;
@@ -10027,35 +10065,13 @@ var addAllMessages = function addAllMessages(messages, direction) {
 var updateMessageOnAllMessages = function updateMessageOnAllMessages(messageId, updatedParams, voteDetails) {
   activeChannelAllMessages = activeChannelAllMessages.map(function (message) {
     if (message.tid === messageId || message.id === messageId) {
-      var _voteDetails$votes, _message$pollDetails;
       if (updatedParams.state === MESSAGE_STATUS.DELETE) {
         return _extends({}, updatedParams);
       }
-      if (voteDetails && voteDetails !== null && voteDetails !== void 0 && (_voteDetails$votes = voteDetails.votes) !== null && _voteDetails$votes !== void 0 && _voteDetails$votes.length && !voteDetails.multipleVotes && message.pollDetails) {
-        message.pollDetails.votes = [].concat((message.pollDetails.votes || []).filter(function (vote) {
-          var _voteDetails$votes2, _voteDetails$votes2$, _voteDetails$votes2$$;
-          return vote.user.id !== (voteDetails === null || voteDetails === void 0 ? void 0 : (_voteDetails$votes2 = voteDetails.votes) === null || _voteDetails$votes2 === void 0 ? void 0 : (_voteDetails$votes2$ = _voteDetails$votes2[0]) === null || _voteDetails$votes2$ === void 0 ? void 0 : (_voteDetails$votes2$$ = _voteDetails$votes2$.user) === null || _voteDetails$votes2$$ === void 0 ? void 0 : _voteDetails$votes2$$.id);
-        }));
-      }
-      var updatedMessage = _extends({}, message, updatedParams, voteDetails && voteDetails.votes && voteDetails.votesPerOption && message.pollDetails ? {
-        pollDetails: _extends({}, message.pollDetails, {
-          votes: [].concat(((_message$pollDetails = message.pollDetails) === null || _message$pollDetails === void 0 ? void 0 : _message$pollDetails.votes) || [], voteDetails.votes),
-          votesPerOption: voteDetails.votesPerOption
-        })
-      } : {});
-      if (voteDetails && voteDetails.deletedVotes && updatedMessage.pollDetails) {
-        updatedMessage = _extends({}, updatedMessage, {
-          pollDetails: _extends({}, updatedMessage.pollDetails, {
-            votes: deleteVotesFromPollDetails(updatedMessage.pollDetails.votes, voteDetails.deletedVotes),
-            votesPerOption: voteDetails.votesPerOption
-          })
-        });
-      }
-      if (voteDetails && voteDetails.closed && updatedMessage.pollDetails) {
+      var updatedMessage = _extends({}, message, updatedParams);
+      if (voteDetails) {
         updatedMessage = _extends({}, updatedMessage, {
-          pollDetails: _extends({}, updatedMessage.pollDetails, {
-            closed: voteDetails.closed
-          })
+          pollDetails: handleVoteDetails(voteDetails, updatedMessage)
         });
       }
       return updatedMessage;
@@ -10177,34 +10193,14 @@ function updateMessageOnMap(channelId, updatedMessage, voteDetails) {
           messagesList.push(_extends({}, mes, updatedMessageData));
           continue;
         } else {
-          var _mes$pollDetails, _voteDetails$votes3;
-          updatedMessageData = _extends({}, mes, updatedMessage.params, voteDetails && voteDetails.votes && voteDetails.votesPerOption && mes.pollDetails ? {
-            pollDetails: _extends({}, mes.pollDetails, {
-              votes: [].concat(((_mes$pollDetails = mes.pollDetails) === null || _mes$pollDetails === void 0 ? void 0 : _mes$pollDetails.votes) || [], voteDetails.votes),
-              votesPerOption: voteDetails.votesPerOption
-            })
-          } : {});
-          if (voteDetails && voteDetails !== null && voteDetails !== void 0 && (_voteDetails$votes3 = voteDetails.votes) !== null && _voteDetails$votes3 !== void 0 && _voteDetails$votes3.length && !voteDetails.multipleVotes && updatedMessageData.pollDetails) {
-            updatedMessageData.pollDetails.votes = [].concat((updatedMessageData.pollDetails.votes || []).filter(function (vote) {
-              var _voteDetails$votes4, _voteDetails$votes4$, _voteDetails$votes4$$;
-              return vote.user.id !== (voteDetails === null || voteDetails === void 0 ? void 0 : (_voteDetails$votes4 = voteDetails.votes) === null || _voteDetails$votes4 === void 0 ? void 0 : (_voteDetails$votes4$ = _voteDetails$votes4[0]) === null || _voteDetails$votes4$ === void 0 ? void 0 : (_voteDetails$votes4$$ = _voteDetails$votes4$.user) === null || _voteDetails$votes4$$ === void 0 ? void 0 : _voteDetails$votes4$$.id);
-            }));
-          }
-          if (voteDetails && voteDetails.deletedVotes && updatedMessageData.pollDetails) {
-            updatedMessageData = _extends({}, updatedMessageData, {
-              pollDetails: _extends({}, updatedMessageData.pollDetails, {
-                votes: deleteVotesFromPollDetails(updatedMessageData.pollDetails.votes, voteDetails.deletedVotes),
-                votesPerOption: voteDetails.votesPerOption
-              })
-            });
-          }
-          if (voteDetails && voteDetails.closed && updatedMessageData.pollDetails) {
-            updatedMessageData = _extends({}, updatedMessageData, {
-              pollDetails: _extends({}, updatedMessageData.pollDetails, {
-                closed: voteDetails.closed
-              })
-            });
+          updatedMessageData = _extends({}, mes, updatedMessage.params);
+          var voteDetailsData = void 0;
+          if (voteDetails) {
+            voteDetailsData = handleVoteDetails(voteDetails, updatedMessageData);
           }
+          updatedMessageData = _extends({}, updatedMessageData, {
+            pollDetails: voteDetailsData
+          });
           messagesList.push(_extends({}, mes, updatedMessageData));
           continue;
         }
@@ -11241,32 +11237,10 @@ var messageSlice = createSlice({
           if (params.state === MESSAGE_STATUS.DELETE) {
             return _extends({}, params);
           } else {
-            var _voteDetails$votes;
-            if (voteDetails && voteDetails !== null && voteDetails !== void 0 && (_voteDetails$votes = voteDetails.votes) !== null && _voteDetails$votes !== void 0 && _voteDetails$votes.length && !voteDetails.multipleVotes && message.pollDetails) {
-              message.pollDetails.votes = [].concat((message.pollDetails.votes || []).filter(function (vote) {
-                var _voteDetails$votes2, _voteDetails$votes2$, _voteDetails$votes2$$;
-                return vote.user.id !== (voteDetails === null || voteDetails === void 0 ? void 0 : (_voteDetails$votes2 = voteDetails.votes) === null || _voteDetails$votes2 === void 0 ? void 0 : (_voteDetails$votes2$ = _voteDetails$votes2[0]) === null || _voteDetails$votes2$ === void 0 ? void 0 : (_voteDetails$votes2$$ = _voteDetails$votes2$.user) === null || _voteDetails$votes2$$ === void 0 ? void 0 : _voteDetails$votes2$$.id);
-              }));
-            }
-            var messageData = _extends({}, message, params, voteDetails && voteDetails.votes && voteDetails.votesPerOption && message.pollDetails ? {
-              pollDetails: _extends({}, message.pollDetails, {
-                votes: [].concat(message.pollDetails.votes || [], voteDetails.votes),
-                votesPerOption: voteDetails.votesPerOption
-              })
-            } : {});
-            if (voteDetails && voteDetails.deletedVotes && messageData.pollDetails) {
+            var messageData = _extends({}, message, params);
+            if (voteDetails) {
               messageData = _extends({}, messageData, {
-                pollDetails: _extends({}, messageData.pollDetails, {
-                  votes: deleteVotesFromPollDetails(messageData.pollDetails.votes, voteDetails.deletedVotes),
-                  votesPerOption: voteDetails.votesPerOption || {}
-                })
-              });
-            }
-            if (voteDetails && voteDetails.closed && messageData.pollDetails) {
-              messageData = _extends({}, messageData, {
-                pollDetails: _extends({}, messageData.pollDetails, {
-                  closed: voteDetails.closed
-                })
+                pollDetails: handleVoteDetails(voteDetails, messageData)
               });
             }
             if (messageData.deliveryStatus !== MESSAGE_DELIVERY_STATUS.PENDING) {
@@ -14348,7 +14322,7 @@ function watchForEvents() {
           };
         });
         _loop = /*#__PURE__*/_regenerator().m(function _callee() {
-          var _yield$take, type, args, createdChannel, channelFilterTypes, getFromContacts, channelExists, _chan, channel, _chan2, _channel, member, _channelExists, _activeChannelId, groupName, updateChannelData, _channel2, _channelExists2, _channel3, removedMembers, _activeChannelId2, _channelExists3, activeChannel, _updateChannelData, _groupName, _channel4, addedMembers, _activeChannelId3, _channelExists4, _updateChannelData2, _groupName2, updatedChannel, _channelExists5, subject, avatarUrl, muted, mutedTill, metadata, _activeChannelId4, _groupName3, _channel5, message, messageToHandle, _channelFilterTypes, _activeChannelId5, _channelExists6, channelForAdd, hasNextMessage, _groupName4, showNotifications, tabIsActive, _state$ThemeReducer$n, _state$ThemeReducer$n2, _state$ThemeReducer$n3, _state$ThemeReducer$n4, _state$ThemeReducer$n5, _state$ThemeReducer$n6, contactsMap, _getFromContacts, state, theme, accentColor, textSecondary, messageBody, channelId, markerList, _channel6, _activeChannelId6, updateLastMessage, markersMap, activeChannelMessages, lastMessage, _channelId, _channel7, _channel8, deletedMessage, _activeChannelId7, _channelExists7, _channel9, _message, _activeChannelId8, _channelExists8, _channel0, user, _message2, reaction, isSelf, _activeChannelId9, _state$ThemeReducer$n7, _state$ThemeReducer$n8, _state$ThemeReducer$n9, _state$ThemeReducer$n0, _state$ThemeReducer$n1, _state$ThemeReducer$n10, _contactsMap, _getFromContacts2, _state, _theme, _accentColor, _textSecondary, _messageBody, channelUpdateParams, _channel1, pollDetails, messageId, _activeChannelId0, addedVotes, obj, _store$getState$Messa, key, hasNext, _iterator, _step, vote, _channel10, _pollDetails, _messageId, _activeChannelId1, deletedVotes, _iterator2, _step2, _vote, _channel11, _pollDetails2, _messageId2, _activeChannelId10, retractedVotes, _iterator3, _step3, _vote2, _channel12, _messageId3, _activeChannelId11, _channel13, _user, _message3, _reaction, channelFromMap, _isSelf, _activeChannelId12, _channelUpdateParams, _channel14, _updatedChannel, _channel15, _activeChannelId13, channelExist, _channel16, _channel17, _channel18, _channel19, _channel20, _channel21, _channel22, _groupName5, _channel23, _groupName6, _channel24, members, _activeChannelId14, i, _channel25, _channel26, _channelId2, from, name, status, _t, _t2;
+          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;
           return _regenerator().w(function (_context) {
             while (1) switch (_context.p = _context.n) {
               case 0:
@@ -14360,7 +14334,7 @@ function watchForEvents() {
                 type = _yield$take.type;
                 args = _yield$take.args;
                 _t = type;
-                _context.n = _t === CHANNEL_EVENT_TYPES.CREATE ? 2 : _t === CHANNEL_EVENT_TYPES.JOIN ? 7 : _t === CHANNEL_EVENT_TYPES.LEAVE ? 9 : _t === CHANNEL_EVENT_TYPES.BLOCK ? 22 : _t === CHANNEL_EVENT_TYPES.UNBLOCK ? 24 : _t === CHANNEL_EVENT_TYPES.KICK_MEMBERS ? 25 : _t === CHANNEL_EVENT_TYPES.ADD_MEMBERS ? 36 : _t === CHANNEL_EVENT_TYPES.UPDATE_CHANNEL ? 46 : _t === CHANNEL_EVENT_TYPES.MESSAGE ? 51 : _t === CHANNEL_EVENT_TYPES.MESSAGE_MARKERS_RECEIVED ? 68 : _t === CHANNEL_EVENT_TYPES.DELETE ? 75 : _t === CHANNEL_EVENT_TYPES.DELETE_MESSAGE ? 77 : _t === CHANNEL_EVENT_TYPES.EDIT_MESSAGE ? 82 : _t === CHANNEL_EVENT_TYPES.REACTION_ADDED ? 87 : _t === CHANNEL_EVENT_TYPES.POLL_ADDED ? 95 : _t === CHANNEL_EVENT_TYPES.POLL_DELETED ? 101 : _t === CHANNEL_EVENT_TYPES.POLL_RETRACTED ? 107 : _t === CHANNEL_EVENT_TYPES.POLL_CLOSED ? 113 : _t === CHANNEL_EVENT_TYPES.REACTION_DELETED ? 117 : _t === CHANNEL_EVENT_TYPES.UNREAD_MESSAGES_INFO ? 122 : _t === CHANNEL_EVENT_TYPES.CLEAR_HISTORY ? 125 : _t === CHANNEL_EVENT_TYPES.MUTE ? 131 : _t === CHANNEL_EVENT_TYPES.UNMUTE ? 133 : _t === CHANNEL_EVENT_TYPES.PINED ? 135 : _t === CHANNEL_EVENT_TYPES.UNPINED ? 137 : _t === CHANNEL_EVENT_TYPES.HIDE ? 139 : _t === CHANNEL_EVENT_TYPES.UNHIDE ? 141 : _t === CHANNEL_EVENT_TYPES.CHANNEL_MARKED_AS_UNREAD ? 143 : _t === CHANNEL_EVENT_TYPES.CHANNEL_MARKED_AS_READ ? 146 : _t === CHANNEL_EVENT_TYPES.CHANGE_ROLE ? 149 : _t === CHANNEL_EVENT_TYPES.FROZEN ? 156 : _t === CHANNEL_EVENT_TYPES.UNFROZEN ? 157 : _t === CHANNEL_EVENT_TYPES.CHANNEL_EVENT ? 158 : _t === CONNECTION_EVENT_TYPES.CONNECTION_STATUS_CHANGED ? 167 : 170;
+                _context.n = _t === CHANNEL_EVENT_TYPES.CREATE ? 2 : _t === CHANNEL_EVENT_TYPES.JOIN ? 7 : _t === CHANNEL_EVENT_TYPES.LEAVE ? 9 : _t === CHANNEL_EVENT_TYPES.BLOCK ? 22 : _t === CHANNEL_EVENT_TYPES.UNBLOCK ? 24 : _t === CHANNEL_EVENT_TYPES.KICK_MEMBERS ? 25 : _t === CHANNEL_EVENT_TYPES.ADD_MEMBERS ? 36 : _t === CHANNEL_EVENT_TYPES.UPDATE_CHANNEL ? 46 : _t === CHANNEL_EVENT_TYPES.MESSAGE ? 51 : _t === CHANNEL_EVENT_TYPES.MESSAGE_MARKERS_RECEIVED ? 68 : _t === CHANNEL_EVENT_TYPES.DELETE ? 75 : _t === CHANNEL_EVENT_TYPES.DELETE_MESSAGE ? 77 : _t === CHANNEL_EVENT_TYPES.EDIT_MESSAGE ? 82 : _t === CHANNEL_EVENT_TYPES.REACTION_ADDED ? 87 : _t === CHANNEL_EVENT_TYPES.POLL_ADDED ? 95 : _t === CHANNEL_EVENT_TYPES.POLL_DELETED ? 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;
                 break;
               case 2:
                 createdChannel = args.createdChannel;
@@ -14394,7 +14368,7 @@ function watchForEvents() {
                   addChannelToAllChannels(createdChannel);
                 }
               case 6:
-                return _context.a(3, 171);
+                return _context.a(3, 179);
               case 7:
                 channel = args.channel;
                 log.info('channel JOIN ... . ', channel);
@@ -14405,7 +14379,7 @@ function watchForEvents() {
                 if (!_chan2) {
                   addChannelToAllChannels(channel);
                 }
-                return _context.a(3, 171);
+                return _context.a(3, 179);
               case 9:
                 _channel = args.channel, member = args.member;
                 log.info('channel LEAVE ... ', _channel, member);
@@ -14473,7 +14447,7 @@ function watchForEvents() {
                   mutedTill: _channel.mutedTill
                 });
               case 21:
-                return _context.a(3, 171);
+                return _context.a(3, 179);
               case 22:
                 log.info('channel BLOCK ... ');
                 _channel2 = args.channel;
@@ -14485,10 +14459,10 @@ function watchForEvents() {
                 _context.n = 23;
                 return effects.put(removeChannelAC(_channel2.id));
               case 23:
-                return _context.a(3, 171);
+                return _context.a(3, 179);
               case 24:
                 log.info('channel UNBLOCK ... ');
-                return _context.a(3, 171);
+                return _context.a(3, 179);
               case 25:
                 _channel3 = args.channel, removedMembers = args.removedMembers;
                 log.info('channel KICK_MEMBERS ... ', removedMembers);
@@ -14558,7 +14532,7 @@ function watchForEvents() {
                   muted: _channel3.muted,
                   mutedTill: _channel3.mutedTill
                 });
-                return _context.a(3, 171);
+                return _context.a(3, 179);
               case 36:
                 _channel4 = args.channel, addedMembers = args.addedMembers;
                 log.info('channel ADD_MEMBERS ... ', addedMembers);
@@ -14613,7 +14587,7 @@ function watchForEvents() {
                   muted: _channel4.muted,
                   mutedTill: _channel4.mutedTill
                 });
-                return _context.a(3, 171);
+                return _context.a(3, 179);
               case 46:
                 log.info('channel UPDATE_CHANNEL ... ');
                 updatedChannel = args.updatedChannel;
@@ -14660,7 +14634,7 @@ function watchForEvents() {
                   mutedTill: mutedTill,
                   metadata: isJSON(metadata) ? JSON.parse(metadata) : metadata
                 });
-                return _context.a(3, 171);
+                return _context.a(3, 179);
               case 51:
                 _channel5 = args.channel, message = args.message;
                 log.info('channel MESSAGE ... id : ', message.id, ', channel.id: ', _channel5.id);
@@ -14825,7 +14799,7 @@ function watchForEvents() {
                 });
                 updateChannelLastMessageOnAllChannels(_channel5.id, _channel5.lastMessage);
               case 67:
-                return _context.a(3, 171);
+                return _context.a(3, 179);
               case 68:
                 channelId = args.channelId, markerList = args.markerList;
                 _context.n = 69;
@@ -14895,7 +14869,7 @@ function watchForEvents() {
                 _context.n = 74;
                 return effects.put(updateMessagesMarkersAC(channelId, markerList.name, markerList));
               case 74:
-                return _context.a(3, 171);
+                return _context.a(3, 179);
               case 75:
                 _channelId = args.channelId;
                 log.info('channel DELETE ... ');
@@ -14904,7 +14878,7 @@ function watchForEvents() {
                 return effects.put(setChannelToRemoveAC(_channel7));
               case 76:
                 deleteChannelFromAllChannels(_channelId);
-                return _context.a(3, 171);
+                return _context.a(3, 179);
               case 77:
                 _channel8 = args.channel, deletedMessage = args.deletedMessage;
                 _context.n = 78;
@@ -14948,7 +14922,7 @@ function watchForEvents() {
                   muted: _channel8.muted,
                   mutedTill: _channel8.mutedTill
                 }, deletedMessage);
-                return _context.a(3, 171);
+                return _context.a(3, 179);
               case 82:
                 _channel9 = args.channel, _message = args.message;
                 _context.n = 83;
@@ -14997,7 +14971,7 @@ function watchForEvents() {
                   });
                 }
                 updateChannelOnAllChannels(_channel9.id, {}, _message);
-                return _context.a(3, 171);
+                return _context.a(3, 179);
               case 87:
                 _channel0 = args.channel, user = args.user, _message2 = args.message, reaction = args.reaction;
                 isSelf = user.id === SceytChatClient.user.id;
@@ -15074,208 +15048,271 @@ function watchForEvents() {
                 if (checkChannelExistsOnMessagesMap(_channel0.id)) {
                   addReactionToMessageOnMap(_channel0.id, _message2, reaction, true);
                 }
-                return _context.a(3, 171);
+                return _context.a(3, 179);
               case 95:
                 _channel1 = args.channel, pollDetails = args.pollDetails, messageId = args.messageId;
+                pollDetailsData = pollDetails;
                 _context.n = 96;
                 return effects.call(getActiveChannelId);
               case 96:
                 _activeChannelId0 = _context.v;
-                addedVotes = (pollDetails === null || pollDetails === void 0 ? void 0 : pollDetails.votes) || [];
-                obj = {
-                  votes: addedVotes,
-                  votesPerOption: pollDetails.votesPerOption || {},
-                  multipleVotes: pollDetails.allowMultipleVotes || false
-                };
-                if (!(pollDetails !== null && pollDetails !== void 0 && pollDetails.id && addedVotes.length > 0)) {
-                  _context.n = 99;
+                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;
+                  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;
+                  objs.push({
+                    type: _vote.user.id === SceytChatClient.user.id ? 'addOwn' : 'add',
+                    vote: _vote,
+                    incrementVotesPerOptionCount: (addedVotes === null || addedVotes === void 0 ? void 0 : addedVotes.length) || 0
+                  });
+                }
+                _i = 0, _objs = objs;
+              case 97:
+                if (!(_i < _objs.length)) {
+                  _context.n = 101;
+                  break;
+                }
+                obj = _objs[_i];
+                if (!(pollDetailsData !== null && pollDetailsData !== void 0 && pollDetailsData.id && obj.vote)) {
+                  _context.n = 100;
                   break;
                 }
-                key = pollDetails.id + "_" + addedVotes[0].optionId;
+                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;
-                _iterator = _createForOfIteratorHelperLoose(addedVotes);
-              case 97:
-                if ((_step = _iterator()).done) {
+                if (!(obj.type === 'addOwn')) {
                   _context.n = 99;
                   break;
                 }
-                vote = _step.value;
                 _context.n = 98;
-                return effects.put(addPollVotesToListAC(pollDetails.id, vote.optionId, [vote], hasNext, undefined));
+                return effects.put(addPollVotesToListAC(pollDetailsData.id, obj.vote.optionId, [obj.vote], hasNext, undefined));
               case 98:
-                _context.n = 97;
+                _context.n = 100;
                 break;
               case 99:
+                _context.n = 100;
+                return effects.put(deletePollVotesFromListAC(pollDetailsData.id, obj.vote.optionId, [obj.vote], messageId));
+              case 100:
+                _i++;
+                _context.n = 97;
+                break;
+              case 101:
+                _i2 = 0, _objs2 = objs;
+              case 102:
+                if (!(_i2 < _objs2.length)) {
+                  _context.n = 104;
+                  break;
+                }
+                _obj = _objs2[_i2];
                 updateMessageOnMap(_channel1.id, {
                   messageId: messageId,
                   params: {}
-                }, obj);
+                }, {
+                  type: _obj.type,
+                  vote: _obj.vote,
+                  incrementVotesPerOptionCount: _obj.incrementVotesPerOptionCount
+                });
                 if (!(_channel1.id === _activeChannelId0)) {
-                  _context.n = 100;
+                  _context.n = 103;
                   break;
                 }
-                updateMessageOnAllMessages(messageId, {}, obj);
-                _context.n = 100;
-                return effects.put(updateMessageAC(messageId, {}, undefined, obj));
-              case 100:
-                return _context.a(3, 171);
-              case 101:
-                _channel10 = args.channel, _pollDetails = args.pollDetails, _messageId = args.messageId;
+                updateMessageOnAllMessages(messageId, {}, _obj);
+                _context.n = 103;
+                return effects.put(updateMessageAC(messageId, {}, undefined, _obj));
+              case 103:
+                _i2++;
                 _context.n = 102;
+                break;
+              case 104:
+                return _context.a(3, 179);
+              case 105:
+                _channel10 = args.channel, _pollDetails = args.pollDetails, _messageId = args.messageId;
+                _pollDetailsData = _pollDetails;
+                _context.n = 106;
                 return effects.call(getActiveChannelId);
-              case 102:
+              case 106:
                 _activeChannelId1 = _context.v;
-                deletedVotes = (_pollDetails === null || _pollDetails === void 0 ? void 0 : _pollDetails.votes) || [];
-                if (!(_pollDetails !== null && _pollDetails !== void 0 && _pollDetails.id && deletedVotes.length > 0)) {
-                  _context.n = 105;
+                _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;
+                  _objs3.push({
+                    type: _vote2.user.id === SceytChatClient.user.id ? 'deleteOwn' : 'delete',
+                    vote: _vote2,
+                    incrementVotesPerOptionCount: -((_deletedVotes === null || _deletedVotes === void 0 ? void 0 : _deletedVotes.length) || 0)
+                  });
+                }
+                _i3 = 0, _objs4 = _objs3;
+              case 107:
+                if (!(_i3 < _objs4.length)) {
+                  _context.n = 109;
                   break;
                 }
-                _iterator2 = _createForOfIteratorHelperLoose(deletedVotes);
-              case 103:
-                if ((_step2 = _iterator2()).done) {
-                  _context.n = 105;
+                _obj2 = _objs4[_i3];
+                if (!(_pollDetailsData !== null && _pollDetailsData !== void 0 && _pollDetailsData.id && _obj2.vote)) {
+                  _context.n = 108;
                   break;
                 }
-                _vote = _step2.value;
-                _context.n = 104;
-                return effects.put(deletePollVotesFromListAC(_pollDetails.id, _vote.optionId, [_vote], _messageId));
-              case 104:
-                _context.n = 103;
+                _context.n = 108;
+                return effects.put(deletePollVotesFromListAC(_pollDetailsData.id, _obj2.vote.optionId, [_obj2.vote], _messageId));
+              case 108:
+                _i3++;
+                _context.n = 107;
                 break;
-              case 105:
+              case 109:
+                _i4 = 0, _objs5 = _objs3;
+              case 110:
+                if (!(_i4 < _objs5.length)) {
+                  _context.n = 112;
+                  break;
+                }
+                _obj3 = _objs5[_i4];
                 updateMessageOnMap(_channel10.id, {
                   messageId: _messageId,
                   params: {}
-                }, {
-                  deletedVotes: deletedVotes,
-                  votesPerOption: _pollDetails.votesPerOption
-                });
+                }, _obj3);
                 if (!(_channel10.id === _activeChannelId1)) {
-                  _context.n = 106;
+                  _context.n = 111;
                   break;
                 }
-                updateMessageOnAllMessages(_messageId, {}, {
-                  deletedVotes: deletedVotes,
-                  votesPerOption: _pollDetails.votesPerOption || {}
-                });
-                _context.n = 106;
-                return effects.put(updateMessageAC(_messageId, {}, undefined, {
-                  deletedVotes: deletedVotes,
-                  votesPerOption: _pollDetails.votesPerOption || {}
-                }));
-              case 106:
-                return _context.a(3, 171);
-              case 107:
+                updateMessageOnAllMessages(_messageId, {}, _obj3);
+                _context.n = 111;
+                return effects.put(updateMessageAC(_messageId, {}, undefined, _obj3));
+              case 111:
+                _i4++;
+                _context.n = 110;
+                break;
+              case 112:
+                return _context.a(3, 179);
+              case 113:
                 _channel11 = args.channel, _pollDetails2 = args.pollDetails, _messageId2 = args.messageId;
-                _context.n = 108;
+                _context.n = 114;
                 return effects.call(getActiveChannelId);
-              case 108:
+              case 114:
                 _activeChannelId10 = _context.v;
-                retractedVotes = (_pollDetails2 === null || _pollDetails2 === void 0 ? void 0 : _pollDetails2.votes) || [];
+                _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;
+                  _objs6.push({
+                    type: _vote4.user.id === SceytChatClient.user.id ? 'deleteOwn' : 'delete',
+                    vote: _vote4,
+                    incrementVotesPerOptionCount: -((retractedVotes === null || retractedVotes === void 0 ? void 0 : retractedVotes.length) || 0)
+                  });
+                }
+                _i5 = 0, _objs7 = _objs6;
+              case 115:
+                if (!(_i5 < _objs7.length)) {
+                  _context.n = 120;
+                  break;
+                }
+                _obj4 = _objs7[_i5];
                 updateMessageOnMap(_channel11.id, {
                   messageId: _messageId2,
                   params: {}
-                }, {
-                  deletedVotes: retractedVotes,
-                  votesPerOption: _pollDetails2.votesPerOption
-                });
-                if (!(_pollDetails2 !== null && _pollDetails2 !== void 0 && _pollDetails2.id && retractedVotes.length > 0)) {
-                  _context.n = 111;
+                }, _obj4);
+                if (!(_pollDetailsData2 !== null && _pollDetailsData2 !== void 0 && _pollDetailsData2.id && retractedVotes.length > 0)) {
+                  _context.n = 118;
                   break;
                 }
-                _iterator3 = _createForOfIteratorHelperLoose(retractedVotes);
-              case 109:
-                if ((_step3 = _iterator3()).done) {
-                  _context.n = 111;
+                _iterator5 = _createForOfIteratorHelperLoose(retractedVotes);
+              case 116:
+                if ((_step5 = _iterator5()).done) {
+                  _context.n = 118;
                   break;
                 }
-                _vote2 = _step3.value;
-                _context.n = 110;
-                return effects.put(deletePollVotesFromListAC(_pollDetails2.id, _vote2.optionId, [_vote2], _messageId2));
-              case 110:
-                _context.n = 109;
+                _vote3 = _step5.value;
+                _context.n = 117;
+                return effects.put(deletePollVotesFromListAC(_pollDetailsData2.id, _vote3.optionId, [_vote3], _messageId2));
+              case 117:
+                _context.n = 116;
                 break;
-              case 111:
+              case 118:
                 if (!(_channel11.id === _activeChannelId10)) {
-                  _context.n = 112;
+                  _context.n = 119;
                   break;
                 }
-                updateMessageOnAllMessages(_messageId2, {}, {
-                  deletedVotes: retractedVotes,
-                  votesPerOption: _pollDetails2.votesPerOption || {}
-                });
-                _context.n = 112;
-                return effects.put(updateMessageAC(_messageId2, {}, undefined, {
-                  deletedVotes: retractedVotes,
-                  votesPerOption: _pollDetails2.votesPerOption || {}
-                }));
-              case 112:
-                return _context.a(3, 171);
-              case 113:
+                updateMessageOnAllMessages(_messageId2, {}, _obj4);
+                _context.n = 119;
+                return effects.put(updateMessageAC(_messageId2, {}, undefined, _obj4));
+              case 119:
+                _i5++;
+                _context.n = 115;
+                break;
+              case 120:
+                return _context.a(3, 179);
+              case 121:
                 _channel12 = args.channel, _messageId3 = args.messageId;
-                _context.n = 114;
+                _context.n = 122;
                 return effects.call(getActiveChannelId);
-              case 114:
+              case 122:
                 _activeChannelId11 = _context.v;
+                _obj5 = {
+                  type: 'close',
+                  incrementVotesPerOptionCount: 0
+                };
                 updateMessageOnMap(_channel12.id, {
                   messageId: _messageId3,
                   params: {}
-                }, {
-                  closed: true
-                });
+                }, _obj5);
                 if (!(_channel12.id === _activeChannelId11)) {
-                  _context.n = 116;
+                  _context.n = 124;
                   break;
                 }
-                updateMessageOnAllMessages(_messageId3, {}, {
-                  closed: true
-                });
-                _context.n = 115;
-                return effects.put(updateMessageAC(_messageId3, {}, undefined, {
-                  closed: true
-                }));
-              case 115:
-                return _context.a(3, 171);
-              case 116:
-                return _context.a(3, 171);
-              case 117:
+                updateMessageOnAllMessages(_messageId3, {}, _obj5);
+                _context.n = 123;
+                return effects.put(updateMessageAC(_messageId3, {}, undefined, _obj5));
+              case 123:
+                return _context.a(3, 179);
+              case 124:
+                return _context.a(3, 179);
+              case 125:
                 _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;
-                _context.n = 118;
+                _context.n = 126;
                 return effects.call(getActiveChannelId);
-              case 118:
+              case 126:
                 _activeChannelId12 = _context.v;
                 if (!(_channel13.id === _activeChannelId12)) {
-                  _context.n = 120;
+                  _context.n = 128;
                   break;
                 }
-                _context.n = 119;
+                _context.n = 127;
                 return effects.put(deleteReactionFromMessageAC(_message3, _reaction, _isSelf));
-              case 119:
+              case 127:
                 removeReactionOnAllMessages(_message3, _reaction, true);
-              case 120:
+              case 128:
                 _channelUpdateParams = JSON.parse(JSON.stringify(_channel13));
                 if (channelFromMap && channelFromMap.lastReactedMessage && channelFromMap.lastReactedMessage.id === _message3.id) {
                   _channelUpdateParams.lastReactedMessage = null;
                 }
-                _context.n = 121;
+                _context.n = 129;
                 return effects.put(updateChannelDataAC(_channel13.id, _channelUpdateParams));
-              case 121:
+              case 129:
                 updateChannelOnAllChannels(_channel13.id, _channelUpdateParams);
                 if (checkChannelExistsOnMessagesMap(_channel13.id)) {
                   removeReactionToMessageOnMap(_channel13.id, _message3, _reaction, true);
                 }
-                return _context.a(3, 171);
-              case 122:
+                return _context.a(3, 179);
+              case 130:
                 _channel14 = args.channel;
                 if (!_channel14) {
-                  _context.n = 124;
+                  _context.n = 132;
                   break;
                 }
                 _updatedChannel = JSON.parse(JSON.stringify(_channel14));
-                _context.n = 123;
+                _context.n = 131;
                 return effects.put(updateChannelDataAC(_channel14.id, {
                   lastMessage: _channel14.lastMessage,
                   newMessageCount: _channel14.newMessageCount,
@@ -15288,36 +15325,36 @@ function watchForEvents() {
                   lastDisplayedMessageId: _channel14.lastDisplayedMessageId,
                   messageRetentionPeriod: _channel14.messageRetentionPeriod
                 }));
-              case 123:
+              case 131:
                 updateChannelOnAllChannels(_channel14.id, _updatedChannel);
-              case 124:
-                return _context.a(3, 171);
-              case 125:
+              case 132:
+                return _context.a(3, 179);
+              case 133:
                 _channel15 = args.channel;
                 log.info('CLEAR_HISTORY: ', _channel15);
-                _context.n = 126;
+                _context.n = 134;
                 return effects.call(getActiveChannelId);
-              case 126:
+              case 134:
                 _activeChannelId13 = _context.v;
-                _context.n = 127;
+                _context.n = 135;
                 return effects.call(checkChannelExists, _channel15.id);
-              case 127:
+              case 135:
                 channelExist = _context.v;
                 if (!(_channel15.id === _activeChannelId13)) {
-                  _context.n = 129;
+                  _context.n = 137;
                   break;
                 }
-                _context.n = 128;
+                _context.n = 136;
                 return effects.put(clearMessagesAC());
-              case 128:
+              case 136:
                 removeAllMessages();
-              case 129:
+              case 137:
                 removeMessagesFromMap(_channel15.id);
                 if (!channelExist) {
-                  _context.n = 130;
+                  _context.n = 138;
                   break;
                 }
-                _context.n = 130;
+                _context.n = 138;
                 return effects.put(updateChannelDataAC(_channel15.id, {
                   lastMessage: null,
                   newMessageCount: 0,
@@ -15325,7 +15362,7 @@ function watchForEvents() {
                   muted: _channel15.muted,
                   mutedTill: _channel15.mutedTill
                 }));
-              case 130:
+              case 138:
                 updateChannelOnAllChannels(_channel15.id, {
                   lastMessage: null,
                   newMessageCount: 0,
@@ -15333,173 +15370,173 @@ function watchForEvents() {
                   muted: _channel15.muted,
                   mutedTill: _channel15.mutedTill
                 });
-                return _context.a(3, 171);
-              case 131:
+                return _context.a(3, 179);
+              case 139:
                 _channel16 = args.channel;
                 log.info('channel MUTE ... ');
-                _context.n = 132;
+                _context.n = 140;
                 return effects.put(updateChannelDataAC(_channel16.id, {
                   muted: _channel16.muted,
                   mutedTill: _channel16.mutedTill
                 }));
-              case 132:
+              case 140:
                 updateChannelOnAllChannels(_channel16.id, {
                   muted: _channel16.muted,
                   mutedTill: _channel16.mutedTill
                 });
-                return _context.a(3, 171);
-              case 133:
+                return _context.a(3, 179);
+              case 141:
                 _channel17 = args.channel;
                 log.info('channel UNMUTE ... ');
-                _context.n = 134;
+                _context.n = 142;
                 return effects.put(updateChannelDataAC(_channel17.id, {
                   muted: _channel17.muted,
                   mutedTill: _channel17.mutedTill
                 }));
-              case 134:
+              case 142:
                 updateChannelOnAllChannels(_channel17.id, {
                   muted: _channel17.muted,
                   mutedTill: _channel17.mutedTill
                 });
-                return _context.a(3, 171);
-              case 135:
+                return _context.a(3, 179);
+              case 143:
                 _channel18 = args.channel;
                 log.info('channel PINED ... ');
-                _context.n = 136;
+                _context.n = 144;
                 return effects.put(updateChannelDataAC(_channel18.id, {
                   pinnedAt: _channel18.pinnedAt
                 }, true));
-              case 136:
+              case 144:
                 updateChannelOnAllChannels(_channel18.id, {
                   pinnedAt: _channel18.pinnedAt
                 });
-                return _context.a(3, 171);
-              case 137:
+                return _context.a(3, 179);
+              case 145:
                 _channel19 = args.channel;
                 log.info('channel UNPINED ... ');
-                _context.n = 138;
+                _context.n = 146;
                 return effects.put(updateChannelDataAC(_channel19.id, {
                   pinnedAt: _channel19.pinnedAt
                 }, false, true));
-              case 138:
+              case 146:
                 updateChannelOnAllChannels(_channel19.id, {
                   pinnedAt: _channel19.pinnedAt
                 });
-                return _context.a(3, 171);
-              case 139:
+                return _context.a(3, 179);
+              case 147:
                 _channel20 = args.channel;
                 log.info('channel HIDE ... ');
-                _context.n = 140;
+                _context.n = 148;
                 return effects.put(setChannelToHideAC(_channel20));
-              case 140:
-                return _context.a(3, 171);
-              case 141:
+              case 148:
+                return _context.a(3, 179);
+              case 149:
                 _channel21 = args.channel;
                 log.info('channel UNHIDE ... ');
-                _context.n = 142;
+                _context.n = 150;
                 return effects.put(setChannelToUnHideAC(_channel21));
-              case 142:
-                return _context.a(3, 171);
-              case 143:
+              case 150:
+                return _context.a(3, 179);
+              case 151:
                 _channel22 = args.channel;
-                _context.n = 144;
+                _context.n = 152;
                 return effects.put(updateChannelDataAC(_channel22.id, {
                   unread: _channel22.unread,
                   muted: _channel22.muted,
                   mutedTill: _channel22.mutedTill
                 }));
-              case 144:
+              case 152:
                 _groupName5 = getChannelGroupName(_channel22);
-                _context.n = 145;
+                _context.n = 153;
                 return effects.put(updateSearchedChannelDataAC(_channel22.id, {
                   unread: _channel22.unread
                 }, _groupName5));
-              case 145:
+              case 153:
                 updateChannelOnAllChannels(_channel22.id, {
                   unread: _channel22.unread
                 });
-                return _context.a(3, 171);
-              case 146:
+                return _context.a(3, 179);
+              case 154:
                 _channel23 = args.channel;
-                _context.n = 147;
+                _context.n = 155;
                 return effects.put(updateChannelDataAC(_channel23.id, {
                   unread: _channel23.unread,
                   muted: _channel23.muted,
                   mutedTill: _channel23.mutedTill
                 }));
-              case 147:
+              case 155:
                 _groupName6 = getChannelGroupName(_channel23);
-                _context.n = 148;
+                _context.n = 156;
                 return effects.put(updateSearchedChannelDataAC(_channel23.id, {
                   unread: _channel23.unread
                 }, _groupName6));
-              case 148:
+              case 156:
                 updateChannelOnAllChannels(_channel23.id, {
                   unread: _channel23.unread
                 });
-                return _context.a(3, 171);
-              case 149:
+                return _context.a(3, 179);
+              case 157:
                 _channel24 = args.channel, members = args.members;
                 log.info('channel CHANGE_ROLE  channel ... ', _channel24);
                 log.info('channel CHANGE_ROLE  member ... ', members);
-                _context.n = 150;
+                _context.n = 158;
                 return effects.call(getActiveChannelId);
-              case 150:
+              case 158:
                 _activeChannelId14 = _context.v;
                 if (!(_channel24.id === _activeChannelId14)) {
-                  _context.n = 151;
+                  _context.n = 159;
                   break;
                 }
-                _context.n = 151;
+                _context.n = 159;
                 return effects.put(updateMembersAC(members));
-              case 151:
+              case 159:
                 i = 0;
-              case 152:
+              case 160:
                 if (!(i < members.length)) {
-                  _context.n = 155;
+                  _context.n = 163;
                   break;
                 }
                 if (!(members[i].id === SceytChatClient.user.id)) {
-                  _context.n = 154;
+                  _context.n = 162;
                   break;
                 }
-                _context.n = 153;
+                _context.n = 161;
                 return effects.put(updateChannelDataAC(_channel24.id, {
                   userRole: members[i].role,
                   muted: _channel24.muted,
                   mutedTill: _channel24.mutedTill
                 }));
-              case 153:
+              case 161:
                 updateChannelOnAllChannels(_channel24.id, {
                   userRole: members[i].role,
                   muted: _channel24.muted,
                   mutedTill: _channel24.mutedTill
                 });
-              case 154:
+              case 162:
                 i++;
-                _context.n = 152;
+                _context.n = 160;
                 break;
-              case 155:
-                return _context.a(3, 171);
-              case 156:
+              case 163:
+                return _context.a(3, 179);
+              case 164:
                 _channel25 = args.channel;
                 log.info('channel frozen  channel ... ', _channel25);
-                return _context.a(3, 171);
-              case 157:
+                return _context.a(3, 179);
+              case 165:
                 _channel26 = args.channel;
                 log.info('channel unfrozen  channel ... ', _channel26);
-                return _context.a(3, 171);
-              case 158:
+                return _context.a(3, 179);
+              case 166:
                 _channelId2 = args.channelId, from = args.from, name = args.name;
                 log.info('channel event received >>>... . . . . . ', args);
                 if (!(from.id === SceytChatClient.user.id)) {
-                  _context.n = 159;
+                  _context.n = 167;
                   break;
                 }
-                return _context.a(3, 171);
-              case 159:
+                return _context.a(3, 179);
+              case 167:
                 if (!(name === 'start_typing')) {
-                  _context.n = 161;
+                  _context.n = 169;
                   break;
                 }
                 if (!usersTimeout[_channelId2]) {
@@ -15511,27 +15548,27 @@ function watchForEvents() {
                 usersTimeout[_channelId2][from.id] = setTimeout(function () {
                   channelListener.onReceivedChannelEvent(_channelId2, from, 'stop_typing');
                 }, 5000);
-                _context.n = 160;
+                _context.n = 168;
                 return effects.put(switchTypingIndicatorAC(true, _channelId2, from));
-              case 160:
-                _context.n = 166;
+              case 168:
+                _context.n = 174;
                 break;
-              case 161:
+              case 169:
                 if (!(name === 'stop_typing')) {
-                  _context.n = 163;
+                  _context.n = 171;
                   break;
                 }
                 if (usersTimeout[_channelId2] && usersTimeout[_channelId2][from.id]) {
                   clearTimeout(usersTimeout[_channelId2][from.id]);
                 }
-                _context.n = 162;
+                _context.n = 170;
                 return effects.put(switchTypingIndicatorAC(false, _channelId2, from));
-              case 162:
-                _context.n = 166;
+              case 170:
+                _context.n = 174;
                 break;
-              case 163:
+              case 171:
                 if (!(name === 'start_recording')) {
-                  _context.n = 165;
+                  _context.n = 173;
                   break;
                 }
                 if (!usersTimeout[_channelId2]) {
@@ -15543,50 +15580,50 @@ function watchForEvents() {
                 usersTimeout[_channelId2][from.id] = setTimeout(function () {
                   channelListener.onReceivedChannelEvent(_channelId2, from, 'stop_recording');
                 }, 5000);
-                _context.n = 164;
+                _context.n = 172;
                 return effects.put(switchRecordingIndicatorAC(true, _channelId2, from));
-              case 164:
-                _context.n = 166;
+              case 172:
+                _context.n = 174;
                 break;
-              case 165:
+              case 173:
                 if (!(name === 'stop_recording')) {
-                  _context.n = 166;
+                  _context.n = 174;
                   break;
                 }
                 if (usersTimeout[_channelId2] && usersTimeout[_channelId2][from.id]) {
                   clearTimeout(usersTimeout[_channelId2][from.id]);
                 }
-                _context.n = 166;
+                _context.n = 174;
                 return effects.put(switchRecordingIndicatorAC(false, _channelId2, from));
-              case 166:
-                return _context.a(3, 171);
-              case 167:
+              case 174:
+                return _context.a(3, 179);
+              case 175:
                 status = args.status;
                 log.info('connection status changed . . . . . ', status);
-                _context.n = 168;
+                _context.n = 176;
                 return effects.put(setConnectionStatusAC(status));
-              case 168:
+              case 176:
                 if (!(status === CONNECTION_STATUS.CONNECTED)) {
-                  _context.n = 169;
+                  _context.n = 177;
                   break;
                 }
-                _context.n = 169;
+                _context.n = 177;
                 return effects.put(getRolesAC());
-              case 169:
-                return _context.a(3, 171);
-              case 170:
+              case 177:
+                return _context.a(3, 179);
+              case 178:
                 log.warn('UNHANDLED EVENT FROM REDUX-SAGA EVENT-CHANNEL');
-              case 171:
-                _context.n = 173;
+              case 179:
+                _context.n = 181;
                 break;
-              case 172:
-                _context.p = 172;
+              case 180:
+                _context.p = 180;
                 _t2 = _context.v;
                 log.error('Error in watchForEvents:', _t2);
-              case 173:
+              case 181:
                 return _context.a(2);
             }
-          }, _callee, null, [[0, 172]]);
+          }, _callee, null, [[0, 180]]);
         });
       case 1:
         return _context2.d(_regeneratorValues(_loop()), 2);
@@ -20679,71 +20716,9 @@ function getMessageMarkers(action) {
     }
   }, _marked16$1, null, [[0, 5, 6, 8]]);
 }
-var updatePollDetails = function updatePollDetails(pollDetails, optionId, addVote, allowMultipleVotes) {
-  if (addVote === void 0) {
-    addVote = true;
-  }
-  if (allowMultipleVotes === void 0) {
-    allowMultipleVotes = false;
-  }
-  var user = getClient().user;
-  if (addVote) {
-    var _user$presence, _pollDetails$ownVotes, _pollDetails$ownVotes2, _pollDetails$ownVotes3, _pollDetails$votesPer2, _pollDetails$ownVotes4, _pollDetails$ownVotes5, _ref3, _pollDetails$votesPer3, _extends3;
-    var vote = {
-      optionId: optionId,
-      createdAt: new Date().getTime(),
-      user: {
-        id: user.id,
-        presence: {
-          status: ((_user$presence = user.presence) === null || _user$presence === void 0 ? void 0 : _user$presence.status) || 'online'
-        },
-        profile: {
-          avatar: user.avatarUrl || '',
-          firstName: user.firstName,
-          lastName: user.lastName,
-          metadata: user.metadata || '',
-          metadataMap: user.metadataMap || {},
-          updatedAt: new Date().getTime(),
-          username: user.username || '',
-          createdAt: new Date().getTime()
-        },
-        createdAt: new Date().getTime()
-      }
-    };
-    if (allowMultipleVotes) {
-      var _pollDetails$votesPer, _extends2;
-      return _extends({}, pollDetails, {
-        votesPerOption: _extends({}, pollDetails === null || pollDetails === void 0 ? void 0 : pollDetails.votesPerOption, (_extends2 = {}, _extends2[optionId] = ((pollDetails === null || pollDetails === void 0 ? void 0 : (_pollDetails$votesPer = pollDetails.votesPerOption) === null || _pollDetails$votesPer === void 0 ? void 0 : _pollDetails$votesPer[optionId]) || 0) + 1, _extends2)),
-        ownVotes: [].concat((pollDetails === null || pollDetails === void 0 ? void 0 : pollDetails.ownVotes) || [], [vote])
-      });
-    }
-    var isVotedAlready = ((pollDetails === null || pollDetails === void 0 ? void 0 : (_pollDetails$ownVotes = pollDetails.ownVotes) === null || _pollDetails$ownVotes === void 0 ? void 0 : _pollDetails$ownVotes.length) || 0) > 0;
-    return _extends({}, pollDetails, {
-      votesPerOption: _extends({}, pollDetails === null || pollDetails === void 0 ? void 0 : pollDetails.votesPerOption, isVotedAlready ? (_ref3 = {}, _ref3[String(pollDetails === null || pollDetails === void 0 ? void 0 : (_pollDetails$ownVotes2 = pollDetails.ownVotes) === null || _pollDetails$ownVotes2 === void 0 ? void 0 : (_pollDetails$ownVotes3 = _pollDetails$ownVotes2[0]) === null || _pollDetails$ownVotes3 === void 0 ? void 0 : _pollDetails$ownVotes3.optionId)] = ((pollDetails === null || pollDetails === void 0 ? void 0 : (_pollDetails$votesPer2 = pollDetails.votesPerOption) === null || _pollDetails$votesPer2 === void 0 ? void 0 : _pollDetails$votesPer2[String(pollDetails === null || pollDetails === void 0 ? void 0 : (_pollDetails$ownVotes4 = pollDetails.ownVotes) === null || _pollDetails$ownVotes4 === void 0 ? void 0 : (_pollDetails$ownVotes5 = _pollDetails$ownVotes4[0]) === null || _pollDetails$ownVotes5 === void 0 ? void 0 : _pollDetails$ownVotes5.optionId)]) || 0) - 1, _ref3) : {}, (_extends3 = {}, _extends3[optionId] = ((pollDetails === null || pollDetails === void 0 ? void 0 : (_pollDetails$votesPer3 = pollDetails.votesPerOption) === null || _pollDetails$votesPer3 === void 0 ? void 0 : _pollDetails$votesPer3[optionId]) || 0) + 1, _extends3)),
-      ownVotes: [vote]
-    });
-  } else {
-    var _pollDetails$votesPer5, _extends5;
-    if (allowMultipleVotes) {
-      var _pollDetails$votesPer4, _extends4;
-      return _extends({}, pollDetails, {
-        votesPerOption: _extends({}, pollDetails === null || pollDetails === void 0 ? void 0 : pollDetails.votesPerOption, (_extends4 = {}, _extends4[optionId] = ((pollDetails === null || pollDetails === void 0 ? void 0 : (_pollDetails$votesPer4 = pollDetails.votesPerOption) === null || _pollDetails$votesPer4 === void 0 ? void 0 : _pollDetails$votesPer4[optionId]) || 0) - 1, _extends4)),
-        ownVotes: [].concat(((pollDetails === null || pollDetails === void 0 ? void 0 : pollDetails.ownVotes) || []).filter(function (vote) {
-          return vote.optionId !== optionId;
-        }))
-      });
-    }
-    return _extends({}, pollDetails, {
-      votesPerOption: _extends({}, pollDetails === null || pollDetails === void 0 ? void 0 : pollDetails.votesPerOption, (_extends5 = {}, _extends5[optionId] = ((pollDetails === null || pollDetails === void 0 ? void 0 : (_pollDetails$votesPer5 = pollDetails.votesPerOption) === null || _pollDetails$votesPer5 === void 0 ? void 0 : _pollDetails$votesPer5[optionId]) || 0) - 1, _extends5)),
-      ownVotes: [].concat(((pollDetails === null || pollDetails === void 0 ? void 0 : pollDetails.ownVotes) || []).filter(function (vote) {
-        return vote.optionId !== optionId;
-      }))
-    });
-  }
-};
 function executeAddPollVote(channelId, pollId, optionId, message) {
-  var _message$pollDetails;
-  var channel, pollDetails;
+  var _user$presence, _message$pollDetails;
+  var channel, user, vote, objs, _message$pollDetails2, _message$pollDetails3, _message$pollDetails4, _i2, _objs, obj;
   return _regenerator().w(function (_context19) {
     while (1) switch (_context19.n) {
       case 0:
@@ -20751,35 +20726,78 @@ function executeAddPollVote(channelId, pollId, optionId, message) {
         return effects.call(getChannelFromMap, channelId);
       case 1:
         channel = _context19.v;
-        pollDetails = JSON.parse(JSON.stringify(updatePollDetails(message.pollDetails, optionId, true, ((_message$pollDetails = message.pollDetails) === null || _message$pollDetails === void 0 ? void 0 : _message$pollDetails.allowMultipleVotes) || false)));
+        if (message.pollDetails) {
+          _context19.n = 2;
+          break;
+        }
+        return _context19.a(2);
+      case 2:
+        user = getClient().user;
+        vote = {
+          optionId: optionId,
+          createdAt: new Date().getTime(),
+          user: {
+            id: user.id,
+            presence: {
+              status: ((_user$presence = user.presence) === null || _user$presence === void 0 ? void 0 : _user$presence.status) || 'online'
+            },
+            profile: {
+              avatar: user.avatarUrl || '',
+              firstName: user.firstName,
+              lastName: user.lastName,
+              metadata: user.metadata || '',
+              metadataMap: user.metadataMap || {},
+              updatedAt: new Date().getTime(),
+              username: user.username || '',
+              createdAt: new Date().getTime()
+            },
+            createdAt: new Date().getTime()
+          }
+        };
+        objs = [{
+          type: 'addOwn',
+          vote: vote,
+          incrementVotesPerOptionCount: 1
+        }];
+        if (!((_message$pollDetails = message.pollDetails) !== null && _message$pollDetails !== void 0 && _message$pollDetails.allowMultipleVotes)) {
+          objs.push({
+            type: 'deleteOwn',
+            vote: (_message$pollDetails2 = message.pollDetails) === null || _message$pollDetails2 === void 0 ? void 0 : (_message$pollDetails3 = _message$pollDetails2.voteDetails) === null || _message$pollDetails3 === void 0 ? void 0 : (_message$pollDetails4 = _message$pollDetails3.ownVotes) === null || _message$pollDetails4 === void 0 ? void 0 : _message$pollDetails4[0],
+            incrementVotesPerOptionCount: -1
+          });
+        }
+        _i2 = 0, _objs = objs;
+      case 3:
+        if (!(_i2 < _objs.length)) {
+          _context19.n = 6;
+          break;
+        }
+        obj = _objs[_i2];
         updateMessageOnMap(channel.id, {
           messageId: message.id,
-          params: {
-            pollDetails: pollDetails
-          }
-        });
-        updateMessageOnAllMessages(message.id, JSON.parse(JSON.stringify({
-          pollDetails: pollDetails
-        })));
-        _context19.n = 2;
-        return effects.put(updateMessageAC(message.id, {
-          pollDetails: pollDetails
-        }));
-      case 2:
+          params: {}
+        }, obj);
+        updateMessageOnAllMessages(message.id, {}, obj);
+        _context19.n = 4;
+        return effects.put(updateMessageAC(message.id, {}, undefined, obj));
+      case 4:
         if (!channel) {
-          _context19.n = 3;
+          _context19.n = 5;
           break;
         }
-        _context19.n = 3;
+        _context19.n = 5;
         return effects.call(channel.addVote, message.id, pollId, [optionId]);
-      case 3:
+      case 5:
+        _i2++;
+        _context19.n = 3;
+        break;
+      case 6:
         return _context19.a(2);
     }
   }, _marked17$1);
 }
-function updateMessageOptimisticallyForAddPollVote(channelId, optionId, message) {
-  var _message$pollDetails2;
-  var channel, pollDetails;
+function updateMessageOptimisticallyForAddPollVote(channelId, message, vote) {
+  var channel, obj;
   return _regenerator().w(function (_context20) {
     while (1) switch (_context20.n) {
       case 0:
@@ -20793,27 +20811,31 @@ function updateMessageOptimisticallyForAddPollVote(channelId, optionId, message)
         }
         return _context20.a(2);
       case 2:
-        pollDetails = JSON.parse(JSON.stringify(updatePollDetails(message.pollDetails, optionId, true, ((_message$pollDetails2 = message.pollDetails) === null || _message$pollDetails2 === void 0 ? void 0 : _message$pollDetails2.allowMultipleVotes) || false)));
+        if (message.pollDetails) {
+          _context20.n = 3;
+          break;
+        }
+        return _context20.a(2);
+      case 3:
+        obj = {
+          type: 'addOwn',
+          vote: vote,
+          incrementVotesPerOptionCount: 1
+        };
         updateMessageOnMap(channel.id, {
           messageId: message.id,
-          params: {
-            pollDetails: pollDetails
-          }
-        });
-        updateMessageOnAllMessages(message.id, JSON.parse(JSON.stringify({
-          pollDetails: pollDetails
-        })));
-        _context20.n = 3;
-        return effects.put(updateMessageAC(message.id, {
-          pollDetails: pollDetails
-        }));
-      case 3:
+          params: {}
+        }, obj);
+        updateMessageOnAllMessages(message.id, {}, obj);
+        _context20.n = 4;
+        return effects.put(updateMessageAC(message.id, {}, undefined, obj));
+      case 4:
         return _context20.a(2);
     }
   }, _marked18$1);
 }
 function addPollVote(action) {
-  var payload, channelId, pollId, optionId, _message4, sceytChatClient, connectionState, pendingAction, conflictCheck, channel, _getMessagesFromMap2, _currentMessage$pollD, _pollDetails, _pollDetails2, _store$getState$Messa, _currentMessage$pollD2, _currentMessage$pollD3, currentMessage, hasVotedAnotherOption, pollDetails, hasNext, _t19;
+  var payload, channelId, pollId, optionId, _message4, sceytChatClient, _user$presence2, connectionState, user, vote, pendingAction, conflictCheck, channel, _getMessagesFromMap2, _store$getState$Messa, _currentMessage$pollD, _currentMessage$pollD2, _currentMessage$pollD3, currentMessage, hasNext, obj, _t19;
   return _regenerator().w(function (_context21) {
     while (1) switch (_context21.p = _context21.n) {
       case 0:
@@ -20826,6 +20848,28 @@ function addPollVote(action) {
           break;
         }
         connectionState = sceytChatClient.connectionState;
+        user = sceytChatClient.user;
+        vote = {
+          optionId: optionId,
+          createdAt: new Date().getTime(),
+          user: {
+            id: user.id,
+            presence: {
+              status: ((_user$presence2 = user.presence) === null || _user$presence2 === void 0 ? void 0 : _user$presence2.status) || 'online'
+            },
+            profile: {
+              avatar: user.avatarUrl || '',
+              firstName: user.firstName,
+              lastName: user.lastName,
+              metadata: user.metadata || '',
+              metadataMap: user.metadataMap || {},
+              updatedAt: new Date().getTime(),
+              username: user.username || '',
+              createdAt: new Date().getTime()
+            },
+            createdAt: new Date().getTime()
+          }
+        };
         if (!(connectionState !== CONNECTION_STATUS.CONNECTED)) {
           _context21.n = 6;
           break;
@@ -20853,31 +20897,22 @@ function addPollVote(action) {
         currentMessage = ((_getMessagesFromMap2 = getMessagesFromMap(channelId)) === null || _getMessagesFromMap2 === void 0 ? void 0 : _getMessagesFromMap2.find(function (msg) {
           return msg.id === _message4.id || msg.tid === _message4.id;
         })) || _message4;
-        hasVotedAnotherOption = (((_currentMessage$pollD = currentMessage.pollDetails) === null || _currentMessage$pollD === void 0 ? void 0 : _currentMessage$pollD.ownVotes) || []).some(function (vote) {
-          return vote.optionId !== optionId;
-        });
-        pollDetails = currentMessage.pollDetails;
-        if (hasVotedAnotherOption && !((_pollDetails = pollDetails) !== null && _pollDetails !== void 0 && _pollDetails.allowMultipleVotes)) {
-          pollDetails = updatePollDetails(pollDetails, optionId, false, false);
-        }
-        pollDetails = JSON.parse(JSON.stringify(updatePollDetails(pollDetails, optionId, true, ((_pollDetails2 = pollDetails) === null || _pollDetails2 === void 0 ? void 0 : _pollDetails2.allowMultipleVotes) || false)));
         hasNext = ((_store$getState$Messa = store.getState().MessageReducer.pollVotesHasMore) === null || _store$getState$Messa === void 0 ? void 0 : _store$getState$Messa[pollId]) || false;
         _context21.n = 2;
-        return effects.put(addPollVotesToListAC(pollId, optionId, [(_currentMessage$pollD2 = currentMessage.pollDetails) === null || _currentMessage$pollD2 === void 0 ? void 0 : (_currentMessage$pollD3 = _currentMessage$pollD2.ownVotes) === null || _currentMessage$pollD3 === void 0 ? void 0 : _currentMessage$pollD3[0]], hasNext, _message4.id));
+        return effects.put(addPollVotesToListAC(pollId, optionId, [(_currentMessage$pollD = currentMessage.pollDetails) === null || _currentMessage$pollD === void 0 ? void 0 : (_currentMessage$pollD2 = _currentMessage$pollD.voteDetails) === null || _currentMessage$pollD2 === void 0 ? void 0 : (_currentMessage$pollD3 = _currentMessage$pollD2.ownVotes) === null || _currentMessage$pollD3 === void 0 ? void 0 : _currentMessage$pollD3[0]], hasNext, _message4.id));
       case 2:
+        obj = {
+          type: 'addOwn',
+          vote: vote,
+          incrementVotesPerOptionCount: 1
+        };
         updateMessageOnMap(channel.id, {
           messageId: _message4.id,
-          params: {
-            pollDetails: pollDetails
-          }
-        });
-        updateMessageOnAllMessages(_message4.id, JSON.parse(JSON.stringify({
-          pollDetails: pollDetails
-        })));
+          params: {}
+        }, obj);
+        updateMessageOnAllMessages(_message4.id, {}, obj);
         _context21.n = 3;
-        return effects.put(updateMessageAC(_message4.id, {
-          pollDetails: pollDetails
-        }));
+        return effects.put(updateMessageAC(_message4.id, {}, undefined, obj));
       case 3:
         _context21.n = 5;
         break;
@@ -20886,7 +20921,7 @@ function addPollVote(action) {
           _context21.n = 5;
           break;
         }
-        return _context21.d(_regeneratorValues(updateMessageOptimisticallyForAddPollVote(channelId, optionId, _message4)), 5);
+        return _context21.d(_regeneratorValues(updateMessageOptimisticallyForAddPollVote(channelId, _message4, vote)), 5);
       case 5:
         if (!conflictCheck.shouldSkip) {
           setPendingPollAction(pendingAction);
@@ -20907,8 +20942,8 @@ function addPollVote(action) {
   }, _marked19$1, null, [[0, 8]]);
 }
 function executeDeletePollVote(channelId, pollId, optionId, message) {
-  var _message$pollDetails3;
-  var channel, pollDetails;
+  var _message$pollDetails5, _message$pollDetails6, _message$pollDetails7;
+  var channel, vote, obj;
   return _regenerator().w(function (_context22) {
     while (1) switch (_context22.n) {
       case 0:
@@ -20916,35 +20951,47 @@ function executeDeletePollVote(channelId, pollId, optionId, message) {
         return effects.call(getChannelFromMap, channelId);
       case 1:
         channel = _context22.v;
-        pollDetails = JSON.parse(JSON.stringify(updatePollDetails(message.pollDetails, optionId, false, ((_message$pollDetails3 = message.pollDetails) === null || _message$pollDetails3 === void 0 ? void 0 : _message$pollDetails3.allowMultipleVotes) || false)));
+        if (message.pollDetails) {
+          _context22.n = 2;
+          break;
+        }
+        return _context22.a(2);
+      case 2:
+        vote = (_message$pollDetails5 = message.pollDetails) === null || _message$pollDetails5 === void 0 ? void 0 : (_message$pollDetails6 = _message$pollDetails5.voteDetails) === null || _message$pollDetails6 === void 0 ? void 0 : (_message$pollDetails7 = _message$pollDetails6.ownVotes) === null || _message$pollDetails7 === void 0 ? void 0 : _message$pollDetails7.find(function (vote) {
+          return vote.optionId === optionId;
+        });
+        if (vote) {
+          _context22.n = 3;
+          break;
+        }
+        return _context22.a(2);
+      case 3:
+        obj = {
+          type: 'deleteOwn',
+          vote: vote,
+          incrementVotesPerOptionCount: -1
+        };
         updateMessageOnMap(channel.id, {
           messageId: message.id,
-          params: {
-            pollDetails: pollDetails
-          }
-        });
-        updateMessageOnAllMessages(message.id, {
-          pollDetails: pollDetails
-        });
-        _context22.n = 2;
-        return effects.put(updateMessageAC(message.id, {
-          pollDetails: pollDetails
-        }));
-      case 2:
+          params: {}
+        }, obj);
+        updateMessageOnAllMessages(message.id, {}, obj);
+        _context22.n = 4;
+        return effects.put(updateMessageAC(message.id, {}, undefined, obj));
+      case 4:
         if (!channel) {
-          _context22.n = 3;
+          _context22.n = 5;
           break;
         }
-        _context22.n = 3;
+        _context22.n = 5;
         return effects.call(channel.deleteVote, message.id, pollId, [optionId]);
-      case 3:
+      case 5:
         return _context22.a(2);
     }
   }, _marked20$1);
 }
-function updateMessageOptimisticallyForDeletePollVote(channelId, optionId, message) {
-  var _message$pollDetails4;
-  var channel, pollDetails;
+function updateMessageOptimisticallyForDeletePollVote(channelId, message, vote) {
+  var channel, obj;
   return _regenerator().w(function (_context23) {
     while (1) switch (_context23.n) {
       case 0:
@@ -20958,27 +21005,31 @@ function updateMessageOptimisticallyForDeletePollVote(channelId, optionId, messa
         }
         return _context23.a(2);
       case 2:
-        pollDetails = JSON.parse(JSON.stringify(updatePollDetails(message.pollDetails, optionId, false, ((_message$pollDetails4 = message.pollDetails) === null || _message$pollDetails4 === void 0 ? void 0 : _message$pollDetails4.allowMultipleVotes) || false)));
+        if (message.pollDetails) {
+          _context23.n = 3;
+          break;
+        }
+        return _context23.a(2);
+      case 3:
+        obj = {
+          type: 'deleteOwn',
+          vote: vote,
+          incrementVotesPerOptionCount: -1
+        };
         updateMessageOnMap(channel.id, {
           messageId: message.id,
-          params: {
-            pollDetails: pollDetails
-          }
-        });
-        updateMessageOnAllMessages(message.id, {
-          pollDetails: pollDetails
-        });
-        _context23.n = 3;
-        return effects.put(updateMessageAC(message.id, {
-          pollDetails: pollDetails
-        }));
-      case 3:
+          params: {}
+        }, obj);
+        updateMessageOnAllMessages(message.id, {}, obj);
+        _context23.n = 4;
+        return effects.put(updateMessageAC(message.id, {}, undefined, obj));
+      case 4:
         return _context23.a(2);
     }
   }, _marked21$1);
 }
 function deletePollVote(action) {
-  var payload, channelId, pollId, optionId, _message5, sceytChatClient, connectionState, pendingAction, conflictCheck, channel, _getMessagesFromMap3, _message5$pollDetails, _currentMessage$pollD4, _currentMessage$pollD5, currentMessage, pollDetails, _t20;
+  var payload, channelId, pollId, optionId, _message5, sceytChatClient, _message5$pollDetails, _message5$pollDetails2, _message5$pollDetails3, connectionState, vote, pendingAction, conflictCheck, channel, _getMessagesFromMap3, _currentMessage$pollD4, _currentMessage$pollD5, _currentMessage$pollD6, currentMessage, obj, _t20;
   return _regenerator().w(function (_context24) {
     while (1) switch (_context24.p = _context24.n) {
       case 0:
@@ -20987,12 +21038,21 @@ function deletePollVote(action) {
         channelId = payload.channelId, pollId = payload.pollId, optionId = payload.optionId, _message5 = payload.message;
         sceytChatClient = getClient();
         if (!sceytChatClient) {
-          _context24.n = 7;
+          _context24.n = 8;
           break;
         }
         connectionState = sceytChatClient.connectionState;
+        vote = (_message5$pollDetails = _message5.pollDetails) === null || _message5$pollDetails === void 0 ? void 0 : (_message5$pollDetails2 = _message5$pollDetails.voteDetails) === null || _message5$pollDetails2 === void 0 ? void 0 : (_message5$pollDetails3 = _message5$pollDetails2.ownVotes) === null || _message5$pollDetails3 === void 0 ? void 0 : _message5$pollDetails3.find(function (vote) {
+          return vote.optionId === optionId;
+        });
+        if (vote) {
+          _context24.n = 1;
+          break;
+        }
+        return _context24.a(2);
+      case 1:
         if (!(connectionState !== CONNECTION_STATUS.CONNECTED)) {
-          _context24.n = 6;
+          _context24.n = 7;
           break;
         }
         pendingAction = {
@@ -21004,67 +21064,65 @@ function deletePollVote(action) {
         };
         conflictCheck = checkPendingPollActionConflict(pendingAction);
         if (!(conflictCheck.hasConflict && conflictCheck.shouldSkip)) {
-          _context24.n = 4;
+          _context24.n = 5;
           break;
         }
-        _context24.n = 1;
+        _context24.n = 2;
         return effects.call(getChannelFromMap, channelId);
-      case 1:
+      case 2:
         channel = _context24.v;
         if (!channel) {
-          _context24.n = 3;
+          _context24.n = 4;
           break;
         }
         currentMessage = ((_getMessagesFromMap3 = getMessagesFromMap(channelId)) === null || _getMessagesFromMap3 === void 0 ? void 0 : _getMessagesFromMap3.find(function (msg) {
           return msg.id === _message5.id || msg.tid === _message5.id;
         })) || _message5;
-        pollDetails = JSON.parse(JSON.stringify(updatePollDetails(currentMessage.pollDetails, optionId, false, ((_message5$pollDetails = _message5.pollDetails) === null || _message5$pollDetails === void 0 ? void 0 : _message5$pollDetails.allowMultipleVotes) || false)));
-        _context24.n = 2;
-        return effects.put(deletePollVotesFromListAC(pollId, optionId, [(_currentMessage$pollD4 = currentMessage.pollDetails) === null || _currentMessage$pollD4 === void 0 ? void 0 : (_currentMessage$pollD5 = _currentMessage$pollD4.ownVotes) === null || _currentMessage$pollD5 === void 0 ? void 0 : _currentMessage$pollD5[0]], _message5.id));
-      case 2:
-        updateMessageOnMap(channel.id, {
-          messageId: _message5.id,
-          params: {
-            pollDetails: pollDetails
-          }
-        });
-        updateMessageOnAllMessages(_message5.id, JSON.parse(JSON.stringify({
-          pollDetails: pollDetails
-        })));
         _context24.n = 3;
-        return effects.put(updateMessageAC(_message5.id, {
-          pollDetails: pollDetails
-        }));
+        return effects.put(deletePollVotesFromListAC(pollId, optionId, [(_currentMessage$pollD4 = currentMessage.pollDetails) === null || _currentMessage$pollD4 === void 0 ? void 0 : (_currentMessage$pollD5 = _currentMessage$pollD4.voteDetails) === null || _currentMessage$pollD5 === void 0 ? void 0 : (_currentMessage$pollD6 = _currentMessage$pollD5.ownVotes) === null || _currentMessage$pollD6 === void 0 ? void 0 : _currentMessage$pollD6[0]], _message5.id));
       case 3:
-        _context24.n = 5;
-        break;
+        obj = {
+          type: 'deleteOwn',
+          vote: vote,
+          incrementVotesPerOptionCount: -1
+        };
+        updateMessageOnMap(channel.id, {
+          messageId: _message5.id,
+          params: {}
+        }, obj);
+        updateMessageOnAllMessages(_message5.id, {}, obj);
+        _context24.n = 4;
+        return effects.put(updateMessageAC(_message5.id, {}, undefined, obj));
       case 4:
+        _context24.n = 6;
+        break;
+      case 5:
         if (conflictCheck.shouldSkip) {
-          _context24.n = 5;
+          _context24.n = 6;
           break;
         }
-        return _context24.d(_regeneratorValues(updateMessageOptimisticallyForDeletePollVote(channelId, optionId, _message5)), 5);
-      case 5:
+        return _context24.d(_regeneratorValues(updateMessageOptimisticallyForDeletePollVote(channelId, _message5, vote)), 6);
+      case 6:
         if (!conflictCheck.shouldSkip) {
           setPendingPollAction(pendingAction);
         }
         return _context24.a(2);
-      case 6:
-        return _context24.d(_regeneratorValues(executeDeletePollVote(channelId, pollId, optionId, _message5)), 7);
       case 7:
-        _context24.n = 9;
-        break;
+        return _context24.d(_regeneratorValues(executeDeletePollVote(channelId, pollId, optionId, _message5)), 8);
       case 8:
-        _context24.p = 8;
+        _context24.n = 10;
+        break;
+      case 9:
+        _context24.p = 9;
         _t20 = _context24.v;
         log.error('error in delete poll vote', _t20);
-      case 9:
+      case 10:
         return _context24.a(2);
     }
-  }, _marked22$1, null, [[0, 8]]);
+  }, _marked22$1, null, [[0, 9]]);
 }
 function executeClosePoll(channelId, pollId, message) {
-  var channel, pollDetails;
+  var channel, obj;
   return _regenerator().w(function (_context25) {
     while (1) switch (_context25.n) {
       case 0:
@@ -21072,22 +21130,17 @@ function executeClosePoll(channelId, pollId, message) {
         return effects.call(getChannelFromMap, channelId);
       case 1:
         channel = _context25.v;
-        pollDetails = JSON.parse(JSON.stringify(message.pollDetails));
-        pollDetails.closed = true;
-        pollDetails.closedAt = new Date().getTime();
-        updateMessageOnMap(channelId, {
+        obj = {
+          type: 'close',
+          incrementVotesPerOptionCount: 0
+        };
+        updateMessageOnMap(channel.id, {
           messageId: message.id,
-          params: {
-            pollDetails: pollDetails
-          }
-        });
-        updateMessageOnAllMessages(message.id, {
-          pollDetails: pollDetails
-        });
+          params: {}
+        }, obj);
+        updateMessageOnAllMessages(message.id, {}, obj);
         _context25.n = 2;
-        return effects.put(updateMessageAC(message.id, {
-          pollDetails: pollDetails
-        }));
+        return effects.put(updateMessageAC(message.id, {}, undefined, obj));
       case 2:
         if (!channel) {
           _context25.n = 3;
@@ -21177,8 +21230,8 @@ function closePoll(action) {
     }
   }, _marked25$1, null, [[0, 4]]);
 }
-function executeRetractPollVote(channelId, pollId, message) {
-  var channel, pollDetails, _iterator, _step, _message$pollDetails5, vote;
+function executeRetractPollVote(channelId, pollId, message, objs) {
+  var channel, _iterator, _step, obj;
   return _regenerator().w(function (_context28) {
     while (1) switch (_context28.n) {
       case 0:
@@ -21186,38 +21239,37 @@ function executeRetractPollVote(channelId, pollId, message) {
         return effects.call(getChannelFromMap, channelId);
       case 1:
         channel = _context28.v;
-        pollDetails = JSON.parse(JSON.stringify(message.pollDetails));
-        for (_iterator = _createForOfIteratorHelperLoose(pollDetails.ownVotes); !(_step = _iterator()).done;) {
-          vote = _step.value;
-          pollDetails = updatePollDetails(pollDetails, vote.optionId, false, ((_message$pollDetails5 = message.pollDetails) === null || _message$pollDetails5 === void 0 ? void 0 : _message$pollDetails5.allowMultipleVotes) || false);
+        _iterator = _createForOfIteratorHelperLoose(objs);
+      case 2:
+        if ((_step = _iterator()).done) {
+          _context28.n = 4;
+          break;
         }
+        obj = _step.value;
         updateMessageOnMap(channelId, {
           messageId: message.id,
-          params: {
-            pollDetails: pollDetails
-          }
-        });
-        updateMessageOnAllMessages(message.id, {
-          pollDetails: pollDetails
-        });
+          params: {}
+        }, obj);
+        updateMessageOnAllMessages(message.id, {}, obj);
+        _context28.n = 3;
+        return effects.put(updateMessageAC(message.id, {}, undefined, obj));
+      case 3:
         _context28.n = 2;
-        return effects.put(updateMessageAC(message.id, {
-          pollDetails: pollDetails
-        }));
-      case 2:
+        break;
+      case 4:
         if (!channel) {
-          _context28.n = 3;
+          _context28.n = 5;
           break;
         }
-        _context28.n = 3;
+        _context28.n = 5;
         return effects.call(channel.retractVote, message.id, pollId);
-      case 3:
+      case 5:
         return _context28.a(2);
     }
   }, _marked26$1);
 }
-function updateMessageOptimisticallyForRetractPollVote(channelId, message) {
-  var channel, pollDetails, _iterator2, _step2, _message$pollDetails6, vote;
+function updateMessageOptimisticallyForRetractPollVote(channelId, message, objs) {
+  var channel, _iterator2, _step2, obj;
   return _regenerator().w(function (_context29) {
     while (1) switch (_context29.n) {
       case 0:
@@ -21231,31 +21283,30 @@ function updateMessageOptimisticallyForRetractPollVote(channelId, message) {
         }
         return _context29.a(2);
       case 2:
-        pollDetails = JSON.parse(JSON.stringify(message.pollDetails));
-        for (_iterator2 = _createForOfIteratorHelperLoose(pollDetails.ownVotes); !(_step2 = _iterator2()).done;) {
-          vote = _step2.value;
-          pollDetails = updatePollDetails(pollDetails, vote.optionId, false, ((_message$pollDetails6 = message.pollDetails) === null || _message$pollDetails6 === void 0 ? void 0 : _message$pollDetails6.allowMultipleVotes) || false);
+        _iterator2 = _createForOfIteratorHelperLoose(objs);
+      case 3:
+        if ((_step2 = _iterator2()).done) {
+          _context29.n = 5;
+          break;
         }
+        obj = _step2.value;
         updateMessageOnMap(channelId, {
           messageId: message.id,
-          params: {
-            pollDetails: pollDetails
-          }
-        });
-        updateMessageOnAllMessages(message.id, {
-          pollDetails: pollDetails
+          params: {}
         });
+        updateMessageOnAllMessages(message.id, {}, obj);
+        _context29.n = 4;
+        return effects.put(updateMessageAC(message.id, {}, undefined, obj));
+      case 4:
         _context29.n = 3;
-        return effects.put(updateMessageAC(message.id, {
-          pollDetails: pollDetails
-        }));
-      case 3:
+        break;
+      case 5:
         return _context29.a(2);
     }
   }, _marked27$1);
 }
 function retractPollVote(action) {
-  var payload, channelId, pollId, _message7, sceytChatClient, connectionState, _t22;
+  var payload, channelId, pollId, _message7, sceytChatClient, connectionState, objs, _iterator3, _step3, _message7$pollDetails, _message7$pollDetails2, vote, _t22;
   return _regenerator().w(function (_context30) {
     while (1) switch (_context30.p = _context30.n) {
       case 0:
@@ -21268,11 +21319,20 @@ function retractPollVote(action) {
           break;
         }
         connectionState = sceytChatClient.connectionState;
+        objs = [];
+        for (_iterator3 = _createForOfIteratorHelperLoose(((_message7$pollDetails = _message7.pollDetails) === null || _message7$pollDetails === void 0 ? void 0 : (_message7$pollDetails2 = _message7$pollDetails.voteDetails) === null || _message7$pollDetails2 === void 0 ? void 0 : _message7$pollDetails2.ownVotes) || []); !(_step3 = _iterator3()).done;) {
+          vote = _step3.value;
+          objs.push({
+            type: 'deleteOwn',
+            vote: vote,
+            incrementVotesPerOptionCount: -1
+          });
+        }
         if (!(connectionState !== CONNECTION_STATUS.CONNECTED)) {
           _context30.n = 2;
           break;
         }
-        return _context30.d(_regeneratorValues(updateMessageOptimisticallyForRetractPollVote(channelId, _message7)), 1);
+        return _context30.d(_regeneratorValues(updateMessageOptimisticallyForRetractPollVote(channelId, _message7, objs)), 1);
       case 1:
         setPendingPollAction({
           type: 'RETRACT_POLL_VOTE',
@@ -21282,7 +21342,7 @@ function retractPollVote(action) {
         });
         return _context30.a(2);
       case 2:
-        return _context30.d(_regeneratorValues(executeRetractPollVote(channelId, pollId, _message7)), 3);
+        return _context30.d(_regeneratorValues(executeRetractPollVote(channelId, pollId, _message7, objs)), 3);
       case 3:
         _context30.n = 5;
         break;
@@ -33983,7 +34043,7 @@ var MessageStatusUpdated = styled__default.span(_templateObject4$m || (_template
 var _templateObject$C, _templateObject2$x, _templateObject3$r, _templateObject4$n, _templateObject5$i, _templateObject6$g, _templateObject7$e, _templateObject8$d, _templateObject9$b, _templateObject0$a, _templateObject1$7, _templateObject10$4;
 var POLL_VOTES_LIMIT = 20;
 var AllVotesPopup = function AllVotesPopup(_ref) {
-  var _pollVotesHasMore$key, _poll$votesPerOption;
+  var _pollVotesHasMore$key, _poll$voteDetails, _poll$voteDetails$vot, _poll$voteDetails3;
   var onClose = _ref.onClose,
     poll = _ref.poll,
     messageId = _ref.messageId,
@@ -34005,7 +34065,7 @@ var AllVotesPopup = function AllVotesPopup(_ref) {
   var allVotes = pollVotesList[key] || [];
   var hasMore = (_pollVotesHasMore$key = pollVotesHasMore[key]) != null ? _pollVotesHasMore$key : false;
   var isLoading = pollVotesLoadingState[key] === LOADING_STATE.LOADING;
-  var totalVotes = ((_poll$votesPerOption = poll.votesPerOption) === null || _poll$votesPerOption === void 0 ? void 0 : _poll$votesPerOption[optionId]) || 0;
+  var totalVotes = ((_poll$voteDetails = poll.voteDetails) === null || _poll$voteDetails === void 0 ? void 0 : (_poll$voteDetails$vot = _poll$voteDetails.votesPerOption) === null || _poll$voteDetails$vot === void 0 ? void 0 : _poll$voteDetails$vot[optionId]) || 0;
   var isLoadingInitial = allVotes.length === 0 && (isLoading || totalVotes > 0);
   React.useEffect(function () {
     if (allVotes.length === 0 && totalVotes > 0 && !isLoading) {
@@ -34038,11 +34098,11 @@ var AllVotesPopup = function AllVotesPopup(_ref) {
     }
   };
   var ownVote = React.useMemo(function () {
-    var _poll$ownVotes;
-    return poll === null || poll === void 0 ? void 0 : (_poll$ownVotes = poll.ownVotes) === null || _poll$ownVotes === void 0 ? void 0 : _poll$ownVotes.find(function (vote) {
+    var _poll$voteDetails2, _poll$voteDetails2$ow;
+    return poll === null || poll === void 0 ? void 0 : (_poll$voteDetails2 = poll.voteDetails) === null || _poll$voteDetails2 === void 0 ? void 0 : (_poll$voteDetails2$ow = _poll$voteDetails2.ownVotes) === null || _poll$voteDetails2$ow === void 0 ? void 0 : _poll$voteDetails2$ow.find(function (vote) {
       return vote.optionId === optionId;
     });
-  }, [poll === null || poll === void 0 ? void 0 : poll.ownVotes, optionId]);
+  }, [poll === null || poll === void 0 ? void 0 : (_poll$voteDetails3 = poll.voteDetails) === null || _poll$voteDetails3 === void 0 ? void 0 : _poll$voteDetails3.ownVotes, optionId]);
   return /*#__PURE__*/React__default.createElement(PopupContainer, null, /*#__PURE__*/React__default.createElement(Popup, {
     backgroundColor: background,
     maxWidth: '560px',
@@ -34131,7 +34191,7 @@ var Loader = styled__default.div(_templateObject10$4 || (_templateObject10$4 = _
 
 var _templateObject$D, _templateObject2$y, _templateObject3$s, _templateObject4$o, _templateObject5$j, _templateObject6$h, _templateObject7$f, _templateObject8$e, _templateObject9$c, _templateObject0$b;
 var VotesResultsPopup = function VotesResultsPopup(_ref) {
-  var _poll$options$find;
+  var _poll$voteDetails3, _poll$voteDetails4, _poll$options$find;
   var onClose = _ref.onClose,
     poll = _ref.poll,
     messageId = _ref.messageId,
@@ -34152,21 +34212,17 @@ var VotesResultsPopup = function VotesResultsPopup(_ref) {
   var optionIdToVotes = React.useMemo(function () {
     var votes = {};
     poll.options.forEach(function (opt) {
-      var allOptionVotes = (poll.votes || []).filter(function (vote) {
+      var _poll$voteDetails, _poll$voteDetails2;
+      var allOptionVotes = (((_poll$voteDetails = poll.voteDetails) === null || _poll$voteDetails === void 0 ? void 0 : _poll$voteDetails.votes) || []).filter(function (vote) {
         return vote.optionId === opt.id;
       });
-      if (allOptionVotes.length < 5) {
-        var ownVote = poll.ownVotes.find(function (vote) {
-          return vote.optionId === opt.id;
-        });
-        if (ownVote) {
-          allOptionVotes.push(ownVote);
-        }
-      }
-      votes[opt.id] = allOptionVotes;
+      var ownVote = (_poll$voteDetails2 = poll.voteDetails) === null || _poll$voteDetails2 === void 0 ? void 0 : _poll$voteDetails2.ownVotes.find(function (vote) {
+        return vote.optionId === opt.id;
+      });
+      votes[opt.id] = [].concat(ownVote ? [ownVote] : [], (allOptionVotes === null || allOptionVotes === void 0 ? void 0 : allOptionVotes.slice(0, ownVote ? 4 : 5)) || []);
     });
     return votes;
-  }, [poll.votes, poll.options, poll.ownVotes]);
+  }, [(_poll$voteDetails3 = poll.voteDetails) === null || _poll$voteDetails3 === void 0 ? void 0 : _poll$voteDetails3.votes, poll.options, (_poll$voteDetails4 = poll.voteDetails) === null || _poll$voteDetails4 === void 0 ? void 0 : _poll$voteDetails4.ownVotes]);
   var handleShowAll = React.useCallback(function (optionId) {
     if (onViewMoreOption) {
       onViewMoreOption(optionId);
@@ -34204,9 +34260,9 @@ var VotesResultsPopup = function VotesResultsPopup(_ref) {
     color: textPrimary,
     marginBottom: '16px'
   }, "Vote results"), /*#__PURE__*/React__default.createElement(OptionsList, null, poll.options.map(function (opt) {
-    var _poll$votesPerOption;
+    var _poll$voteDetails5, _poll$voteDetails5$vo;
     var allVotes = optionIdToVotes[opt.id] || [];
-    var totalVotes = ((_poll$votesPerOption = poll.votesPerOption) === null || _poll$votesPerOption === void 0 ? void 0 : _poll$votesPerOption[opt.id]) || 0;
+    var totalVotes = ((_poll$voteDetails5 = poll.voteDetails) === null || _poll$voteDetails5 === void 0 ? void 0 : (_poll$voteDetails5$vo = _poll$voteDetails5.votesPerOption) === null || _poll$voteDetails5$vo === void 0 ? void 0 : _poll$voteDetails5$vo[opt.id]) || 0;
     return /*#__PURE__*/React__default.createElement(OptionBlock, {
       key: opt.id,
       background: surface1,
@@ -34310,6 +34366,7 @@ function SvgFilledCheckbox(props) {
 
 var _templateObject$E, _templateObject2$z, _templateObject3$t, _templateObject4$p, _templateObject5$k, _templateObject6$i, _templateObject7$g, _templateObject8$f, _templateObject9$d, _templateObject0$c, _templateObject1$8, _templateObject10$5, _templateObject11$4, _templateObject12$3;
 var PollMessage = function PollMessage(_ref) {
+  var _poll$voteDetails3, _poll$voteDetails4, _poll$voteDetails5, _poll$voteDetails6, _poll$voteDetails7;
   var message = _ref.message;
   var _useColor = useColors(),
     textPrimary = _useColor[THEME_COLORS.TEXT_PRIMARY],
@@ -34329,20 +34386,20 @@ var PollMessage = function PollMessage(_ref) {
     showResults = _useState[0],
     setShowResults = _useState[1];
   var isHaveResults = React.useMemo(function () {
-    var _poll$votes$length, _poll$votes, _poll$ownVotes$length, _poll$ownVotes;
-    return ((_poll$votes$length = poll === null || poll === void 0 ? void 0 : (_poll$votes = poll.votes) === null || _poll$votes === void 0 ? void 0 : _poll$votes.length) != null ? _poll$votes$length : 0) > 0 || ((_poll$ownVotes$length = poll === null || poll === void 0 ? void 0 : (_poll$ownVotes = poll.ownVotes) === null || _poll$ownVotes === void 0 ? void 0 : _poll$ownVotes.length) != null ? _poll$ownVotes$length : 0) > 0;
-  }, [poll === null || poll === void 0 ? void 0 : poll.votes, poll === null || poll === void 0 ? void 0 : poll.ownVotes]);
+    var _poll$voteDetails$vot, _poll$voteDetails, _poll$voteDetails$vot2, _poll$voteDetails$own, _poll$voteDetails2, _poll$voteDetails2$ow;
+    return ((_poll$voteDetails$vot = poll === null || poll === void 0 ? void 0 : (_poll$voteDetails = poll.voteDetails) === null || _poll$voteDetails === void 0 ? void 0 : (_poll$voteDetails$vot2 = _poll$voteDetails.votes) === null || _poll$voteDetails$vot2 === void 0 ? void 0 : _poll$voteDetails$vot2.length) != null ? _poll$voteDetails$vot : 0) > 0 || ((_poll$voteDetails$own = poll === null || poll === void 0 ? void 0 : (_poll$voteDetails2 = poll.voteDetails) === null || _poll$voteDetails2 === void 0 ? void 0 : (_poll$voteDetails2$ow = _poll$voteDetails2.ownVotes) === null || _poll$voteDetails2$ow === void 0 ? void 0 : _poll$voteDetails2$ow.length) != null ? _poll$voteDetails$own : 0) > 0;
+  }, [poll === null || poll === void 0 ? void 0 : (_poll$voteDetails3 = poll.voteDetails) === null || _poll$voteDetails3 === void 0 ? void 0 : _poll$voteDetails3.votes, poll === null || poll === void 0 ? void 0 : (_poll$voteDetails4 = poll.voteDetails) === null || _poll$voteDetails4 === void 0 ? void 0 : _poll$voteDetails4.ownVotes]);
   if (!poll) {
     return null;
   }
-  var votesPerOption = poll.votesPerOption || {};
+  var votesPerOption = ((_poll$voteDetails5 = poll.voteDetails) === null || _poll$voteDetails5 === void 0 ? void 0 : _poll$voteDetails5.votesPerOption) || {};
   var maxVotes = poll.options.reduce(function (acc, opt) {
     return Math.max(acc, votesPerOption[opt.id] || 0);
   }, 0);
-  var ownVotedOptionIds = new Set((poll.ownVotes || []).map(function (v) {
+  var ownVotedOptionIds = new Set((((_poll$voteDetails6 = poll.voteDetails) === null || _poll$voteDetails6 === void 0 ? void 0 : _poll$voteDetails6.ownVotes) || []).map(function (v) {
     return v.optionId;
   }));
-  var votesUsers = poll.votes || [];
+  var votesUsers = ((_poll$voteDetails7 = poll.voteDetails) === null || _poll$voteDetails7 === void 0 ? void 0 : _poll$voteDetails7.votes) || [];
   var canVote = !poll.closed;
   var handleVote = function handleVote(optionId) {
     if (!canVote) return;
@@ -34368,8 +34425,8 @@ var PollMessage = function PollMessage(_ref) {
       return v.optionId === opt.id;
     }).slice(0, 3);
     if (optionVotesUsers.length < 3) {
-      var _poll$ownVotes2;
-      poll === null || poll === void 0 ? void 0 : (_poll$ownVotes2 = poll.ownVotes) === null || _poll$ownVotes2 === void 0 ? void 0 : _poll$ownVotes2.forEach(function (vote) {
+      var _poll$voteDetails8, _poll$voteDetails8$ow;
+      poll === null || poll === void 0 ? void 0 : (_poll$voteDetails8 = poll.voteDetails) === null || _poll$voteDetails8 === void 0 ? void 0 : (_poll$voteDetails8$ow = _poll$voteDetails8.ownVotes) === null || _poll$voteDetails8$ow === void 0 ? void 0 : _poll$voteDetails8$ow.forEach(function (vote) {
         if (vote.optionId === opt.id) {
           optionVotesUsers.push(vote);
         }
@@ -42512,7 +42569,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     },
     iconWidth: '20px',
     iconColor: iconInactive
-  }, /*#__PURE__*/React__default.createElement(SvgChoseFile, null), chooseFileAttachmentText != null ? chooseFileAttachmentText : 'File')), (pollOptions === null || pollOptions === void 0 ? void 0 : pollOptions.showAddPoll) && !isDirectChannel && (/*#__PURE__*/React__default.createElement(DropdownOptionLi, {
+  }, /*#__PURE__*/React__default.createElement(SvgChoseFile, null), chooseFileAttachmentText != null ? chooseFileAttachmentText : 'File')), (pollOptions === null || pollOptions === void 0 ? void 0 : pollOptions.showAddPoll) && (/*#__PURE__*/React__default.createElement(DropdownOptionLi, {
     key: 3,
     textColor: textPrimary,
     hoverBackground: backgroundHovered,