sceyt-chat-react-uikit 1.7.5-beta.16 → 1.7.5-beta.18

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/index.js +220 -133
  2. package/index.modern.js +220 -133
  3. package/package.json +1 -1
  4. package/types/index.d.ts +13 -15
package/index.js CHANGED
@@ -10027,33 +10027,33 @@ var addAllMessages = function addAllMessages(messages, direction) {
10027
10027
  var updateMessageOnAllMessages = function updateMessageOnAllMessages(messageId, updatedParams, voteDetails) {
10028
10028
  activeChannelAllMessages = activeChannelAllMessages.map(function (message) {
10029
10029
  if (message.tid === messageId || message.id === messageId) {
10030
- var _voteDetails$votes, _message$pollDetails;
10030
+ var _message$pollDetails$;
10031
10031
  if (updatedParams.state === MESSAGE_STATUS.DELETE) {
10032
10032
  return _extends({}, updatedParams);
10033
10033
  }
10034
- if (voteDetails && voteDetails !== null && voteDetails !== void 0 && (_voteDetails$votes = voteDetails.votes) !== null && _voteDetails$votes !== void 0 && _voteDetails$votes.length && !voteDetails.multipleVotes && message.pollDetails) {
10035
- message.pollDetails.votes = [].concat((message.pollDetails.votes || []).filter(function (vote) {
10036
- var _voteDetails$votes2, _voteDetails$votes2$, _voteDetails$votes2$$;
10037
- 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);
10038
- }));
10039
- }
10040
- var updatedMessage = _extends({}, message, updatedParams, voteDetails && voteDetails.votes && voteDetails.votesPerOption && message.pollDetails ? {
10034
+ var updatedMessage = _extends({}, message, updatedParams, voteDetails && voteDetails.votes && voteDetails.votesPerOption && message.pollDetails && message.pollDetails.voteDetails ? {
10041
10035
  pollDetails: _extends({}, message.pollDetails, {
10042
- votes: [].concat(((_message$pollDetails = message.pollDetails) === null || _message$pollDetails === void 0 ? void 0 : _message$pollDetails.votes) || [], voteDetails.votes),
10043
- votesPerOption: voteDetails.votesPerOption
10036
+ voteDetails: _extends({}, message.pollDetails.voteDetails, {
10037
+ votes: [].concat(((_message$pollDetails$ = message.pollDetails.voteDetails) === null || _message$pollDetails$ === void 0 ? void 0 : _message$pollDetails$.votes) || [], voteDetails.votes),
10038
+ votesPerOption: voteDetails.votesPerOption
10039
+ })
10044
10040
  })
10045
10041
  } : {});
10046
10042
  if (voteDetails && voteDetails.deletedVotes && updatedMessage.pollDetails) {
10043
+ var _updatedMessage$pollD;
10047
10044
  updatedMessage = _extends({}, updatedMessage, {
10048
10045
  pollDetails: _extends({}, updatedMessage.pollDetails, {
10049
- votes: deleteVotesFromPollDetails(updatedMessage.pollDetails.votes, voteDetails.deletedVotes),
10050
- votesPerOption: voteDetails.votesPerOption
10046
+ voteDetails: _extends({}, updatedMessage.pollDetails.voteDetails, {
10047
+ votes: deleteVotesFromPollDetails(((_updatedMessage$pollD = updatedMessage.pollDetails.voteDetails) === null || _updatedMessage$pollD === void 0 ? void 0 : _updatedMessage$pollD.votes) || [], voteDetails.deletedVotes),
10048
+ votesPerOption: voteDetails.votesPerOption
10049
+ })
10051
10050
  })
10052
10051
  });
10053
10052
  }
10054
10053
  if (voteDetails && voteDetails.closed && updatedMessage.pollDetails) {
10055
10054
  updatedMessage = _extends({}, updatedMessage, {
10056
10055
  pollDetails: _extends({}, updatedMessage.pollDetails, {
10056
+ voteDetails: _extends({}, updatedMessage.pollDetails.voteDetails),
10057
10057
  closed: voteDetails.closed
10058
10058
  })
10059
10059
  });
@@ -10177,30 +10177,30 @@ function updateMessageOnMap(channelId, updatedMessage, voteDetails) {
10177
10177
  messagesList.push(_extends({}, mes, updatedMessageData));
10178
10178
  continue;
10179
10179
  } else {
10180
- var _mes$pollDetails, _voteDetails$votes3;
10180
+ var _mes$pollDetails$vote;
10181
10181
  updatedMessageData = _extends({}, mes, updatedMessage.params, voteDetails && voteDetails.votes && voteDetails.votesPerOption && mes.pollDetails ? {
10182
10182
  pollDetails: _extends({}, mes.pollDetails, {
10183
- votes: [].concat(((_mes$pollDetails = mes.pollDetails) === null || _mes$pollDetails === void 0 ? void 0 : _mes$pollDetails.votes) || [], voteDetails.votes),
10184
- votesPerOption: voteDetails.votesPerOption
10183
+ voteDetails: _extends({}, mes.pollDetails.voteDetails, {
10184
+ votes: [].concat(((_mes$pollDetails$vote = mes.pollDetails.voteDetails) === null || _mes$pollDetails$vote === void 0 ? void 0 : _mes$pollDetails$vote.votes) || [], voteDetails.votes),
10185
+ votesPerOption: voteDetails.votesPerOption
10186
+ })
10185
10187
  })
10186
10188
  } : {});
10187
- if (voteDetails && voteDetails !== null && voteDetails !== void 0 && (_voteDetails$votes3 = voteDetails.votes) !== null && _voteDetails$votes3 !== void 0 && _voteDetails$votes3.length && !voteDetails.multipleVotes && updatedMessageData.pollDetails) {
10188
- updatedMessageData.pollDetails.votes = [].concat((updatedMessageData.pollDetails.votes || []).filter(function (vote) {
10189
- var _voteDetails$votes4, _voteDetails$votes4$, _voteDetails$votes4$$;
10190
- 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);
10191
- }));
10192
- }
10193
10189
  if (voteDetails && voteDetails.deletedVotes && updatedMessageData.pollDetails) {
10190
+ var _updatedMessageData$p;
10194
10191
  updatedMessageData = _extends({}, updatedMessageData, {
10195
10192
  pollDetails: _extends({}, updatedMessageData.pollDetails, {
10196
- votes: deleteVotesFromPollDetails(updatedMessageData.pollDetails.votes, voteDetails.deletedVotes),
10197
- votesPerOption: voteDetails.votesPerOption
10193
+ voteDetails: _extends({}, updatedMessageData.pollDetails.voteDetails, {
10194
+ votes: deleteVotesFromPollDetails((_updatedMessageData$p = updatedMessageData.pollDetails.voteDetails) === null || _updatedMessageData$p === void 0 ? void 0 : _updatedMessageData$p.votes, voteDetails.deletedVotes),
10195
+ votesPerOption: voteDetails.votesPerOption
10196
+ })
10198
10197
  })
10199
10198
  });
10200
10199
  }
10201
10200
  if (voteDetails && voteDetails.closed && updatedMessageData.pollDetails) {
10202
10201
  updatedMessageData = _extends({}, updatedMessageData, {
10203
10202
  pollDetails: _extends({}, updatedMessageData.pollDetails, {
10203
+ voteDetails: _extends({}, updatedMessageData.pollDetails.voteDetails),
10204
10204
  closed: voteDetails.closed
10205
10205
  })
10206
10206
  });
@@ -11241,30 +11241,36 @@ var messageSlice = createSlice({
11241
11241
  if (params.state === MESSAGE_STATUS.DELETE) {
11242
11242
  return _extends({}, params);
11243
11243
  } else {
11244
- var _voteDetails$votes;
11245
- if (voteDetails && voteDetails !== null && voteDetails !== void 0 && (_voteDetails$votes = voteDetails.votes) !== null && _voteDetails$votes !== void 0 && _voteDetails$votes.length && !voteDetails.multipleVotes && message.pollDetails) {
11246
- message.pollDetails.votes = [].concat((message.pollDetails.votes || []).filter(function (vote) {
11247
- var _voteDetails$votes2, _voteDetails$votes2$, _voteDetails$votes2$$;
11248
- 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);
11249
- }));
11250
- }
11251
- var messageData = _extends({}, message, params, voteDetails && voteDetails.votes && voteDetails.votesPerOption && message.pollDetails ? {
11244
+ var _message$pollDetails$;
11245
+ var messageData = _extends({}, message, params, voteDetails && voteDetails.votes && voteDetails.votesPerOption && message.pollDetails && message.pollDetails.voteDetails ? {
11252
11246
  pollDetails: _extends({}, message.pollDetails, {
11253
- votes: [].concat(message.pollDetails.votes || [], voteDetails.votes),
11254
- votesPerOption: voteDetails.votesPerOption
11247
+ voteDetails: _extends({}, message.pollDetails.voteDetails, {
11248
+ votes: [].concat(((_message$pollDetails$ = message.pollDetails.voteDetails) === null || _message$pollDetails$ === void 0 ? void 0 : _message$pollDetails$.votes) || [], voteDetails.votes),
11249
+ votesPerOption: voteDetails.votesPerOption
11250
+ })
11255
11251
  })
11256
11252
  } : {});
11257
- if (voteDetails && voteDetails.deletedVotes && messageData.pollDetails) {
11253
+ if (voteDetails && voteDetails.deletedVotes && messageData.pollDetails && messageData.pollDetails.voteDetails) {
11254
+ var _messageData$pollDeta;
11258
11255
  messageData = _extends({}, messageData, {
11259
11256
  pollDetails: _extends({}, messageData.pollDetails, {
11260
- votes: deleteVotesFromPollDetails(messageData.pollDetails.votes, voteDetails.deletedVotes),
11261
- votesPerOption: voteDetails.votesPerOption || {}
11257
+ voteDetails: _extends({}, messageData.pollDetails.voteDetails, {
11258
+ votes: deleteVotesFromPollDetails(((_messageData$pollDeta = messageData.pollDetails.voteDetails) === null || _messageData$pollDeta === void 0 ? void 0 : _messageData$pollDeta.votes) || [], voteDetails.deletedVotes),
11259
+ votesPerOption: voteDetails.votesPerOption || {}
11260
+ })
11262
11261
  })
11263
11262
  });
11264
11263
  }
11265
11264
  if (voteDetails && voteDetails.closed && messageData.pollDetails) {
11265
+ var existingVoteDetails = messageData.pollDetails.voteDetails;
11266
+ var newVoteDetails = {
11267
+ votesPerOption: (existingVoteDetails === null || existingVoteDetails === void 0 ? void 0 : existingVoteDetails.votesPerOption) || {},
11268
+ votes: (existingVoteDetails === null || existingVoteDetails === void 0 ? void 0 : existingVoteDetails.votes) || [],
11269
+ ownVotes: (existingVoteDetails === null || existingVoteDetails === void 0 ? void 0 : existingVoteDetails.ownVotes) || []
11270
+ };
11266
11271
  messageData = _extends({}, messageData, {
11267
11272
  pollDetails: _extends({}, messageData.pollDetails, {
11273
+ voteDetails: newVoteDetails,
11268
11274
  closed: voteDetails.closed
11269
11275
  })
11270
11276
  });
@@ -13392,9 +13398,9 @@ var Button = styled__default.button(_templateObject12 || (_templateObject12 = _t
13392
13398
  }, function (props) {
13393
13399
  return props.margin || '0';
13394
13400
  }, function (props) {
13395
- return props.disabled ? 0.5 : 1;
13401
+ return props.disabled ? props.disabledOpacity || 0.5 : 1;
13396
13402
  }, function (props) {
13397
- return props.disabled ? 0.5 : 0.8;
13403
+ return props.disabled ? props.disabledOpacity || 0.5 : 0.8;
13398
13404
  });
13399
13405
  var PopupName = styled__default.h3(_templateObject13 || (_templateObject13 = _taggedTemplateLiteralLoose(["\n font-style: normal;\n font-weight: 500;\n font-size: 20px;\n line-height: 23px;\n color: ", ";\n margin: 0;\n margin-top: ", ";\n margin-bottom: ", ";\n padding: ", ";\n word-break: break-word;\n\n ", "\n"])), function (props) {
13400
13406
  return props.color;
@@ -14348,7 +14354,7 @@ function watchForEvents() {
14348
14354
  };
14349
14355
  });
14350
14356
  _loop = /*#__PURE__*/_regenerator().m(function _callee() {
14351
- 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;
14357
+ 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, _pollDetailsData$vote, _channel1, pollDetails, messageId, pollDetailsData, _activeChannelId0, addedVotes, deletedVotes, obj, _store$getState$Messa, key, hasNext, _iterator, _step, vote, _pollDetailsData$chan3, _pollDetailsData$vote2, _channel10, _pollDetails, _messageId, _pollDetailsData, _activeChannelId1, _deletedVotes, _iterator2, _step2, _vote, _pollDetailsData$vote3, _pollDetailsData$vote4, _pollDetailsData2$cha, _pollDetailsData2$vot, _channel11, _pollDetails2, _messageId2, _activeChannelId10, _pollDetailsData2, retractedVotes, _iterator3, _step3, _vote2, _pollDetailsData2$vot2, _pollDetailsData2$vot3, _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;
14352
14358
  return _regenerator().w(function (_context) {
14353
14359
  while (1) switch (_context.p = _context.n) {
14354
14360
  case 0:
@@ -15077,21 +15083,23 @@ function watchForEvents() {
15077
15083
  return _context.a(3, 171);
15078
15084
  case 95:
15079
15085
  _channel1 = args.channel, pollDetails = args.pollDetails, messageId = args.messageId;
15086
+ pollDetailsData = pollDetails;
15080
15087
  _context.n = 96;
15081
15088
  return effects.call(getActiveChannelId);
15082
15089
  case 96:
15083
15090
  _activeChannelId0 = _context.v;
15084
- addedVotes = (pollDetails === null || pollDetails === void 0 ? void 0 : pollDetails.votes) || [];
15091
+ addedVotes = (pollDetailsData === null || pollDetailsData === void 0 ? void 0 : (_pollDetailsData$chan = pollDetailsData.changedVotes) === null || _pollDetailsData$chan === void 0 ? void 0 : _pollDetailsData$chan.addedVotes) || [];
15092
+ deletedVotes = (pollDetailsData === null || pollDetailsData === void 0 ? void 0 : (_pollDetailsData$chan2 = pollDetailsData.changedVotes) === null || _pollDetailsData$chan2 === void 0 ? void 0 : _pollDetailsData$chan2.removedVotes) || [];
15085
15093
  obj = {
15086
15094
  votes: addedVotes,
15087
- votesPerOption: pollDetails.votesPerOption || {},
15088
- multipleVotes: pollDetails.allowMultipleVotes || false
15095
+ votesPerOption: (pollDetailsData === null || pollDetailsData === void 0 ? void 0 : (_pollDetailsData$vote = pollDetailsData.voteDetails) === null || _pollDetailsData$vote === void 0 ? void 0 : _pollDetailsData$vote.votesPerOption) || {},
15096
+ deletedVotes: deletedVotes
15089
15097
  };
15090
- if (!(pollDetails !== null && pollDetails !== void 0 && pollDetails.id && addedVotes.length > 0)) {
15098
+ if (!(pollDetailsData !== null && pollDetailsData !== void 0 && pollDetailsData.id && addedVotes.length > 0)) {
15091
15099
  _context.n = 99;
15092
15100
  break;
15093
15101
  }
15094
- key = pollDetails.id + "_" + addedVotes[0].optionId;
15102
+ key = pollDetailsData.id + "_" + addedVotes[0].optionId;
15095
15103
  hasNext = ((_store$getState$Messa = store.getState().MessageReducer.pollVotesHasMore) === null || _store$getState$Messa === void 0 ? void 0 : _store$getState$Messa[key]) || false;
15096
15104
  _iterator = _createForOfIteratorHelperLoose(addedVotes);
15097
15105
  case 97:
@@ -15101,7 +15109,7 @@ function watchForEvents() {
15101
15109
  }
15102
15110
  vote = _step.value;
15103
15111
  _context.n = 98;
15104
- return effects.put(addPollVotesToListAC(pollDetails.id, vote.optionId, [vote], hasNext, undefined));
15112
+ return effects.put(addPollVotesToListAC(pollDetailsData.id, vote.optionId, [vote], hasNext, undefined));
15105
15113
  case 98:
15106
15114
  _context.n = 97;
15107
15115
  break;
@@ -15121,16 +15129,17 @@ function watchForEvents() {
15121
15129
  return _context.a(3, 171);
15122
15130
  case 101:
15123
15131
  _channel10 = args.channel, _pollDetails = args.pollDetails, _messageId = args.messageId;
15132
+ _pollDetailsData = _pollDetails;
15124
15133
  _context.n = 102;
15125
15134
  return effects.call(getActiveChannelId);
15126
15135
  case 102:
15127
15136
  _activeChannelId1 = _context.v;
15128
- deletedVotes = (_pollDetails === null || _pollDetails === void 0 ? void 0 : _pollDetails.votes) || [];
15129
- if (!(_pollDetails !== null && _pollDetails !== void 0 && _pollDetails.id && deletedVotes.length > 0)) {
15137
+ _deletedVotes = (_pollDetailsData === null || _pollDetailsData === void 0 ? void 0 : (_pollDetailsData$chan3 = _pollDetailsData.changedVotes) === null || _pollDetailsData$chan3 === void 0 ? void 0 : _pollDetailsData$chan3.removedVotes) || [];
15138
+ if (!(_pollDetailsData !== null && _pollDetailsData !== void 0 && _pollDetailsData.id && _deletedVotes.length > 0)) {
15130
15139
  _context.n = 105;
15131
15140
  break;
15132
15141
  }
15133
- _iterator2 = _createForOfIteratorHelperLoose(deletedVotes);
15142
+ _iterator2 = _createForOfIteratorHelperLoose(_deletedVotes);
15134
15143
  case 103:
15135
15144
  if ((_step2 = _iterator2()).done) {
15136
15145
  _context.n = 105;
@@ -15138,7 +15147,7 @@ function watchForEvents() {
15138
15147
  }
15139
15148
  _vote = _step2.value;
15140
15149
  _context.n = 104;
15141
- return effects.put(deletePollVotesFromListAC(_pollDetails.id, _vote.optionId, [_vote], _messageId));
15150
+ return effects.put(deletePollVotesFromListAC(_pollDetailsData.id, _vote.optionId, [_vote], _messageId));
15142
15151
  case 104:
15143
15152
  _context.n = 103;
15144
15153
  break;
@@ -15147,21 +15156,21 @@ function watchForEvents() {
15147
15156
  messageId: _messageId,
15148
15157
  params: {}
15149
15158
  }, {
15150
- deletedVotes: deletedVotes,
15151
- votesPerOption: _pollDetails.votesPerOption
15159
+ deletedVotes: _deletedVotes,
15160
+ votesPerOption: (_pollDetailsData === null || _pollDetailsData === void 0 ? void 0 : (_pollDetailsData$vote2 = _pollDetailsData.voteDetails) === null || _pollDetailsData$vote2 === void 0 ? void 0 : _pollDetailsData$vote2.votesPerOption) || {}
15152
15161
  });
15153
15162
  if (!(_channel10.id === _activeChannelId1)) {
15154
15163
  _context.n = 106;
15155
15164
  break;
15156
15165
  }
15157
15166
  updateMessageOnAllMessages(_messageId, {}, {
15158
- deletedVotes: deletedVotes,
15159
- votesPerOption: _pollDetails.votesPerOption || {}
15167
+ deletedVotes: _deletedVotes,
15168
+ votesPerOption: (_pollDetailsData === null || _pollDetailsData === void 0 ? void 0 : (_pollDetailsData$vote3 = _pollDetailsData.voteDetails) === null || _pollDetailsData$vote3 === void 0 ? void 0 : _pollDetailsData$vote3.votesPerOption) || {}
15160
15169
  });
15161
15170
  _context.n = 106;
15162
15171
  return effects.put(updateMessageAC(_messageId, {}, undefined, {
15163
- deletedVotes: deletedVotes,
15164
- votesPerOption: _pollDetails.votesPerOption || {}
15172
+ deletedVotes: _deletedVotes,
15173
+ votesPerOption: (_pollDetailsData === null || _pollDetailsData === void 0 ? void 0 : (_pollDetailsData$vote4 = _pollDetailsData.voteDetails) === null || _pollDetailsData$vote4 === void 0 ? void 0 : _pollDetailsData$vote4.votesPerOption) || {}
15165
15174
  }));
15166
15175
  case 106:
15167
15176
  return _context.a(3, 171);
@@ -15171,15 +15180,16 @@ function watchForEvents() {
15171
15180
  return effects.call(getActiveChannelId);
15172
15181
  case 108:
15173
15182
  _activeChannelId10 = _context.v;
15174
- retractedVotes = (_pollDetails2 === null || _pollDetails2 === void 0 ? void 0 : _pollDetails2.votes) || [];
15183
+ _pollDetailsData2 = _pollDetails2;
15184
+ retractedVotes = (_pollDetailsData2 === null || _pollDetailsData2 === void 0 ? void 0 : (_pollDetailsData2$cha = _pollDetailsData2.changedVotes) === null || _pollDetailsData2$cha === void 0 ? void 0 : _pollDetailsData2$cha.removedVotes) || [];
15175
15185
  updateMessageOnMap(_channel11.id, {
15176
15186
  messageId: _messageId2,
15177
15187
  params: {}
15178
15188
  }, {
15179
15189
  deletedVotes: retractedVotes,
15180
- votesPerOption: _pollDetails2.votesPerOption
15190
+ votesPerOption: (_pollDetailsData2 === null || _pollDetailsData2 === void 0 ? void 0 : (_pollDetailsData2$vot = _pollDetailsData2.voteDetails) === null || _pollDetailsData2$vot === void 0 ? void 0 : _pollDetailsData2$vot.votesPerOption) || {}
15181
15191
  });
15182
- if (!(_pollDetails2 !== null && _pollDetails2 !== void 0 && _pollDetails2.id && retractedVotes.length > 0)) {
15192
+ if (!(_pollDetailsData2 !== null && _pollDetailsData2 !== void 0 && _pollDetailsData2.id && retractedVotes.length > 0)) {
15183
15193
  _context.n = 111;
15184
15194
  break;
15185
15195
  }
@@ -15191,7 +15201,7 @@ function watchForEvents() {
15191
15201
  }
15192
15202
  _vote2 = _step3.value;
15193
15203
  _context.n = 110;
15194
- return effects.put(deletePollVotesFromListAC(_pollDetails2.id, _vote2.optionId, [_vote2], _messageId2));
15204
+ return effects.put(deletePollVotesFromListAC(_pollDetailsData2.id, _vote2.optionId, [_vote2], _messageId2));
15195
15205
  case 110:
15196
15206
  _context.n = 109;
15197
15207
  break;
@@ -15202,12 +15212,12 @@ function watchForEvents() {
15202
15212
  }
15203
15213
  updateMessageOnAllMessages(_messageId2, {}, {
15204
15214
  deletedVotes: retractedVotes,
15205
- votesPerOption: _pollDetails2.votesPerOption || {}
15215
+ votesPerOption: (_pollDetailsData2 === null || _pollDetailsData2 === void 0 ? void 0 : (_pollDetailsData2$vot2 = _pollDetailsData2.voteDetails) === null || _pollDetailsData2$vot2 === void 0 ? void 0 : _pollDetailsData2$vot2.votesPerOption) || {}
15206
15216
  });
15207
15217
  _context.n = 112;
15208
15218
  return effects.put(updateMessageAC(_messageId2, {}, undefined, {
15209
15219
  deletedVotes: retractedVotes,
15210
- votesPerOption: _pollDetails2.votesPerOption || {}
15220
+ votesPerOption: (_pollDetailsData2 === null || _pollDetailsData2 === void 0 ? void 0 : (_pollDetailsData2$vot3 = _pollDetailsData2.voteDetails) === null || _pollDetailsData2$vot3 === void 0 ? void 0 : _pollDetailsData2$vot3.votesPerOption) || {}
15211
15221
  }));
15212
15222
  case 112:
15213
15223
  return _context.a(3, 171);
@@ -20688,7 +20698,7 @@ var updatePollDetails = function updatePollDetails(pollDetails, optionId, addVot
20688
20698
  }
20689
20699
  var user = getClient().user;
20690
20700
  if (addVote) {
20691
- var _user$presence, _pollDetails$ownVotes, _pollDetails$ownVotes2, _pollDetails$ownVotes3, _pollDetails$votesPer2, _pollDetails$ownVotes4, _pollDetails$ownVotes5, _ref3, _pollDetails$votesPer3, _extends3;
20701
+ var _user$presence, _pollDetails$voteDeta5, _pollDetails$voteDeta6, _pollDetails$voteDeta7, _pollDetails$voteDeta8, _pollDetails$voteDeta9, _pollDetails$voteDeta0, _pollDetails$voteDeta1, _pollDetails$voteDeta10, _pollDetails$voteDeta11, _pollDetails$voteDeta12, _pollDetails$voteDeta13, _ref3, _pollDetails$voteDeta14, _pollDetails$voteDeta15, _extends3;
20692
20702
  var vote = {
20693
20703
  optionId: optionId,
20694
20704
  createdAt: new Date().getTime(),
@@ -20711,39 +20721,36 @@ var updatePollDetails = function updatePollDetails(pollDetails, optionId, addVot
20711
20721
  }
20712
20722
  };
20713
20723
  if (allowMultipleVotes) {
20714
- var _pollDetails$votesPer, _extends2;
20724
+ var _pollDetails$voteDeta, _pollDetails$voteDeta2, _pollDetails$voteDeta3, _extends2, _pollDetails$voteDeta4;
20715
20725
  return _extends({}, pollDetails, {
20716
- 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)),
20717
- ownVotes: [].concat((pollDetails === null || pollDetails === void 0 ? void 0 : pollDetails.ownVotes) || [], [vote])
20726
+ voteDetails: _extends({}, pollDetails === null || pollDetails === void 0 ? void 0 : pollDetails.voteDetails, {
20727
+ votesPerOption: _extends({}, pollDetails === null || pollDetails === void 0 ? void 0 : (_pollDetails$voteDeta = pollDetails.voteDetails) === null || _pollDetails$voteDeta === void 0 ? void 0 : _pollDetails$voteDeta.votesPerOption, (_extends2 = {}, _extends2[optionId] = ((pollDetails === null || pollDetails === void 0 ? void 0 : (_pollDetails$voteDeta2 = pollDetails.voteDetails) === null || _pollDetails$voteDeta2 === void 0 ? void 0 : (_pollDetails$voteDeta3 = _pollDetails$voteDeta2.votesPerOption) === null || _pollDetails$voteDeta3 === void 0 ? void 0 : _pollDetails$voteDeta3[optionId]) || 0) + 1, _extends2)),
20728
+ ownVotes: [].concat((pollDetails === null || pollDetails === void 0 ? void 0 : (_pollDetails$voteDeta4 = pollDetails.voteDetails) === null || _pollDetails$voteDeta4 === void 0 ? void 0 : _pollDetails$voteDeta4.ownVotes) || [], [vote])
20729
+ })
20718
20730
  });
20719
20731
  }
20720
- 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;
20732
+ var isVotedAlready = ((pollDetails === null || pollDetails === void 0 ? void 0 : (_pollDetails$voteDeta5 = pollDetails.voteDetails) === null || _pollDetails$voteDeta5 === void 0 ? void 0 : (_pollDetails$voteDeta6 = _pollDetails$voteDeta5.ownVotes) === null || _pollDetails$voteDeta6 === void 0 ? void 0 : _pollDetails$voteDeta6.length) || 0) > 0;
20721
20733
  return _extends({}, pollDetails, {
20722
- 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)),
20723
- ownVotes: [vote]
20734
+ voteDetails: _extends({}, pollDetails === null || pollDetails === void 0 ? void 0 : pollDetails.voteDetails, {
20735
+ votesPerOption: _extends({}, pollDetails === null || pollDetails === void 0 ? void 0 : (_pollDetails$voteDeta7 = pollDetails.voteDetails) === null || _pollDetails$voteDeta7 === void 0 ? void 0 : _pollDetails$voteDeta7.votesPerOption, isVotedAlready ? (_ref3 = {}, _ref3[String(pollDetails === null || pollDetails === void 0 ? void 0 : (_pollDetails$voteDeta8 = pollDetails.voteDetails) === null || _pollDetails$voteDeta8 === void 0 ? void 0 : (_pollDetails$voteDeta9 = _pollDetails$voteDeta8.ownVotes) === null || _pollDetails$voteDeta9 === void 0 ? void 0 : (_pollDetails$voteDeta0 = _pollDetails$voteDeta9[0]) === null || _pollDetails$voteDeta0 === void 0 ? void 0 : _pollDetails$voteDeta0.optionId)] = ((pollDetails === null || pollDetails === void 0 ? void 0 : (_pollDetails$voteDeta1 = pollDetails.voteDetails) === null || _pollDetails$voteDeta1 === void 0 ? void 0 : (_pollDetails$voteDeta10 = _pollDetails$voteDeta1.votesPerOption) === null || _pollDetails$voteDeta10 === void 0 ? void 0 : _pollDetails$voteDeta10[String(pollDetails === null || pollDetails === void 0 ? void 0 : (_pollDetails$voteDeta11 = pollDetails.voteDetails) === null || _pollDetails$voteDeta11 === void 0 ? void 0 : (_pollDetails$voteDeta12 = _pollDetails$voteDeta11.ownVotes) === null || _pollDetails$voteDeta12 === void 0 ? void 0 : (_pollDetails$voteDeta13 = _pollDetails$voteDeta12[0]) === null || _pollDetails$voteDeta13 === void 0 ? void 0 : _pollDetails$voteDeta13.optionId)]) || 0) - 1, _ref3) : {}, (_extends3 = {}, _extends3[optionId] = ((pollDetails === null || pollDetails === void 0 ? void 0 : (_pollDetails$voteDeta14 = pollDetails.voteDetails) === null || _pollDetails$voteDeta14 === void 0 ? void 0 : (_pollDetails$voteDeta15 = _pollDetails$voteDeta14.votesPerOption) === null || _pollDetails$voteDeta15 === void 0 ? void 0 : _pollDetails$voteDeta15[optionId]) || 0) + 1, _extends3)),
20736
+ ownVotes: [vote]
20737
+ })
20724
20738
  });
20725
20739
  } else {
20726
- var _pollDetails$votesPer5, _extends5;
20727
- if (allowMultipleVotes) {
20728
- var _pollDetails$votesPer4, _extends4;
20729
- return _extends({}, pollDetails, {
20730
- 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)),
20731
- ownVotes: [].concat(((pollDetails === null || pollDetails === void 0 ? void 0 : pollDetails.ownVotes) || []).filter(function (vote) {
20740
+ var _pollDetails$voteDeta16, _pollDetails$voteDeta17, _pollDetails$voteDeta18, _extends4, _pollDetails$voteDeta19;
20741
+ return _extends({}, pollDetails, {
20742
+ voteDetails: _extends({}, pollDetails === null || pollDetails === void 0 ? void 0 : pollDetails.voteDetails, {
20743
+ votesPerOption: _extends({}, pollDetails === null || pollDetails === void 0 ? void 0 : (_pollDetails$voteDeta16 = pollDetails.voteDetails) === null || _pollDetails$voteDeta16 === void 0 ? void 0 : _pollDetails$voteDeta16.votesPerOption, (_extends4 = {}, _extends4[optionId] = ((pollDetails === null || pollDetails === void 0 ? void 0 : (_pollDetails$voteDeta17 = pollDetails.voteDetails) === null || _pollDetails$voteDeta17 === void 0 ? void 0 : (_pollDetails$voteDeta18 = _pollDetails$voteDeta17.votesPerOption) === null || _pollDetails$voteDeta18 === void 0 ? void 0 : _pollDetails$voteDeta18[optionId]) || 0) - 1, _extends4)),
20744
+ ownVotes: [].concat(((pollDetails === null || pollDetails === void 0 ? void 0 : (_pollDetails$voteDeta19 = pollDetails.voteDetails) === null || _pollDetails$voteDeta19 === void 0 ? void 0 : _pollDetails$voteDeta19.ownVotes) || []).filter(function (vote) {
20732
20745
  return vote.optionId !== optionId;
20733
20746
  }))
20734
- });
20735
- }
20736
- return _extends({}, pollDetails, {
20737
- 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)),
20738
- ownVotes: [].concat(((pollDetails === null || pollDetails === void 0 ? void 0 : pollDetails.ownVotes) || []).filter(function (vote) {
20739
- return vote.optionId !== optionId;
20740
- }))
20747
+ })
20741
20748
  });
20742
20749
  }
20743
20750
  };
20744
20751
  function executeAddPollVote(channelId, pollId, optionId, message) {
20745
20752
  var _message$pollDetails;
20746
- var channel, pollDetails;
20753
+ var channel, pollDetails, result;
20747
20754
  return _regenerator().w(function (_context19) {
20748
20755
  while (1) switch (_context19.n) {
20749
20756
  case 0:
@@ -20751,6 +20758,12 @@ function executeAddPollVote(channelId, pollId, optionId, message) {
20751
20758
  return effects.call(getChannelFromMap, channelId);
20752
20759
  case 1:
20753
20760
  channel = _context19.v;
20761
+ if (message.pollDetails) {
20762
+ _context19.n = 2;
20763
+ break;
20764
+ }
20765
+ return _context19.a(2);
20766
+ case 2:
20754
20767
  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)));
20755
20768
  updateMessageOnMap(channel.id, {
20756
20769
  messageId: message.id,
@@ -20761,18 +20774,21 @@ function executeAddPollVote(channelId, pollId, optionId, message) {
20761
20774
  updateMessageOnAllMessages(message.id, JSON.parse(JSON.stringify({
20762
20775
  pollDetails: pollDetails
20763
20776
  })));
20764
- _context19.n = 2;
20777
+ _context19.n = 3;
20765
20778
  return effects.put(updateMessageAC(message.id, {
20766
20779
  pollDetails: pollDetails
20767
20780
  }));
20768
- case 2:
20781
+ case 3:
20769
20782
  if (!channel) {
20770
- _context19.n = 3;
20783
+ _context19.n = 5;
20771
20784
  break;
20772
20785
  }
20773
- _context19.n = 3;
20786
+ _context19.n = 4;
20774
20787
  return effects.call(channel.addVote, message.id, pollId, [optionId]);
20775
- case 3:
20788
+ case 4:
20789
+ result = _context19.v;
20790
+ console.log('result', result);
20791
+ case 5:
20776
20792
  return _context19.a(2);
20777
20793
  }
20778
20794
  }, _marked17$1);
@@ -20793,6 +20809,12 @@ function updateMessageOptimisticallyForAddPollVote(channelId, optionId, message)
20793
20809
  }
20794
20810
  return _context20.a(2);
20795
20811
  case 2:
20812
+ if (message.pollDetails) {
20813
+ _context20.n = 3;
20814
+ break;
20815
+ }
20816
+ return _context20.a(2);
20817
+ case 3:
20796
20818
  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)));
20797
20819
  updateMessageOnMap(channel.id, {
20798
20820
  messageId: message.id,
@@ -20803,17 +20825,17 @@ function updateMessageOptimisticallyForAddPollVote(channelId, optionId, message)
20803
20825
  updateMessageOnAllMessages(message.id, JSON.parse(JSON.stringify({
20804
20826
  pollDetails: pollDetails
20805
20827
  })));
20806
- _context20.n = 3;
20828
+ _context20.n = 4;
20807
20829
  return effects.put(updateMessageAC(message.id, {
20808
20830
  pollDetails: pollDetails
20809
20831
  }));
20810
- case 3:
20832
+ case 4:
20811
20833
  return _context20.a(2);
20812
20834
  }
20813
20835
  }, _marked18$1);
20814
20836
  }
20815
20837
  function addPollVote(action) {
20816
- 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;
20838
+ var payload, channelId, pollId, optionId, _message4, sceytChatClient, connectionState, pendingAction, conflictCheck, channel, _getMessagesFromMap2, _currentMessage$pollD, _currentMessage$pollD2, _pollDetails, _pollDetails2, _store$getState$Messa, _currentMessage$pollD3, _currentMessage$pollD4, _currentMessage$pollD5, currentMessage, hasVotedAnotherOption, pollDetails, hasNext, _t19;
20817
20839
  return _regenerator().w(function (_context21) {
20818
20840
  while (1) switch (_context21.p = _context21.n) {
20819
20841
  case 0:
@@ -20853,7 +20875,7 @@ function addPollVote(action) {
20853
20875
  currentMessage = ((_getMessagesFromMap2 = getMessagesFromMap(channelId)) === null || _getMessagesFromMap2 === void 0 ? void 0 : _getMessagesFromMap2.find(function (msg) {
20854
20876
  return msg.id === _message4.id || msg.tid === _message4.id;
20855
20877
  })) || _message4;
20856
- hasVotedAnotherOption = (((_currentMessage$pollD = currentMessage.pollDetails) === null || _currentMessage$pollD === void 0 ? void 0 : _currentMessage$pollD.ownVotes) || []).some(function (vote) {
20878
+ hasVotedAnotherOption = (((_currentMessage$pollD = currentMessage.pollDetails) === null || _currentMessage$pollD === void 0 ? void 0 : (_currentMessage$pollD2 = _currentMessage$pollD.voteDetails) === null || _currentMessage$pollD2 === void 0 ? void 0 : _currentMessage$pollD2.ownVotes) || []).some(function (vote) {
20857
20879
  return vote.optionId !== optionId;
20858
20880
  });
20859
20881
  pollDetails = currentMessage.pollDetails;
@@ -20863,7 +20885,7 @@ function addPollVote(action) {
20863
20885
  pollDetails = JSON.parse(JSON.stringify(updatePollDetails(pollDetails, optionId, true, ((_pollDetails2 = pollDetails) === null || _pollDetails2 === void 0 ? void 0 : _pollDetails2.allowMultipleVotes) || false)));
20864
20886
  hasNext = ((_store$getState$Messa = store.getState().MessageReducer.pollVotesHasMore) === null || _store$getState$Messa === void 0 ? void 0 : _store$getState$Messa[pollId]) || false;
20865
20887
  _context21.n = 2;
20866
- 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));
20888
+ return effects.put(addPollVotesToListAC(pollId, optionId, [(_currentMessage$pollD3 = currentMessage.pollDetails) === null || _currentMessage$pollD3 === void 0 ? void 0 : (_currentMessage$pollD4 = _currentMessage$pollD3.voteDetails) === null || _currentMessage$pollD4 === void 0 ? void 0 : (_currentMessage$pollD5 = _currentMessage$pollD4.ownVotes) === null || _currentMessage$pollD5 === void 0 ? void 0 : _currentMessage$pollD5[0]], hasNext, _message4.id));
20867
20889
  case 2:
20868
20890
  updateMessageOnMap(channel.id, {
20869
20891
  messageId: _message4.id,
@@ -20916,6 +20938,12 @@ function executeDeletePollVote(channelId, pollId, optionId, message) {
20916
20938
  return effects.call(getChannelFromMap, channelId);
20917
20939
  case 1:
20918
20940
  channel = _context22.v;
20941
+ if (message.pollDetails) {
20942
+ _context22.n = 2;
20943
+ break;
20944
+ }
20945
+ return _context22.a(2);
20946
+ case 2:
20919
20947
  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)));
20920
20948
  updateMessageOnMap(channel.id, {
20921
20949
  messageId: message.id,
@@ -20926,18 +20954,18 @@ function executeDeletePollVote(channelId, pollId, optionId, message) {
20926
20954
  updateMessageOnAllMessages(message.id, {
20927
20955
  pollDetails: pollDetails
20928
20956
  });
20929
- _context22.n = 2;
20957
+ _context22.n = 3;
20930
20958
  return effects.put(updateMessageAC(message.id, {
20931
20959
  pollDetails: pollDetails
20932
20960
  }));
20933
- case 2:
20961
+ case 3:
20934
20962
  if (!channel) {
20935
- _context22.n = 3;
20963
+ _context22.n = 4;
20936
20964
  break;
20937
20965
  }
20938
- _context22.n = 3;
20966
+ _context22.n = 4;
20939
20967
  return effects.call(channel.deleteVote, message.id, pollId, [optionId]);
20940
- case 3:
20968
+ case 4:
20941
20969
  return _context22.a(2);
20942
20970
  }
20943
20971
  }, _marked20$1);
@@ -20958,6 +20986,12 @@ function updateMessageOptimisticallyForDeletePollVote(channelId, optionId, messa
20958
20986
  }
20959
20987
  return _context23.a(2);
20960
20988
  case 2:
20989
+ if (message.pollDetails) {
20990
+ _context23.n = 3;
20991
+ break;
20992
+ }
20993
+ return _context23.a(2);
20994
+ case 3:
20961
20995
  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)));
20962
20996
  updateMessageOnMap(channel.id, {
20963
20997
  messageId: message.id,
@@ -20968,17 +21002,17 @@ function updateMessageOptimisticallyForDeletePollVote(channelId, optionId, messa
20968
21002
  updateMessageOnAllMessages(message.id, {
20969
21003
  pollDetails: pollDetails
20970
21004
  });
20971
- _context23.n = 3;
21005
+ _context23.n = 4;
20972
21006
  return effects.put(updateMessageAC(message.id, {
20973
21007
  pollDetails: pollDetails
20974
21008
  }));
20975
- case 3:
21009
+ case 4:
20976
21010
  return _context23.a(2);
20977
21011
  }
20978
21012
  }, _marked21$1);
20979
21013
  }
20980
21014
  function deletePollVote(action) {
20981
- var payload, channelId, pollId, optionId, _message5, sceytChatClient, connectionState, pendingAction, conflictCheck, channel, _getMessagesFromMap3, _message5$pollDetails, _currentMessage$pollD4, _currentMessage$pollD5, currentMessage, pollDetails, _t20;
21015
+ var payload, channelId, pollId, optionId, _message5, sceytChatClient, connectionState, pendingAction, conflictCheck, channel, _getMessagesFromMap3, _message5$pollDetails, _currentMessage$pollD6, _currentMessage$pollD7, _currentMessage$pollD8, currentMessage, pollDetails, _t20;
20982
21016
  return _regenerator().w(function (_context24) {
20983
21017
  while (1) switch (_context24.p = _context24.n) {
20984
21018
  case 0:
@@ -21020,7 +21054,7 @@ function deletePollVote(action) {
21020
21054
  })) || _message5;
21021
21055
  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)));
21022
21056
  _context24.n = 2;
21023
- 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));
21057
+ return effects.put(deletePollVotesFromListAC(pollId, optionId, [(_currentMessage$pollD6 = currentMessage.pollDetails) === null || _currentMessage$pollD6 === void 0 ? void 0 : (_currentMessage$pollD7 = _currentMessage$pollD6.voteDetails) === null || _currentMessage$pollD7 === void 0 ? void 0 : (_currentMessage$pollD8 = _currentMessage$pollD7.ownVotes) === null || _currentMessage$pollD8 === void 0 ? void 0 : _currentMessage$pollD8[0]], _message5.id));
21024
21058
  case 2:
21025
21059
  updateMessageOnMap(channel.id, {
21026
21060
  messageId: _message5.id,
@@ -21178,7 +21212,7 @@ function closePoll(action) {
21178
21212
  }, _marked25$1, null, [[0, 4]]);
21179
21213
  }
21180
21214
  function executeRetractPollVote(channelId, pollId, message) {
21181
- var channel, pollDetails, _iterator, _step, _message$pollDetails5, vote;
21215
+ var channel, pollDetails, _iterator, _step, _pollDetails3, _pollDetails3$voteDet, _message$pollDetails5, vote, result;
21182
21216
  return _regenerator().w(function (_context28) {
21183
21217
  while (1) switch (_context28.n) {
21184
21218
  case 0:
@@ -21187,7 +21221,7 @@ function executeRetractPollVote(channelId, pollId, message) {
21187
21221
  case 1:
21188
21222
  channel = _context28.v;
21189
21223
  pollDetails = JSON.parse(JSON.stringify(message.pollDetails));
21190
- for (_iterator = _createForOfIteratorHelperLoose(pollDetails.ownVotes); !(_step = _iterator()).done;) {
21224
+ for (_iterator = _createForOfIteratorHelperLoose(((_pollDetails3 = pollDetails) === null || _pollDetails3 === void 0 ? void 0 : (_pollDetails3$voteDet = _pollDetails3.voteDetails) === null || _pollDetails3$voteDet === void 0 ? void 0 : _pollDetails3$voteDet.ownVotes) || []); !(_step = _iterator()).done;) {
21191
21225
  vote = _step.value;
21192
21226
  pollDetails = updatePollDetails(pollDetails, vote.optionId, false, ((_message$pollDetails5 = message.pollDetails) === null || _message$pollDetails5 === void 0 ? void 0 : _message$pollDetails5.allowMultipleVotes) || false);
21193
21227
  }
@@ -21206,18 +21240,21 @@ function executeRetractPollVote(channelId, pollId, message) {
21206
21240
  }));
21207
21241
  case 2:
21208
21242
  if (!channel) {
21209
- _context28.n = 3;
21243
+ _context28.n = 4;
21210
21244
  break;
21211
21245
  }
21212
21246
  _context28.n = 3;
21213
21247
  return effects.call(channel.retractVote, message.id, pollId);
21214
21248
  case 3:
21249
+ result = _context28.v;
21250
+ console.log('result', result);
21251
+ case 4:
21215
21252
  return _context28.a(2);
21216
21253
  }
21217
21254
  }, _marked26$1);
21218
21255
  }
21219
21256
  function updateMessageOptimisticallyForRetractPollVote(channelId, message) {
21220
- var channel, pollDetails, _iterator2, _step2, _message$pollDetails6, vote;
21257
+ var channel, pollDetails, _iterator2, _step2, _pollDetails4, _pollDetails4$voteDet, _message$pollDetails6, vote;
21221
21258
  return _regenerator().w(function (_context29) {
21222
21259
  while (1) switch (_context29.n) {
21223
21260
  case 0:
@@ -21232,7 +21269,7 @@ function updateMessageOptimisticallyForRetractPollVote(channelId, message) {
21232
21269
  return _context29.a(2);
21233
21270
  case 2:
21234
21271
  pollDetails = JSON.parse(JSON.stringify(message.pollDetails));
21235
- for (_iterator2 = _createForOfIteratorHelperLoose(pollDetails.ownVotes); !(_step2 = _iterator2()).done;) {
21272
+ for (_iterator2 = _createForOfIteratorHelperLoose(((_pollDetails4 = pollDetails) === null || _pollDetails4 === void 0 ? void 0 : (_pollDetails4$voteDet = _pollDetails4.voteDetails) === null || _pollDetails4$voteDet === void 0 ? void 0 : _pollDetails4$voteDet.ownVotes) || []); !(_step2 = _iterator2()).done;) {
21236
21273
  vote = _step2.value;
21237
21274
  pollDetails = updatePollDetails(pollDetails, vote.optionId, false, ((_message$pollDetails6 = message.pollDetails) === null || _message$pollDetails6 === void 0 ? void 0 : _message$pollDetails6.allowMultipleVotes) || false);
21238
21275
  }
@@ -33983,7 +34020,7 @@ var MessageStatusUpdated = styled__default.span(_templateObject4$m || (_template
33983
34020
  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;
33984
34021
  var POLL_VOTES_LIMIT = 20;
33985
34022
  var AllVotesPopup = function AllVotesPopup(_ref) {
33986
- var _pollVotesHasMore$key, _poll$votesPerOption;
34023
+ var _pollVotesHasMore$key, _poll$voteDetails, _poll$voteDetails$vot, _poll$voteDetails3;
33987
34024
  var onClose = _ref.onClose,
33988
34025
  poll = _ref.poll,
33989
34026
  messageId = _ref.messageId,
@@ -33994,6 +34031,9 @@ var AllVotesPopup = function AllVotesPopup(_ref) {
33994
34031
  textPrimary = _useColor[THEME_COLORS.TEXT_PRIMARY],
33995
34032
  textSecondary = _useColor[THEME_COLORS.TEXT_SECONDARY],
33996
34033
  surface1 = _useColor[THEME_COLORS.SURFACE_1];
34034
+ var contactsMap = useSelector(contactsMapSelector);
34035
+ var getFromContacts = getShowOnlyContactUsers();
34036
+ var user = getClient().user;
33997
34037
  var dispatch = useDispatch();
33998
34038
  var key = poll.id + "_" + optionId;
33999
34039
  var pollVotesList = useSelector(pollVotesListSelector);
@@ -34002,7 +34042,7 @@ var AllVotesPopup = function AllVotesPopup(_ref) {
34002
34042
  var allVotes = pollVotesList[key] || [];
34003
34043
  var hasMore = (_pollVotesHasMore$key = pollVotesHasMore[key]) != null ? _pollVotesHasMore$key : false;
34004
34044
  var isLoading = pollVotesLoadingState[key] === LOADING_STATE.LOADING;
34005
- var totalVotes = ((_poll$votesPerOption = poll.votesPerOption) === null || _poll$votesPerOption === void 0 ? void 0 : _poll$votesPerOption[optionId]) || 0;
34045
+ 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;
34006
34046
  var isLoadingInitial = allVotes.length === 0 && (isLoading || totalVotes > 0);
34007
34047
  React.useEffect(function () {
34008
34048
  if (allVotes.length === 0 && totalVotes > 0 && !isLoading) {
@@ -34010,7 +34050,7 @@ var AllVotesPopup = function AllVotesPopup(_ref) {
34010
34050
  }
34011
34051
  }, []);
34012
34052
  React.useEffect(function () {
34013
- if (allVotes.length > 0 && hasMore && !isLoading && allVotes.length < POLL_VOTES_LIMIT) {
34053
+ if (allVotes.length > 0 && hasMore && !isLoading && allVotes.length < POLL_VOTES_LIMIT - 1) {
34014
34054
  dispatch(loadMorePollVotesAC(poll.id, optionId, POLL_VOTES_LIMIT));
34015
34055
  }
34016
34056
  }, [allVotes.length, hasMore, isLoading, poll.id, optionId, dispatch]);
@@ -34034,6 +34074,12 @@ var AllVotesPopup = function AllVotesPopup(_ref) {
34034
34074
  return '';
34035
34075
  }
34036
34076
  };
34077
+ var ownVote = React.useMemo(function () {
34078
+ var _poll$voteDetails2, _poll$voteDetails2$ow;
34079
+ 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) {
34080
+ return vote.optionId === optionId;
34081
+ });
34082
+ }, [poll === null || poll === void 0 ? void 0 : (_poll$voteDetails3 = poll.voteDetails) === null || _poll$voteDetails3 === void 0 ? void 0 : _poll$voteDetails3.ownVotes, optionId]);
34037
34083
  return /*#__PURE__*/React__default.createElement(PopupContainer, null, /*#__PURE__*/React__default.createElement(Popup, {
34038
34084
  backgroundColor: background,
34039
34085
  maxWidth: '560px',
@@ -34059,7 +34105,9 @@ var AllVotesPopup = function AllVotesPopup(_ref) {
34059
34105
  color: textSecondary
34060
34106
  }))) : (/*#__PURE__*/React__default.createElement(VotesList, {
34061
34107
  onScroll: handleScroll
34062
- }, allVotes.map(function (vote) {
34108
+ }, [].concat(ownVote ? [ownVote] : [], allVotes).map(function (vote) {
34109
+ var _vote$user, _vote$user2, _vote$user2$profile, _vote$user3, _vote$user3$profile, _vote$user4, _vote$user4$profile, _vote$user5, _vote$user5$presence, _vote$user6, _vote$user6$presence, _vote$user7, _vote$user7$presence, _vote$user8;
34110
+ var contact = contactsMap[vote.user.id];
34063
34111
  return /*#__PURE__*/React__default.createElement(VoterRow, {
34064
34112
  key: vote.optionId + "_" + vote.user.id
34065
34113
  }, /*#__PURE__*/React__default.createElement(Avatar, {
@@ -34070,14 +34118,26 @@ var AllVotesPopup = function AllVotesPopup(_ref) {
34070
34118
  setDefaultAvatar: true
34071
34119
  }), /*#__PURE__*/React__default.createElement(VoterInfo, null, /*#__PURE__*/React__default.createElement(VoterName, {
34072
34120
  color: textPrimary
34073
- }, vote.user.profile.firstName || vote.user.id, " ", vote.user.profile.lastName || ''), /*#__PURE__*/React__default.createElement(VotedAt, {
34121
+ }, user.id === vote.user.id ? 'You' : makeUsername(contact, {
34122
+ id: vote === null || vote === void 0 ? void 0 : (_vote$user = vote.user) === null || _vote$user === void 0 ? void 0 : _vote$user.id,
34123
+ firstName: vote === null || vote === void 0 ? void 0 : (_vote$user2 = vote.user) === null || _vote$user2 === void 0 ? void 0 : (_vote$user2$profile = _vote$user2.profile) === null || _vote$user2$profile === void 0 ? void 0 : _vote$user2$profile.firstName,
34124
+ lastName: vote === null || vote === void 0 ? void 0 : (_vote$user3 = vote.user) === null || _vote$user3 === void 0 ? void 0 : (_vote$user3$profile = _vote$user3.profile) === null || _vote$user3$profile === void 0 ? void 0 : _vote$user3$profile.lastName,
34125
+ avatarUrl: vote === null || vote === void 0 ? void 0 : (_vote$user4 = vote.user) === null || _vote$user4 === void 0 ? void 0 : (_vote$user4$profile = _vote$user4.profile) === null || _vote$user4$profile === void 0 ? void 0 : _vote$user4$profile.avatar,
34126
+ state: vote === null || vote === void 0 ? void 0 : (_vote$user5 = vote.user) === null || _vote$user5 === void 0 ? void 0 : (_vote$user5$presence = _vote$user5.presence) === null || _vote$user5$presence === void 0 ? void 0 : _vote$user5$presence.status,
34127
+ blocked: false,
34128
+ presence: {
34129
+ state: vote === null || vote === void 0 ? void 0 : (_vote$user6 = vote.user) === null || _vote$user6 === void 0 ? void 0 : (_vote$user6$presence = _vote$user6.presence) === null || _vote$user6$presence === void 0 ? void 0 : _vote$user6$presence.status,
34130
+ status: vote === null || vote === void 0 ? void 0 : (_vote$user7 = vote.user) === null || _vote$user7 === void 0 ? void 0 : (_vote$user7$presence = _vote$user7.presence) === null || _vote$user7$presence === void 0 ? void 0 : _vote$user7$presence.status,
34131
+ lastActiveAt: new Date((vote === null || vote === void 0 ? void 0 : (_vote$user8 = vote.user) === null || _vote$user8 === void 0 ? void 0 : _vote$user8.createdAt) || '')
34132
+ }
34133
+ }, getFromContacts)), /*#__PURE__*/React__default.createElement(VotedAt, {
34074
34134
  color: textSecondary
34075
34135
  }, formatDate(new Date(vote.createdAt)))));
34076
34136
  }), isLoading && allVotes.length > 0 && /*#__PURE__*/React__default.createElement(LoadingText, {
34077
34137
  color: textSecondary
34078
34138
  }, "Loading...")))))));
34079
34139
  };
34080
- var VotesList = styled__default.div(_templateObject$C || (_templateObject$C = _taggedTemplateLiteralLoose(["\n display: flex;\n flex-direction: column;\n overflow-y: auto;\n max-height: 60vh;\n padding: 8px 0;\n"])));
34140
+ var VotesList = styled__default.div(_templateObject$C || (_templateObject$C = _taggedTemplateLiteralLoose(["\n display: flex;\n flex-direction: column;\n overflow-y: auto;\n max-height: 500px;\n padding: 8px 0;\n"])));
34081
34141
  var VoterRow = styled__default.div(_templateObject2$x || (_templateObject2$x = _taggedTemplateLiteralLoose(["\n display: flex;\n align-items: center;\n gap: 12px;\n padding: 6px 0;\n"])));
34082
34142
  var VoterInfo = styled__default.div(_templateObject3$r || (_templateObject3$r = _taggedTemplateLiteralLoose(["\n display: flex;\n align-items: center;\n gap: 10px;\n width: 100%;\n justify-content: space-between;\n"])));
34083
34143
  var VoterName = styled__default.div(_templateObject4$n || (_templateObject4$n = _taggedTemplateLiteralLoose(["\n color: ", ";\n font-weight: 500;\n font-size: 15px;\n line-height: 20px;\n letter-spacing: -0.2px;\n"])), function (p) {
@@ -34108,7 +34168,7 @@ var Loader = styled__default.div(_templateObject10$4 || (_templateObject10$4 = _
34108
34168
 
34109
34169
  var _templateObject$D, _templateObject2$y, _templateObject3$s, _templateObject4$o, _templateObject5$j, _templateObject6$h, _templateObject7$f, _templateObject8$e, _templateObject9$c, _templateObject0$b;
34110
34170
  var VotesResultsPopup = function VotesResultsPopup(_ref) {
34111
- var _poll$options$find;
34171
+ var _poll$voteDetails3, _poll$voteDetails4, _poll$options$find;
34112
34172
  var onClose = _ref.onClose,
34113
34173
  poll = _ref.poll,
34114
34174
  messageId = _ref.messageId,
@@ -34116,6 +34176,9 @@ var VotesResultsPopup = function VotesResultsPopup(_ref) {
34116
34176
  var _useState = React.useState(null),
34117
34177
  selectedOptionId = _useState[0],
34118
34178
  setSelectedOptionId = _useState[1];
34179
+ var getFromContacts = getShowOnlyContactUsers();
34180
+ var user = getClient().user;
34181
+ var contactsMap = useSelector(contactsMapSelector);
34119
34182
  var _useColor = useColors(),
34120
34183
  background = _useColor[THEME_COLORS.BACKGROUND],
34121
34184
  surface1 = _useColor[THEME_COLORS.SURFACE_1],
@@ -34126,19 +34189,23 @@ var VotesResultsPopup = function VotesResultsPopup(_ref) {
34126
34189
  var optionIdToVotes = React.useMemo(function () {
34127
34190
  var votes = {};
34128
34191
  poll.options.forEach(function (opt) {
34129
- var allOptionVotes = (poll.votes || []).filter(function (vote) {
34192
+ var _poll$voteDetails;
34193
+ var allOptionVotes = (((_poll$voteDetails = poll.voteDetails) === null || _poll$voteDetails === void 0 ? void 0 : _poll$voteDetails.votes) || []).filter(function (vote) {
34130
34194
  return vote.optionId === opt.id;
34131
34195
  });
34132
- var ownVote = poll.ownVotes.find(function (vote) {
34133
- return vote.optionId === opt.id;
34134
- });
34135
- if (ownVote) {
34136
- allOptionVotes.push(ownVote);
34196
+ if (allOptionVotes.length < 5) {
34197
+ var _poll$voteDetails2;
34198
+ var ownVote = (_poll$voteDetails2 = poll.voteDetails) === null || _poll$voteDetails2 === void 0 ? void 0 : _poll$voteDetails2.ownVotes.find(function (vote) {
34199
+ return vote.optionId === opt.id;
34200
+ });
34201
+ if (ownVote) {
34202
+ allOptionVotes.push(ownVote);
34203
+ }
34137
34204
  }
34138
34205
  votes[opt.id] = allOptionVotes;
34139
34206
  });
34140
34207
  return votes;
34141
- }, [poll.votes, poll.options, poll.ownVotes]);
34208
+ }, [(_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]);
34142
34209
  var handleShowAll = React.useCallback(function (optionId) {
34143
34210
  if (onViewMoreOption) {
34144
34211
  onViewMoreOption(optionId);
@@ -34176,9 +34243,9 @@ var VotesResultsPopup = function VotesResultsPopup(_ref) {
34176
34243
  color: textPrimary,
34177
34244
  marginBottom: '16px'
34178
34245
  }, "Vote results"), /*#__PURE__*/React__default.createElement(OptionsList, null, poll.options.map(function (opt) {
34179
- var _poll$votesPerOption;
34246
+ var _poll$voteDetails5, _poll$voteDetails5$vo;
34180
34247
  var allVotes = optionIdToVotes[opt.id] || [];
34181
- var totalVotes = ((_poll$votesPerOption = poll.votesPerOption) === null || _poll$votesPerOption === void 0 ? void 0 : _poll$votesPerOption[opt.id]) || 0;
34248
+ 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;
34182
34249
  return /*#__PURE__*/React__default.createElement(OptionBlock, {
34183
34250
  key: opt.id,
34184
34251
  background: surface1,
@@ -34188,6 +34255,7 @@ var VotesResultsPopup = function VotesResultsPopup(_ref) {
34188
34255
  }, opt.name), /*#__PURE__*/React__default.createElement(OptionCount, {
34189
34256
  color: textSecondary
34190
34257
  }, totalVotes, " votes")), /*#__PURE__*/React__default.createElement(Voters, null, allVotes.map(function (vote) {
34258
+ var _vote$user, _vote$user2, _vote$user2$profile, _vote$user3, _vote$user3$profile, _vote$user4, _vote$user4$profile, _vote$user5, _vote$user5$presence, _vote$user6, _vote$user6$presence, _vote$user7, _vote$user7$presence, _vote$user8;
34191
34259
  return /*#__PURE__*/React__default.createElement(VoterRow$1, {
34192
34260
  key: opt.id + "_" + vote.user.id
34193
34261
  }, /*#__PURE__*/React__default.createElement(Avatar, {
@@ -34198,7 +34266,19 @@ var VotesResultsPopup = function VotesResultsPopup(_ref) {
34198
34266
  setDefaultAvatar: true
34199
34267
  }), /*#__PURE__*/React__default.createElement(VoterInfo$1, null, /*#__PURE__*/React__default.createElement(VoterName$1, {
34200
34268
  color: textPrimary
34201
- }, vote.user.profile.firstName || vote.user.id, " ", vote.user.profile.lastName || ''), /*#__PURE__*/React__default.createElement(VotedAt$1, {
34269
+ }, user.id === vote.user.id ? 'You' : makeUsername(contactsMap[vote.user.id], {
34270
+ id: vote === null || vote === void 0 ? void 0 : (_vote$user = vote.user) === null || _vote$user === void 0 ? void 0 : _vote$user.id,
34271
+ firstName: vote === null || vote === void 0 ? void 0 : (_vote$user2 = vote.user) === null || _vote$user2 === void 0 ? void 0 : (_vote$user2$profile = _vote$user2.profile) === null || _vote$user2$profile === void 0 ? void 0 : _vote$user2$profile.firstName,
34272
+ lastName: vote === null || vote === void 0 ? void 0 : (_vote$user3 = vote.user) === null || _vote$user3 === void 0 ? void 0 : (_vote$user3$profile = _vote$user3.profile) === null || _vote$user3$profile === void 0 ? void 0 : _vote$user3$profile.lastName,
34273
+ avatarUrl: vote === null || vote === void 0 ? void 0 : (_vote$user4 = vote.user) === null || _vote$user4 === void 0 ? void 0 : (_vote$user4$profile = _vote$user4.profile) === null || _vote$user4$profile === void 0 ? void 0 : _vote$user4$profile.avatar,
34274
+ state: vote === null || vote === void 0 ? void 0 : (_vote$user5 = vote.user) === null || _vote$user5 === void 0 ? void 0 : (_vote$user5$presence = _vote$user5.presence) === null || _vote$user5$presence === void 0 ? void 0 : _vote$user5$presence.status,
34275
+ blocked: false,
34276
+ presence: {
34277
+ state: vote === null || vote === void 0 ? void 0 : (_vote$user6 = vote.user) === null || _vote$user6 === void 0 ? void 0 : (_vote$user6$presence = _vote$user6.presence) === null || _vote$user6$presence === void 0 ? void 0 : _vote$user6$presence.status,
34278
+ status: vote === null || vote === void 0 ? void 0 : (_vote$user7 = vote.user) === null || _vote$user7 === void 0 ? void 0 : (_vote$user7$presence = _vote$user7.presence) === null || _vote$user7$presence === void 0 ? void 0 : _vote$user7$presence.status,
34279
+ lastActiveAt: new Date((vote === null || vote === void 0 ? void 0 : (_vote$user8 = vote.user) === null || _vote$user8 === void 0 ? void 0 : _vote$user8.createdAt) || '')
34280
+ }
34281
+ }, getFromContacts)), /*#__PURE__*/React__default.createElement(VotedAt$1, {
34202
34282
  color: textSecondary
34203
34283
  }, formatDate(new Date(vote.createdAt)))));
34204
34284
  })), allVotes.length < totalVotes && (/*#__PURE__*/React__default.createElement(Row, {
@@ -34222,7 +34302,7 @@ var VotesResultsPopup = function VotesResultsPopup(_ref) {
34222
34302
  })) === null || _poll$options$find === void 0 ? void 0 : _poll$options$find.name) || ''
34223
34303
  })));
34224
34304
  };
34225
- var OptionsList = styled__default.div(_templateObject$D || (_templateObject$D = _taggedTemplateLiteralLoose(["\n display: flex;\n flex-direction: column;\n gap: 16px;\n overflow-y: auto;\n max-height: 64vh;\n"])));
34305
+ var OptionsList = styled__default.div(_templateObject$D || (_templateObject$D = _taggedTemplateLiteralLoose(["\n display: flex;\n flex-direction: column;\n gap: 16px;\n overflow-y: auto;\n max-height: 585px;\n"])));
34226
34306
  var OptionBlock = styled__default.div(_templateObject2$y || (_templateObject2$y = _taggedTemplateLiteralLoose(["\n background: ", ";\n border-radius: 12px;\n border: 1px solid ", "0F; /* subtle */\n padding: 14px 16px 0 16px;\n"])), function (p) {
34227
34307
  return p.background;
34228
34308
  }, function (p) {
@@ -34269,6 +34349,7 @@ function SvgFilledCheckbox(props) {
34269
34349
 
34270
34350
  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;
34271
34351
  var PollMessage = function PollMessage(_ref) {
34352
+ var _poll$voteDetails3, _poll$voteDetails4, _poll$voteDetails5, _poll$voteDetails6, _poll$voteDetails7;
34272
34353
  var message = _ref.message;
34273
34354
  var _useColor = useColors(),
34274
34355
  textPrimary = _useColor[THEME_COLORS.TEXT_PRIMARY],
@@ -34287,17 +34368,21 @@ var PollMessage = function PollMessage(_ref) {
34287
34368
  var _useState = React.useState(false),
34288
34369
  showResults = _useState[0],
34289
34370
  setShowResults = _useState[1];
34371
+ var isHaveResults = React.useMemo(function () {
34372
+ var _poll$voteDetails$vot, _poll$voteDetails, _poll$voteDetails$vot2, _poll$voteDetails$own, _poll$voteDetails2, _poll$voteDetails2$ow;
34373
+ 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;
34374
+ }, [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]);
34290
34375
  if (!poll) {
34291
34376
  return null;
34292
34377
  }
34293
- var votesPerOption = poll.votesPerOption || {};
34378
+ var votesPerOption = ((_poll$voteDetails5 = poll.voteDetails) === null || _poll$voteDetails5 === void 0 ? void 0 : _poll$voteDetails5.votesPerOption) || {};
34294
34379
  var maxVotes = poll.options.reduce(function (acc, opt) {
34295
34380
  return Math.max(acc, votesPerOption[opt.id] || 0);
34296
34381
  }, 0);
34297
- var ownVotedOptionIds = new Set((poll.ownVotes || []).map(function (v) {
34382
+ var ownVotedOptionIds = new Set((((_poll$voteDetails6 = poll.voteDetails) === null || _poll$voteDetails6 === void 0 ? void 0 : _poll$voteDetails6.ownVotes) || []).map(function (v) {
34298
34383
  return v.optionId;
34299
34384
  }));
34300
- var votesUsers = poll.votes || [];
34385
+ var votesUsers = ((_poll$voteDetails7 = poll.voteDetails) === null || _poll$voteDetails7 === void 0 ? void 0 : _poll$voteDetails7.votes) || [];
34301
34386
  var canVote = !poll.closed;
34302
34387
  var handleVote = function handleVote(optionId) {
34303
34388
  if (!canVote) return;
@@ -34323,8 +34408,8 @@ var PollMessage = function PollMessage(_ref) {
34323
34408
  return v.optionId === opt.id;
34324
34409
  }).slice(0, 3);
34325
34410
  if (optionVotesUsers.length < 3) {
34326
- var _poll$ownVotes;
34327
- poll === null || poll === void 0 ? void 0 : (_poll$ownVotes = poll.ownVotes) === null || _poll$ownVotes === void 0 ? void 0 : _poll$ownVotes.forEach(function (vote) {
34411
+ var _poll$voteDetails8, _poll$voteDetails8$ow;
34412
+ 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) {
34328
34413
  if (vote.optionId === opt.id) {
34329
34414
  optionVotesUsers.push(vote);
34330
34415
  }
@@ -34375,13 +34460,15 @@ var PollMessage = function PollMessage(_ref) {
34375
34460
  })), !(poll !== null && poll !== void 0 && poll.anonymous) && (/*#__PURE__*/React__default.createElement(Button, {
34376
34461
  type: 'button',
34377
34462
  backgroundColor: background,
34378
- color: accent,
34463
+ color: isHaveResults ? accent : textSecondary,
34464
+ disabledOpacity: 0.8,
34379
34465
  borderRadius: '14px',
34380
- onClick: handleViewResults,
34466
+ onClick: isHaveResults ? handleViewResults : undefined,
34381
34467
  style: {
34382
34468
  width: '100%',
34383
34469
  marginTop: 10
34384
- }
34470
+ },
34471
+ disabled: !isHaveResults
34385
34472
  }, "View Results")), showResults && (/*#__PURE__*/React__default.createElement(VotesResultsPopup, {
34386
34473
  onClose: function onClose() {
34387
34474
  return setShowResults(false);
@@ -42465,7 +42552,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
42465
42552
  },
42466
42553
  iconWidth: '20px',
42467
42554
  iconColor: iconInactive
42468
- }, /*#__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, {
42555
+ }, /*#__PURE__*/React__default.createElement(SvgChoseFile, null), chooseFileAttachmentText != null ? chooseFileAttachmentText : 'File')), (pollOptions === null || pollOptions === void 0 ? void 0 : pollOptions.showAddPoll) && (/*#__PURE__*/React__default.createElement(DropdownOptionLi, {
42469
42556
  key: 3,
42470
42557
  textColor: textPrimary,
42471
42558
  hoverBackground: backgroundHovered,