sceyt-chat-react-uikit 1.7.4-beta.5 → 1.7.4-beta.7

package/index.modern.js

@@ -10302,6 +10302,11 @@ var setPendingMessage = function setPendingMessage(channelId, pendingMessage) {
 var getPendingMessagesMap = function getPendingMessagesMap() {
   return pendingMessagesMap;
 };
+var clearPendingMessagesMap = function clearPendingMessagesMap() {
+  Object.keys(pendingMessagesMap).forEach(function (channelId) {
+    delete pendingMessagesMap[channelId];
+  });
+};
 var draftMessagesMap = {};
 var audioRecordingMap = {};
 var getDraftMessageFromMap = function getDraftMessageFromMap(channelId) {
@@ -12758,7 +12763,7 @@ function SvgSearch(props) {
   })));
 }
 
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject0, _templateObject1, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14, _templateObject15, _templateObject16, _templateObject17, _templateObject18, _templateObject19, _templateObject20, _templateObject21, _templateObject22, _templateObject23, _templateObject24, _templateObject25, _templateObject26, _templateObject27, _templateObject28, _templateObject29, _templateObject30, _templateObject31, _templateObject32, _templateObject33, _templateObject34, _templateObject35, _templateObject36, _templateObject37, _templateObject38, _templateObject39, _templateObject40;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject0, _templateObject1, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14, _templateObject15, _templateObject16, _templateObject17, _templateObject18, _templateObject19, _templateObject20, _templateObject21, _templateObject22, _templateObject23, _templateObject24, _templateObject25, _templateObject26, _templateObject27, _templateObject28, _templateObject29, _templateObject30, _templateObject31, _templateObject32, _templateObject33, _templateObject34, _templateObject35, _templateObject36, _templateObject37, _templateObject38, _templateObject39, _templateObject40, _templateObject41;
 function md5(inputString) {
   var hc = '0123456789abcdef';
   function rh(n) {
@@ -13254,6 +13259,11 @@ var AttachmentPreviewTitle = styled.span(_templateObject40 || (_templateObject40
 }, function (props) {
   return props.color;
 });
+var CopiedTooltip = styled.span(_templateObject41 || (_templateObject41 = _taggedTemplateLiteralLoose(["\n  position: absolute;\n  left: 50%;\n  transform: translateX(-50%);\n  bottom: calc(100% + 6px);\n  padding: 4px 8px;\n  border-radius: 6px;\n  font-size: 12px;\n  line-height: 14px;\n  white-space: nowrap;\n  pointer-events: none;\n  z-index: 10;\n  animation: slideDownFadeIn 0.3s ease-out;\n  background-color: ", ";\n  color: ", ";\n  box-shadow: 0px 4px 12px rgba(0, 0, 0, 0.15);\n\n  @keyframes slideDownFadeIn {\n    from {\n      transform: translateX(-50%) translateY(8px);\n      opacity: 0;\n    }\n    to {\n      transform: translateX(-50%) translateY(0);\n      opacity: 1;\n    }\n  }\n"])), function (p) {
+  return p.background;
+}, function (p) {
+  return p.color;
+});
 
 var _templateObject$1, _templateObject2$1, _templateObject3$1, _templateObject4$1, _templateObject5$1;
 var StatusText = styled.span(_templateObject$1 || (_templateObject$1 = _taggedTemplateLiteralLoose(["\n  color: ", ";\n  font-weight: 400;\n  font-size: ", ";\n"])), function (props) {
@@ -13330,7 +13340,10 @@ var MessageStatusIcon = function MessageStatusIcon(_ref) {
       });
   }
 };
-var linkifyTextPart = function linkifyTextPart(textPart, match) {
+var linkifyTextPart = function linkifyTextPart(textPart, match, target) {
+  if (target === void 0) {
+    target = '_blank';
+  }
   var newMessageText;
   var prevMatchEnd = 0;
   var lastFoundIndex = 0;
@@ -13342,7 +13355,7 @@ var linkifyTextPart = function linkifyTextPart(textPart, match) {
         draggable: false,
         key: index,
         href: matchItem.url,
-        target: '_blank',
+        target: target,
         rel: 'noreferrer'
       }, "" + matchItem.text)];
     } else {
@@ -13350,7 +13363,7 @@ var linkifyTextPart = function linkifyTextPart(textPart, match) {
         draggable: false,
         key: index,
         href: matchItem.url,
-        target: '_blank',
+        target: target,
         rel: 'noreferrer'
       }, "" + matchItem.text));
     }
