sceyt-chat-react-uikit 1.8.9-beta.6 → 1.8.9-beta.8

package/index.js

@@ -12613,6 +12613,15 @@ var removeAudioRecordingFromMap = function removeAudioRecordingFromMap(channelId
   delete audioRecordingMap[channelId];
 };
 var setDraftMessageToMap = function setDraftMessageToMap(channelId, draftMessage) {
+  var _draftMessage$attachm, _draftMessage$text, _draftMessage$editMes;
+  var hasAttachments = !!((_draftMessage$attachm = draftMessage.attachments) !== null && _draftMessage$attachm !== void 0 && _draftMessage$attachm.length);
+  var hasComposeText = !draftMessage.messageToEdit && !!((_draftMessage$text = draftMessage.text) !== null && _draftMessage$text !== void 0 && _draftMessage$text.trim());
+  var editText = ((_draftMessage$editMes = draftMessage.editMessageText) === null || _draftMessage$editMes === void 0 ? void 0 : _draftMessage$editMes.trim()) || '';
+  var hasChangedEdit = !!draftMessage.messageToEdit && !!editText && (draftMessage.editMessageText !== draftMessage.messageToEdit.body || JSON.stringify(draftMessage.editBodyAttributes || []) !== JSON.stringify(draftMessage.messageToEdit.bodyAttributes || []));
+  if (!hasComposeText && !hasAttachments && !hasChangedEdit) {
+    removeDraftMessageFromMap(channelId);
+    return;
+  }
   draftMessagesMap[channelId] = draftMessage;
   Promise.resolve(persistDraft(channelId, draftMessage))["catch"](function () {
     return undefined;
@@ -25666,81 +25675,52 @@ function watchForEvents() {
   }, _marked0$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(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$2 = /*#__PURE__*/_regenerator().m(channelsForForwardLoadMore),
-  _marked0$2 = /*#__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);
+  _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$2 = /*#__PURE__*/_regenerator().m(getChannelMentions),
+  _marked0$2 = /*#__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);
 var getUniqueMessageIds = function getUniqueMessageIds(messageIds) {
   if (messageIds === void 0) {
     messageIds = [];
@@ -25842,104 +25822,80 @@ function applyChannelReadProgress(channelId, updateData) {
 var shouldKeepQueuedPendingRead = function shouldKeepQueuedPendingRead(error) {
   return isResendableError(error === null || error === void 0 ? void 0 : error.type);
 };
-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;
+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;
-        case 10:
-          return _context2.a(2, {
-            status: 'queued'
-          });
-      }
-    }, _callee, null, [[2, 6]]);
-  })();
+        }
+        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;
+          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]]);
 }
 function createChannel(action) {
   var payload, channelData, dontCreateIfNotExists, callback, SceytChatClient, createChannelData, fileToUpload, isSelfChannel, channelIsExistOnAllChannels, createdChannel, allChannels, memberId, whoDoesNotAdded, checkChannelExist, messageToSend, _allChannels, _memberId, _t2;
@@ -26137,7 +26093,7 @@ function createChannel(action) {
       case 19:
         return _context3.a(2);
     }
-  }, _marked2$3, null, [[0, 18]]);
+  }, _marked3$2, 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;
@@ -26235,7 +26191,7 @@ function getChannels(action) {
         _yield$call = _context5.v;
         mappedChannels = _yield$call.channels;
         channelsForUpdateLastReactionMessage = _yield$call.channelsForUpdateLastReactionMessage;
-        _loop = /*#__PURE__*/_regenerator().m(function _callee2() {
+        _loop = /*#__PURE__*/_regenerator().m(function _callee() {
           var _store$getState$Chann;
           var channelId, pendingLastMessage, currentReduxLastMessage, resolvedLastMessage, mappedChannel, mapEntry;
           return _regenerator().w(function (_context4) {
@@ -26262,7 +26218,7 @@ function getChannels(action) {
               case 1:
                 return _context4.a(2);
             }
-          }, _callee2);
+          }, _callee);
         });
         _i = 0, _Object$keys = Object.keys(pendingLastMessages);
       case 14:
@@ -26456,7 +26412,7 @@ function getChannels(action) {
       case 38:
         return _context5.a(2);
     }
-  }, _marked3$2, null, [[27, 30], [1, 37]]);
+  }, _marked4$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;
@@ -26589,7 +26545,7 @@ function searchChannels(action) {
       case 8:
         return _context6.a(2);
     }
-  }, _marked4$2, null, [[0, 7]]);
+  }, _marked5$2, null, [[0, 7]]);
 }
 function getChannelsForForward() {
   var _SceytChatClient, channelQueryBuilder, channelTypesFilter, channelQuery, channelsData, channelsToAdd, _yield$call2, mappedChannels, _t7;
@@ -26647,7 +26603,7 @@ function getChannelsForForward() {
       case 9:
         return _context7.a(2);
     }
-  }, _marked5$2, null, [[0, 8]]);
+  }, _marked6$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;
@@ -26779,7 +26735,7 @@ function searchChannelsForForward(action) {
       case 8:
         return _context8.a(2);
     }
