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

package/index.js

@@ -8498,6 +8498,31 @@ var getAllowEditDeleteIncomingMessage = function getAllowEditDeleteIncomingMessa
 var compareMessageBodyAttributes = function compareMessageBodyAttributes(attributes1, attributes2) {
   return JSON.stringify(attributes1) === JSON.stringify(attributes2);
 };
+var trimMessageBodyWithAttributes = function trimMessageBodyWithAttributes(text, attributes) {
+  var body = text.trim();
+  var leadingTrim = text.length - text.trimStart().length;
+  var bodyAttributes = (attributes || []).map(function (att) {
+    var offset = att.offset - leadingTrim;
+    var length = att.length;
+    if (offset < 0) {
+      length += offset;
+      offset = 0;
+    }
+    if (offset + length > body.length) {
+      length = body.length - offset;
+    }
+    return _extends({}, att, {
+      offset: offset,
+      length: length
+    });
+  }).filter(function (att) {
+    return att.length > 0 && att.offset >= 0 && att.offset < body.length;
+  });
+  return {
+    body: body,
+    bodyAttributes: bodyAttributes
+  };
+};
 var bodyAttributesMapByType = {
   1: ['bold'],
   2: ['italic'],
@@ -12096,9 +12121,20 @@ function getLatestMessagesFromMap(channelId, limit) {
     return !!m.id || m.tid;
   }).sort(compareMessagesForList).slice(-limit);
 }
