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