sceyt-chat-react-uikit 1.8.0-beta.11 → 1.8.0-beta.13

package/index.js

@@ -10603,10 +10603,11 @@ function updateMessageAC(messageId, params, addIfNotExists, voteDetails) {
     voteDetails: voteDetails
   });
 }
-function updateMessagesStatusAC(name, markersMap) {
+function updateMessagesStatusAC(name, markersMap, isOwnMarker) {
   return updateMessagesStatus({
     name: name,
-    markersMap: markersMap
+    markersMap: markersMap,
+    isOwnMarker: isOwnMarker
   });
 }
 function clearMessagesAC() {
@@ -10923,34 +10924,30 @@ var shouldSkipDeliveryStatusUpdate = function shouldSkipDeliveryStatusUpdate(mar
   }
   return false;
 };
-var updateMessageDeliveryStatusAndMarkers = function updateMessageDeliveryStatusAndMarkers(message, markerName) {
-  var _message$markerTotals;
+var updateMessageDeliveryStatusAndMarkers = function updateMessageDeliveryStatusAndMarkers(message, markerName, isOwnMarker) {
   if (shouldSkipDeliveryStatusUpdate(markerName, message.deliveryStatus)) {
     return {
       markerTotals: message.markerTotals,
       deliveryStatus: message.deliveryStatus
     };
   }
-  var markerInMarkersTotal = message === null || message === void 0 ? void 0 : (_message$markerTotals = message.markerTotals) === null || _message$markerTotals === void 0 ? void 0 : _message$markerTotals.find(function (marker) {
+  var markersTotal = isOwnMarker ? message.userMarkers : message.markerTotals;
+  var markerInMarkersTotal = markersTotal === null || markersTotal === void 0 ? void 0 : markersTotal.find(function (marker) {
     return marker.name === markerName;
   });
   if (!markerInMarkersTotal) {
-    return {
-      markerTotals: [].concat(message.markerTotals || [], [{
-        name: markerName,
-        count: 1
-      }]),
-      deliveryStatus: markerName
-    };
+    var _ref;
+    return _ref = {}, _ref[isOwnMarker ? 'userMarkers' : 'markerTotals'] = [].concat(markersTotal || [], [{
+      name: markerName,
+      count: 1
+    }]), _ref.deliveryStatus = markerName, _ref;
   } else {
-    return {
-      markerTotals: message.markerTotals.map(function (marker) {
-        return marker.name === markerName ? _extends({}, marker, {
-          count: marker.count + 1
-        }) : marker;
-      }),
-      deliveryStatus: markerName
-    };
+    var _ref2;
+    return _ref2 = {}, _ref2[isOwnMarker ? 'userMarkers' : 'markerTotals'] = markersTotal.map(function (marker) {
+      return marker.name === markerName ? _extends({}, marker, {
+        count: marker.count + 1
+      }) : marker;
+    }), _ref2.deliveryStatus = markerName, _ref2;
   }
 };
 var sendMessageHandler;
@@ -10996,10 +10993,10 @@ var updateMessageOnAllMessages = function updateMessageOnAllMessages(messageId,
     return message;
   });
 };
-var updateMessageStatusOnAllMessages = function updateMessageStatusOnAllMessages(name, markersMap) {
+var updateMessageStatusOnAllMessages = function updateMessageStatusOnAllMessages(name, markersMap, isOwnMarker) {
   activeChannelAllMessages = activeChannelAllMessages.map(function (message) {
     if (markersMap[message.id]) {
-      var statusUpdatedMessage = updateMessageDeliveryStatusAndMarkers(message, name);
+      var statusUpdatedMessage = updateMessageDeliveryStatusAndMarkers(message, name, isOwnMarker);
       return _extends({}, message, statusUpdatedMessage);
     }
     return message;
@@ -11010,12 +11007,12 @@ var removeMessageFromAllMessages = function removeMessageFromAllMessages(message
     return !(msg.id === messageId || msg.tid === messageId);
   });
 };
-var updateMarkersOnAllMessages = function updateMarkersOnAllMessages(markersMap, name) {
+var updateMarkersOnAllMessages = function updateMarkersOnAllMessages(markersMap, name, isOwnMarker) {
   activeChannelAllMessages = activeChannelAllMessages.map(function (message) {
     if (!markersMap[message.id]) {
       return message;
     }
-    var statusUpdatedMessage = updateMessageDeliveryStatusAndMarkers(message, name);
+    var statusUpdatedMessage = updateMessageDeliveryStatusAndMarkers(message, name, isOwnMarker);
     return _extends({}, message, statusUpdatedMessage);
   });
 };
@@ -11582,7 +11579,8 @@ var messageSlice = createSlice({
     updateMessagesStatus: function updateMessagesStatus(state, action) {
       var _action$payload2 = action.payload,
         name = _action$payload2.name,
-        markersMap = _action$payload2.markersMap;
+        markersMap = _action$payload2.markersMap,
+        isOwnMarker = _action$payload2.isOwnMarker;
       var markerName = name;
       for (var index = 0; index < state.activeChannelMessages.length; index++) {
         if (!markersMap[state.activeChannelMessages[index].id]) {
@@ -11590,13 +11588,8 @@ var messageSlice = createSlice({
         }
         if (state.activeChannelMessages[index].state !== 'Deleted') {
           var message = state.activeChannelMessages[index];
-          var _updateMessageDeliver = updateMessageDeliveryStatusAndMarkers(message, markerName),
-            markerTotals = _updateMessageDeliver.markerTotals,
-            deliveryStatus = _updateMessageDeliver.deliveryStatus;
-          state.activeChannelMessages[index] = _extends({}, message, {
-            markerTotals: markerTotals,
-            deliveryStatus: deliveryStatus
-          });
+          var statusUpdatedMessage = updateMessageDeliveryStatusAndMarkers(message, markerName, isOwnMarker);
+          state.activeChannelMessages[index] = _extends({}, message, statusUpdatedMessage);
         }
       }
       state.activeChannelMessages.sort(function (a, b) {
@@ -15159,7 +15152,7 @@ function watchForEvents() {
           };
         });
         _loop = /*#__PURE__*/_regenerator().m(function _callee() {
-          var _yield$take, type, args, createdChannel, channelFilterTypes, getFromContacts, channelExists, _chan, channel, joinedMember, _chan2, customLoadMembersFunctions, joinMembersEvent, membersList, updateChannelData, _channel, member, _channelExists, activeChannelId, groupName, _updateChannelData, _channel2, _channelExists2, _channel3, removedMembers, _activeChannelId, _channelExists3, activeChannel, _updateChannelData2, _groupName, _channel4, addedMembers, _activeChannelId2, _channelExists4, _updateChannelData3, _customLoadMembersFunctions, addMembersEvent, _membersList, _groupName2, onUpdateChannel, updatedChannel, _channelExists5, subject, avatarUrl, muted, mutedTill, metadata, _channel5, fields, _activeChannelId3, _groupName3, _channel6, message, messageToHandle, _channelFilterTypes, _activeChannelId4, _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, _channel7, _activeChannelId5, updateLastMessage, markersMap, activeChannelMessages, _iterator, _step, messageId, isPendingMessage, lastMessage, _channelId, _channel8, _channel9, deletedMessage, _activeChannelId6, _channelExists7, _channel0, _message, _activeChannelId7, _channelExists8, _channel1, user, _message2, reaction, isSelf, _activeChannelId8, _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, _channel10, pollDetails, _messageId, pollDetailsData, _activeChannelId9, addedVotes, deletedVotes, objs, _iterator2, _step2, vote, _iterator3, _step3, _vote, _i, _objs, obj, _store$getState$Messa, key, hasNext, _i2, _objs2, _obj, _pollDetailsData$chan3, _channel11, _pollDetails, _messageId2, _pollDetailsData, _activeChannelId0, _deletedVotes, _objs3, _iterator4, _step4, _vote2, _i3, _objs4, _obj2, _i4, _objs5, _obj3, _pollDetailsData2$cha, _channel12, _pollDetails2, _messageId3, _activeChannelId1, _pollDetailsData2, retractedVotes, _objs6, _iterator5, _step5, _vote4, _i5, _objs7, _obj4, _iterator6, _step6, _vote3, _channel13, _messageId4, _activeChannelId10, _obj5, _channel14, _user, _message3, _reaction, channelFromMap, _isSelf, _activeChannelId11, _channelUpdateParams, _channel15, _updatedChannel, _channel16, _activeChannelId12, channelExist, _channel17, _channel18, _channel19, _channel20, _channel21, _channel22, _channel23, _groupName5, _channel24, _groupName6, _channel25, members, _activeChannelId13, _customLoadMembersFunctions2, updateMembersEvent, _membersList2, i, _channel26, _channel27, _channelId2, from, name, status, _t, _t2, _t3, _t4;
+          var _yield$take, type, args, createdChannel, channelFilterTypes, getFromContacts, channelExists, _chan, channel, joinedMember, _chan2, customLoadMembersFunctions, joinMembersEvent, membersList, updateChannelData, _channel, member, _channelExists, activeChannelId, groupName, _updateChannelData, _channel2, _channelExists2, _channel3, removedMembers, _activeChannelId, _channelExists3, activeChannel, _updateChannelData2, _groupName, _channel4, addedMembers, _activeChannelId2, _channelExists4, _updateChannelData3, _customLoadMembersFunctions, addMembersEvent, _membersList, _groupName2, onUpdateChannel, updatedChannel, _channelExists5, subject, avatarUrl, muted, mutedTill, metadata, _channel5, fields, _activeChannelId3, _groupName3, _channel6, message, messageToHandle, _channelFilterTypes, _activeChannelId4, _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, _channel7, _markerList$user, isOwnMarker, _activeChannelId5, updateLastMessage, markersMap, activeChannelMessages, _iterator, _step, messageId, isPendingMessage, lastMessage, _channelId, _channel8, _channel9, deletedMessage, _activeChannelId6, _channelExists7, _channel0, _message, _activeChannelId7, _channelExists8, _channel1, user, _message2, reaction, isSelf, _activeChannelId8, _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, _channel10, pollDetails, _messageId, pollDetailsData, _activeChannelId9, addedVotes, deletedVotes, objs, _iterator2, _step2, vote, _iterator3, _step3, _vote, _i, _objs, obj, _store$getState$Messa, key, hasNext, _i2, _objs2, _obj, _pollDetailsData$chan3, _channel11, _pollDetails, _messageId2, _pollDetailsData, _activeChannelId0, _deletedVotes, _objs3, _iterator4, _step4, _vote2, _i3, _objs4, _obj2, _i4, _objs5, _obj3, _pollDetailsData2$cha, _channel12, _pollDetails2, _messageId3, _activeChannelId1, _pollDetailsData2, retractedVotes, _objs6, _iterator5, _step5, _vote4, _i5, _objs7, _obj4, _iterator6, _step6, _vote3, _channel13, _messageId4, _activeChannelId10, _obj5, _channel14, _user, _message3, _reaction, channelFromMap, _isSelf, _activeChannelId11, _channelUpdateParams, _channel15, _updatedChannel, _channel16, _activeChannelId12, channelExist, _channel17, _channel18, _channel19, _channel20, _channel21, _channel22, _channel23, _groupName5, _channel24, _groupName6, _channel25, members, _activeChannelId13, _customLoadMembersFunctions2, updateMembersEvent, _membersList2, i, _channel26, _channel27, _channelId2, from, name, status, _t, _t2, _t3, _t4;
           return _regenerator().w(function (_context) {
             while (1) switch (_context.p = _context.n) {
               case 0:
@@ -15744,6 +15737,7 @@ function watchForEvents() {
                   _context.n = 91;
                   break;
                 }
+                isOwnMarker = ((_markerList$user = markerList.user) === null || _markerList$user === void 0 ? void 0 : _markerList$user.id) === SceytChatClient.user.id;
                 _context.n = 81;
                 return effects.call(getActiveChannelId);
               case 81:
@@ -15793,7 +15787,7 @@ function watchForEvents() {
                   _context.n = 88;
                   break;
                 }
-                lastMessage = _extends({}, _channel7.lastMessage, updateMessageDeliveryStatusAndMarkers(_channel7.lastMessage, markerList.name));
+                lastMessage = _extends({}, _channel7.lastMessage, updateMessageDeliveryStatusAndMarkers(_channel7.lastMessage, markerList.name, isOwnMarker));
                 updateChannelLastMessageOnAllChannels(_channel7.id, lastMessage);
                 _context.n = 88;
                 return effects.put(updateChannelLastMessageStatusAC(lastMessage, _channel7));
@@ -15803,15 +15797,19 @@ function watchForEvents() {
                   break;
                 }
                 _context.n = 89;
-                return effects.put(updateMessagesStatusAC(markerList.name, markersMap));
+                return effects.put(updateMessagesStatusAC(markerList.name, markersMap, isOwnMarker));
               case 89:
-                updateMarkersOnAllMessages(markersMap, markerList.name);
+                updateMarkersOnAllMessages(markersMap, markerList.name, isOwnMarker);
               case 90:
                 updateMessageStatusOnMap(_channel7.id, {
                   name: markerList.name,
                   markersMap: markersMap
                 });
-                updateMessageStatusOnAllMessages(markerList.name, markersMap);
+                updateMessageStatusOnAllMessages(markerList.name, markersMap, isOwnMarker);
+                if (isOwnMarker) {
+                  _context.n = 91;
+                  break;
+                }
                 _context.n = 91;
                 return effects.put(updateMessagesMarkersAC(channelId, markerList.name, markerList));
               case 91:
@@ -20355,7 +20353,7 @@ function sendMessage(action) {
         messagesToSend.push(messageToSend);
       case 12:
         _loop2 = /*#__PURE__*/_regenerator().m(function _callee3() {
-          var messageAttachment, messageToSend, messageCopy, _attachmentsToSend, linkAttachmentToSend, linkAttachmentBuilder, messageResponse, k, pendingAttachment, attachmentsToUpdate, currentAttachmentsMap, messageUpdateData, stringifiedMessageUpdateData, activeChannelId, messageToUpdate, channelUpdateParam, _channel, _messageToSend2, _channel2, isErrorResendable, _t;
+          var messageAttachment, messageToSend, messageCopy, _attachmentsToSend, linkAttachmentToSend, linkAttachmentBuilder, messageResponse, k, pendingAttachment, attachmentsToUpdate, currentAttachmentsMap, messageUpdateData, activeChannelId, messageToUpdate, channelUpdateParam, _channel, _messageToSend2, _channel2, isErrorResendable, _t;
           return _regenerator().w(function (_context3) {
             while (1) switch (_context3.p = _context3.n) {
               case 0:
@@ -20432,11 +20430,15 @@ function sendMessage(action) {
                     currentAttachmentsMap[attachment.tid] = attachment;
                   });
                   attachmentsToUpdate = messageResponse.attachments.map(function (attachment) {
-                    if (currentAttachmentsMap[attachment.tid]) {
+                    if (currentAttachmentsMap[attachment.tid] && attachment.type !== attachmentTypes.voice) {
                       log.info('set at');
                       return _extends({}, attachment, {
                         attachmentUrl: currentAttachmentsMap[attachment.tid].attachmentUrl
                       });
+                    } else if (attachment.type === attachmentTypes.voice) {
+                      return _extends({}, attachment, {
+                        attachmentUrl: null
+                      });
                     }
                     return attachment;
                   });
@@ -20445,14 +20447,13 @@ function sendMessage(action) {
                   attachments: attachmentsToUpdate,
                   channelId: channel.id
                 });
-                stringifiedMessageUpdateData = JSON.parse(JSON.stringify(messageResponse));
                 activeChannelId = getActiveChannelId();
                 if (!(activeChannelId === channel.id)) {
                   _context3.n = 9;
                   break;
                 }
                 _context3.n = 9;
-                return effects.put(updateMessageAC(messageToSend.tid, stringifiedMessageUpdateData, true));
+                return effects.put(updateMessageAC(messageToSend.tid, messageUpdateData, true));
               case 9:
                 _context3.n = 10;
                 return effects.put(removePendingMessageAC(channel.id, messageToSend.tid));
@@ -20717,7 +20718,7 @@ function sendTextMessage(action) {
       case 20:
         _context5.p = 20;
         _t3 = _context5.v;
-        log.error('error on send text message ... ', _t3 === null || _t3 === void 0 ? void 0 : _t3.type);
+        log.error('error on send text message ... ', _t3 === null || _t3 === void 0 ? void 0 : _t3.type, _t3);
         isErrorResendable = isResendableError(_t3 === null || _t3 === void 0 ? void 0 : _t3.type);
         if (!(!isErrorResendable && (_channel3 = channel) !== null && _channel3 !== void 0 && _channel3.id && sendMessageTid)) {
           _context5.n = 22;
@@ -22250,45 +22251,51 @@ function loadMoreMessageAttachments(action) {
         } else {
           AttachmentQuery = query.AttachmentByTypeQuery;
         }
-        _context18.n = 1;
-        return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADING));
+        if (AttachmentQuery) {
+          _context18.n = 1;
+          break;
+        }
+        return _context18.a(2);
       case 1:
-        AttachmentQuery.limit = limit;
         _context18.n = 2;
-        return effects.call(AttachmentQuery.loadPrevious);
+        return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADING));
       case 2:
+        AttachmentQuery.limit = limit;
+        _context18.n = 3;
+        return effects.call(AttachmentQuery.loadPrevious);
+      case 3:
         _yield$call3 = _context18.v;
         attachments = _yield$call3.attachments;
         hasNext = _yield$call3.hasNext;
         if (!forPopup) {
-          _context18.n = 4;
+          _context18.n = 5;
           break;
         }
-        _context18.n = 3;
+        _context18.n = 4;
         return effects.put(addAttachmentsForPopupAC(attachments, direction));
-      case 3:
-        _context18.n = 7;
-        break;
       case 4:
-        _context18.n = 5;
-        return effects.put(setAttachmentsCompleteAC(hasNext));
+        _context18.n = 8;
+        break;
       case 5:
         _context18.n = 6;
-        return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
+        return effects.put(setAttachmentsCompleteAC(hasNext));
       case 6:
         _context18.n = 7;
-        return effects.put(addAttachmentsAC(attachments));
+        return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
       case 7:
-        _context18.n = 9;
-        break;
+        _context18.n = 8;
+        return effects.put(addAttachmentsAC(attachments));
       case 8:
-        _context18.p = 8;
+        _context18.n = 10;
+        break;
+      case 9:
+        _context18.p = 9;
         _t26 = _context18.v;
         log.error('error in message attachment query', _t26);
-      case 9:
+      case 10:
         return _context18.a(2);
     }
-  }, _marked13$1, null, [[0, 8]]);
+  }, _marked13$1, null, [[0, 9]]);
 }
 function pauseAttachmentUploading(action) {
   var attachmentId, isPaused, _t27;
@@ -45609,7 +45616,8 @@ var SendMessageInput = function SendMessageInput(_ref3) {
               viewOnce: viewOnce || false,
               parentMessage: messageForReply || null
             };
-            dispatch(sendMessageAC(messageToSend, id, connectionStatus));
+            var sendAttachmentsAsSeparateMessage = getSendAttachmentsAsSeparateMessages();
+            dispatch(sendMessageAC(messageToSend, id, connectionStatus, connectionStatus, sendAttachmentsAsSeparateMessage));
             setViewOnce(false);
             setAttachments([]);
             handleCloseReply();

package/index.modern.js

@@ -10602,10 +10602,11 @@ function updateMessageAC(messageId, params, addIfNotExists, voteDetails) {
     voteDetails: voteDetails
   });
 }
-function updateMessagesStatusAC(name, markersMap) {
+function updateMessagesStatusAC(name, markersMap, isOwnMarker) {
   return updateMessagesStatus({
     name: name,
-    markersMap: markersMap
+    markersMap: markersMap,
+    isOwnMarker: isOwnMarker
   });
 }
 function clearMessagesAC() {
@@ -10922,34 +10923,30 @@ var shouldSkipDeliveryStatusUpdate = function shouldSkipDeliveryStatusUpdate(mar
   }
   return false;
 };
-var updateMessageDeliveryStatusAndMarkers = function updateMessageDeliveryStatusAndMarkers(message, markerName) {
-  var _message$markerTotals;
+var updateMessageDeliveryStatusAndMarkers = function updateMessageDeliveryStatusAndMarkers(message, markerName, isOwnMarker) {
   if (shouldSkipDeliveryStatusUpdate(markerName, message.deliveryStatus)) {
     return {
       markerTotals: message.markerTotals,
       deliveryStatus: message.deliveryStatus
     };
   }
-  var markerInMarkersTotal = message === null || message === void 0 ? void 0 : (_message$markerTotals = message.markerTotals) === null || _message$markerTotals === void 0 ? void 0 : _message$markerTotals.find(function (marker) {
+  var markersTotal = isOwnMarker ? message.userMarkers : message.markerTotals;
+  var markerInMarkersTotal = markersTotal === null || markersTotal === void 0 ? void 0 : markersTotal.find(function (marker) {
     return marker.name === markerName;
   });
   if (!markerInMarkersTotal) {
-    return {
-      markerTotals: [].concat(message.markerTotals || [], [{
-        name: markerName,
-        count: 1
-      }]),
-      deliveryStatus: markerName
-    };
+    var _ref;
+    return _ref = {}, _ref[isOwnMarker ? 'userMarkers' : 'markerTotals'] = [].concat(markersTotal || [], [{
+      name: markerName,
+      count: 1
+    }]), _ref.deliveryStatus = markerName, _ref;
   } else {
-    return {
-      markerTotals: message.markerTotals.map(function (marker) {
-        return marker.name === markerName ? _extends({}, marker, {
-          count: marker.count + 1
-        }) : marker;
-      }),
-      deliveryStatus: markerName
-    };
+    var _ref2;
+    return _ref2 = {}, _ref2[isOwnMarker ? 'userMarkers' : 'markerTotals'] = markersTotal.map(function (marker) {
+      return marker.name === markerName ? _extends({}, marker, {
+        count: marker.count + 1
+      }) : marker;
+    }), _ref2.deliveryStatus = markerName, _ref2;
   }
 };
 var sendMessageHandler;
@@ -10995,10 +10992,10 @@ var updateMessageOnAllMessages = function updateMessageOnAllMessages(messageId,
     return message;
   });
 };
-var updateMessageStatusOnAllMessages = function updateMessageStatusOnAllMessages(name, markersMap) {
+var updateMessageStatusOnAllMessages = function updateMessageStatusOnAllMessages(name, markersMap, isOwnMarker) {
   activeChannelAllMessages = activeChannelAllMessages.map(function (message) {
     if (markersMap[message.id]) {
-      var statusUpdatedMessage = updateMessageDeliveryStatusAndMarkers(message, name);
+      var statusUpdatedMessage = updateMessageDeliveryStatusAndMarkers(message, name, isOwnMarker);
       return _extends({}, message, statusUpdatedMessage);
     }
     return message;
@@ -11009,12 +11006,12 @@ var removeMessageFromAllMessages = function removeMessageFromAllMessages(message
     return !(msg.id === messageId || msg.tid === messageId);
   });
 };
-var updateMarkersOnAllMessages = function updateMarkersOnAllMessages(markersMap, name) {
+var updateMarkersOnAllMessages = function updateMarkersOnAllMessages(markersMap, name, isOwnMarker) {
   activeChannelAllMessages = activeChannelAllMessages.map(function (message) {
     if (!markersMap[message.id]) {
       return message;
     }
-    var statusUpdatedMessage = updateMessageDeliveryStatusAndMarkers(message, name);
+    var statusUpdatedMessage = updateMessageDeliveryStatusAndMarkers(message, name, isOwnMarker);
     return _extends({}, message, statusUpdatedMessage);
   });
 };
@@ -11581,7 +11578,8 @@ var messageSlice = createSlice({
     updateMessagesStatus: function updateMessagesStatus(state, action) {
       var _action$payload2 = action.payload,
         name = _action$payload2.name,
-        markersMap = _action$payload2.markersMap;
+        markersMap = _action$payload2.markersMap,
+        isOwnMarker = _action$payload2.isOwnMarker;
       var markerName = name;
       for (var index = 0; index < state.activeChannelMessages.length; index++) {
         if (!markersMap[state.activeChannelMessages[index].id]) {
@@ -11589,13 +11587,8 @@ var messageSlice = createSlice({
         }
         if (state.activeChannelMessages[index].state !== 'Deleted') {
           var message = state.activeChannelMessages[index];
-          var _updateMessageDeliver = updateMessageDeliveryStatusAndMarkers(message, markerName),
-            markerTotals = _updateMessageDeliver.markerTotals,
-            deliveryStatus = _updateMessageDeliver.deliveryStatus;
-          state.activeChannelMessages[index] = _extends({}, message, {
-            markerTotals: markerTotals,
-            deliveryStatus: deliveryStatus
-          });
+          var statusUpdatedMessage = updateMessageDeliveryStatusAndMarkers(message, markerName, isOwnMarker);
+          state.activeChannelMessages[index] = _extends({}, message, statusUpdatedMessage);
         }
       }
       state.activeChannelMessages.sort(function (a, b) {
@@ -15158,7 +15151,7 @@ function watchForEvents() {
           };
         });
         _loop = /*#__PURE__*/_regenerator().m(function _callee() {
-          var _yield$take, type, args, createdChannel, channelFilterTypes, getFromContacts, channelExists, _chan, channel, joinedMember, _chan2, customLoadMembersFunctions, joinMembersEvent, membersList, updateChannelData, _channel, member, _channelExists, activeChannelId, groupName, _updateChannelData, _channel2, _channelExists2, _channel3, removedMembers, _activeChannelId, _channelExists3, activeChannel, _updateChannelData2, _groupName, _channel4, addedMembers, _activeChannelId2, _channelExists4, _updateChannelData3, _customLoadMembersFunctions, addMembersEvent, _membersList, _groupName2, onUpdateChannel, updatedChannel, _channelExists5, subject, avatarUrl, muted, mutedTill, metadata, _channel5, fields, _activeChannelId3, _groupName3, _channel6, message, messageToHandle, _channelFilterTypes, _activeChannelId4, _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, _channel7, _activeChannelId5, updateLastMessage, markersMap, activeChannelMessages, _iterator, _step, messageId, isPendingMessage, lastMessage, _channelId, _channel8, _channel9, deletedMessage, _activeChannelId6, _channelExists7, _channel0, _message, _activeChannelId7, _channelExists8, _channel1, user, _message2, reaction, isSelf, _activeChannelId8, _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, _channel10, pollDetails, _messageId, pollDetailsData, _activeChannelId9, addedVotes, deletedVotes, objs, _iterator2, _step2, vote, _iterator3, _step3, _vote, _i, _objs, obj, _store$getState$Messa, key, hasNext, _i2, _objs2, _obj, _pollDetailsData$chan3, _channel11, _pollDetails, _messageId2, _pollDetailsData, _activeChannelId0, _deletedVotes, _objs3, _iterator4, _step4, _vote2, _i3, _objs4, _obj2, _i4, _objs5, _obj3, _pollDetailsData2$cha, _channel12, _pollDetails2, _messageId3, _activeChannelId1, _pollDetailsData2, retractedVotes, _objs6, _iterator5, _step5, _vote4, _i5, _objs7, _obj4, _iterator6, _step6, _vote3, _channel13, _messageId4, _activeChannelId10, _obj5, _channel14, _user, _message3, _reaction, channelFromMap, _isSelf, _activeChannelId11, _channelUpdateParams, _channel15, _updatedChannel, _channel16, _activeChannelId12, channelExist, _channel17, _channel18, _channel19, _channel20, _channel21, _channel22, _channel23, _groupName5, _channel24, _groupName6, _channel25, members, _activeChannelId13, _customLoadMembersFunctions2, updateMembersEvent, _membersList2, i, _channel26, _channel27, _channelId2, from, name, status, _t, _t2, _t3, _t4;
+          var _yield$take, type, args, createdChannel, channelFilterTypes, getFromContacts, channelExists, _chan, channel, joinedMember, _chan2, customLoadMembersFunctions, joinMembersEvent, membersList, updateChannelData, _channel, member, _channelExists, activeChannelId, groupName, _updateChannelData, _channel2, _channelExists2, _channel3, removedMembers, _activeChannelId, _channelExists3, activeChannel, _updateChannelData2, _groupName, _channel4, addedMembers, _activeChannelId2, _channelExists4, _updateChannelData3, _customLoadMembersFunctions, addMembersEvent, _membersList, _groupName2, onUpdateChannel, updatedChannel, _channelExists5, subject, avatarUrl, muted, mutedTill, metadata, _channel5, fields, _activeChannelId3, _groupName3, _channel6, message, messageToHandle, _channelFilterTypes, _activeChannelId4, _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, _channel7, _markerList$user, isOwnMarker, _activeChannelId5, updateLastMessage, markersMap, activeChannelMessages, _iterator, _step, messageId, isPendingMessage, lastMessage, _channelId, _channel8, _channel9, deletedMessage, _activeChannelId6, _channelExists7, _channel0, _message, _activeChannelId7, _channelExists8, _channel1, user, _message2, reaction, isSelf, _activeChannelId8, _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, _channel10, pollDetails, _messageId, pollDetailsData, _activeChannelId9, addedVotes, deletedVotes, objs, _iterator2, _step2, vote, _iterator3, _step3, _vote, _i, _objs, obj, _store$getState$Messa, key, hasNext, _i2, _objs2, _obj, _pollDetailsData$chan3, _channel11, _pollDetails, _messageId2, _pollDetailsData, _activeChannelId0, _deletedVotes, _objs3, _iterator4, _step4, _vote2, _i3, _objs4, _obj2, _i4, _objs5, _obj3, _pollDetailsData2$cha, _channel12, _pollDetails2, _messageId3, _activeChannelId1, _pollDetailsData2, retractedVotes, _objs6, _iterator5, _step5, _vote4, _i5, _objs7, _obj4, _iterator6, _step6, _vote3, _channel13, _messageId4, _activeChannelId10, _obj5, _channel14, _user, _message3, _reaction, channelFromMap, _isSelf, _activeChannelId11, _channelUpdateParams, _channel15, _updatedChannel, _channel16, _activeChannelId12, channelExist, _channel17, _channel18, _channel19, _channel20, _channel21, _channel22, _channel23, _groupName5, _channel24, _groupName6, _channel25, members, _activeChannelId13, _customLoadMembersFunctions2, updateMembersEvent, _membersList2, i, _channel26, _channel27, _channelId2, from, name, status, _t, _t2, _t3, _t4;
           return _regenerator().w(function (_context) {
             while (1) switch (_context.p = _context.n) {
               case 0:
@@ -15743,6 +15736,7 @@ function watchForEvents() {
                   _context.n = 91;
                   break;
                 }
+                isOwnMarker = ((_markerList$user = markerList.user) === null || _markerList$user === void 0 ? void 0 : _markerList$user.id) === SceytChatClient.user.id;
                 _context.n = 81;
                 return call(getActiveChannelId);
               case 81:
@@ -15792,7 +15786,7 @@ function watchForEvents() {
                   _context.n = 88;
                   break;
                 }
-                lastMessage = _extends({}, _channel7.lastMessage, updateMessageDeliveryStatusAndMarkers(_channel7.lastMessage, markerList.name));
+                lastMessage = _extends({}, _channel7.lastMessage, updateMessageDeliveryStatusAndMarkers(_channel7.lastMessage, markerList.name, isOwnMarker));
                 updateChannelLastMessageOnAllChannels(_channel7.id, lastMessage);
                 _context.n = 88;
                 return put(updateChannelLastMessageStatusAC(lastMessage, _channel7));
@@ -15802,15 +15796,19 @@ function watchForEvents() {
                   break;
                 }
                 _context.n = 89;
-                return put(updateMessagesStatusAC(markerList.name, markersMap));
+                return put(updateMessagesStatusAC(markerList.name, markersMap, isOwnMarker));
               case 89:
-                updateMarkersOnAllMessages(markersMap, markerList.name);
+                updateMarkersOnAllMessages(markersMap, markerList.name, isOwnMarker);
               case 90:
                 updateMessageStatusOnMap(_channel7.id, {
                   name: markerList.name,
                   markersMap: markersMap
                 });
-                updateMessageStatusOnAllMessages(markerList.name, markersMap);
+                updateMessageStatusOnAllMessages(markerList.name, markersMap, isOwnMarker);
+                if (isOwnMarker) {
+                  _context.n = 91;
+                  break;
+                }
                 _context.n = 91;
                 return put(updateMessagesMarkersAC(channelId, markerList.name, markerList));
               case 91:
@@ -20354,7 +20352,7 @@ function sendMessage(action) {
         messagesToSend.push(messageToSend);
       case 12:
         _loop2 = /*#__PURE__*/_regenerator().m(function _callee3() {
-          var messageAttachment, messageToSend, messageCopy, _attachmentsToSend, linkAttachmentToSend, linkAttachmentBuilder, messageResponse, k, pendingAttachment, attachmentsToUpdate, currentAttachmentsMap, messageUpdateData, stringifiedMessageUpdateData, activeChannelId, messageToUpdate, channelUpdateParam, _channel, _messageToSend2, _channel2, isErrorResendable, _t;
+          var messageAttachment, messageToSend, messageCopy, _attachmentsToSend, linkAttachmentToSend, linkAttachmentBuilder, messageResponse, k, pendingAttachment, attachmentsToUpdate, currentAttachmentsMap, messageUpdateData, activeChannelId, messageToUpdate, channelUpdateParam, _channel, _messageToSend2, _channel2, isErrorResendable, _t;
           return _regenerator().w(function (_context3) {
             while (1) switch (_context3.p = _context3.n) {
               case 0:
@@ -20431,11 +20429,15 @@ function sendMessage(action) {
                     currentAttachmentsMap[attachment.tid] = attachment;
                   });
                   attachmentsToUpdate = messageResponse.attachments.map(function (attachment) {
-                    if (currentAttachmentsMap[attachment.tid]) {
+                    if (currentAttachmentsMap[attachment.tid] && attachment.type !== attachmentTypes.voice) {
                       log.info('set at');
                       return _extends({}, attachment, {
                         attachmentUrl: currentAttachmentsMap[attachment.tid].attachmentUrl
                       });
+                    } else if (attachment.type === attachmentTypes.voice) {
+                      return _extends({}, attachment, {
+                        attachmentUrl: null
+                      });
                     }
                     return attachment;
                   });
@@ -20444,14 +20446,13 @@ function sendMessage(action) {
                   attachments: attachmentsToUpdate,
                   channelId: channel.id
                 });
-                stringifiedMessageUpdateData = JSON.parse(JSON.stringify(messageResponse));
                 activeChannelId = getActiveChannelId();
                 if (!(activeChannelId === channel.id)) {
                   _context3.n = 9;
                   break;
                 }
                 _context3.n = 9;
-                return put(updateMessageAC(messageToSend.tid, stringifiedMessageUpdateData, true));
+                return put(updateMessageAC(messageToSend.tid, messageUpdateData, true));
               case 9:
                 _context3.n = 10;
                 return put(removePendingMessageAC(channel.id, messageToSend.tid));
@@ -20716,7 +20717,7 @@ function sendTextMessage(action) {
       case 20:
         _context5.p = 20;
         _t3 = _context5.v;
-        log.error('error on send text message ... ', _t3 === null || _t3 === void 0 ? void 0 : _t3.type);
+        log.error('error on send text message ... ', _t3 === null || _t3 === void 0 ? void 0 : _t3.type, _t3);
         isErrorResendable = isResendableError(_t3 === null || _t3 === void 0 ? void 0 : _t3.type);
         if (!(!isErrorResendable && (_channel3 = channel) !== null && _channel3 !== void 0 && _channel3.id && sendMessageTid)) {
           _context5.n = 22;
@@ -22249,45 +22250,51 @@ function loadMoreMessageAttachments(action) {
         } else {
           AttachmentQuery = query.AttachmentByTypeQuery;
         }
-        _context18.n = 1;
-        return put(setMessagesLoadingStateAC(LOADING_STATE.LOADING));
+        if (AttachmentQuery) {
+          _context18.n = 1;
+          break;
+        }
+        return _context18.a(2);
       case 1:
-        AttachmentQuery.limit = limit;
         _context18.n = 2;
-        return call(AttachmentQuery.loadPrevious);
+        return put(setMessagesLoadingStateAC(LOADING_STATE.LOADING));
       case 2:
+        AttachmentQuery.limit = limit;
+        _context18.n = 3;
+        return call(AttachmentQuery.loadPrevious);
+      case 3:
         _yield$call3 = _context18.v;
         attachments = _yield$call3.attachments;
         hasNext = _yield$call3.hasNext;
         if (!forPopup) {
-          _context18.n = 4;
+          _context18.n = 5;
           break;
         }
-        _context18.n = 3;
+        _context18.n = 4;
         return put(addAttachmentsForPopupAC(attachments, direction));
-      case 3:
-        _context18.n = 7;
-        break;
       case 4:
-        _context18.n = 5;
-        return put(setAttachmentsCompleteAC(hasNext));
+        _context18.n = 8;
+        break;
       case 5:
         _context18.n = 6;
-        return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
+        return put(setAttachmentsCompleteAC(hasNext));
       case 6:
         _context18.n = 7;
-        return put(addAttachmentsAC(attachments));
+        return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
       case 7:
-        _context18.n = 9;
-        break;
+        _context18.n = 8;
+        return put(addAttachmentsAC(attachments));
       case 8:
-        _context18.p = 8;
+        _context18.n = 10;
+        break;
+      case 9:
+        _context18.p = 9;
         _t26 = _context18.v;
         log.error('error in message attachment query', _t26);
-      case 9:
+      case 10:
         return _context18.a(2);
     }
-  }, _marked13$1, null, [[0, 8]]);
+  }, _marked13$1, null, [[0, 9]]);
 }
 function pauseAttachmentUploading(action) {
   var attachmentId, isPaused, _t27;
@@ -45608,7 +45615,8 @@ var SendMessageInput = function SendMessageInput(_ref3) {
               viewOnce: viewOnce || false,
               parentMessage: messageForReply || null
             };
-            dispatch(sendMessageAC(messageToSend, id, connectionStatus));
+            var sendAttachmentsAsSeparateMessage = getSendAttachmentsAsSeparateMessages();
+            dispatch(sendMessageAC(messageToSend, id, connectionStatus, connectionStatus, sendAttachmentsAsSeparateMessage));
             setViewOnce(false);
             setAttachments([]);
             handleCloseReply();

package/package.json

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

package/types/index.d.ts

@@ -145,10 +145,7 @@ export interface IMessage {
     updatedAt?: Date;
     type: string;
     deliveryStatus: string;
-    markerTotals: {
-        name: string;
-        count: number;
-    }[];
+    markerTotals: IMarker[];
     userMarkers: IMarker[];
     incoming: boolean;
     metadata: any;