-  }, _marked6$2, null, [[0, 7]]);
+  }, _marked7$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;
@@ -26900,7 +26856,7 @@ function channelsLoadMore(action) {
       case 13:
         return _context9.a(2);
     }
-  }, _marked7$2, null, [[1, 12]]);
+  }, _marked8$2, null, [[1, 12]]);
 }
 function getChannelMentions(action) {
   var payload, channelId, _SceytChatClient3, mentionsQueryBuilder, mentionsQuery, mentions, _t0;
@@ -26937,7 +26893,7 @@ function getChannelMentions(action) {
       case 5:
         return _context0.a(2);
     }
-  }, _marked8$2, null, [[0, 4]]);
+  }, _marked9$2, null, [[0, 4]]);
 }
 function channelsForForwardLoadMore(action) {
   var payload, limit, _SceytChatClient4, channelQueryForward, channelsData, channelsToAdd, _yield$call4, mappedChannels, _t1;
@@ -26988,10 +26944,10 @@ function channelsForForwardLoadMore(action) {
       case 8:
         return _context1.a(2);
     }
-  }, _marked9$2, null, [[0, 7]]);
+  }, _marked0$2, null, [[0, 7]]);
 }
 function markMessagesRead(action) {
-  var payload, channelId, messageIds, requestedMessageIds, _confirmation$message, channel, optimisticUpdate, pendingRead, confirmation, queuedPendingRead, _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;
   return _regenerator().w(function (_context10) {
     while (1) switch (_context10.p = _context10.n) {
       case 0:
@@ -27002,21 +26958,9 @@ 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:
@@ -27025,10 +26969,6 @@ function markMessagesRead(action) {
           _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({
@@ -27043,7 +26983,7 @@ function markMessagesRead(action) {
           messageIds: requestedMessageIds
         });
         _context10.n = 5;
-        return effects.call(confirmDisplayedRead, channel, pendingRead, 'initial');
+        return effects.call(confirmDisplayedRead, channel, pendingRead);
       case 5:
         confirmation = _context10.v;
         if (!(confirmation.status === 'success')) {
@@ -27070,13 +27010,6 @@ function markMessagesRead(action) {
         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 9:
         if ((_step6 = _iterator6()).done) {
@@ -27108,12 +27041,10 @@ function markMessagesRead(action) {
         break;
       case 13:
         _context10.p = 13;
-        _t10 = _context10.v;
-        log.error(_t10, '[READ_MESSAGE] Error on mark messages read');
       case 14:
         return _context10.a(2);
     }
-  }, _marked0$2, null, [[1, 13]]);
+  }, _marked1$1, null, [[1, 13]]);
 }
 function markVoiceMessageAsPlayed(action) {
   var payload, channelId, messageIds, connectionStatus, channel, messageListMarker, _iterator7, _step7, messageId, updateParams, _t11;
@@ -27184,7 +27115,7 @@ function markVoiceMessageAsPlayed(action) {
       case 9:
         return _context11.a(2);
     }
-  }, _marked1$1, null, [[1, 8]]);
+  }, _marked10$1, null, [[1, 8]]);
 }
 function updateMessageAsOpened(action) {
   var payload, channelId, messageListMarker, connectionStatus, channel, _iterator8, _step8, messageId, updateParams;
@@ -27243,7 +27174,7 @@ function updateMessageAsOpened(action) {
       case 6:
         return _context12.a(2);
     }
-  }, _marked10$1);
+  }, _marked11$1);
 }
 function markMessageAsOpened(action) {
   var payload, channelId, messageIds, shouldUpdateMessage, connectionStatus, channel, messageListMarker, _t12;
@@ -27294,7 +27225,7 @@ function markMessageAsOpened(action) {
       case 6:
         return _context13.a(2);
     }
-  }, _marked11$1, null, [[1, 5]]);
+  }, _marked12$1, null, [[1, 5]]);
 }
 function markMessagesDelivered(action) {
   var payload, channelId, messageIds, connectionStatus, channel, messageListMarker, _iterator9, _step9, messageId, updateParams, _t13;
@@ -27365,7 +27296,7 @@ function markMessagesDelivered(action) {
       case 9:
         return _context14.a(2);
     }
-  }, _marked12$1, null, [[1, 8]]);
+  }, _marked13$1, null, [[1, 8]]);
 }
 function switchChannel(action) {
   var payload, channel, updateActiveChannel, channelToSwitch, existingChannel, addChannel, _SceytChatClient5, fetchedChannel, channelFromMap, currentActiveChannel, _t14;
@@ -27461,7 +27392,7 @@ function switchChannel(action) {
       case 17:
         return _context15.a(2);
     }
-  }, _marked13$1, null, [[0, 16]]);
+  }, _marked14$1, null, [[0, 16]]);
 }
 function notificationsTurnOff(action) {
   var expireTime, activeChannelId, channel, updatedChannel, _t15;
@@ -27501,7 +27432,7 @@ function notificationsTurnOff(action) {
       case 7:
         return _context16.a(2);
     }
-  }, _marked14$1, null, [[3, 6]]);
+  }, _marked15$1, null, [[3, 6]]);
 }
 function notificationsTurnOn() {
   var activeChannelId, channel, updatedChannel, _t16;
@@ -27540,21 +27471,15 @@ function notificationsTurnOn() {
       case 7:
         return _context17.a(2);
     }
-  }, _marked15$1, null, [[3, 6]]);
+  }, _marked16$1, null, [[3, 6]]);
 }
 function markChannelAsRead(action) {
-  var channelId, channel, optimisticUpdate, pendingRead, confirmation, queuedPendingRead, _queuedPendingRead2, _t17;
+  var channelId, channel, optimisticUpdate, pendingRead, confirmation, queuedPendingRead, _queuedPendingRead2;
   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:
@@ -27563,9 +27488,6 @@ 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({
@@ -27580,7 +27502,7 @@ function markChannelAsRead(action) {
           readAll: true
         });
         _context18.n = 4;
-        return effects.call(confirmDisplayedRead, channel, pendingRead, 'initial');
+        return effects.call(confirmDisplayedRead, channel, pendingRead);
       case 4:
         confirmation = _context18.v;
         if (!(confirmation.status === 'success')) {
@@ -27591,13 +27513,6 @@ 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') {
@@ -27610,15 +27525,13 @@ function markChannelAsRead(action) {
         break;
       case 6:
         _context18.p = 6;
-        _t17 = _context18.v;
-        log.error(_t17, '[READ_MESSAGE] Error on mark channel as read');
       case 7:
         return _context18.a(2);
     }
-  }, _marked16$1, null, [[0, 6]]);
+  }, _marked17$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;
+  var connectionState, pendingReads, _iterator0, _step0, pendingRead, currentPendingRead, channel, confirmation, latestPendingRead, _confirmation$message4, readMessageIds, _iterator1, _step1, _confirmation$message5, _confirmation$message6, messageId, updateParams;
   return _regenerator().w(function (_context19) {
     while (1) switch (_context19.p = _context19.n) {
       case 0:
@@ -27636,7 +27549,7 @@ function resendPendingChannelReads(action) {
         _iterator0 = _createForOfIteratorHelperLoose(pendingReads);
       case 2:
         if ((_step0 = _iterator0()).done) {
-          _context19.n = 16;
+          _context19.n = 14;
           break;
         }
         pendingRead = _step0.value;
@@ -27651,20 +27564,14 @@ function resendPendingChannelReads(action) {
           _context19.n = 4;
           break;
         }
-        return _context19.a(3, 15);
+        return _context19.a(3, 13);
       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, 15);
+        return _context19.a(3, 13);
       case 5:
         _context19.n = 6;
         return effects.call(getStoredChannel$2, pendingRead.channelId);
@@ -27674,18 +27581,11 @@ 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, 15);
+        return _context19.a(3, 13);
       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, 'replay');
+        return effects.call(confirmDisplayedRead, channel, pendingRead);
       case 8:
         confirmation = _context19.v;
         latestPendingRead = getPendingChannelRead(pendingRead.channelId);
@@ -27693,23 +27593,16 @@ function resendPendingChannelReads(action) {
           _context19.n = 9;
           break;
         }
-        return _context19.a(3, 15);
+        return _context19.a(3, 13);
       case 9:
         if (confirmation.status === 'success' || confirmation.status === 'drop') {
           removePendingChannelRead(pendingRead.channelId);
         }
         if (!(confirmation.status === 'success' && !pendingRead.readAll)) {
-          _context19.n = 14;
+          _context19.n = 13;
           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) {
@@ -27737,32 +27630,17 @@ function resendPendingChannelReads(action) {
         _context19.n = 10;
         break;
       case 13:
-        _context19.n = 15;
+        _context19.n = 2;
         break;
       case 14:
-        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.n = 2;
+        _context19.n = 16;
         break;
+      case 15:
+        _context19.p = 15;
       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 18:
         return _context19.a(2);
     }
-  }, _marked17$1, null, [[0, 17]]);
+  }, _marked18$1, null, [[0, 15]]);
 }
 function markChannelAsUnRead(action) {
   var channelId, channel, _t19;
@@ -27798,7 +27676,7 @@ function markChannelAsUnRead(action) {
       case 5:
         return _context20.a(2);
     }
-  }, _marked18$1, null, [[0, 4]]);
+  }, _marked19$1, null, [[0, 4]]);
 }
 function pinChannel(action) {
   var channelId, channel, updatedChannel, _t20;
@@ -27835,7 +27713,7 @@ function pinChannel(action) {
       case 5:
         return _context21.a(2);
     }
-  }, _marked19$1, null, [[0, 4]]);
+  }, _marked20$1, null, [[0, 4]]);
 }
 function unpinChannel(action) {
   var channelId, channel, updatedChannel, _t21;
@@ -27872,7 +27750,7 @@ function unpinChannel(action) {
       case 5:
         return _context22.a(2);
     }
-  }, _marked20$1, null, [[0, 4]]);
+  }, _marked21$1, null, [[0, 4]]);
 }
 function removeChannelCaches(action) {
   var payload, channelId, activeChannelId, activeChannel;
@@ -27907,7 +27785,7 @@ function removeChannelCaches(action) {
       case 4:
         return _context23.a(2);
     }
-  }, _marked21$1);
+  }, _marked22$1);
 }
 function leaveChannel(action) {
   var payload, channelId, channel, messageBuilder, messageToSend, _t22;
@@ -27966,7 +27844,7 @@ function leaveChannel(action) {
       case 8:
         return _context24.a(2);
     }
-  }, _marked22$1, null, [[0, 7]]);
+  }, _marked23$1, null, [[0, 7]]);
 }
 function deletePendingDeleteChannels() {
   var pendingDeleteChannels, _iterator10, _step10, channel, resendableError, _t23;
@@ -28010,7 +27888,7 @@ function deletePendingDeleteChannels() {
       case 9:
         return _context25.a(2);
     }
-  }, _marked23$1, null, [[2, 7]]);
+  }, _marked24$1, null, [[2, 7]]);
 }
 function deleteChannel(action) {
   var payload, channelId, channel, activeChannelId, lastChannel, _t24;
@@ -28104,7 +27982,7 @@ function deleteChannel(action) {
       case 19:
         return _context26.a(2);
     }
-  }, _marked24$1, null, [[0, 18]]);
+  }, _marked25$1, null, [[0, 18]]);
 }
 function blockChannel(action) {
   var payload, channelId, channel, _t25;
@@ -28143,7 +28021,7 @@ function blockChannel(action) {
       case 6:
         return _context27.a(2);
     }
-  }, _marked25$1, null, [[0, 5]]);
+  }, _marked26$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;
@@ -28240,7 +28118,7 @@ function updateChannel(action) {
       case 9:
         return _context28.a(2);
     }