-function getLatestCachedConfirmedMessageId(channelId) {
+function getLatestContiguousMessagesFromMap(channelId, limit) {
   var _loadedSegmentsMap$ch;
   var latestSegment = (_loadedSegmentsMap$ch = loadedSegmentsMap[channelId]) === null || _loadedSegmentsMap$ch === void 0 ? void 0 : _loadedSegmentsMap$ch.at(-1);
+  var messages = Object.values(messagesMap[channelId] || {}).filter(function (m) {
+    return !!m.id || m.tid;
+  });
+  var contiguousMessages = latestSegment ? messages.filter(function (m) {
+    return !m.id || compareMessageIds(m.id, latestSegment.startId) >= 0 && compareMessageIds(m.id, latestSegment.endId) <= 0;
+  }) : messages;
+  return contiguousMessages.sort(compareMessagesForList).slice(-limit);
+}
+function getLatestCachedConfirmedMessageId(channelId) {
+  var _loadedSegmentsMap$ch2;
+  var latestSegment = (_loadedSegmentsMap$ch2 = loadedSegmentsMap[channelId]) === null || _loadedSegmentsMap$ch2 === void 0 ? void 0 : _loadedSegmentsMap$ch2.at(-1);
   if (latestSegment !== null && latestSegment !== void 0 && latestSegment.endId) {
     return latestSegment.endId;
   }
@@ -16014,6 +16050,10 @@ var SDKErrorTypeEnum = {
   Authentication: {
     value: 'Authentication',
     isResendable: true
+  },
+  AttachmentUnavailable: {
+    value: 'AttachmentUnavailable',
+    isResendable: false
   }
 };
 var fromValue = function fromValue(value) {
@@ -16031,6 +16071,11 @@ var isResendableError = function isResendableError(value) {
   var errorType = fromValue(value);
   return (_errorType$isResendab = errorType === null || errorType === void 0 ? void 0 : errorType.isResendable) != null ? _errorType$isResendab : true;
 };
+var createAttachmentUnavailableError = function createAttachmentUnavailableError(message) {
+  var error = new Error(message);
+  error.type = SDKErrorTypeEnum.AttachmentUnavailable.value;
+  return error;
+};
 
 var _excluded$1 = ["lastMessage"];
 var _marked = /*#__PURE__*/_regenerator().m(setMessageListLoading),
@@ -16093,6 +16138,8 @@ var _marked = /*#__PURE__*/_regenerator().m(setMessageListLoading),
   _marked56 = /*#__PURE__*/_regenerator().m(loadMorePollVotes),
   _marked57 = /*#__PURE__*/_regenerator().m(refreshCacheAroundMessage),
   _marked58 = /*#__PURE__*/_regenerator().m(MessageSaga);
+var MAX_AUTO_RESEND_ATTEMPTS = 5;
+var autoResendAttempts = new Map();
 var loadMoreMessagesInFlight = new Set();
 var prefetchInFlight = new Set();
 var queuedPrefetchRequests = new Map();
@@ -16316,6 +16363,7 @@ var handleUploadAttachments = function handleUploadAttachments(attachments, mess
   try {
     return Promise.resolve(Promise.all(attachments.map(function (attachment) {
       try {
+        var _attachment$url, _attachment$url$type;
         var _temp10 = function _temp10() {
           function _temp0() {
             store.dispatch(updateAttachmentUploadingStateAC(UPLOAD_STATE.SUCCESS, attachment.tid));
@@ -16337,14 +16385,15 @@ var handleUploadAttachments = function handleUploadAttachments(attachments, mess
             return attachmentToSend;
           }
           var _temp9 = function () {
-            if (!attachment.cachedUrl && attachment.url.type.split('/')[0] === 'image') {
+            if (!attachment.cachedUrl && fileType === 'image') {
               return _catch(function () {
                 var _temp2 = function () {
                   if (blobLocal && blobLocal.type.startsWith('image/')) {
+                    var _attachment, _attachment2;
                     var file = attachment.url instanceof File ? attachment.url : new File([attachment.url], attachment.name || 'image', {
                       type: attachment.url.type || blobLocal.type
                     });
-                    var _calculateRenderedIma = calculateRenderedImageWidth((attachment === null || attachment === void 0 ? void 0 : attachment.metadata.szw) || 1280, (attachment === null || attachment === void 0 ? void 0 : attachment.metadata.szh) || 1080),
+                    var _calculateRenderedIma = calculateRenderedImageWidth(((_attachment = attachment) === null || _attachment === void 0 ? void 0 : _attachment.metadata.szw) || 1280, ((_attachment2 = attachment) === null || _attachment2 === void 0 ? void 0 : _attachment2.metadata.szh) || 1080),
                       newWidth = _calculateRenderedIma[0],
                       newHeight = _calculateRenderedIma[1];
                     return Promise.resolve(resizeImageWithPica(file, newWidth, newHeight, 1)).then(function (_ref) {
@@ -16382,10 +16431,11 @@ var handleUploadAttachments = function handleUploadAttachments(attachments, mess
               });
             } else {
               var _temp11 = function () {
-                if (!attachment.cachedUrl && attachment.url.type.split('/')[0] === 'video') {
+                if (!attachment.cachedUrl && fileType === 'video') {
                   var _temp7 = function () {
                     if (blobLocal) {
-                      var _calculateRenderedIma2 = calculateRenderedImageWidth((attachment === null || attachment === void 0 ? void 0 : attachment.metadata.szw) || 1280, (attachment === null || attachment === void 0 ? void 0 : attachment.metadata.szh) || 1080),
+                      var _attachment3, _attachment4;
+                      var _calculateRenderedIma2 = calculateRenderedImageWidth(((_attachment3 = attachment) === null || _attachment3 === void 0 ? void 0 : _attachment3.metadata.szw) || 1280, ((_attachment4 = attachment) === null || _attachment4 === void 0 ? void 0 : _attachment4.metadata.szh) || 1080),
                         newWidth = _calculateRenderedIma2[0],
                         newHeight = _calculateRenderedIma2[1];
                       return Promise.resolve(getVideoFirstFrame(blobLocal, newWidth, newHeight)).then(function (result) {
@@ -16443,7 +16493,19 @@ var handleUploadAttachments = function handleUploadAttachments(attachments, mess
             total = _ref2.total;
           store.dispatch(updateAttachmentUploadingProgressAC(loaded, total, attachment.tid));
         };
-        var fileType = attachment.url.type.split('/')[0];
+        if (!attachment.cachedUrl && !(attachment.url instanceof Blob)) {
+          var _getPendingAttachment;
+          var pendingFile = (_getPendingAttachment = getPendingAttachment(attachment.tid)) === null || _getPendingAttachment === void 0 ? void 0 : _getPendingAttachment.file;
+          if (pendingFile instanceof Blob) {
+            attachment = _extends({}, attachment, {
+              url: pendingFile,
+              data: pendingFile
+            });
+          } else {
+            throw createAttachmentUnavailableError("Attachment file for tid " + attachment.tid + " is no longer available for upload");
+          }
+        }
+        var fileType = (_attachment$url = attachment.url) === null || _attachment$url === void 0 ? void 0 : (_attachment$url$type = _attachment$url.type) === null || _attachment$url$type === void 0 ? void 0 : _attachment$url$type.split('/')[0];
         var fileSize = attachment.size;
         var filePath;
         var uriLocal;
@@ -16946,11 +17008,19 @@ function sendMessage(action) {
           break;
         }
         _loop2 = /*#__PURE__*/_regenerator().m(function _callee3() {
-          var attachment, uri, attachmentBuilder, messageAttachment, handleUpdateUploadProgress, _messageBuilder, _messageToSend, messageForSend, _pending;
+          var attachment, _getPendingAttachment2, pendingFile, uri, attachmentBuilder, messageAttachment, handleUpdateUploadProgress, _messageBuilder, _messageToSend, messageForSend, _pending;
           return _regenerator().w(function (_context11) {
             while (1) switch (_context11.n) {
               case 0:
                 attachment = mediaAttachments[i];
+                if (customUploader && !attachment.cachedUrl && !(attachment.data instanceof Blob)) {
+                  pendingFile = (_getPendingAttachment2 = getPendingAttachment(attachment.tid)) === null || _getPendingAttachment2 === void 0 ? void 0 : _getPendingAttachment2.file;
+                  if (pendingFile instanceof Blob) {
+                    attachment = _extends({}, attachment, {
+                      data: pendingFile
+                    });
+                  }
+                }
                 if (attachment.cachedUrl) {
                   uri = attachment.cachedUrl;
                 }
@@ -17251,6 +17321,9 @@ function sendMessage(action) {
                 return effects.call(channel.sendMessage, messageToSend);
               case 5:
                 messageResponse = _context12.v;
+                if (messageToSend.tid) {
+                  autoResendAttempts["delete"](messageToSend.tid);
+                }
                 if (!customUploader) {
                   _context12.n = 10;
                   break;
@@ -17783,12 +17856,17 @@ function forwardMessage(action) {
 }
 function resendMessage(action) {
   var _message$attachments;
-  var payload, message, connectionState, channelId, attachments, sendAttachmentsAsSeparateMessage, isVoiceMessage;
+  var payload, payloadMessage, connectionState, channelId, liveMessage, message, attachments, sendAttachmentsAsSeparateMessage, isVoiceMessage;
   return _regenerator().w(function (_context16) {
     while (1) switch (_context16.n) {
       case 0:
         payload = action.payload;
-        message = payload.message, connectionState = payload.connectionState, channelId = payload.channelId;
+        payloadMessage = payload.message, connectionState = payload.connectionState, channelId = payload.channelId;
+        liveMessage = payloadMessage !== null && payloadMessage !== void 0 && payloadMessage.tid || payloadMessage !== null && payloadMessage !== void 0 && payloadMessage.id ? getMessageFromMap(channelId, payloadMessage.tid || payloadMessage.id) : null;
+        message = liveMessage || payloadMessage;
+        if (message !== null && message !== void 0 && message.tid || message !== null && message !== void 0 && message.id) {
+          autoResendAttempts["delete"](message.tid || message.id);
+        }
         attachments = message === null || message === void 0 ? void 0 : (_message$attachments = message.attachments) === null || _message$attachments === void 0 ? void 0 : _message$attachments.filter(function (att) {
           return (att === null || att === void 0 ? void 0 : att.type) !== attachmentTypes.link;
         });
@@ -17983,7 +18061,7 @@ function editMessage(action) {
   }, _marked14, null, [[0, 8]]);
 }
 var sendPendingMessages = /*#__PURE__*/_regenerator().m(function _callee5(connectionState) {
-  var pendingMessagesMap, channelId, _iterator3, _step3, _msg$attachments, msg, attachments, pendingPollActionsMap, _t7, _t8, _t9;
+  var pendingMessagesMap, channelId, _iterator3, _step3, _msg$attachments, msg, attachments, resendKey, attempts, pendingPollActionsMap, _t7, _t8, _t9;
   return _regenerator().w(function (_context19) {
     while (1) switch (_context19.p = _context19.n) {
       case 0:
@@ -17991,26 +18069,41 @@ var sendPendingMessages = /*#__PURE__*/_regenerator().m(function _callee5(connec
         _t7 = _regeneratorKeys(pendingMessagesMap);
       case 1:
         if ((_t8 = _t7()).done) {
-          _context19.n = 12;
+          _context19.n = 13;
           break;
         }
         channelId = _t8.value;
         _iterator3 = _createForOfIteratorHelperLoose(pendingMessagesMap[channelId]);
       case 2:
         if ((_step3 = _iterator3()).done) {
-          _context19.n = 11;
+          _context19.n = 12;
           break;
         }
         msg = _step3.value;
         attachments = msg === null || msg === void 0 ? void 0 : (_msg$attachments = msg.attachments) === null || _msg$attachments === void 0 ? void 0 : _msg$attachments.filter(function (att) {
           return (att === null || att === void 0 ? void 0 : att.type) !== attachmentTypes.link;
         });
-        _context19.p = 3;
+        resendKey = (msg === null || msg === void 0 ? void 0 : msg.tid) || (msg === null || msg === void 0 ? void 0 : msg.id);
+        if (!resendKey) {
+          _context19.n = 4;
+          break;
+        }
+        attempts = autoResendAttempts.get(resendKey) || 0;
+        if (!(attempts >= MAX_AUTO_RESEND_ATTEMPTS)) {
+          _context19.n = 3;
+          break;
+        }
+        log.info("Skipping auto-resend of message " + resendKey + " after " + attempts + " failed attempts");
+        return _context19.a(3, 11);
+      case 3:
+        autoResendAttempts.set(resendKey, attempts + 1);
+      case 4:
+        _context19.p = 4;
         if (!(msg !== null && msg !== void 0 && msg.forwardingDetails)) {
-          _context19.n = 5;
+          _context19.n = 6;
           break;
         }
-        _context19.n = 4;
+        _context19.n = 5;
         return effects.call(forwardMessage, {
           type: RESEND_MESSAGE,
           payload: {
@@ -18020,15 +18113,15 @@ var sendPendingMessages = /*#__PURE__*/_regenerator().m(function _callee5(connec
             isForward: true
           }
         });
-      case 4:
-        _context19.n = 8;
-        break;
       case 5:
+        _context19.n = 9;
+        break;
+      case 6:
         if (!(attachments && attachments.length > 0)) {
-          _context19.n = 7;
+          _context19.n = 8;
           break;
         }
-        _context19.n = 6;
+        _context19.n = 7;
         return effects.call(sendMessage, {
           type: RESEND_MESSAGE,
           payload: {
@@ -18038,11 +18131,11 @@ var sendPendingMessages = /*#__PURE__*/_regenerator().m(function _callee5(connec
             sendAttachmentsAsSeparateMessage: false
           }
         });
-      case 6:
-        _context19.n = 8;
-        break;
       case 7:
-        _context19.n = 8;
+        _context19.n = 9;
+        break;
+      case 8:
+        _context19.n = 9;
         return effects.call(sendTextMessage, {
           type: RESEND_MESSAGE,
           payload: {
@@ -18051,31 +18144,31 @@ var sendPendingMessages = /*#__PURE__*/_regenerator().m(function _callee5(connec
             channelId: channelId
           }
         });
-      case 8:
-        _context19.n = 10;
-        break;
       case 9:
-        _context19.p = 9;
+        _context19.n = 11;
+        break;
+      case 10:
+        _context19.p = 10;
         _t9 = _context19.v;
         log.error("Failed to send pending message " + (msg.tid || msg.id) + ":", _t9);
-      case 10:
+      case 11:
         _context19.n = 2;
         break;
-      case 11:
+      case 12:
         _context19.n = 1;
         break;
-      case 12:
+      case 13:
         pendingPollActionsMap = store.getState().MessageReducer.pendingPollActions;
         if (!(pendingPollActionsMap && Object.keys(pendingPollActionsMap).length > 0)) {
-          _context19.n = 13;
+          _context19.n = 14;
           break;
         }
-        _context19.n = 13;
+        _context19.n = 14;
         return effects.put(resendPendingPollActionsAC(connectionState));
-      case 13:
+      case 14:
         return _context19.a(2);
     }
-  }, _callee5, null, [[3, 9]]);
+  }, _callee5, null, [[4, 10]]);
 });
 var shouldAppendPendingMessages = function shouldAppendPendingMessages(channelOrId, messages, options) {
   var _getStoredChannel9, _getStoredChannel9$la, _channelOrId$lastMess;
@@ -18300,7 +18393,7 @@ function loadOGMetadataForLinkMessages(messages, getFromServer) {
     getFromServer = true;
   }
   return /*#__PURE__*/_regenerator().m(function _callee6() {
-    var i, _message$attachments2, message, isOnlyLinkAttachments, firstAttachment, j, _attachment, _firstAttachment, _store$getState$Messa, _firstAttachment2, _firstAttachment3, _firstAttachment4, metadata, storedData;
+    var i, _message$attachments2, message, isOnlyLinkAttachments, firstAttachment, j, _attachment5, _firstAttachment, _store$getState$Messa, _firstAttachment2, _firstAttachment3, _firstAttachment4, metadata, storedData;
     return _regenerator().w(function (_context22) {
       while (1) switch (_context22.n) {
         case 0:
@@ -18329,13 +18422,13 @@ function loadOGMetadataForLinkMessages(messages, getFromServer) {
             _context22.n = 6;
             break;
           }
-          _attachment = message.attachments[j];
-          if (!(_attachment.type === attachmentTypes.link)) {
+          _attachment5 = message.attachments[j];
+          if (!(_attachment5.type === attachmentTypes.link)) {
             _context22.n = 4;
             break;
           }
           if (!firstAttachment) {
-            firstAttachment = _attachment;
+            firstAttachment = _attachment5;
           }
           _context22.n = 5;
           break;
@@ -19412,7 +19505,7 @@ function loadDefaultMessages(action) {
       case 4:
         messageQuery = _t24;
         query.messageQuery = messageQuery;
-        cachedMessages = getLatestMessagesFromMap(channel.id, MESSAGES_MAX_PAGE_COUNT);
+        cachedMessages = getLatestContiguousMessagesFromMap(channel.id, MESSAGES_MAX_PAGE_COUNT);
         if (!(cachedMessages && cachedMessages.length)) {
           _context32.n = 9;
           break;
@@ -19716,7 +19809,7 @@ function getMessagesQuery(action) {
         _context33.n = 22;
         break;
       case 17:
-        cachedMessages = getLatestMessagesFromMap(channel.id, MESSAGES_MAX_PAGE_COUNT);
+        cachedMessages = getLatestContiguousMessagesFromMap(channel.id, MESSAGES_MAX_PAGE_COUNT);
         cacheIsCurrent = !networkChanged && cachedMessages.length > 0 && getLastConfirmedMessageId(cachedMessages) === ((_channel$lastMessage1 = channel.lastMessage) === null || _channel$lastMessage1 === void 0 ? void 0 : _channel$lastMessage1.id);
         if (!cacheIsCurrent) {
           _context33.n = 18;
@@ -25292,52 +25385,81 @@ function watchForEvents() {
   }, _marked8$1);
 }
 
+var READ_MESSAGE_LOG_KEY_ALIASES = {
+  source: 's',
+  channelId: 'ch',
+  readAll: 'ra',
+  messageIds: 'mi',
+  messageId: 'm',
+  connectionStatus: 'cs',
+  attempts: 'at',
+  retryDelayMs: 'rd',
+  requestedMessageIds: 'rq',
+  confirmedMessageIds: 'cf',
+  isVisible: 'iv',
+  alreadyRead: 'ar',
+  disableAutoReadTracking: 'da',
+  isTabActive: 'ta',
+  newMessageCount: 'nm',
+  queued: 'q',
+  localRef: 'lr',
+  visibleCandidateIds: 'vc',
+  unreadScrollTo: 'us',
+  pendingFrameScheduled: 'pf'
+};
+var compactReadMessageLogData = function compactReadMessageLogData(data) {
+  return JSON.stringify(Object.fromEntries(Object.entries(data).map(function (_ref) {
+    var key = _ref[0],
+      value = _ref[1];
+    return [READ_MESSAGE_LOG_KEY_ALIASES[key] || key.slice(0, 2), value];
+  })));
+};
+
 var _marked$3 = /*#__PURE__*/_regenerator().m(applyChannelReadProgress),
-  _marked2$3 = /*#__PURE__*/_regenerator().m(confirmDisplayedRead),
-  _marked3$2 = /*#__PURE__*/_regenerator().m(createChannel),
-  _marked4$2 = /*#__PURE__*/_regenerator().m(getChannels),
-  _marked5$2 = /*#__PURE__*/_regenerator().m(searchChannels),
-  _marked6$2 = /*#__PURE__*/_regenerator().m(getChannelsForForward),
-  _marked7$2 = /*#__PURE__*/_regenerator().m(searchChannelsForForward),
-  _marked8$2 = /*#__PURE__*/_regenerator().m(channelsLoadMore),
-  _marked9$1 = /*#__PURE__*/_regenerator().m(getChannelMentions),
-  _marked0$1 = /*#__PURE__*/_regenerator().m(channelsForForwardLoadMore),
-  _marked1$1 = /*#__PURE__*/_regenerator().m(markMessagesRead),
-  _marked10$1 = /*#__PURE__*/_regenerator().m(markVoiceMessageAsPlayed),
-  _marked11$1 = /*#__PURE__*/_regenerator().m(updateMessageAsOpened),
-  _marked12$1 = /*#__PURE__*/_regenerator().m(markMessageAsOpened),
-  _marked13$1 = /*#__PURE__*/_regenerator().m(markMessagesDelivered),
-  _marked14$1 = /*#__PURE__*/_regenerator().m(switchChannel),
-  _marked15$1 = /*#__PURE__*/_regenerator().m(notificationsTurnOff),
-  _marked16$1 = /*#__PURE__*/_regenerator().m(notificationsTurnOn),
-  _marked17$1 = /*#__PURE__*/_regenerator().m(markChannelAsRead),
-  _marked18$1 = /*#__PURE__*/_regenerator().m(resendPendingChannelReads),
-  _marked19$1 = /*#__PURE__*/_regenerator().m(markChannelAsUnRead),
-  _marked20$1 = /*#__PURE__*/_regenerator().m(pinChannel),
-  _marked21$1 = /*#__PURE__*/_regenerator().m(unpinChannel),
-  _marked22$1 = /*#__PURE__*/_regenerator().m(removeChannelCaches),
-  _marked23$1 = /*#__PURE__*/_regenerator().m(leaveChannel),
-  _marked24$1 = /*#__PURE__*/_regenerator().m(deletePendingDeleteChannels),
-  _marked25$1 = /*#__PURE__*/_regenerator().m(deleteChannel),
-  _marked26$1 = /*#__PURE__*/_regenerator().m(blockChannel),
-  _marked27$1 = /*#__PURE__*/_regenerator().m(updateChannel),
-  _marked28$1 = /*#__PURE__*/_regenerator().m(checkUsersStatus),
-  _marked29$1 = /*#__PURE__*/_regenerator().m(sendTyping),
-  _marked30$1 = /*#__PURE__*/_regenerator().m(sendRecording),
-  _marked31$1 = /*#__PURE__*/_regenerator().m(clearHistory),
-  _marked32$1 = /*#__PURE__*/_regenerator().m(deleteAllMessages),
-  _marked33$1 = /*#__PURE__*/_regenerator().m(joinChannel),
-  _marked34$1 = /*#__PURE__*/_regenerator().m(watchForChannelEvents),
-  _marked35$1 = /*#__PURE__*/_regenerator().m(createChannelInviteKey),
-  _marked36$1 = /*#__PURE__*/_regenerator().m(getChannelInviteKeys),
-  _marked37$1 = /*#__PURE__*/_regenerator().m(regenerateChannelInviteKey),
-  _marked38$1 = /*#__PURE__*/_regenerator().m(updateChannelInviteKey),
-  _marked39$1 = /*#__PURE__*/_regenerator().m(getChannelByInviteKey),
-  _marked40$1 = /*#__PURE__*/_regenerator().m(joinChannelWithInviteKey),
-  _marked41$1 = /*#__PURE__*/_regenerator().m(setMessageRetentionPeriod),
-  _marked42$1 = /*#__PURE__*/_regenerator().m(getChannelsWithUser),
-  _marked43$1 = /*#__PURE__*/_regenerator().m(loadMoreMutualChannels),
-  _marked44$1 = /*#__PURE__*/_regenerator().m(ChannelsSaga);
+  _marked2$3 = /*#__PURE__*/_regenerator().m(createChannel),
+  _marked3$2 = /*#__PURE__*/_regenerator().m(getChannels),
+  _marked4$2 = /*#__PURE__*/_regenerator().m(searchChannels),
+  _marked5$2 = /*#__PURE__*/_regenerator().m(getChannelsForForward),
+  _marked6$2 = /*#__PURE__*/_regenerator().m(searchChannelsForForward),
+  _marked7$2 = /*#__PURE__*/_regenerator().m(channelsLoadMore),
+  _marked8$2 = /*#__PURE__*/_regenerator().m(getChannelMentions),
+  _marked9$1 = /*#__PURE__*/_regenerator().m(channelsForForwardLoadMore),
+  _marked0$1 = /*#__PURE__*/_regenerator().m(markMessagesRead),
+  _marked1$1 = /*#__PURE__*/_regenerator().m(markVoiceMessageAsPlayed),
+  _marked10$1 = /*#__PURE__*/_regenerator().m(updateMessageAsOpened),
+  _marked11$1 = /*#__PURE__*/_regenerator().m(markMessageAsOpened),
+  _marked12$1 = /*#__PURE__*/_regenerator().m(markMessagesDelivered),
+  _marked13$1 = /*#__PURE__*/_regenerator().m(switchChannel),
+  _marked14$1 = /*#__PURE__*/_regenerator().m(notificationsTurnOff),
+  _marked15$1 = /*#__PURE__*/_regenerator().m(notificationsTurnOn),
+  _marked16$1 = /*#__PURE__*/_regenerator().m(markChannelAsRead),
+  _marked17$1 = /*#__PURE__*/_regenerator().m(resendPendingChannelReads),
+  _marked18$1 = /*#__PURE__*/_regenerator().m(markChannelAsUnRead),
+  _marked19$1 = /*#__PURE__*/_regenerator().m(pinChannel),
+  _marked20$1 = /*#__PURE__*/_regenerator().m(unpinChannel),
+  _marked21$1 = /*#__PURE__*/_regenerator().m(removeChannelCaches),
+  _marked22$1 = /*#__PURE__*/_regenerator().m(leaveChannel),
+  _marked23$1 = /*#__PURE__*/_regenerator().m(deletePendingDeleteChannels),
+  _marked24$1 = /*#__PURE__*/_regenerator().m(deleteChannel),
+  _marked25$1 = /*#__PURE__*/_regenerator().m(blockChannel),
+  _marked26$1 = /*#__PURE__*/_regenerator().m(updateChannel),
+  _marked27$1 = /*#__PURE__*/_regenerator().m(checkUsersStatus),
+  _marked28$1 = /*#__PURE__*/_regenerator().m(sendTyping),
+  _marked29$1 = /*#__PURE__*/_regenerator().m(sendRecording),
+  _marked30$1 = /*#__PURE__*/_regenerator().m(clearHistory),
+  _marked31$1 = /*#__PURE__*/_regenerator().m(deleteAllMessages),
+  _marked32$1 = /*#__PURE__*/_regenerator().m(joinChannel),
+  _marked33$1 = /*#__PURE__*/_regenerator().m(watchForChannelEvents),
+  _marked34$1 = /*#__PURE__*/_regenerator().m(createChannelInviteKey),
+  _marked35$1 = /*#__PURE__*/_regenerator().m(getChannelInviteKeys),
+  _marked36$1 = /*#__PURE__*/_regenerator().m(regenerateChannelInviteKey),
+  _marked37$1 = /*#__PURE__*/_regenerator().m(updateChannelInviteKey),
+  _marked38$1 = /*#__PURE__*/_regenerator().m(getChannelByInviteKey),
+  _marked39$1 = /*#__PURE__*/_regenerator().m(joinChannelWithInviteKey),
+  _marked40$1 = /*#__PURE__*/_regenerator().m(setMessageRetentionPeriod),
+  _marked41$1 = /*#__PURE__*/_regenerator().m(getChannelsWithUser),
+  _marked42$1 = /*#__PURE__*/_regenerator().m(loadMoreMutualChannels),
+  _marked43$1 = /*#__PURE__*/_regenerator().m(ChannelsSaga);
 var getUniqueMessageIds = function getUniqueMessageIds(messageIds) {
   if (messageIds === void 0) {
     messageIds = [];
@@ -25439,80 +25561,104 @@ function applyChannelReadProgress(channelId, updateData) {
 var shouldKeepQueuedPendingRead = function shouldKeepQueuedPendingRead(error) {
   return isResendableError(error === null || error === void 0 ? void 0 : error.type);
 };
-function confirmDisplayedRead(channel, pendingRead) {
-  var messageIds, attempt, connectionStatus, messageListMarker, _t;
-  return _regenerator().w(function (_context2) {
-    while (1) switch (_context2.p = _context2.n) {
-      case 0:
-        messageIds = getUniqueMessageIds(pendingRead.messageIds);
-        attempt = 0;
-      case 1:
-        if (!(attempt <= READ_MARKER_RETRY_DELAYS_MS.length)) {
-          _context2.n = 10;
-          break;
-        }
-        connectionStatus = store.getState().UserReducer.connectionStatus;
-        if (!(connectionStatus !== CONNECTION_STATUS.CONNECTED)) {
-          _context2.n = 2;
-          break;
-        }
-        return _context2.a(2, {
-          status: 'queued'
-        });
-      case 2:
-        _context2.p = 2;
-        if (!pendingRead.readAll) {
-          _context2.n = 4;
-          break;
-        }
-        _context2.n = 3;
-        return effects.call(channel.markAsRead);
-      case 3:
-        return _context2.a(2, {
-          status: 'success'
-        });
-      case 4:
-        _context2.n = 5;
-        return effects.call(channel.markMessagesAsDisplayed, messageIds);
-      case 5:
-        messageListMarker = _context2.v;
-        return _context2.a(2, {
-          status: 'success',
-          messageListMarker: messageListMarker
-        });
-      case 6:
-        _context2.p = 6;
-        _t = _context2.v;
-        if (shouldKeepQueuedPendingRead(_t)) {
-          _context2.n = 7;
-          break;
-        }
-        return _context2.a(2, {
-          status: 'drop',
-          error: _t
-        });
-      case 7:
-        if (!(attempt === READ_MARKER_RETRY_DELAYS_MS.length)) {
-          _context2.n = 8;
+var getReadMarkerLogContext = function getReadMarkerLogContext(pendingRead, source, messageIds) {
+  return {
+    source: source,
+    channelId: pendingRead.channelId,
+    readAll: pendingRead.readAll,
+    messageIds: messageIds
+  };
+};
+function confirmDisplayedRead(channel, pendingRead, source) {
+  if (source === void 0) {
+    source = 'initial';
+  }
+  return /*#__PURE__*/_regenerator().m(function _callee() {
+    var messageIds, logContext, attempt, connectionStatus, messageListMarker, _t;
+    return _regenerator().w(function (_context2) {
+      while (1) switch (_context2.p = _context2.n) {
+        case 0:
+          messageIds = getUniqueMessageIds(pendingRead.messageIds);
+          logContext = getReadMarkerLogContext(pendingRead, source, messageIds);
+          attempt = 0;
+        case 1:
+          if (!(attempt <= READ_MARKER_RETRY_DELAYS_MS.length)) {
+            _context2.n = 10;
+            break;
+          }
+          connectionStatus = store.getState().UserReducer.connectionStatus;
+          if (!(connectionStatus !== CONNECTION_STATUS.CONNECTED)) {
+            _context2.n = 2;
+            break;
+          }
+          log.warn('[READ_MESSAGE] Queued read marker because connection is not ready', compactReadMessageLogData(_extends({}, logContext, {
+            connectionStatus: connectionStatus
+          })));
+          return _context2.a(2, {
+            status: 'queued'
+          });
+        case 2:
+          _context2.p = 2;
+          if (!pendingRead.readAll) {
+            _context2.n = 4;
+            break;
+          }
+          _context2.n = 3;
+          return effects.call(channel.markAsRead);
+        case 3:
+          return _context2.a(2, {
+            status: 'success'
+          });
+        case 4:
+          _context2.n = 5;
+          return effects.call(channel.markMessagesAsDisplayed, messageIds);
+        case 5:
+          messageListMarker = _context2.v;
+          return _context2.a(2, {
+            status: 'success',
+            messageListMarker: messageListMarker
+          });
+        case 6:
+          _context2.p = 6;
+          _t = _context2.v;
+          if (shouldKeepQueuedPendingRead(_t)) {
+            _context2.n = 7;
+            break;
+          }
+          log.error(_t, '[READ_MESSAGE] Dropping read marker after non-resendable error', compactReadMessageLogData(logContext));
+          return _context2.a(2, {
+            status: 'drop',
+            error: _t
+          });
+        case 7:
+          if (!(attempt === READ_MARKER_RETRY_DELAYS_MS.length)) {
+            _context2.n = 8;
+            break;
+          }
+          log.error(_t, '[READ_MESSAGE] Exhausted read marker retries; keeping queued for replay', compactReadMessageLogData(_extends({}, logContext, {
+            attempts: attempt + 1
+          })));
+          return _context2.a(2, {
+            status: 'queued',
+            error: _t
+          });
+        case 8:
+          log.warn(_t, "[READ_MESSAGE] Retrying read marker (" + (attempt + 1) + "/" + READ_MARKER_RETRY_DELAYS_MS.length + ")", compactReadMessageLogData(_extends({}, logContext, {
+            retryDelayMs: READ_MARKER_RETRY_DELAYS_MS[attempt]
+          })));
+          _context2.n = 9;
+          return effects.call(waitForReadMarkerRetry, READ_MARKER_RETRY_DELAYS_MS[attempt]);
+        case 9:
+          attempt++;
+          _context2.n = 1;
           break;
-        }
-        return _context2.a(2, {
-          status: 'queued',
-          error: _t
-        });
-      case 8:
-        _context2.n = 9;
-        return effects.call(waitForReadMarkerRetry, READ_MARKER_RETRY_DELAYS_MS[attempt]);
-      case 9:
-        attempt++;
-        _context2.n = 1;
-        break;
-      case 10:
-        return _context2.a(2, {
-          status: 'queued'
-        });
-    }
-  }, _marked2$3, null, [[2, 6]]);
+        case 10:
+          return _context2.a(2, {
+            status: 'queued'
+          });
+      }
+    }, _callee, null, [[2, 6]]);
+  })();
 }
 function createChannel(action) {
   var payload, channelData, dontCreateIfNotExists, callback, SceytChatClient, createChannelData, fileToUpload, isSelfChannel, channelIsExistOnAllChannels, createdChannel, allChannels, memberId, whoDoesNotAdded, checkChannelExist, messageToSend, _allChannels, _memberId, _t2;
@@ -25710,7 +25856,7 @@ function createChannel(action) {
       case 19:
         return _context3.a(2);
     }
-  }, _marked3$2, null, [[0, 18]]);
+  }, _marked2$3, null, [[0, 18]]);
 }
 function getChannels(action) {
   var _params$filter, _types, _activeChannel, _mappedChannels, _mappedChannels3, _mappedChannels4, payload, params, SceytChatClient, connectionStatus, channelQueryBuilder, channelTypesFilter, types, limit, channelQuery, channelsData, channelList, channelId, activeChannel, pendingLastMessages, _yield$call, mappedChannels, channelsForUpdateLastReactionMessage, _loop, _i, _Object$keys, _Object$keys2, _Object$keys3, _mappedChannels2, channelMessageMap, _iterator, _step, _lastMsg$userMarkers, ch, lastMsg, _activeChannel2, _activeChannel3, hiddenList, allChannelsQueryBuilder, allChannelsQuery, hasNext, totalAllChannelsAdded, i, _connectionStatus, allChannelsData, allChannelList, _t3, _t4, _t5;
@@ -25808,7 +25954,7 @@ function getChannels(action) {
         _yield$call = _context5.v;
         mappedChannels = _yield$call.channels;
         channelsForUpdateLastReactionMessage = _yield$call.channelsForUpdateLastReactionMessage;
-        _loop = /*#__PURE__*/_regenerator().m(function _callee() {
+        _loop = /*#__PURE__*/_regenerator().m(function _callee2() {
           var _store$getState$Chann;
           var channelId, pendingLastMessage, currentReduxLastMessage, resolvedLastMessage, mappedChannel, mapEntry;
           return _regenerator().w(function (_context4) {
@@ -25835,7 +25981,7 @@ function getChannels(action) {
               case 1:
                 return _context4.a(2);
             }
-          }, _callee);
+          }, _callee2);
         });
         _i = 0, _Object$keys = Object.keys(pendingLastMessages);
       case 14:
@@ -26029,7 +26175,7 @@ function getChannels(action) {
       case 38:
         return _context5.a(2);
     }
-  }, _marked4$2, null, [[27, 30], [1, 37]]);
+  }, _marked3$2, null, [[27, 30], [1, 37]]);
 }
 function searchChannels(action) {
   var payload, params, contactsMap, SceytChatClient, getFromContacts, searchBy, _params$filter2, _types2, channelQueryBuilder, channelTypesFilter, types, allChannels, publicChannels, chatsGroups, contactsList, contactsWithChannelsMap, lowerCaseSearchBy, handleChannels, channelsMap, _iterator2, _step2, channel, channelQuery, channelsData, _iterator3, _step3, _channel, channelsToAdd, _t6;
@@ -26162,7 +26308,7 @@ function searchChannels(action) {
       case 8:
         return _context6.a(2);
     }
-  }, _marked5$2, null, [[0, 7]]);
+  }, _marked4$2, null, [[0, 7]]);
 }
 function getChannelsForForward() {
   var _SceytChatClient, channelQueryBuilder, channelTypesFilter, channelQuery, channelsData, channelsToAdd, _yield$call2, mappedChannels, _t7;
@@ -26220,7 +26366,7 @@ function getChannelsForForward() {
       case 9:
         return _context7.a(2);
     }
-  }, _marked6$2, null, [[0, 8]]);
+  }, _marked5$2, null, [[0, 8]]);
 }
 function searchChannelsForForward(action) {
   var payload, params, _contactsMap, _SceytChatClient2, _getFromContacts, searchBy, _params$filter3, _types3, channelQueryBuilder, channelTypesFilter, types, allChannels, _publicChannels, _chatsGroups, contactsList, _contactsWithChannelsMap, _lowerCaseSearchBy, handleChannels, channelsMap, _iterator4, _step4, channel, channelQuery, channelsData, _iterator5, _step5, _channel2, channelsToAdd, _t8;
@@ -26352,7 +26498,7 @@ function searchChannelsForForward(action) {
       case 8:
         return _context8.a(2);
     }
-  }, _marked7$2, null, [[0, 7]]);
+  }, _marked6$2, null, [[0, 7]]);
 }
 function channelsLoadMore(action) {
   var _mappedChannels5, _mappedChannels7, _mappedChannels8, payload, limit, channelQuery, channelsData, channelList, _yield$call3, mappedChannels, channelsForUpdateLastReactionMessage, _Object$keys4, _mappedChannels6, channelMessageMap, _t9;
@@ -26473,7 +26619,7 @@ function channelsLoadMore(action) {
       case 13:
         return _context9.a(2);
     }
-  }, _marked8$2, null, [[1, 12]]);
+  }, _marked7$2, null, [[1, 12]]);
 }
 function getChannelMentions(action) {
   var payload, channelId, _SceytChatClient3, mentionsQueryBuilder, mentionsQuery, mentions, _t0;
@@ -26510,7 +26656,7 @@ function getChannelMentions(action) {
       case 5:
         return _context0.a(2);
     }
-  }, _marked9$1, null, [[0, 4]]);
+  }, _marked8$2, null, [[0, 4]]);
 }
 function channelsForForwardLoadMore(action) {
   var payload, limit, _SceytChatClient4, channelQueryForward, channelsData, channelsToAdd, _yield$call4, mappedChannels, _t1;
@@ -26561,10 +26707,10 @@ function channelsForForwardLoadMore(action) {
       case 8:
         return _context1.a(2);
     }
-  }, _marked0$1, null, [[0, 7]]);
+  }, _marked9$1, null, [[0, 7]]);
 }
 function markMessagesRead(action) {
-  var payload, channelId, messageIds, requestedMessageIds, channel, _confirmation$message, optimisticUpdate, pendingRead, confirmation, queuedPendingRead, readMessageIds, _iterator6, _step6, _confirmation$message2, _confirmation$message3, messageId, updateParams, _t10;
+  var payload, channelId, messageIds, requestedMessageIds, _confirmation$message, channel, optimisticUpdate, pendingRead, confirmation, queuedPendingRead, _queuedPendingRead, readMessageIds, _iterator6, _step6, _confirmation$message2, _confirmation$message3, messageId, updateParams, _t10;
   return _regenerator().w(function (_context10) {
     while (1) switch (_context10.p = _context10.n) {
       case 0:
@@ -26575,57 +26721,85 @@ function markMessagesRead(action) {
           _context10.n = 1;
           break;
         }
+        log.warn('[READ_MESSAGE] Skipping read marker because message id list is empty', compactReadMessageLogData({
+          source: 'initial',
+          channelId: channelId,
+          readAll: false,
+          messageIds: messageIds
+        }));
         return _context10.a(2);
       case 1:
         _context10.p = 1;
+        log.info('[READ_MESSAGE] Received markMessagesRead action', compactReadMessageLogData({
+          source: 'initial',
+          channelId: channelId,
+          readAll: false,
+          messageIds: requestedMessageIds
+        }));
         _context10.n = 2;
         return effects.call(getStoredChannel$2, channelId);
       case 2:
         channel = _context10.v;
-        if (!channel) {
-          _context10.n = 11;
+        if (channel) {
+          _context10.n = 3;
           break;
         }
+        log.warn('[READ_MESSAGE] Cannot mark messages as read because channel was not found', compactReadMessageLogData({
+          channelId: channelId,
+          messageIds: requestedMessageIds
+        }));
+        return _context10.a(2);
+      case 3:
         optimisticUpdate = deriveChannelReadProgressUpdate({
           channel: channel,
           messageIds: requestedMessageIds
         });
-        _context10.n = 3;
+        _context10.n = 4;
         return effects.call(applyChannelReadProgress, channel.id, optimisticUpdate);
-      case 3:
+      case 4:
         pendingRead = setPendingChannelRead({
           channelId: channel.id,
           messageIds: requestedMessageIds
         });
-        _context10.n = 4;
-        return effects.call(confirmDisplayedRead, channel, pendingRead);
-      case 4:
+        _context10.n = 5;
+        return effects.call(confirmDisplayedRead, channel, pendingRead, 'initial');
+      case 5:
         confirmation = _context10.v;
         if (!(confirmation.status === 'success')) {
-          _context10.n = 5;
+          _context10.n = 6;
           break;
         }
         queuedPendingRead = getPendingChannelRead(channel.id);
         if ((queuedPendingRead === null || queuedPendingRead === void 0 ? void 0 : queuedPendingRead.queuedAt) === (pendingRead === null || pendingRead === void 0 ? void 0 : pendingRead.queuedAt)) {
           removePendingChannelRead(channel.id);
         }
-        _context10.n = 7;
+        _context10.n = 8;
         break;
-      case 5:
+      case 6:
         if (!(confirmation.status === 'drop')) {
-          _context10.n = 6;
+          _context10.n = 7;
           break;
         }
-        removePendingChannelRead(channel.id);
-        return _context10.a(2);
-      case 6:
+        _queuedPendingRead = getPendingChannelRead(channel.id);
+        if ((_queuedPendingRead === null || _queuedPendingRead === void 0 ? void 0 : _queuedPendingRead.queuedAt) === (pendingRead === null || pendingRead === void 0 ? void 0 : pendingRead.queuedAt)) {
+          removePendingChannelRead(channel.id);
+        }
         return _context10.a(2);
       case 7:
+        return _context10.a(2);
+      case 8:
         readMessageIds = getUniqueMessageIds(((_confirmation$message = confirmation.messageListMarker) === null || _confirmation$message === void 0 ? void 0 : _confirmation$message.messageIds) || requestedMessageIds);
+        log.info('[READ_MESSAGE] Confirmed read marker', compactReadMessageLogData({
+          source: 'initial',
+          channelId: channel.id,
+          readAll: false,
+          requestedMessageIds: requestedMessageIds,
+          confirmedMessageIds: readMessageIds
+        }));
         _iterator6 = _createForOfIteratorHelperLoose(readMessageIds);
-      case 8:
+      case 9:
         if ((_step6 = _iterator6()).done) {
-          _context10.n = 11;
+          _context10.n = 12;
           break;
         }
         messageId = _step6.value;
@@ -26638,27 +26812,27 @@ function markMessagesRead(action) {
             name: MESSAGE_DELIVERY_STATUS.READ
           }]
         };
-        _context10.n = 9;
+        _context10.n = 10;
         return effects.put(updateMessageAC(messageId, updateParams));
-      case 9:
+      case 10:
         updateMessageOnMap(channel.id, {
           messageId: messageId,
           params: updateParams
         });
-      case 10:
-        _context10.n = 8;
-        break;
       case 11:
-        _context10.n = 13;
+        _context10.n = 9;
         break;
       case 12:
-        _context10.p = 12;
+        _context10.n = 14;
+        break;
+      case 13:
+        _context10.p = 13;
         _t10 = _context10.v;
         log.error(_t10, '[READ_MESSAGE] Error on mark messages read');
-      case 13:
+      case 14:
         return _context10.a(2);
     }
-  }, _marked1$1, null, [[1, 12]]);
+  }, _marked0$1, null, [[1, 13]]);
 }
 function markVoiceMessageAsPlayed(action) {
   var payload, channelId, messageIds, connectionStatus, channel, messageListMarker, _iterator7, _step7, messageId, updateParams, _t11;
@@ -26729,7 +26903,7 @@ function markVoiceMessageAsPlayed(action) {
       case 9:
         return _context11.a(2);
     }
-  }, _marked10$1, null, [[1, 8]]);
+  }, _marked1$1, null, [[1, 8]]);
 }
 function updateMessageAsOpened(action) {
   var payload, channelId, messageListMarker, connectionStatus, channel, _iterator8, _step8, messageId, updateParams;
@@ -26788,7 +26962,7 @@ function updateMessageAsOpened(action) {
       case 6:
         return _context12.a(2);
     }
-  }, _marked11$1);
+  }, _marked10$1);
 }
 function markMessageAsOpened(action) {
   var payload, channelId, messageIds, shouldUpdateMessage, connectionStatus, channel, messageListMarker, _t12;
@@ -26839,7 +27013,7 @@ function markMessageAsOpened(action) {
       case 6:
         return _context13.a(2);
     }
-  }, _marked12$1, null, [[1, 5]]);
+  }, _marked11$1, null, [[1, 5]]);
 }
 function markMessagesDelivered(action) {
   var payload, channelId, messageIds, connectionStatus, channel, messageListMarker, _iterator9, _step9, messageId, updateParams, _t13;
@@ -26910,7 +27084,7 @@ function markMessagesDelivered(action) {
       case 9:
         return _context14.a(2);
     }
-  }, _marked13$1, null, [[1, 8]]);
+  }, _marked12$1, null, [[1, 8]]);
 }
 function switchChannel(action) {
   var payload, channel, updateActiveChannel, channelToSwitch, existingChannel, addChannel, _SceytChatClient5, fetchedChannel, channelFromMap, currentActiveChannel, _t14;
@@ -27006,7 +27180,7 @@ function switchChannel(action) {
       case 17:
         return _context15.a(2);
     }
-  }, _marked14$1, null, [[0, 16]]);
+  }, _marked13$1, null, [[0, 16]]);
 }
 function notificationsTurnOff(action) {
   var expireTime, activeChannelId, channel, updatedChannel, _t15;
@@ -27046,7 +27220,7 @@ function notificationsTurnOff(action) {
       case 7:
         return _context16.a(2);
     }
-  }, _marked15$1, null, [[3, 6]]);
+  }, _marked14$1, null, [[3, 6]]);
 }
 function notificationsTurnOn() {
   var activeChannelId, channel, updatedChannel, _t16;
@@ -27085,15 +27259,21 @@ function notificationsTurnOn() {
       case 7:
         return _context17.a(2);
     }
-  }, _marked16$1, null, [[3, 6]]);
+  }, _marked15$1, null, [[3, 6]]);
 }
 function markChannelAsRead(action) {
-  var channelId, channel, optimisticUpdate, pendingRead, confirmation, queuedPendingRead, _t17;
+  var channelId, channel, optimisticUpdate, pendingRead, confirmation, queuedPendingRead, _queuedPendingRead2, _t17;
   return _regenerator().w(function (_context18) {
     while (1) switch (_context18.p = _context18.n) {
       case 0:
         _context18.p = 0;
         channelId = action.payload.channelId;
+        log.info('[READ_MESSAGE] Received markChannelAsRead action', compactReadMessageLogData({
+          source: 'initial',
+          channelId: channelId,
+          readAll: true,
+          messageIds: []
+        }));
         _context18.n = 1;
         return effects.call(getStoredChannel$2, channelId);
       case 1:
@@ -27102,6 +27282,9 @@ function markChannelAsRead(action) {
           _context18.n = 2;
           break;
         }
+        log.warn('[READ_MESSAGE] Cannot mark channel as read because channel was not found', compactReadMessageLogData({
+          channelId: channelId
+        }));
         return _context18.a(2);
       case 2:
         optimisticUpdate = deriveChannelReadProgressUpdate({
@@ -27116,7 +27299,7 @@ function markChannelAsRead(action) {
           readAll: true
         });
         _context18.n = 4;
-        return effects.call(confirmDisplayedRead, channel, pendingRead);
+        return effects.call(confirmDisplayedRead, channel, pendingRead, 'initial');
       case 4:
         confirmation = _context18.v;
         if (!(confirmation.status === 'success')) {
@@ -27127,22 +27310,31 @@ function markChannelAsRead(action) {
         if ((queuedPendingRead === null || queuedPendingRead === void 0 ? void 0 : queuedPendingRead.queuedAt) === (pendingRead === null || pendingRead === void 0 ? void 0 : pendingRead.queuedAt)) {
           removePendingChannelRead(channel.id);
         }
+        log.info('[READ_MESSAGE] Confirmed read marker', compactReadMessageLogData({
+          source: 'initial',
+          channelId: channel.id,
+          readAll: true,
+          requestedMessageIds: [],
+          confirmedMessageIds: []
+        }));
         return _context18.a(2);
       case 5:
         if (confirmation.status === 'drop') {
-          removePendingChannelRead(channel.id);
+          _queuedPendingRead2 = getPendingChannelRead(channel.id);
+          if ((_queuedPendingRead2 === null || _queuedPendingRead2 === void 0 ? void 0 : _queuedPendingRead2.queuedAt) === (pendingRead === null || pendingRead === void 0 ? void 0 : pendingRead.queuedAt)) {
+            removePendingChannelRead(channel.id);
+          }
         }
-        log.error(confirmation.error, 'Error in set channel unread');
         _context18.n = 7;
         break;
       case 6:
         _context18.p = 6;
         _t17 = _context18.v;
-        log.error(_t17, 'Error in set channel unread');
+        log.error(_t17, '[READ_MESSAGE] Error on mark channel as read');
       case 7:
         return _context18.a(2);
     }
-  }, _marked17$1, null, [[0, 6]]);
+  }, _marked16$1, null, [[0, 6]]);
 }
 function resendPendingChannelReads(action) {
   var connectionState, pendingReads, _iterator0, _step0, pendingRead, currentPendingRead, channel, confirmation, latestPendingRead, _confirmation$message4, readMessageIds, _iterator1, _step1, _confirmation$message5, _confirmation$message6, messageId, updateParams, _t18;
@@ -27163,7 +27355,7 @@ function resendPendingChannelReads(action) {
         _iterator0 = _createForOfIteratorHelperLoose(pendingReads);
       case 2:
         if ((_step0 = _iterator0()).done) {
-          _context19.n = 14;
+          _context19.n = 16;
           break;
         }
         pendingRead = _step0.value;
@@ -27178,14 +27370,20 @@ function resendPendingChannelReads(action) {
           _context19.n = 4;
           break;
         }
-        return _context19.a(3, 13);
+        return _context19.a(3, 15);
       case 4:
         if (!(!pendingRead.readAll && !pendingRead.messageIds.length)) {
           _context19.n = 5;
           break;
         }
+        log.warn('[READ_MESSAGE] Dropping queued replay because it has no message ids', compactReadMessageLogData({
+          source: 'replay',
+          channelId: pendingRead.channelId,
+          readAll: pendingRead.readAll,
+          messageIds: pendingRead.messageIds
+        }));
         removePendingChannelRead(pendingRead.channelId);
-        return _context19.a(3, 13);
+        return _context19.a(3, 15);
       case 5:
         _context19.n = 6;
         return effects.call(getStoredChannel$2, pendingRead.channelId);
@@ -27195,11 +27393,18 @@ function resendPendingChannelReads(action) {
           _context19.n = 7;
           break;
         }
+        log.warn('[READ_MESSAGE] Dropping queued replay because channel was not found', compactReadMessageLogData({
+          source: 'replay',
+          channelId: pendingRead.channelId,
+          readAll: pendingRead.readAll,
+          messageIds: pendingRead.messageIds
+        }));
         removePendingChannelRead(pendingRead.channelId);
-        return _context19.a(3, 13);
+        return _context19.a(3, 15);
       case 7:
+        log.info('[READ_MESSAGE] Replaying queued read marker', compactReadMessageLogData(getReadMarkerLogContext(pendingRead, 'replay', pendingRead.messageIds)));
         _context19.n = 8;
-        return effects.call(confirmDisplayedRead, channel, pendingRead);
+        return effects.call(confirmDisplayedRead, channel, pendingRead, 'replay');
       case 8:
         confirmation = _context19.v;
         latestPendingRead = getPendingChannelRead(pendingRead.channelId);
@@ -27207,16 +27412,23 @@ function resendPendingChannelReads(action) {
           _context19.n = 9;
           break;
         }
-        return _context19.a(3, 13);
+        return _context19.a(3, 15);
       case 9:
         if (confirmation.status === 'success' || confirmation.status === 'drop') {
           removePendingChannelRead(pendingRead.channelId);
         }
         if (!(confirmation.status === 'success' && !pendingRead.readAll)) {
-          _context19.n = 13;
+          _context19.n = 14;
           break;
         }
         readMessageIds = getUniqueMessageIds(((_confirmation$message4 = confirmation.messageListMarker) === null || _confirmation$message4 === void 0 ? void 0 : _confirmation$message4.messageIds) || pendingRead.messageIds);
+        log.info('[READ_MESSAGE] Confirmed read marker', compactReadMessageLogData({
+          source: 'replay',
+          channelId: channel.id,
+          readAll: false,
+          requestedMessageIds: pendingRead.messageIds,
+          confirmedMessageIds: readMessageIds
+        }));
         _iterator1 = _createForOfIteratorHelperLoose(readMessageIds);
       case 10:
         if ((_step1 = _iterator1()).done) {
@@ -27244,19 +27456,32 @@ function resendPendingChannelReads(action) {
         _context19.n = 10;
         break;
       case 13:
-        _context19.n = 2;
+        _context19.n = 15;
         break;
       case 14:
-        _context19.n = 16;
-        break;
+        if (confirmation.status === 'success' && pendingRead.readAll) {
+          log.info('[READ_MESSAGE] Confirmed read marker', compactReadMessageLogData({
+            source: 'replay',
+            channelId: channel.id,
+            readAll: true,
+            requestedMessageIds: [],
+            confirmedMessageIds: []
+          }));
+        }
       case 15:
-        _context19.p = 15;
+        _context19.n = 2;
+        break;
+      case 16:
+        _context19.n = 18;
+        break;
+      case 17:
+        _context19.p = 17;
         _t18 = _context19.v;
         log.error(_t18, '[READ_MESSAGE] Error on resend pending channel reads');
-      case 16:
+      case 18:
         return _context19.a(2);
     }
-  }, _marked18$1, null, [[0, 15]]);
+  }, _marked17$1, null, [[0, 17]]);
 }
 function markChannelAsUnRead(action) {
   var channelId, channel, _t19;
@@ -27292,7 +27517,7 @@ function markChannelAsUnRead(action) {
       case 5:
         return _context20.a(2);
     }
-  }, _marked19$1, null, [[0, 4]]);
+  }, _marked18$1, null, [[0, 4]]);
 }
 function pinChannel(action) {
   var channelId, channel, updatedChannel, _t20;
@@ -27329,7 +27554,7 @@ function pinChannel(action) {
       case 5:
         return _context21.a(2);
     }
-  }, _marked20$1, null, [[0, 4]]);
+  }, _marked19$1, null, [[0, 4]]);
 }
 function unpinChannel(action) {
   var channelId, channel, updatedChannel, _t21;
@@ -27366,7 +27591,7 @@ function unpinChannel(action) {
       case 5:
         return _context22.a(2);
     }
-  }, _marked21$1, null, [[0, 4]]);
+  }, _marked20$1, null, [[0, 4]]);
 }
 function removeChannelCaches(action) {
   var payload, channelId, activeChannelId, activeChannel;
@@ -27401,7 +27626,7 @@ function removeChannelCaches(action) {
       case 4:
         return _context23.a(2);
     }
-  }, _marked22$1);
+  }, _marked21$1);
 }
 function leaveChannel(action) {
   var payload, channelId, channel, messageBuilder, messageToSend, _t22;
@@ -27453,7 +27678,7 @@ function leaveChannel(action) {
       case 7:
         return _context24.a(2);
     }
-  }, _marked23$1, null, [[0, 6]]);
+  }, _marked22$1, null, [[0, 6]]);
 }
 function deletePendingDeleteChannels() {
   var pendingDeleteChannels, _iterator10, _step10, channel, resendableError, _t23;
@@ -27497,7 +27722,7 @@ function deletePendingDeleteChannels() {
       case 9:
         return _context25.a(2);
     }
-  }, _marked24$1, null, [[2, 7]]);
+  }, _marked23$1, null, [[2, 7]]);
 }
 function deleteChannel(action) {
   var payload, channelId, channel, activeChannelId, lastChannel, _t24;
@@ -27591,7 +27816,7 @@ function deleteChannel(action) {
       case 19:
         return _context26.a(2);
     }
-  }, _marked25$1, null, [[0, 18]]);
+  }, _marked24$1, null, [[0, 18]]);
 }
 function blockChannel(action) {
   var payload, channelId, channel, _t25;
@@ -27630,7 +27855,7 @@ function blockChannel(action) {
       case 6:
         return _context27.a(2);
     }
-  }, _marked26$1, null, [[0, 5]]);
+  }, _marked25$1, null, [[0, 5]]);
 }
 function updateChannel(action) {
   var payload, channelId, config, _SceytChatClient6, channel, paramsToUpdate, fileToUpload, _yield$call5, subject, avatarUrl, metadata, onUpdateChannel, _channel3, _channel4, _channel5, fields, updatedChannel, _t26;
@@ -27727,7 +27952,7 @@ function updateChannel(action) {
       case 9:
         return _context28.a(2);
     }
-  }, _marked27$1, null, [[0, 8]]);
+  }, _marked26$1, null, [[0, 8]]);
 }
 function checkUsersStatus() {
   var _SceytChatClient7, usersForUpdate, updatedUsers, usersToUpdateMap, update, updateData, _t27;
@@ -27778,7 +28003,7 @@ function checkUsersStatus() {
       case 7:
         return _context29.a(2);
     }
-  }, _marked28$1, null, [[0, 6]]);
+  }, _marked27$1, null, [[0, 6]]);
 }
 function sendTyping(action) {
   var state, activeChannelId, channel, _t28;
@@ -27821,7 +28046,7 @@ function sendTyping(action) {
       case 8:
         return _context30.a(2);
     }
-  }, _marked29$1, null, [[3, 7]]);
+  }, _marked28$1, null, [[3, 7]]);
 }
 function sendRecording(action) {
   var _action$payload, state, channelId, channel, _t29;
@@ -27864,7 +28089,7 @@ function sendRecording(action) {
       case 7:
         return _context31.a(2);
     }
-  }, _marked30$1, null, [[2, 6]]);
+  }, _marked29$1, null, [[2, 6]]);
 }
 function clearHistory(action) {
   var payload, channelId, channel, activeChannelId, groupName, _t30;
@@ -27934,7 +28159,7 @@ function clearHistory(action) {
       case 10:
         return _context32.a(2);
     }
-  }, _marked31$1, null, [[0, 9]]);
+  }, _marked30$1, null, [[0, 9]]);
 }
 function deleteAllMessages(action) {
   var payload, channelId, channel, activeChannelId, groupName, _t31;
@@ -28007,7 +28232,7 @@ function deleteAllMessages(action) {
       case 11:
         return _context33.a(2);
     }
-  }, _marked32$1, null, [[0, 10]]);
+  }, _marked31$1, null, [[0, 10]]);
 }
 function joinChannel(action) {
   var payload, channelId, _SceytChatClient8, channel, joinedChannel, _t32;
@@ -28060,7 +28285,7 @@ function joinChannel(action) {
       case 10:
         return _context34.a(2);
     }
-  }, _marked33$1, null, [[0, 9]]);
+  }, _marked32$1, null, [[0, 9]]);
 }
 function watchForChannelEvents() {
   return _regenerator().w(function (_context35) {
@@ -28071,7 +28296,7 @@ function watchForChannelEvents() {
       case 1:
         return _context35.a(2);
     }
-  }, _marked34$1);
+  }, _marked33$1);
 }
 function createChannelInviteKey(action) {
   var payload, channelId, _SceytChatClient9, channel, inviteKey, _t33;
@@ -28113,7 +28338,7 @@ function createChannelInviteKey(action) {
       case 5:
         return _context36.a(2);
     }
-  }, _marked35$1, null, [[0, 4]]);
+  }, _marked34$1, null, [[0, 4]]);
 }
 function getChannelInviteKeys(action) {
   var payload, channelId, channel, inviteKeys, _t34;
@@ -28150,7 +28375,7 @@ function getChannelInviteKeys(action) {
       case 5:
         return _context37.a(2);
     }
-  }, _marked36$1, null, [[0, 4]]);
+  }, _marked35$1, null, [[0, 4]]);
 }
 function regenerateChannelInviteKey(action) {
   var payload, channelId, key, deletePermanently, channel, inviteKey, _t35;
@@ -28191,7 +28416,7 @@ function regenerateChannelInviteKey(action) {
       case 5:
         return _context38.a(2);
     }
-  }, _marked37$1, null, [[0, 4]]);
+  }, _marked36$1, null, [[0, 4]]);
 }
 function updateChannelInviteKey(action) {
   var channelInviteKeys, channelId, payload, payloadChannelId, key, accessPriorHistory, expiresAt, maxUses, channel, copiedChannelInviteKeys, _t36;
@@ -28251,7 +28476,7 @@ function updateChannelInviteKey(action) {
       case 6:
         return _context39.a(2);
     }
-  }, _marked38$1, null, [[1, 5]]);
+  }, _marked37$1, null, [[1, 5]]);
 }
 function getChannelByInviteKey(action) {
   var _channel$, _channel$2, payload, key, _SceytChatClient0, channel, _t37;
@@ -28302,7 +28527,7 @@ function getChannelByInviteKey(action) {
       case 8:
         return _context40.a(2);
     }
-  }, _marked39$1, null, [[0, 6]]);
+  }, _marked38$1, null, [[0, 6]]);
 }
 function joinChannelWithInviteKey(action) {
   var payload, key, _SceytChatClient1, user, channel, messageToSend, _t38;
@@ -28346,7 +28571,7 @@ function joinChannelWithInviteKey(action) {
       case 7:
         return _context41.a(2);
     }
-  }, _marked40$1, null, [[0, 6]]);
+  }, _marked39$1, null, [[0, 6]]);
 }
 function setMessageRetentionPeriod(action) {
   var payload, channelId, periodInMilliseconds, channel, messageToSend, _t39;
@@ -28399,7 +28624,7 @@ function setMessageRetentionPeriod(action) {
       case 6:
         return _context42.a(2);
     }
-  }, _marked41$1, null, [[0, 5]]);
+  }, _marked40$1, null, [[0, 5]]);
 }
 function getChannelsWithUser(action) {
   var payload, userId, _SceytChatClient10, channelsQueryBuilder, channelsQuery, channelsData, channels, _t40;
@@ -28462,7 +28687,7 @@ function getChannelsWithUser(action) {
       case 12:
         return _context43.a(2);
     }
-  }, _marked42$1, null, [[2, 9, 10, 12]]);
+  }, _marked41$1, null, [[2, 9, 10, 12]]);
 }
 function loadMoreMutualChannels(action) {
   var payload, limit, mutualChannelsQuery, channelsData, _t41;
@@ -28520,7 +28745,7 @@ function loadMoreMutualChannels(action) {
       case 11:
         return _context44.a(2);
     }
-  }, _marked43$1, null, [[1, 8, 9, 11]]);
+  }, _marked42$1, null, [[1, 8, 9, 11]]);
 }
 function ChannelsSaga() {
   return _regenerator().w(function (_context45) {
@@ -28654,7 +28879,7 @@ function ChannelsSaga() {
       case 42:
         return _context45.a(2);
     }
-  }, _marked44$1);
+  }, _marked43$1);
 }
 
 var _marked$4 = /*#__PURE__*/_regenerator().m(getMembers),