@@ -13372,7 +13385,9 @@ var MessageTextFormat = function MessageTextFormat(_ref2) {
     textSecondary = _ref2.textSecondary,
     onMentionNameClick = _ref2.onMentionNameClick,
     shouldOpenUserProfileForMention = _ref2.shouldOpenUserProfileForMention,
-    unsupportedMessage = _ref2.unsupportedMessage;
+    unsupportedMessage = _ref2.unsupportedMessage,
+    _ref2$target = _ref2.target,
+    target = _ref2$target === void 0 ? '_blank' : _ref2$target;
   try {
     var messageText = [];
     var linkify = new LinkifyIt();
@@ -13390,12 +13405,12 @@ var MessageTextFormat = function MessageTextFormat(_ref2) {
           var firstPart = "" + (textPart ? textPart === null || textPart === void 0 ? void 0 : textPart.substring(nextPartIndex || 0, attributeOffset) : '');
           var firstPartMatch = firstPart ? linkify.match(firstPart) : '';
           if (!isLastMessage && !asSampleText && firstPartMatch) {
-            firstPart = linkifyTextPart(firstPart, firstPartMatch);
+            firstPart = linkifyTextPart(firstPart, firstPartMatch, target);
           }
           var secondPart = "" + (textPart ? textPart === null || textPart === void 0 ? void 0 : textPart.substring(attributeOffset + attribute.length) : '');
           var secondPartMatch = secondPart ? linkify.match(secondPart) : '';
           if (!isLastMessage && !asSampleText && secondPartMatch) {
-            secondPart = linkifyTextPart(secondPart, secondPartMatch);
+            secondPart = linkifyTextPart(secondPart, secondPartMatch, target);
           }
           if (attribute.type.includes('mention')) {
             var mentionDisplay = message.mentionedUsers && message.mentionedUsers.find(function (men) {
@@ -13464,7 +13479,7 @@ var MessageTextFormat = function MessageTextFormat(_ref2) {
     } else {
       var match = linkify.match(text);
       if (!isLastMessage && !asSampleText && match) {
-        messageText = linkifyTextPart(text, match);
+        messageText = linkifyTextPart(text, match, target);
       }
     }
     return messageText.length > 1 ? asSampleText ? messageText.join('') : messageText : text;
@@ -18234,9 +18249,15 @@ function sendMessage(action) {
         _t2 = _context3.v;
         log.error('error on send message ... ', _t2);
       case 19:
+        _context3.p = 19;
+        _context3.n = 20;
+        return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
+      case 20:
+        return _context3.f(19);
+      case 21:
         return _context3.a(2);
     }
-  }, _marked$3, null, [[1, 18]]);
+  }, _marked$3, null, [[1, 18, 19, 21]]);
 }
 function sendTextMessage(action) {
   var payload, message, connectionState, channelId, channel, sendMessageTid, activeChannelId, SceytChatClient, createChannelData, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, messageToSend, pendingMessage, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, _t3;
@@ -18392,15 +18413,12 @@ function sendTextMessage(action) {
         throw new Error('Connection required to send message');
       case 17:
         _context4.n = 18;
-        return put(getMessagesAC(channel, true, channel.lastMessage.id, undefined, undefined, false));
-      case 18:
-        _context4.n = 19;
         return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
-      case 19:
-        _context4.n = 22;
+      case 18:
+        _context4.n = 21;
         break;
-      case 20:
-        _context4.p = 20;
+      case 19:
+        _context4.p = 19;
         _t3 = _context4.v;
         log.error('error on send text message ... ', _t3);
         updateMessageOnMap(channel.id, {
@@ -18410,23 +18428,23 @@ function sendTextMessage(action) {
           }
         });
         if (!(activeChannelId === channel.id)) {
-          _context4.n = 21;
+          _context4.n = 20;
           break;
         }
         updateMessageOnAllMessages(sendMessageTid, {
           state: MESSAGE_STATUS.FAILED
         });
-        _context4.n = 21;
+        _context4.n = 20;
         return put(updateMessageAC(sendMessageTid, {
           state: MESSAGE_STATUS.FAILED
         }));
-      case 21:
-        _context4.n = 22;
+      case 20:
+        _context4.n = 21;
         return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
-      case 22:
+      case 21:
         return _context4.a(2);
     }
-  }, _marked2$2, null, [[3, 20]]);
+  }, _marked2$2, null, [[3, 19]]);
 }
 function forwardMessage(action) {
   var payload, message, channelId, connectionState, isForward, channel, SceytChatClient, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, messageToSend, pendingMessage, activeChannelId, isCachedChannel, hasNextMessages, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, _t4;
@@ -19064,7 +19082,7 @@ function editMessage(action) {
   }, _marked6$1, null, [[0, 5]]);
 }
 function getMessagesQuery(action) {
-  var _action$payload, channel, loadWithLastMessage, messageId, limit, withDeliveredMessages, highlight, behavior, SceytChatClient, messageQueryBuilder, messageQuery, cachedMessages, result, allMessages, havLastMessage, secondResult, sentMessages, messagesMap, filteredSentMessages, _allMessages, messageIndex, maxLengthPart, _secondResult, thirdResult, _secondResult2, _thirdResult, _secondResult3, _secondResult4, updatedMessages, pendingMessages, _messagesMap, filteredPendingMessages, _t9;
+  var _action$payload, channel, loadWithLastMessage, messageId, limit, highlight, behavior, SceytChatClient, messageQueryBuilder, messageQuery, cachedMessages, result, allMessages, havLastMessage, shouldReloadFromServer, secondResult, pendingMessages, messagesMap, uniqueMessagesMap, currentMessagesInState, preservedMessages, _allMessages, messageIndex, maxLengthPart, _secondResult, thirdResult, _secondResult2, _thirdResult, _secondResult3, _pendingMessages, _messagesMap, filteredPendingMessages, _secondResult4, updatedMessages, _currentMessagesInState, _messagesMap2, preservedFromRedux, _pendingMessages2, _messagesMap3, _filteredPendingMessages, _t9;
   return _regenerator().w(function (_context9) {
     while (1) switch (_context9.p = _context9.n) {
       case 0:
@@ -19072,9 +19090,9 @@ function getMessagesQuery(action) {
         _context9.n = 1;
         return put(setMessagesLoadingStateAC(LOADING_STATE.LOADING));
       case 1:
-        _action$payload = action.payload, channel = _action$payload.channel, loadWithLastMessage = _action$payload.loadWithLastMessage, messageId = _action$payload.messageId, limit = _action$payload.limit, withDeliveredMessages = _action$payload.withDeliveredMessages, highlight = _action$payload.highlight, behavior = _action$payload.behavior;
+        _action$payload = action.payload, channel = _action$payload.channel, loadWithLastMessage = _action$payload.loadWithLastMessage, messageId = _action$payload.messageId, limit = _action$payload.limit, highlight = _action$payload.highlight, behavior = _action$payload.behavior;
         if (!(channel.id && !channel.isMockChannel)) {
-          _context9.n = 48;
+          _context9.n = 50;
           break;
         }
         SceytChatClient = getClient();
@@ -19092,13 +19110,14 @@ function getMessagesQuery(action) {
           hasNext: false
         };
         if (!loadWithLastMessage) {
-          _context9.n = 13;
+          _context9.n = 14;
           break;
         }
         allMessages = getAllMessages();
         havLastMessage = allMessages && allMessages.length && channel.lastMessage && allMessages[allMessages.length - 1] && allMessages[allMessages.length - 1].id === channel.lastMessage.id;
-        if (!(channel.newMessageCount && channel.newMessageCount > 0 || !havLastMessage)) {
-          _context9.n = 8;
+        shouldReloadFromServer = channel.newMessageCount && channel.newMessageCount > 0 || !havLastMessage;
+        if (!shouldReloadFromServer) {
+          _context9.n = 9;
           break;
         }
         setHasPrevCached(false);
@@ -19120,52 +19139,86 @@ function getMessagesQuery(action) {
         result.messages = [].concat(secondResult.messages, result.messages);
         result.hasNext = secondResult.hasNext;
       case 5:
-        sentMessages = [];
-        if (withDeliveredMessages) {
-          sentMessages = getFromAllMessagesByMessageId('', '', true);
-        }
+        pendingMessages = getPendingMessages(channel.id) || [];
         messagesMap = {};
         result.messages.forEach(function (msg) {
-          messagesMap[msg.tid || ''] = msg;
+          if (msg.id) messagesMap[msg.id] = msg;
+          if (msg.tid) messagesMap[msg.tid] = msg;
         });
-        filteredSentMessages = sentMessages.filter(function (msg) {
-          return !messagesMap[msg.tid || ''];
+        pendingMessages.forEach(function (msg) {
+          var alreadyExists = msg.id && messagesMap[msg.id] || msg.tid && messagesMap[msg.tid] || msg.tid && msg.id && (messagesMap[msg.tid] || messagesMap[msg.id]);
+          if (!alreadyExists) {
+            if (msg.id) messagesMap[msg.id] = msg;
+            if (msg.tid) messagesMap[msg.tid] = msg;
+          }
+        });
+        uniqueMessagesMap = {};
+        result.messages = result.messages.filter(function (msg) {
+          var key = msg.id || msg.tid;
+          if (key && !uniqueMessagesMap[key]) {
+            uniqueMessagesMap[key] = msg;
+            return true;
+          }
+          return false;
+        });
+        pendingMessages.forEach(function (msg) {
+          var key = msg.id || msg.tid;
+          var alreadyExists = msg.id && uniqueMessagesMap[msg.id] || msg.tid && uniqueMessagesMap[msg.tid];
+          if (!alreadyExists && key && !uniqueMessagesMap[key]) {
+            uniqueMessagesMap[key] = msg;
+            result.messages.push(msg);
+          }
         });
-        result.messages = [].concat(result.messages, filteredSentMessages).slice(filteredSentMessages.length);
         _context9.n = 6;
-        return put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
+        return select(function (state) {
+          return state.MessageReducer.activeChannelMessages;
+        });
       case 6:
-        setMessagesToMap(channel.id, result.messages);
-        setAllMessages(result.messages);
+        currentMessagesInState = _context9.v;
+        preservedMessages = [];
+        currentMessagesInState.forEach(function (msg) {
+          var key = msg.id || msg.tid;
+          var alreadyExists = msg.id && uniqueMessagesMap[msg.id] || msg.tid && uniqueMessagesMap[msg.tid];
+          if (!alreadyExists && key && !uniqueMessagesMap[key]) {
+            uniqueMessagesMap[key] = msg;
+            result.messages.push(msg);
+            preservedMessages.push(msg);
+          }
+        });
         _context9.n = 7;
-        return put(setMessagesHasPrevAC(true));
+        return put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
       case 7:
-        _context9.n = 10;
-        break;
+        setMessagesToMap(channel.id, result.messages);
+        setAllMessages(result.messages);
+        _context9.n = 8;
+        return put(setMessagesHasPrevAC(result.hasNext));
       case 8:
-        result.messages = getFromAllMessagesByMessageId('', '', true);
-        _context9.n = 9;
-        return put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
+        _context9.n = 11;
+        break;
       case 9:
+        result.messages = getFromAllMessagesByMessageId('', '', true);
         _context9.n = 10;
-        return put(setMessagesHasPrevAC(true));
+        return put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
       case 10:
         _context9.n = 11;
-        return put(setMessagesHasNextAC(false));
+        return put(setMessagesHasPrevAC(true));
       case 11:
+        _context9.n = 12;
+        return put(setMessagesHasNextAC(false));
+      case 12:
         setHasNextCached(false);
         if (!messageId) {
-          _context9.n = 12;
+          _context9.n = 13;
           break;
         }
-        _context9.n = 12;
+        _context9.n = 13;
         return put(setScrollToMessagesAC(messageId, highlight, behavior));
-      case 12:
-        _context9.n = 46;
-        break;
       case 13:
+        _context9.n = 49;
+        break;
+      case 14:
         if (!messageId) {
-          _context9.n = 26;
+          _context9.n = 27;
           break;
         }
         _allMessages = getAllMessages();
@@ -19174,168 +19227,182 @@ function getMessagesQuery(action) {
         });
         maxLengthPart = MESSAGES_MAX_LENGTH / 2;
         if (!(messageIndex >= maxLengthPart)) {
-          _context9.n = 16;
+          _context9.n = 17;
           break;
         }
         result.messages = _allMessages.slice(messageIndex - maxLengthPart, messageIndex + maxLengthPart);
-        _context9.n = 14;
+        _context9.n = 15;
         return put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
-      case 14:
+      case 15:
         setHasPrevCached(messageIndex > maxLengthPart);
         setHasNextCached(_allMessages.length > maxLengthPart);
-        _context9.n = 15;
+        _context9.n = 16;
         return put(setMessagesHasPrevAC(true));
-      case 15:
-        _context9.n = 22;
-        break;
       case 16:
+        _context9.n = 23;
+        break;
+      case 17:
         messageQuery.limit = MESSAGES_MAX_LENGTH;
         log.info('load by message id from server ...............', messageId);
-        _context9.n = 17;
+        _context9.n = 18;
         return call(messageQuery.loadNearMessageId, messageId);
-      case 17:
+      case 18:
         result = _context9.v;
         if (!(result.messages.length === 50)) {
-          _context9.n = 20;
+          _context9.n = 21;
           break;
         }
         messageQuery.limit = MESSAGES_MAX_LENGTH - 50;
-        _context9.n = 18;
+        _context9.n = 19;
         return call(messageQuery.loadPreviousMessageId, result.messages[0].id);
-      case 18:
+      case 19:
         _secondResult = _context9.v;
         messageQuery.reverse = false;
-        _context9.n = 19;
+        _context9.n = 20;
         return call(messageQuery.loadNextMessageId, result.messages[result.messages.length - 1].id);
-      case 19:
+      case 20:
         thirdResult = _context9.v;
         result.messages = [].concat(_secondResult.messages, result.messages, thirdResult.messages);
         result.hasNext = _secondResult.hasNext;
         messageQuery.reverse = true;
-        _context9.n = 20;
-        return put(setMessagesHasPrevAC(_secondResult.hasNext));
-      case 20:
         _context9.n = 21;
-        return put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
+        return put(setMessagesHasPrevAC(_secondResult.hasNext));
       case 21:
+        _context9.n = 22;
+        return put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
+      case 22:
         setMessagesToMap(channel.id, result.messages);
         setAllMessages([].concat(result.messages));
         setHasPrevCached(false);
         setHasNextCached(false);
-      case 22:
-        _context9.n = 23;
-        return put(setMessagesHasNextAC(true));
       case 23:
         _context9.n = 24;
-        return put(setScrollToMessagesAC(messageId, true, behavior));
+        return put(setMessagesHasNextAC(true));
       case 24:
         _context9.n = 25;
-        return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
+        return put(setScrollToMessagesAC(messageId, true, behavior));
       case 25:
-        _context9.n = 46;
-        break;
+        _context9.n = 26;
+        return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
       case 26:
+        _context9.n = 49;
+        break;
+      case 27:
         if (!(channel.newMessageCount && channel.lastDisplayedMessageId)) {
-          _context9.n = 39;
+          _context9.n = 40;
           break;
         }
         setMessagesToMap(channel.id, []);
         setAllMessages([]);
         messageQuery.limit = MESSAGES_MAX_LENGTH;
         if (!Number(channel.lastDisplayedMessageId)) {
-          _context9.n = 32;
+          _context9.n = 33;
           break;
         }
-        _context9.n = 27;
+        _context9.n = 28;
         return call(messageQuery.loadNearMessageId, channel.lastDisplayedMessageId);
-      case 27:
+      case 28:
         result = _context9.v;
         if (!(result.messages.length === 50)) {
-          _context9.n = 31;
+          _context9.n = 32;
           break;
         }
         messageQuery.limit = channel.newMessageCount > 25 ? (MESSAGES_MAX_LENGTH - 50) / 2 : MESSAGES_MAX_LENGTH - 50;
-        _context9.n = 28;
+        _context9.n = 29;
         return call(messageQuery.loadPreviousMessageId, result.messages[0].id);
-      case 28:
+      case 29:
         _secondResult2 = _context9.v;
         if (!(channel.newMessageCount > 25)) {
-          _context9.n = 30;
+          _context9.n = 31;
           break;
         }
         messageQuery.reverse = false;
-        _context9.n = 29;
+        _context9.n = 30;
         return call(messageQuery.loadNextMessageId, result.messages[result.messages.length - 1].id);
-      case 29:
+      case 30:
         _thirdResult = _context9.v;
         result.messages = [].concat(_secondResult2.messages, result.messages, _thirdResult.messages);
         messageQuery.reverse = true;
-        _context9.n = 31;
+        _context9.n = 32;
         break;
-      case 30:
-        result.messages = [].concat(_secondResult2.messages, result.messages);
       case 31:
-        _context9.n = 35;
-        break;
+        result.messages = [].concat(_secondResult2.messages, result.messages);
       case 32:
-        _context9.n = 33;
-        return call(messageQuery.loadPrevious);
+        _context9.n = 36;
+        break;
       case 33:
+        _context9.n = 34;
+        return call(messageQuery.loadPrevious);
+      case 34:
         result = _context9.v;
         if (!(result.messages.length === 50)) {
-          _context9.n = 35;
+          _context9.n = 36;
           break;
         }
         messageQuery.limit = MESSAGES_MAX_LENGTH - 50;
-        _context9.n = 34;
+        _context9.n = 35;
         return call(messageQuery.loadPreviousMessageId, result.messages[0].id);
-      case 34:
+      case 35:
         _secondResult3 = _context9.v;
         result.messages = [].concat(_secondResult3.messages, result.messages);
         result.hasNext = _secondResult3.hasNext;
-      case 35:
-        _context9.n = 36;
-        return put(setMessagesHasPrevAC(true));
       case 36:
         _context9.n = 37;
-        return put(setMessagesHasNextAC(channel.lastMessage && result.messages.length > 0 && channel.lastMessage.id !== result.messages[result.messages.length - 1].id));
+        return put(setMessagesHasPrevAC(true));
       case 37:
+        _context9.n = 38;
+        return put(setMessagesHasNextAC(channel.lastMessage && result.messages.length > 0 && channel.lastMessage.id !== result.messages[result.messages.length - 1].id));
+      case 38:
+        _pendingMessages = getPendingMessages(channel.id);
+        if (_pendingMessages && _pendingMessages.length) {
+          _messagesMap = {};
+          result.messages.forEach(function (msg) {
+            if (msg.tid) _messagesMap[msg.tid] = true;
+            if (msg.id) _messagesMap[msg.id] = true;
+          });
+          filteredPendingMessages = _pendingMessages.filter(function (msg) {
+            return !(_messagesMap[msg.tid || ''] || _messagesMap[msg.id || '']);
+          });
+          if (filteredPendingMessages.length > 0) {
+            result.messages = [].concat(result.messages, filteredPendingMessages);
+          }
+        }
         setMessagesToMap(channel.id, result.messages);
         setAllMessages([].concat(result.messages));
-        _context9.n = 38;
+        _context9.n = 39;
         return put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
-      case 38:
-        _context9.n = 46;
-        break;
       case 39:
+        _context9.n = 49;
+        break;
+      case 40:
         setMessagesToMap(channel.id, []);
         setAllMessages([]);
         if (!(cachedMessages && cachedMessages.length)) {
-          _context9.n = 40;
+          _context9.n = 41;
           break;
         }
         setMessagesToMap(channel.id, []);
         setAllMessages([].concat(cachedMessages));
-        _context9.n = 40;
+        _context9.n = 41;
         return put(setMessagesAC(JSON.parse(JSON.stringify(cachedMessages))));
-      case 40:
+      case 41:
         log.info('load message from server');
-        _context9.n = 41;
+        _context9.n = 42;
         return call(messageQuery.loadPrevious);
-      case 41:
+      case 42:
         result = _context9.v;
         if (!(result.messages.length === 50)) {
-          _context9.n = 43;
+          _context9.n = 44;
           break;
         }
         messageQuery.limit = MESSAGES_MAX_LENGTH - 50;
-        _context9.n = 42;
+        _context9.n = 43;
         return call(messageQuery.loadPreviousMessageId, result.messages[0].id);
-      case 42:
+      case 43:
         _secondResult4 = _context9.v;
         result.messages = [].concat(_secondResult4.messages, result.messages);
         result.hasNext = _secondResult4.hasNext;
-      case 43:
+      case 44:
         updatedMessages = [];
         result.messages.forEach(function (msg) {
           var updatedMessage = updateMessageOnMap(channel.id, {
@@ -19345,58 +19412,86 @@ function getMessagesQuery(action) {
           updateMessageOnAllMessages(msg.id, updatedMessage || msg);
           updatedMessages.push(updatedMessage || msg);
         });
+        _context9.n = 45;
+        return select(function (state) {
+          return state.MessageReducer.activeChannelMessages;
+        });
+      case 45:
+        _currentMessagesInState = _context9.v;
+        _messagesMap2 = {};
+        updatedMessages.forEach(function (msg) {
+          if (msg.tid) _messagesMap2[msg.tid] = true;
+          if (msg.id) _messagesMap2[msg.id] = true;
+        });
+        preservedFromRedux = [];
+        _currentMessagesInState.forEach(function (msg) {
+          var alreadyExists = msg.id && _messagesMap2[msg.id] || msg.tid && _messagesMap2[msg.tid];
+          if (!alreadyExists) {
+            var key = msg.id || msg.tid;
+            if (key && !_messagesMap2[key]) {
+              _messagesMap2[key] = true;
+              updatedMessages.push(msg);
+              preservedFromRedux.push(msg);
+            }
+          }
+        });
         setMessagesToMap(channel.id, updatedMessages);
         setAllMessages([].concat(updatedMessages));
-        _context9.n = 44;
+        _context9.n = 46;
         return put(setMessagesAC(JSON.parse(JSON.stringify(updatedMessages))));
-      case 44:
-        _context9.n = 45;
+      case 46:
+        _context9.n = 47;
         return put(setMessagesHasPrevAC(result.hasNext));
-      case 45:
-        _context9.n = 46;
+      case 47:
+        _context9.n = 48;
         return put(setMessagesHasNextAC(false));
-      case 46:
-        pendingMessages = getPendingMessages(channel.id);
-        if (!(pendingMessages && pendingMessages.length)) {
-          _context9.n = 47;
+      case 48:
+        _pendingMessages2 = getPendingMessages(channel.id);
+        if (!(_pendingMessages2 && _pendingMessages2.length)) {
+          _context9.n = 49;
           break;
         }
-        _messagesMap = {};
-        result.messages.forEach(function (msg) {
-          _messagesMap[msg.tid || ''] = msg;
+        _messagesMap3 = {};
+        updatedMessages.forEach(function (msg) {
+          if (msg.tid) _messagesMap3[msg.tid] = true;
+          if (msg.id) _messagesMap3[msg.id] = true;
         });
-        filteredPendingMessages = pendingMessages.filter(function (msg) {
-          return !_messagesMap[msg.tid || ''];
+        _filteredPendingMessages = _pendingMessages2.filter(function (msg) {
+          return !(_messagesMap3[msg.tid || ''] || _messagesMap3[msg.id || '']);
         });
-        _context9.n = 47;
-        return put(addMessagesAC(filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
-      case 47:
-        _context9.n = 49;
-        break;
-      case 48:
-        if (!channel.isMockChannel) {
+        if (!(_filteredPendingMessages.length > 0)) {
           _context9.n = 49;
           break;
         }
         _context9.n = 49;
-        return put(setMessagesAC([]));
+        return put(addMessagesAC(_filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
       case 49:
         _context9.n = 51;
         break;
       case 50:
-        _context9.p = 50;
-        _t9 = _context9.v;
-        log.error('error in message query', _t9);
+        if (!channel.isMockChannel) {
+          _context9.n = 51;
+          break;
+        }
+        _context9.n = 51;
+        return put(setMessagesAC([]));
       case 51:
-        _context9.p = 51;
-        _context9.n = 52;
-        return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
+        _context9.n = 53;
+        break;
       case 52:
-        return _context9.f(51);
+        _context9.p = 52;
+        _t9 = _context9.v;
+        log.error('error in message query', _t9);
       case 53:
+        _context9.p = 53;
+        _context9.n = 54;
+        return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
+      case 54:
+        return _context9.f(53);
+      case 55:
         return _context9.a(2);
     }
-  }, _marked7$1, null, [[0, 50, 51, 53]]);
+  }, _marked7$1, null, [[0, 52, 53, 55]]);
 }
 function getMessageQuery(action) {
   var payload, channelId, messageId, channel, messages, fetchedMessage, _t0;
@@ -22119,7 +22214,7 @@ var ChannelMessageText = function ChannelMessageText(_ref2) {
     return mem === user.id ? ' You' : " " + systemMessageUserName(mem, contactsMap && contactsMap[mem], lastMessage.mentionedUsers);
   })) + " " + (lastMessageMetas && lastMessageMetas.m && lastMessageMetas.m.length > 5 ? "and " + (lastMessageMetas.m.length - 5) + " more" : '') : lastMessage.body === 'RM' ? " removed " + (lastMessageMetas && lastMessageMetas.m && lastMessageMetas.m.slice(0, 5).map(function (mem) {
     return mem === user.id ? ' You' : " " + systemMessageUserName(mem, contactsMap && contactsMap[mem], lastMessage.mentionedUsers);
-  })) + " " + (lastMessageMetas && lastMessageMetas.m && lastMessageMetas.m.length > 5 ? "and " + (lastMessageMetas.m.length - 5) + " more" : '') : lastMessage.body === 'LG' ? 'Left this group' : '') : (/*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(LastMessageDescription, null, channel.lastReactedMessage && (/*#__PURE__*/React__default.createElement(React__default.Fragment, null, "Reacted", /*#__PURE__*/React__default.createElement(ReactionItem, null, channel.newReactions && channel.newReactions[0] && channel.newReactions[0].key), "to", ' "')), LastMessageAttachments({
+  })) + " " + (lastMessageMetas && lastMessageMetas.m && lastMessageMetas.m.length > 5 ? "and " + (lastMessageMetas.m.length - 5) + " more" : '') : lastMessage.body === 'LG' ? 'Left this group' : lastMessage.body === 'JL' ? 'Joined this group via invite link' : '') : (/*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(LastMessageDescription, null, channel.lastReactedMessage && (/*#__PURE__*/React__default.createElement(React__default.Fragment, null, "Reacted", /*#__PURE__*/React__default.createElement(ReactionItem, null, channel.newReactions && channel.newReactions[0] && channel.newReactions[0].key), "to", ' "')), LastMessageAttachments({
     lastMessage: lastMessage
   }), !!(lastMessage && lastMessage.id) && MessageTextFormat({
     text: lastMessage.body,
@@ -32346,7 +32441,9 @@ var OGMetadata = function OGMetadata(_ref) {
   var _metadata$og4, _metadata$og4$image, _metadata$og4$image$, _metadata$og5, _metadata$og5$image, _metadata$og5$image$, _metadata$og6, _metadata$og7, _metadata$og7$favicon, _metadata$og8, _metadata$og8$favicon, _metadata$og9, _metadata$og0, _metadata$og1;
   var attachments = _ref.attachments,
     state = _ref.state,
-    incoming = _ref.incoming;
+    incoming = _ref.incoming,
+    _ref$target = _ref.target,
+    target = _ref$target === void 0 ? '_blank' : _ref$target;
   var dispatch = useDispatch();
   var oGMetadata = useSelector(function (state) {
     return state.MessageReducer.oGMetadata;
@@ -32486,7 +32583,7 @@ var OGMetadata = function OGMetadata(_ref) {
     bgColor: incoming ? incomingMessageBackgroundX : outgoingMessageBackgroundX
   }, /*#__PURE__*/React__default.createElement("div", {
     onClick: function onClick() {
-      window.open(attachment === null || attachment === void 0 ? void 0 : attachment.url, '_blank');
+      window.open(attachment === null || attachment === void 0 ? void 0 : attachment.url, target);
     },
     style: {
       width: showOGMetadata ? '100%' : 'auto'
@@ -39295,6 +39392,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     if (connectionStatus === CONNECTION_STATUS.CONNECTED) {
       var pendingMessagesMap = getPendingMessagesMap();
       var pendingMessagesMapCopy = JSON.parse(JSON.stringify(pendingMessagesMap));
+      clearPendingMessagesMap();
       setTimeout(function () {
         Object.keys(pendingMessagesMapCopy).forEach(function (key) {
           pendingMessagesMapCopy[key].forEach(function (msg) {
@@ -40801,7 +40899,7 @@ function ResetLinkConfirmModal(_ref) {
   });
 }
 
-var _templateObject$P, _templateObject2$K, _templateObject3$D, _templateObject4$x, _templateObject5$s, _templateObject6$o, _templateObject7$m, _templateObject8$k, _templateObject9$g, _templateObject0$f, _templateObject1$c, _templateObject10$7, _templateObject11$7, _templateObject12$6;
+var _templateObject$P, _templateObject2$K, _templateObject3$D, _templateObject4$x, _templateObject5$s, _templateObject6$o, _templateObject7$m, _templateObject8$k, _templateObject9$g, _templateObject0$f, _templateObject1$c, _templateObject10$7, _templateObject11$7, _templateObject12$6, _templateObject13$5;
 function InviteLinkModal(_ref) {
   var _getInviteLinkOptions, _tabs$link, _tabs$qr, _tabs$link2, _tabs$qr2;
   var onClose = _ref.onClose,
@@ -40816,7 +40914,8 @@ function InviteLinkModal(_ref) {
     surface1 = _useColor[THEME_COLORS.SURFACE_1],
     textOnPrimary = _useColor[THEME_COLORS.TEXT_ON_PRIMARY],
     border = _useColor[THEME_COLORS.BORDER],
-    iconPrimary = _useColor[THEME_COLORS.ICON_PRIMARY];
+    iconPrimary = _useColor[THEME_COLORS.ICON_PRIMARY],
+    tooltipBackground = _useColor[THEME_COLORS.TOOLTIP_BACKGROUND];
   var theme = useSelector(themeSelector) || 'light';
   var connectionStatus = useSelector(connectionStatusSelector, shallowEqual);
   var channelsInviteKeys = useSelector(channelInviteKeysSelector, shallowEqual);
@@ -40860,11 +40959,23 @@ function InviteLinkModal(_ref) {
   var _useState4 = useState('link'),
     shareMode = _useState4[0],
     setShareMode = _useState4[1];
+  var _useState5 = useState(false),
+    showCopiedToast = _useState5[0],
+    setShowCopiedToast = _useState5[1];
   var logoRef = useRef(null);
+  var toastTimeoutRef = useRef(null);
   var handleCopy = function handleCopy() {
     try {
       var _temp = _catch(function () {
-        return Promise.resolve(navigator.clipboard.writeText(inviteUrl)).then(function () {});
+        return Promise.resolve(navigator.clipboard.writeText(inviteUrl)).then(function () {
+          setShowCopiedToast(true);
+          if (toastTimeoutRef.current) {
+            clearTimeout(toastTimeoutRef.current);
+          }
+          toastTimeoutRef.current = setTimeout(function () {
+            setShowCopiedToast(false);
+          }, 2000);
+        });
       }, function () {});
       return Promise.resolve(_temp && _temp.then ? _temp.then(function () {}) : void 0);
     } catch (e) {
@@ -41096,6 +41207,13 @@ function InviteLinkModal(_ref) {
       dispatch(getChannelInviteKeysAC(channelId));
     }
   }, [channelId]);
+  useEffect(function () {
+    return function () {
+      if (toastTimeoutRef.current) {
+        clearTimeout(toastTimeoutRef.current);
+      }
+    };
+  }, []);
   var channelInviteKeys = useMemo(function () {
     return channelId && channelsInviteKeys !== null && channelsInviteKeys !== void 0 && channelsInviteKeys[channelId] ? channelsInviteKeys[channelId] : [];
   }, [channelId, channelsInviteKeys]);
@@ -41195,12 +41313,15 @@ function InviteLinkModal(_ref) {
     value: inviteUrl,
     readOnly: true,
     color: textPrimary
-  }), /*#__PURE__*/React__default.createElement(CopyButton, {
+  }), /*#__PURE__*/React__default.createElement(CopyButtonWrapper, null, /*#__PURE__*/React__default.createElement(CopyButton, {
     onClick: handleCopy,
     "aria-label": 'Copy invite link'
   }, /*#__PURE__*/React__default.createElement(SvgCopyIcon, {
     color: accentColor
-  }))), showHistorySection && /*#__PURE__*/React__default.createElement(SectionTitle, {
+  })), showCopiedToast && (/*#__PURE__*/React__default.createElement(CopiedTooltip, {
+    background: tooltipBackground,
+    color: textOnPrimary
+  }, "Copied")))), showHistorySection && /*#__PURE__*/React__default.createElement(SectionTitle, {
     color: textSecondary
   }, historyTitle), showHistorySection && (/*#__PURE__*/React__default.createElement(HistoryRow, null, /*#__PURE__*/React__default.createElement("span", null, /*#__PURE__*/React__default.createElement(FieldLabel, {
     color: textPrimary
@@ -41278,22 +41399,23 @@ var LinkInput = styled.input(_templateObject7$m || (_templateObject7$m = _tagged
   return p.color;
 });
 var CopyButton = styled.button(_templateObject8$k || (_templateObject8$k = _taggedTemplateLiteralLoose(["\n  display: inline-flex;\n  align-items: center;\n  justify-content: center;\n  width: 40px;\n  height: 40px;\n  border: none;\n  background: transparent;\n  cursor: pointer;\n"])));
-var SectionTitle = styled.h4(_templateObject9$g || (_templateObject9$g = _taggedTemplateLiteralLoose(["\n  margin: 16px 0 8px;\n  font-weight: 500;\n  font-size: 15px;\n  line-height: 16px;\n  color: ", ";\n"])), function (p) {
+var CopyButtonWrapper = styled.div(_templateObject9$g || (_templateObject9$g = _taggedTemplateLiteralLoose(["\n  position: relative;\n  display: inline-flex;\n  align-items: center;\n  justify-content: center;\n"])));
+var SectionTitle = styled.h4(_templateObject0$f || (_templateObject0$f = _taggedTemplateLiteralLoose(["\n  margin: 16px 0 8px;\n  font-weight: 500;\n  font-size: 15px;\n  line-height: 16px;\n  color: ", ";\n"])), function (p) {
   return p.color;
 });
-var HistoryRow = styled.div(_templateObject0$f || (_templateObject0$f = _taggedTemplateLiteralLoose(["\n  display: flex;\n  align-items: center;\n  justify-content: space-between;\n  margin-bottom: 12px;\n"])));
-var Switch = styled.div(_templateObject1$c || (_templateObject1$c = _taggedTemplateLiteralLoose(["\n  width: 44px;\n  height: 26px;\n  border-radius: 13px;\n  background: ", ";\n  position: relative;\n  cursor: pointer;\n  transition: background 0.2s ease;\n\n  &:after {\n    content: '';\n    position: absolute;\n    top: 3px;\n    left: ", ";\n    width: 20px;\n    height: 20px;\n    background: #fff;\n    border-radius: 50%;\n    transition: left 0.2s ease;\n  }\n"])), function (p) {
+var HistoryRow = styled.div(_templateObject1$c || (_templateObject1$c = _taggedTemplateLiteralLoose(["\n  display: flex;\n  align-items: center;\n  justify-content: space-between;\n  margin-bottom: 12px;\n"])));
+var Switch = styled.div(_templateObject10$7 || (_templateObject10$7 = _taggedTemplateLiteralLoose(["\n  width: 44px;\n  height: 26px;\n  border-radius: 13px;\n  background: ", ";\n  position: relative;\n  cursor: pointer;\n  transition: background 0.2s ease;\n\n  &:after {\n    content: '';\n    position: absolute;\n    top: 3px;\n    left: ", ";\n    width: 20px;\n    height: 20px;\n    background: #fff;\n    border-radius: 50%;\n    transition: left 0.2s ease;\n  }\n"])), function (p) {
   return p.active ? p.accent : 'rgba(226,226,226,1)';
 }, function (p) {
   return p.active ? '22px' : '3px';
 });
-var ResetLink = styled.button(_templateObject10$7 || (_templateObject10$7 = _taggedTemplateLiteralLoose(["\n  margin-top: 12px;\n  border: none;\n  background: transparent;\n  color: #ff4d4f;\n  cursor: pointer;\n"])));
-var QRCodeBox = styled.div(_templateObject11$7 || (_templateObject11$7 = _taggedTemplateLiteralLoose(["\n  border-radius: 8px;\n  border: 1px solid ", ";\n  background-color: ", ";\n  display: flex;\n  width: max-content;\n  padding: 13.5px;\n  margin: auto;\n  position: relative;\n"])), function (p) {
+var ResetLink = styled.button(_templateObject11$7 || (_templateObject11$7 = _taggedTemplateLiteralLoose(["\n  margin-top: 12px;\n  border: none;\n  background: transparent;\n  color: #ff4d4f;\n  cursor: pointer;\n"])));
+var QRCodeBox = styled.div(_templateObject12$6 || (_templateObject12$6 = _taggedTemplateLiteralLoose(["\n  border-radius: 8px;\n  border: 1px solid ", ";\n  background-color: ", ";\n  display: flex;\n  width: max-content;\n  padding: 13.5px;\n  margin: auto;\n  position: relative;\n"])), function (p) {
   return p.borderColor;
 }, function (p) {
   return p.backgroundColor;
 });
-var QrHint = styled.p(_templateObject12$6 || (_templateObject12$6 = _taggedTemplateLiteralLoose(["\n  text-align: center;\n  font-size: 14px;\n  line-height: 16px;\n  color: ", ";\n  margin: 12px 0 0;\n"])), function (p) {
+var QrHint = styled.p(_templateObject13$5 || (_templateObject13$5 = _taggedTemplateLiteralLoose(["\n  text-align: center;\n  font-size: 14px;\n  line-height: 16px;\n  color: ", ";\n  margin: 12px 0 0;\n"])), function (p) {
   return p.color;
 });
 
@@ -42676,7 +42798,7 @@ var EditChannel = function EditChannel(_ref) {
   })));
 };
 
-var _templateObject$Z, _templateObject2$S, _templateObject3$J, _templateObject4$D, _templateObject5$x, _templateObject6$s, _templateObject7$q, _templateObject8$o, _templateObject9$i, _templateObject0$g, _templateObject1$d, _templateObject10$8, _templateObject11$8, _templateObject12$7;
+var _templateObject$Z, _templateObject2$S, _templateObject3$J, _templateObject4$D, _templateObject5$x, _templateObject6$s, _templateObject7$q, _templateObject8$o, _templateObject9$i, _templateObject0$g, _templateObject1$d, _templateObject10$8, _templateObject11$8;
 var Details = function Details(_ref) {
   var _activeChannel$member;
   var detailsTitleText = _ref.detailsTitleText,
@@ -43155,11 +43277,6 @@ var ChannelName$1 = styled(SectionHeader)(_templateObject0$g || (_templateObject
 var ChannelNameWrapper = styled.div(_templateObject1$d || (_templateObject1$d = _taggedTemplateLiteralLoose(["\n  display: flex;\n  justify-content: center;\n"])));
 var EditButton = styled.span(_templateObject10$8 || (_templateObject10$8 = _taggedTemplateLiteralLoose(["\n  margin-left: 6px;\n  cursor: pointer;\n  color: #b2b6be;\n"])));
 var PhoneNumberContainer = styled.span(_templateObject11$8 || (_templateObject11$8 = _taggedTemplateLiteralLoose(["\n  position: relative;\n  display: inline-flex;\n  align-items: center;\n  cursor: pointer;\n  user-select: text;\n"])));
-var CopiedTooltip = styled.span(_templateObject12$7 || (_templateObject12$7 = _taggedTemplateLiteralLoose(["\n  position: absolute;\n  left: 50%;\n  transform: translateX(-50%);\n  bottom: calc(100% + 6px);\n  padding: 4px 8px;\n  border-radius: 6px;\n  background: ", ";\n  color: ", ";\n  font-size: 12px;\n  line-height: 14px;\n  white-space: nowrap;\n  pointer-events: none;\n  z-index: 10;\n"])), function (props) {
-  return props.background;
-}, function (props) {
-  return props.color;
-});
 
 var _templateObject$_;
 var ChannelDetailsContainer = function ChannelDetailsContainer(_ref) {