-  }, _marked26$1, null, [[0, 8]]);
+  }, _marked27$1, null, [[0, 8]]);
 }
 function checkUsersStatus() {
   var _SceytChatClient7, usersForUpdate, updatedUsers, usersToUpdateMap, update, updateData, _t27;
@@ -28291,7 +28169,7 @@ function checkUsersStatus() {
       case 7:
         return _context29.a(2);
     }
-  }, _marked27$1, null, [[0, 6]]);
+  }, _marked28$1, null, [[0, 6]]);
 }
 function sendTyping(action) {
   var state, activeChannelId, channel, _t28;
@@ -28334,7 +28212,7 @@ function sendTyping(action) {
       case 8:
         return _context30.a(2);
     }
-  }, _marked28$1, null, [[3, 7]]);
+  }, _marked29$1, null, [[3, 7]]);
 }
 function sendRecording(action) {
   var _action$payload, state, channelId, channel, _t29;
@@ -28377,7 +28255,7 @@ function sendRecording(action) {
       case 7:
         return _context31.a(2);
     }
-  }, _marked29$1, null, [[2, 6]]);
+  }, _marked30$1, null, [[2, 6]]);
 }
 function clearHistory(action) {
   var payload, channelId, channel, activeChannelId, groupName, _t30;
@@ -28447,7 +28325,7 @@ function clearHistory(action) {
       case 10:
         return _context32.a(2);
     }
-  }, _marked30$1, null, [[0, 9]]);
+  }, _marked31$1, null, [[0, 9]]);
 }
 function deleteAllMessages(action) {
   var payload, channelId, channel, activeChannelId, groupName, _t31;
@@ -28520,7 +28398,7 @@ function deleteAllMessages(action) {
       case 11:
         return _context33.a(2);
     }
-  }, _marked31$1, null, [[0, 10]]);
+  }, _marked32$1, null, [[0, 10]]);
 }
 function joinChannel(action) {
   var payload, channelId, _SceytChatClient8, channel, joinedChannel, _t32;
@@ -28573,7 +28451,7 @@ function joinChannel(action) {
       case 10:
         return _context34.a(2);
     }
-  }, _marked32$1, null, [[0, 9]]);
+  }, _marked33$1, null, [[0, 9]]);
 }
 function watchForChannelEvents() {
   return _regenerator().w(function (_context35) {
@@ -28584,7 +28462,7 @@ function watchForChannelEvents() {
       case 1:
         return _context35.a(2);
     }
-  }, _marked33$1);
+  }, _marked34$1);
 }
 function createChannelInviteKey(action) {
   var payload, channelId, _SceytChatClient9, channel, inviteKey, _t33;
@@ -28626,7 +28504,7 @@ function createChannelInviteKey(action) {
       case 5:
         return _context36.a(2);
     }
-  }, _marked34$1, null, [[0, 4]]);
+  }, _marked35$1, null, [[0, 4]]);
 }
 function getChannelInviteKeys(action) {
   var payload, channelId, channel, inviteKeys, _t34;
@@ -28663,7 +28541,7 @@ function getChannelInviteKeys(action) {
       case 5:
         return _context37.a(2);
     }
-  }, _marked35$1, null, [[0, 4]]);
+  }, _marked36$1, null, [[0, 4]]);
 }
 function regenerateChannelInviteKey(action) {
   var payload, channelId, key, deletePermanently, channel, inviteKey, _t35;
@@ -28704,7 +28582,7 @@ function regenerateChannelInviteKey(action) {
       case 5:
         return _context38.a(2);
     }
-  }, _marked36$1, null, [[0, 4]]);
+  }, _marked37$1, null, [[0, 4]]);
 }
 function updateChannelInviteKey(action) {
   var channelInviteKeys, channelId, payload, payloadChannelId, key, accessPriorHistory, expiresAt, maxUses, channel, copiedChannelInviteKeys, _t36;
@@ -28764,7 +28642,7 @@ function updateChannelInviteKey(action) {
       case 6:
         return _context39.a(2);
     }
-  }, _marked37$1, null, [[1, 5]]);
+  }, _marked38$1, null, [[1, 5]]);
 }
 function getChannelByInviteKey(action) {
   var _channel$, _channel$2, payload, key, _SceytChatClient0, channel, _t37;
@@ -28815,7 +28693,7 @@ function getChannelByInviteKey(action) {
       case 8:
         return _context40.a(2);
     }
-  }, _marked38$1, null, [[0, 6]]);
+  }, _marked39$1, null, [[0, 6]]);
 }
 function joinChannelWithInviteKey(action) {
   var payload, key, _SceytChatClient1, user, channel, messageToSend, _t38;
@@ -28859,7 +28737,7 @@ function joinChannelWithInviteKey(action) {
       case 7:
         return _context41.a(2);
     }
-  }, _marked39$1, null, [[0, 6]]);
+  }, _marked40$1, null, [[0, 6]]);
 }
 function setMessageRetentionPeriod(action) {
   var payload, channelId, periodInMilliseconds, channel, messageToSend, _t39;
@@ -28912,7 +28790,7 @@ function setMessageRetentionPeriod(action) {
       case 6:
         return _context42.a(2);
     }
-  }, _marked40$1, null, [[0, 5]]);
+  }, _marked41$1, null, [[0, 5]]);
 }
 function getChannelsWithUser(action) {
   var payload, userId, _SceytChatClient10, channelsQueryBuilder, channelsQuery, channelsData, channels, _t40;
@@ -28975,7 +28853,7 @@ function getChannelsWithUser(action) {
       case 12:
         return _context43.a(2);
     }
-  }, _marked41$1, null, [[2, 9, 10, 12]]);
+  }, _marked42$1, null, [[2, 9, 10, 12]]);
 }
 function loadMoreMutualChannels(action) {
   var payload, limit, mutualChannelsQuery, channelsData, _t41;
@@ -29033,7 +28911,7 @@ function loadMoreMutualChannels(action) {
       case 11:
         return _context44.a(2);
     }
-  }, _marked42$1, null, [[1, 8, 9, 11]]);
+  }, _marked43$1, null, [[1, 8, 9, 11]]);
 }
 function ChannelsSaga() {
   return _regenerator().w(function (_context45) {
@@ -29167,7 +29045,7 @@ function ChannelsSaga() {
       case 42:
         return _context45.a(2);
     }
-  }, _marked43$1);
+  }, _marked44$1);
 }
 
 var _marked$4 = /*#__PURE__*/_regenerator().m(getMembers),