@@ -30641,19 +30866,10 @@ var SceytChat = function SceytChat(_ref) {
   var handleUserInteraction = function handleUserInteraction() {
     requestPermissionOnUserInteraction();
   };
-  var handleVisibilityChange = function handleVisibilityChange() {
-    if (document[hidden]) {
-      dispatch(browserTabIsActiveAC(false));
-    } else {
-      dispatch(browserTabIsActiveAC(true));
-    }
-  };
-  var handleFocusChange = function handleFocusChange(focus) {
-    if (focus) {
-      dispatch(browserTabIsActiveAC(true));
-    } else {
-      dispatch(browserTabIsActiveAC(false));
-    }
+  var syncBrowserTabIsActive = function syncBrowserTabIsActive() {
+    var isVisible = hidden ? !document[hidden] : document.visibilityState !== 'hidden';
+    var isFocused = typeof document.hasFocus === 'function' ? document.hasFocus() : true;
+    dispatch(browserTabIsActiveAC(isVisible && isFocused));
   };
   React.useEffect(function () {
     log.info('client is changed.... ', client);
@@ -30735,24 +30951,23 @@ var SceytChat = function SceytChat(_ref) {
     setBlobUrlEvictListener(function (keys) {
       return dispatch(removeAttachmentUpdatedEntriesAC(keys));
     });
-    var handleWindowFocus = function handleWindowFocus() {
-      return handleFocusChange(true);
-    };
-    var handleWindowBlur = function handleWindowBlur() {
-      return handleFocusChange(false);
-    };
     if (showNotifications) {
       initializeNotifications();
       window.sceytTabNotifications = null;
       window.sceytTabUrl = window.location.href;
-      window.addEventListener('focus', handleWindowFocus);
-      window.addEventListener('blur', handleWindowBlur);
     }
-    document.addEventListener(visibilityChange, handleVisibilityChange, false);
+    window.addEventListener('focus', syncBrowserTabIsActive);
+    window.addEventListener('blur', syncBrowserTabIsActive);
+    if (visibilityChange) {
+      document.addEventListener(visibilityChange, syncBrowserTabIsActive, false);
+    }
+    syncBrowserTabIsActive();
     return function () {
-      window.removeEventListener('focus', handleWindowFocus);
-      window.removeEventListener('blur', handleWindowBlur);
-      document.removeEventListener(visibilityChange, handleVisibilityChange);
+      window.removeEventListener('focus', syncBrowserTabIsActive);
+      window.removeEventListener('blur', syncBrowserTabIsActive);
+      if (visibilityChange) {
+        document.removeEventListener(visibilityChange, syncBrowserTabIsActive);
+      }
       clearMessagesMap();
       setActiveChannelId('');
       destroyChannelsMap();
@@ -44821,10 +45036,49 @@ var Message$1 = function Message(_ref) {
     var alreadyRead = !!(message.userMarkers && message.userMarkers.length && message.userMarkers.find(function (marker) {
       return marker.name === MESSAGE_DELIVERY_STATUS.READ;
     }));
-    if (isVisible && message.incoming && !alreadyRead && !disableAutoReadTracking && isTabActive && channel.newMessageCount && channel.newMessageCount > 0 && connectionStatus === CONNECTION_STATUS.CONNECTED) {
+    var shouldSendReadMarker = isVisible && message.incoming && !alreadyRead && !disableAutoReadTracking && isTabActive && !!channel.newMessageCount && channel.newMessageCount > 0 && connectionStatus === CONNECTION_STATUS.CONNECTED;
+    if (message.incoming && isVisible) {
+      if (shouldSendReadMarker) {
+        log.info('[READ_MESSAGE] Message auto-read gate passed', compactReadMessageLogData({
+          source: 'message',
+          channelId: channel.id,
+          messageId: message.id,
+          isVisible: isVisible,
+          alreadyRead: alreadyRead,
+          disableAutoReadTracking: disableAutoReadTracking,
+          isTabActive: isTabActive,
+          newMessageCount: channel.newMessageCount || 0,
+          connectionStatus: connectionStatus,
+          queued: !!queueReadMarker
+        }));
+      } else {
+        log.info('[READ_MESSAGE] Message auto-read gate blocked', compactReadMessageLogData({
+          source: 'message',
+          channelId: channel.id,
+          messageId: message.id,
+          isVisible: isVisible,
+          alreadyRead: alreadyRead,
+          disableAutoReadTracking: disableAutoReadTracking,
+          isTabActive: isTabActive,
+          newMessageCount: channel.newMessageCount || 0,
+          connectionStatus: connectionStatus
+        }));
+      }
+    }
+    if (shouldSendReadMarker) {
       if (queueReadMarker) {
+        log.info('[READ_MESSAGE] Queueing read marker from Message component', compactReadMessageLogData({
+          source: 'message',
+          channelId: channel.id,
+          messageId: message.id
+        }));
         queueReadMarker(channel.id, message.id);
       } else {
+        log.info('[READ_MESSAGE] Dispatching read marker directly from Message component', compactReadMessageLogData({
+          source: 'message',
+          channelId: channel.id,
+          messageId: message.id
+        }));
         dispatch(markMessagesAsReadAC(channel.id, [message.id]));
       }
     }
@@ -44867,6 +45121,14 @@ var Message$1 = function Message(_ref) {
   }, [dispatch, selectionIsActive]);
   React.useEffect(function () {
     if (isVisible) {
+      if (message.incoming) {
+        log.info('[READ_MESSAGE] Message row became visible', compactReadMessageLogData({
+          source: 'message',
+          channelId: channel.id,
+          messageId: message.id,
+          localRef: message.tid || message.id || ''
+        }));
+      }
       if (setLastVisibleMessageId) {
         setLastVisibleMessageId(message);
       }
@@ -45876,6 +46138,14 @@ function useChatController(_ref5) {
   }, [clearJumpScrollingLock]);
   var queueVisibleUnreadCheck = React.useCallback(function () {
     if (pendingVisibleUnreadFrameRef.current !== null || unreadScrollTo || !tabIsActive) {
+      if (!tabIsActive) {
+        log.info('[READ_MESSAGE] Visible unread scan skipped because tab is inactive', compactReadMessageLogData({
+          source: 'controller',
+          channelId: channel.id,
+          unreadScrollTo: unreadScrollTo,
+          pendingFrameScheduled: pendingVisibleUnreadFrameRef.current !== null
+        }));
+      }
       return;
     }
     pendingVisibleUnreadFrameRef.current = requestAnimationFrame(function () {
@@ -45910,13 +46180,35 @@ function useChatController(_ref5) {
       var ids = visibleUnreadMessages.filter(isUnreadIncomingMessage).map(function (message) {
         return message.id;
       });
+      if (visibleUnreadMessages.length && !ids.length) {
+        log.info('[READ_MESSAGE] Visible unread scan found messages, but none were unread incoming', compactReadMessageLogData({
+          source: 'controller',
+          channelId: channel.id,
+          visibleCandidateIds: visibleUnreadMessages.map(function (message) {
+            return message.id;
+          })
+        }));
+      }
       if (!ids.length || !channel.id || !channel.newMessageCount) {
+        if (ids.length && (!channel.id || !channel.newMessageCount)) {
+          log.info('[READ_MESSAGE] Visible unread scan blocked before dispatch', compactReadMessageLogData({
+            source: 'controller',
+            channelId: channel.id,
+            messageIds: ids,
+            newMessageCount: channel.newMessageCount || 0
+          }));
+        }
         return;
       }
       ids.forEach(function (id) {
         visibleUnreadReportedRef.current.add(id);
       });
       registerLocallyReadUnreadMessages(ids.length);
+      log.info('[READ_MESSAGE] Dispatching read marker from visible unread scan', compactReadMessageLogData({
+        source: 'controller',
+        channelId: channel.id,
+        messageIds: ids
+      }));
       dispatch(markMessagesAsReadAC(channel.id, ids));
     });
   }, [channel.id, channel.lastDisplayedMessageId, channel.newMessageCount, dispatch, hasNext, messages, registerLocallyReadUnreadMessages, unreadScrollTo, tabIsActive]);
@@ -52382,17 +52674,19 @@ var SendMessageInput = function SendMessageInput(_ref3) {
       if (messageToEdit) {
         handleEditMessage();
       } else if (messageTextForSend !== null && messageTextForSend !== void 0 && messageTextForSend.trim() || attachments.length && attachments.length > 0) {
-        var messageTexToSend = messageTextForSend === null || messageTextForSend === void 0 ? void 0 : messageTextForSend.trim();
+        var _trimMessageBodyWithA = trimMessageBodyWithAttributes(messageText, messageBodyAttributes),
+          messageTexToSend = _trimMessageBodyWithA.body,
+          adjustedBodyAttributes = _trimMessageBodyWithA.bodyAttributes;
         var messageToSend = {
           body: messageTexToSend,
-          bodyAttributes: messageBodyAttributes,
+          bodyAttributes: adjustedBodyAttributes,
           mentionedUsers: [],
           attachments: [],
           type: 'text'
         };
         var mentionUsersToSend = [];
-        if (messageBodyAttributes && messageBodyAttributes.length) {
-          messageBodyAttributes.forEach(function (att) {
+        if (adjustedBodyAttributes && adjustedBodyAttributes.length) {
+          adjustedBodyAttributes.forEach(function (att) {
             if (att.type === 'mention') {
               var mentionsToFind = [].concat(mentionedUsers);
               var draftMessage = getDraftMessageFromMap(activeChannel.id);
@@ -52520,12 +52814,14 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     }
   };
   var handleEditMessage = function handleEditMessage() {
-    var messageTexToSend = editMessageText.trim();
+    var _trimMessageBodyWithA2 = trimMessageBodyWithAttributes(editMessageText, messageBodyAttributes),
+      messageTexToSend = _trimMessageBodyWithA2.body,
+      adjustedBodyAttributes = _trimMessageBodyWithA2.bodyAttributes;
     var hasTextChanged = messageTexToSend !== messageToEdit.body;
     var normalizeAttrs = function normalizeAttrs(attrs) {
       return !attrs || attrs.length === 0 ? [] : attrs;
     };
-    var hasAttributesChanged = !compareMessageBodyAttributes(normalizeAttrs(messageBodyAttributes), normalizeAttrs(messageToEdit.bodyAttributes));
+    var hasAttributesChanged = !compareMessageBodyAttributes(normalizeAttrs(adjustedBodyAttributes), normalizeAttrs(messageToEdit.bodyAttributes));
     if (!hasTextChanged && !hasAttributesChanged) {
       handleCloseEditMode();
       return;
@@ -52569,8 +52865,8 @@ var SendMessageInput = function SendMessageInput(_ref3) {
       var mentionedUsersPositions = [];
       var mentionUsersToSend = [];
       if (mentionedUsers && mentionedUsers.length) {
-        if (messageBodyAttributes && messageBodyAttributes.length) {
-          messageBodyAttributes.forEach(function (att) {
+        if (adjustedBodyAttributes && adjustedBodyAttributes.length) {
+          adjustedBodyAttributes.forEach(function (att) {
             if (att.type === 'mention') {
               var mentionsToFind = [].concat(mentionedUsers);
               var draftMessage = getDraftMessageFromMap(activeChannel.id);
@@ -52592,7 +52888,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
       var messageToSend = _extends({}, messageToEdit, {
         attachments: updatedAttachments,
         metadata: mentionedUsersPositions,
-        bodyAttributes: messageBodyAttributes,
+        bodyAttributes: adjustedBodyAttributes,
         mentionedUsers: mentionUsersToSend,
         body: messageTexToSend
       });