@@ -39918,6 +39796,10 @@ var Attachment = function Attachment(_ref) {
   var _useState3 = React.useState(attachmentUrlFromMap),
     attachmentUrl = _useState3[0],
     setAttachmentUrl = _useState3[1];
+  var attachmentIdentity = attachment.id || attachment.tid || 'unknown-attachment';
+  var attachmentKey = (channelId || 'unknown-channel') + ":" + attachmentIdentity + ":" + (attachment.url || '');
+  var currentAttachmentKeyRef = React.useRef(attachmentKey);
+  currentAttachmentKeyRef.current = attachmentKey;
   var _useState4 = React.useState(false),
     imageLoaded = _useState4[0],
     setImageLoaded = _useState4[1];
@@ -39977,6 +39859,18 @@ var Attachment = function Attachment(_ref) {
       log.error('error on get attachmentThumb', e);
     }
   }
+  React.useEffect(function () {
+    if (attachment.type !== attachmentTypes.image) return;
+    log.info('[MEDIA_ISSUE] image thumbnail source', JSON.stringify({
+      channelId: channelId || null,
+      attachmentId: attachment.id || attachment.tid || null,
+      attachmentUrl: attachment.url || null,
+      mapUrl: attachmentUrlFromMap || null,
+      propUrl: attachment.attachmentUrl || null,
+      localUrl: attachmentUrl || null,
+      renderedSource: attachmentUrlFromMap || attachment.attachmentUrl || attachmentUrl || attachmentThumb || null
+    }));
+  }, [attachment.id, attachment.tid, attachment.type, attachment.url, attachment.attachmentUrl, attachmentUrlFromMap, attachmentUrl, channelId]);
   React.useEffect(function () {
     var currentSrc = attachment.attachmentUrl || attachmentUrlFromMap || attachmentUrl || attachmentThumb;
     var wasThumbnail = previousImageSrcRef.current === attachmentThumb;
@@ -40266,12 +40160,23 @@ var Attachment = function Attachment(_ref) {
   }, [attachmentUrl]);
   React.useEffect(function () {
     if (!attachment.attachmentUrl && connectionStatus === CONNECTION_STATUS.CONNECTED && attachment.id && !attachmentUrlFromMap && !(attachment.type === attachmentTypes.file || attachment.type === attachmentTypes.link)) {
+      var requestAttachmentKey = attachmentKey;
+      log.info('[MEDIA_ISSUE] image thumbnail load started', JSON.stringify({
+        channelId: channelId || null,
+        attachmentId: attachment.id || attachment.tid || null,
+        url: attachment.url
+      }));
       getAttachmentUrlFromCache(attachment.url).then(function (cachedUrl) {
         try {
           var _temp16 = function () {
             if (attachment.type === attachmentTypes.image && !isPreview) {
               var _temp15 = function () {
                 if (cachedUrl) {
+                  log.info('[MEDIA_ISSUE] image thumbnail cache resolved', JSON.stringify({
+                    requestAttachmentKey: requestAttachmentKey,
+                    currentAttachmentKey: currentAttachmentKeyRef.current,
+                    cachedUrl: cachedUrl
+                  }));
                   setAttachmentUrl(cachedUrl);
                   dispatch(setUpdateMessageAttachmentAC(attachment.url, cachedUrl));
                   setIsCached(true);
@@ -40292,6 +40197,12 @@ var Attachment = function Attachment(_ref) {
                         try {
                           return Promise.resolve(compressAndCacheImage(url, attachment.url, renderWidth, renderHeight)).then(function (compressedUrl) {
                             if (compressedUrl) {
+                              log.info('[MEDIA_ISSUE] image thumbnail download resolved', JSON.stringify({
+                                requestAttachmentKey: requestAttachmentKey,
+                                currentAttachmentKey: currentAttachmentKeyRef.current,
+                                sourceUrl: url,
+                                cachedUrl: compressedUrl
+                              }));
                               setAttachmentUrl(compressedUrl);
                             }
                             downloadImage(compressedUrl || url);
@@ -45358,48 +45269,10 @@ var Message$1 = function Message(_ref) {
       return marker.name === MESSAGE_DELIVERY_STATUS.READ;
     }));
     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]));
       }
     }
@@ -45442,14 +45315,6 @@ 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);
       }
@@ -46460,14 +46325,6 @@ 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 () {
@@ -46502,35 +46359,13 @@ 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]);
@@ -53999,6 +53834,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
       return;
     }
     if (messageToEdit) {
+      var _getDraftMessageFromM;
       var persistedEditText = editMessageText || messageToEdit.body || '';
       var normalizeAttrs = function normalizeAttrs(attrs) {
         return !attrs || attrs.length === 0 ? [] : attrs;
@@ -54007,13 +53843,18 @@ var SendMessageInput = function SendMessageInput(_ref3) {
       var hasAttributesChanged = !compareMessageBodyAttributes(normalizeAttrs(messageBodyAttributes), normalizeAttrs(messageToEdit.bodyAttributes));
       var canSubmitEdit = !!editMessageText.trim() && (hasTextChanged || hasAttributesChanged);
       setSendMessageIsActive(canSubmitEdit);
-      setDraftMessageToMap(activeChannel.id, {
-        text: persistedEditText || 'Edit message',
-        mentionedUsers: mentionedUsers,
-        messageToEdit: messageToEdit,
-        editMessageText: persistedEditText,
-        editBodyAttributes: messageBodyAttributes
-      });
+      if (canSubmitEdit) {
+        setDraftMessageToMap(activeChannel.id, {
+          text: persistedEditText,
+          mentionedUsers: mentionedUsers,
+          messageToEdit: messageToEdit,
+          editMessageText: persistedEditText,
+          editBodyAttributes: messageBodyAttributes
+        });
+      } else if ((_getDraftMessageFromM = getDraftMessageFromMap(activeChannel.id)) !== null && _getDraftMessageFromM !== void 0 && _getDraftMessageFromM.messageToEdit) {
+        removeDraftMessageFromMap(activeChannel.id);
+        dispatch(setChannelDraftMessageIsRemovedAC(activeChannel.id));
+      }
       return;
     }
     if (messageText.trim() || editMessageText !== null && editMessageText !== void 0 && editMessageText.trim() && editMessageText && (editMessageText === null || editMessageText === void 0 ? void 0 : editMessageText.trim()) !== (messageToEdit === null || messageToEdit === void 0 ? void 0 : messageToEdit.body) || attachments.length) {
@@ -54056,15 +53897,6 @@ var SendMessageInput = function SendMessageInput(_ref3) {
         setListenerIsAdded(true);
         document.body.setAttribute('onbeforeunload', "return () => 'reload?'");
       }
-    } else if (messageForReply || draftMessage !== null && draftMessage !== void 0 && draftMessage.messageForReply) {
-      setDraftMessageToMap(activeChannel.id, {
-        text: '',
-        mentionedUsers: (draftMessage === null || draftMessage === void 0 ? void 0 : draftMessage.mentionedUsers) || mentionedUsers,
-        messageForReply: messageForReply || (draftMessage === null || draftMessage === void 0 ? void 0 : draftMessage.messageForReply),
-        bodyAttributes: messageBodyAttributes,
-        attachments: [],
-        viewOnce: false
-      });
     } else if (draftMessage) {
       if (restoredDraftChannelIdRef.current && restoredDraftChannelIdRef.current !== activeChannel.id) {
         return;
@@ -54134,18 +53966,16 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     }
   });
   useDidUpdate(function () {
-    var _draftMessagesMap$act;
-    var persistedReply = (_draftMessagesMap$act = draftMessagesMap[activeChannel.id]) === null || _draftMessagesMap$act === void 0 ? void 0 : _draftMessagesMap$act.messageForReply;
     if (isNavigatingChannelRef.current) {
       isNavigatingChannelRef.current = false;
       return;
     }
-    var hasDraftContent = !!(messageText.trim() || attachments.length || messageForReply || persistedReply);
+    var hasDraftContent = !!(messageText.trim() || attachments.length);
     if (hasDraftContent) {
       setDraftMessageToMap(activeChannel.id, {
         text: messageText,
         mentionedUsers: mentionedUsers,
-        messageForReply: messageForReply || persistedReply,
+        messageForReply: messageForReply,
         bodyAttributes: messageBodyAttributes,
         attachments: attachments,
         viewOnce: viewOnce