sceyt-chat-react-uikit 1.5.0 → 1.5.1

package/index.js

@@ -9939,7 +9939,7 @@ function getActiveChannelId() {
 function setChannelsInMap(channels) {
   var channelsForUpdateLastReactionMessage = [];
   var formattedChannel = channels.map(function (channel) {
-    if (channel.userMessageReactions && channel.userMessageReactions.length && channel.lastMessage && channel.lastMessage.id < channel.userMessageReactions[0].id && channel.lastMessage.id !== channel.userMessageReactions[0].messageId) {
+    if (channel.newReactions && channel.newReactions.length && channel.lastMessage && channel.lastMessage.id < channel.newReactions[0].id && channel.lastMessage.id !== channel.newReactions[0].messageId) {
       channelsForUpdateLastReactionMessage.push(channel);
     }
 
@@ -11659,7 +11659,7 @@ function watchForEvents() {
 
           _context3.next = 201;
           return effects.put(updateChannelDataAC(_channel8.id, {
-            unreadMessageCount: _channel8.unreadMessageCount
+            unreadMessageCount: _channel8.newMessageCount
           }));
 
         case 201:
@@ -11745,13 +11745,13 @@ function watchForEvents() {
             }
           }
 
-          if (!(_channel10.userMessageReactions && _channel10.userMessageReactions.length)) {
+          if (!(_channel10.newReactions && _channel10.newReactions.length)) {
             _context3.next = 232;
             break;
           }
 
           channelUpdateParams = {
-            userMessageReactions: _channel10.userMessageReactions,
+            userMessageReactions: _channel10.newReactions,
             lastReactedMessage: _message2
           };
           _context3.next = 232;
@@ -11782,7 +11782,7 @@ function watchForEvents() {
           removeReactionOnAllMessages(_message3, _reaction, true);
 
         case 242:
-          if (_channel11.userMessageReactions && _channel11.userMessageReactions.length) {
+          if (_channel11.newReactions && _channel11.newReactions.length) {
             _context3.next = 246;
             break;
           }
@@ -11859,7 +11859,7 @@ function watchForEvents() {
           _context3.next = 275;
           return effects.put(updateChannelDataAC(_channel14.id, {
             muted: _channel14.muted,
-            muteExpireDate: _channel14.muteExpireDate
+            mutedTill: _channel14.mutedTill
           }));
 
         case 275:
@@ -11871,7 +11871,7 @@ function watchForEvents() {
           _context3.next = 280;
           return effects.put(updateChannelDataAC(_channel15.id, {
             muted: _channel15.muted,
-            muteExpireDate: _channel15.muteExpireDate
+            mutedTill: _channel15.mutedTill
           }));
 
         case 280:
@@ -11899,7 +11899,7 @@ function watchForEvents() {
           _channel18 = args.channel;
           _context3.next = 294;
           return effects.put(updateChannelDataAC(_channel18.id, {
-            markedAsUnread: _channel18.markedAsUnread
+            markedAsUnread: _channel18.unread
           }));
 
         case 294:
@@ -11909,7 +11909,7 @@ function watchForEvents() {
           _channel19 = args.channel;
           _context3.next = 298;
           return effects.put(updateChannelDataAC(_channel19.id, {
-            markedAsUnread: _channel19.markedAsUnread
+            markedAsUnread: _channel19.unread
           }));
 
         case 298:
@@ -12189,7 +12189,7 @@ function getChannels(action) {
               return Promise.resolve(Promise.all(channelsForUpdateLastReactionMessage.map(function (channel) {
                 try {
                   return Promise.resolve(new Promise(function (resolve) {
-                    channel.getMessagesById([channel.userMessageReactions[0].messageId]).then(function (messages) {
+                    channel.getMessagesById([channel.newReactions[0].messageId]).then(function (messages) {
                       channelMessageMap[channel.id] = messages[0];
                       resolve(true);
                     });
@@ -12283,7 +12283,7 @@ function getChannels(action) {
               return Promise.resolve(Promise.all(_channelsForUpdateLastReactionMessage.map(function (channel) {
                 try {
                   return Promise.resolve(new Promise(function (resolve) {
-                    channel.getMessagesById([channel.userMessageReactions[0].messageId]).then(function (messages) {
+                    channel.getMessagesById([channel.newReactions[0].messageId]).then(function (messages) {
                       _channelMessageMap[channel.id] = messages[0];
                       resolve(true);
                     })["catch"](function (e) {
@@ -12530,7 +12530,7 @@ function channelsLoadMore(action) {
               return Promise.resolve(Promise.all(channelsForUpdateLastReactionMessage.map(function (channel) {
                 try {
                   return Promise.resolve(new Promise(function (resolve) {
-                    channel.getMessagesById([channel.userMessageReactions[0].messageId]).then(function (messages) {
+                    channel.getMessagesById([channel.newReactions[0].messageId]).then(function (messages) {
                       channelMessageMap[channel.id] = messages[0];
                       resolve(true);
                     })["catch"](function (e) {
@@ -12673,9 +12673,9 @@ function markMessagesRead(action) {
           markedMessageIds = _context6.sent;
           _context6.next = 11;
           return effects.put(updateChannelDataAC(channel.id, {
-            markedAsUnread: channel.markedAsUnread,
-            lastReadMessageId: channel.lastReadMessageId,
-            unreadMessageCount: channel.unreadMessageCount
+            markedAsUnread: channel.unread,
+            lastReadMessageId: channel.lastDisplayedMsgId,
+            unreadMessageCount: channel.newMessageCount
           }));
 
         case 11:
@@ -12800,7 +12800,7 @@ function notificationsTurnOff(action) {
           _context9.next = 13;
           return effects.put(updateChannelDataAC(updatedChannel.id, {
             muted: updatedChannel.muted,
-            muteExpireDate: updatedChannel.muteExpireDate
+            mutedTill: updatedChannel.mutedTill
           }));
 
         case 13:
@@ -12845,7 +12845,7 @@ function notificationsTurnOn() {
           _context10.next = 12;
           return effects.put(updateChannelDataAC(updatedChannel.id, {
             muted: updatedChannel.muted,
-            muteExpireDate: updatedChannel.muteExpireDate
+            mutedTill: updatedChannel.mutedTill
           }));
 
         case 12:
@@ -15122,7 +15122,7 @@ function getMessagesQuery(action) {
           break;
 
         case 48:
-          if (!(channel.unreadMessageCount && channel.lastReadMessageId)) {
+          if (!(channel.newMessageCount && channel.lastDisplayedMsgId)) {
             _context7.next = 72;
             break;
           }
@@ -15130,13 +15130,13 @@ function getMessagesQuery(action) {
           setAllMessages([]);
           messageQuery.limit = MESSAGES_MAX_LENGTH;
 
-          if (!Number(channel.lastReadMessageId)) {
+          if (!Number(channel.lastDisplayedMsgId)) {
             _context7.next = 57;
             break;
           }
 
           _context7.next = 54;
-          return effects.call(messageQuery.loadNearMessageId, channel.lastReadMessageId);
+          return effects.call(messageQuery.loadNearMessageId, channel.lastDisplayedMsgId);
 
         case 54:
           result = _context7.sent;
@@ -17639,18 +17639,18 @@ var Channel = function Channel(_ref) {
   }, React__default.createElement("h3", null, channel.subject || (isDirectChannel && directChannelUser ? makeUsername(contactsMap[directChannelUser.id], directChannelUser, getFromContacts) : '')), channel.muted && React__default.createElement(MutedIcon, {
     color: notificationsIsMutedIconColor
   }, notificationsIsMutedIcon || React__default.createElement(SvgNotificationsOff3, null)), (lastMessage || !!typingIndicator) && React__default.createElement(LastMessage, {
-    markedAsUnread: !!(channel.markedAsUnread || channel.unreadMessageCount && channel.unreadMessageCount > 0),
-    unreadMentions: !!(channel.unreadMentionsCount && channel.unreadMentionsCount > 0)
+    markedAsUnread: !!(channel.unread || channel.newMessageCount && channel.newMessageCount > 0),
+    unreadMentions: !!(channel.newMentionCount && channel.newMentionCount > 0)
   }, typingIndicator ? !isDirectChannel ? React__default.createElement(LastMessageAuthor, {
     typing: typingIndicator,
     minWidth: messageAuthorRef.current && messageAuthorRef.current.offsetWidth
   }, React__default.createElement("span", {
     ref: messageAuthorRef
-  }, typingIndicator ? getFromContacts ? contactsMap[typingIndicator.from.id] && contactsMap[typingIndicator.from.id].firstName ? contactsMap[typingIndicator.from.id].firstName.split(' ')[0] : typingIndicator.from.id : typingIndicator.from && typingIndicator.from.firstName || typingIndicator.from.id : '')) : null : channel.lastReactedMessage && channel.userMessageReactions && channel.userMessageReactions[0] ? lastMessage.state !== MESSAGE_STATUS.DELETE && (channel.userMessageReactions[0].user && channel.userMessageReactions[0].user.id === user.id || !isDirectChannel) && lastMessage.type !== 'system' && React__default.createElement(LastMessageAuthor, {
+  }, typingIndicator ? getFromContacts ? contactsMap[typingIndicator.from.id] && contactsMap[typingIndicator.from.id].firstName ? contactsMap[typingIndicator.from.id].firstName.split(' ')[0] : typingIndicator.from.id : typingIndicator.from && typingIndicator.from.firstName || typingIndicator.from.id : '')) : null : channel.lastReactedMessage && channel.newReactions && channel.newReactions[0] ? lastMessage.state !== MESSAGE_STATUS.DELETE && (channel.newReactions[0].user && channel.newReactions[0].user.id === user.id || !isDirectChannel) && lastMessage.type !== 'system' && React__default.createElement(LastMessageAuthor, {
     minWidth: messageAuthorRef.current && messageAuthorRef.current.offsetWidth
   }, React__default.createElement("span", {
     ref: messageAuthorRef
-  }, channel.userMessageReactions[0].user.id === user.id ? 'You' : contactsMap[channel.userMessageReactions[0].user.id] ? contactsMap[channel.userMessageReactions[0].user.id].firstName : channel.userMessageReactions[0].user.id || 'Deleted')) : lastMessage.user && lastMessage.state !== MESSAGE_STATUS.DELETE && (lastMessage.user && lastMessage.user.id === user.id || !isDirectChannel) && lastMessage.type !== 'system' && React__default.createElement(LastMessageAuthor, {
+  }, channel.newReactions[0].user.id === user.id ? 'You' : contactsMap[channel.newReactions[0].user.id] ? contactsMap[channel.newReactions[0].user.id].firstName : channel.newReactions[0].user.id || 'Deleted')) : lastMessage.user && lastMessage.state !== MESSAGE_STATUS.DELETE && (lastMessage.user && lastMessage.user.id === user.id || !isDirectChannel) && lastMessage.type !== 'system' && React__default.createElement(LastMessageAuthor, {
     minWidth: messageAuthorRef.current && messageAuthorRef.current.offsetWidth
   }, React__default.createElement("span", {
     ref: messageAuthorRef
@@ -17662,7 +17662,7 @@ var Channel = function Channel(_ref) {
     return mem === user.id ? ' You' : " " + systemMessageUserName(contactsMap[mem], mem);
   })) + " " + (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(contactsMap[mem], mem);
-  })) + " " + (lastMessageMetas && lastMessageMetas.m && lastMessageMetas.m.length > 5 ? "and " + (lastMessageMetas.m.length - 5) + " more" : '') : lastMessage.body === 'LG' ? 'Left this group' : '') : React__default.createElement(React__default.Fragment, null, channel.lastReactedMessage && React__default.createElement(React__default.Fragment, null, "Reacted", React__default.createElement(ReactionItem, null, channel.userMessageReactions && channel.userMessageReactions[0].key), "to", ' "'), !!(lastMessage.attachments && lastMessage.attachments.length) && (lastMessage.attachments[0].type === attachmentTypes.image ? React__default.createElement(React__default.Fragment, null, React__default.createElement(SvgPicture, null), lastMessage.body ? '' : 'Photo') : lastMessage.attachments[0].type === attachmentTypes.video ? React__default.createElement(React__default.Fragment, null, React__default.createElement(SvgVideoCall, null), lastMessage.body ? '' : 'Video') : lastMessage.attachments[0].type === attachmentTypes.file ? React__default.createElement(React__default.Fragment, null, React__default.createElement(SvgChoseFile, null), lastMessage.body ? '' : 'File') : lastMessage.attachments[0].type === attachmentTypes.voice ? React__default.createElement(React__default.Fragment, null, React__default.createElement(SvgVoiceIcon, null), lastMessage.body ? '' : 'Voice') : null), !!(lastMessage && lastMessage.id) && MessageTextFormat({
+  })) + " " + (lastMessageMetas && lastMessageMetas.m && lastMessageMetas.m.length > 5 ? "and " + (lastMessageMetas.m.length - 5) + " more" : '') : lastMessage.body === 'LG' ? 'Left this group' : '') : React__default.createElement(React__default.Fragment, null, channel.lastReactedMessage && React__default.createElement(React__default.Fragment, null, "Reacted", React__default.createElement(ReactionItem, null, channel.newReactions && channel.newReactions[0].key), "to", ' "'), !!(lastMessage.attachments && lastMessage.attachments.length) && (lastMessage.attachments[0].type === attachmentTypes.image ? React__default.createElement(React__default.Fragment, null, React__default.createElement(SvgPicture, null), lastMessage.body ? '' : 'Photo') : lastMessage.attachments[0].type === attachmentTypes.video ? React__default.createElement(React__default.Fragment, null, React__default.createElement(SvgVideoCall, null), lastMessage.body ? '' : 'Video') : lastMessage.attachments[0].type === attachmentTypes.file ? React__default.createElement(React__default.Fragment, null, React__default.createElement(SvgChoseFile, null), lastMessage.body ? '' : 'File') : lastMessage.attachments[0].type === attachmentTypes.voice ? React__default.createElement(React__default.Fragment, null, React__default.createElement(SvgVoiceIcon, null), lastMessage.body ? '' : 'Voice') : null), !!(lastMessage && lastMessage.id) && MessageTextFormat({
     text: lastMessage.body,
     message: lastMessage,
     contactsMap: contactsMap,
@@ -17670,13 +17670,13 @@ var Channel = function Channel(_ref) {
     isLastMessage: true
   }), channel.lastReactedMessage && '"')))), React__default.createElement(ChannelStatus, {
     ref: messageTimeAndStatusRef
-  }, lastMessage && lastMessage.state !== MESSAGE_STATUS.DELETE && React__default.createElement(DeliveryIconCont, null, lastMessage && lastMessage.user && lastMessage.user.id === user.id && lastMessage.type !== 'system' && messageStatusIcon(lastMessage.deliveryStatus, 'ticks', undefined, colors.primary)), React__default.createElement(LastMessageDate, null, lastMessage && lastMessage.createdAt && lastMessageDateFormat(lastMessage.createdAt))), React__default.createElement(UnreadInfo, null, !!(channel.unreadMentionsCount && channel.unreadMentionsCount > 0) && React__default.createElement(UnreadMentionIconWrapper, {
+  }, lastMessage && lastMessage.state !== MESSAGE_STATUS.DELETE && React__default.createElement(DeliveryIconCont, null, lastMessage && lastMessage.user && lastMessage.user.id === user.id && lastMessage.type !== 'system' && messageStatusIcon(lastMessage.deliveryStatus, 'ticks', undefined, colors.primary)), React__default.createElement(LastMessageDate, null, lastMessage && lastMessage.createdAt && lastMessageDateFormat(lastMessage.createdAt))), React__default.createElement(UnreadInfo, null, !!(channel.newMentionCount && channel.newMentionCount > 0) && React__default.createElement(UnreadMentionIconWrapper, {
     iconColor: colors.primary,
-    rightMargin: !!(channel.unreadMessageCount || channel.markedAsUnread)
-  }, React__default.createElement(SvgUnreadMention, null)), !!(channel.unreadMessageCount || channel.markedAsUnread) && React__default.createElement(UnreadCount, {
+    rightMargin: !!(channel.newMessageCount || channel.unread)
+  }, React__default.createElement(SvgUnreadMention, null)), !!(channel.newMessageCount || channel.unread) && React__default.createElement(UnreadCount, {
     backgroundColor: colors.primary,
     isMuted: channel.muted
-  }, channel.unreadMessageCount ? channel.unreadMessageCount > 99 ? '99+' : channel.unreadMessageCount : '')));
+  }, channel.newMessageCount ? channel.newMessageCount > 99 ? '99+' : channel.newMessageCount : '')));
 };
 var Container$2 = styled__default.div(_templateObject$4 || (_templateObject$4 = _taggedTemplateLiteralLoose(["\n  position: relative;\n  display: flex;\n  align-items: center;\n  cursor: pointer;\n  height: 48px;\n  background-color: ", ";\n  border-left: ", ";\n  // padding: selectedChannel ? '8px 16px 8px 13px' : '8px 16px'\n  padding: ", ";\n  margin: ", ";\n  border-radius: ", ";\n"])), function (props) {
   return props.selectedChannel ? props.selectedBackgroundColor || colors.primaryLight : 'inherit';
@@ -19440,6 +19440,7 @@ var ChannelList = function ChannelList(_ref) {
 
   var connectionStatus = reactRedux.useSelector(connectionStatusSelector);
   var channels = reactRedux.useSelector(channelsSelector, reactRedux.shallowEqual) || [];
+  console.log('channels. .. ', channels);
   var contactsMap = reactRedux.useSelector(contactsMapSelector);
   var addedChannel = reactRedux.useSelector(addedChannelSelector);
   var addedToChannel = reactRedux.useSelector(addedToChannelSelector);
@@ -19955,7 +19956,7 @@ function ChatHeader(_ref) {
     color: titleColor
   }, activeChannel.subject || (isDirectChannel && directChannelUser ? makeUsername(contactsMap[directChannelUser.id], directChannelUser, getFromContacts) : '')), showMemberInfo && (isDirectChannel && directChannelUser ? React__default.createElement(SubTitle, {
     color: memberInfoTextColor
-  }, hideUserPresence(directChannelUser) ? '' : directChannelUser.presence && (directChannelUser.presence.state === PRESENCE_STATUS.ONLINE ? 'Online' : directChannelUser.presence.lastActiveAt && userLastActiveDateFormat(directChannelUser.presence.lastActiveAt))) : React__default.createElement(SubTitle, {
+  }, hideUserPresence && hideUserPresence(directChannelUser) ? '' : directChannelUser.presence && (directChannelUser.presence.state === PRESENCE_STATUS.ONLINE ? 'Online' : directChannelUser.presence.lastActiveAt && userLastActiveDateFormat(directChannelUser.presence.lastActiveAt))) : React__default.createElement(SubTitle, {
     color: memberInfoTextColor
   }, !activeChannel.subject && !isDirectChannel ? '' : activeChannel.memberCount + " " + (activeChannel.type === CHANNEL_TYPE.BROADCAST ? activeChannel.memberCount > 1 ? 'subscribers' : 'subscriber' : activeChannel.memberCount > 1 ? 'members' : 'member') + " ")))), !channelListHidden && React__default.createElement(ChanelInfo, {
     onClick: function onClick() {
@@ -23592,7 +23593,7 @@ var Message = function Message(_ref) {
     if (message.selfReactions && message.selfReactions.some(function (item) {
       return item.key === selectedEmoji;
     })) {
-      dispatch(deleteReactionAC(channel.id, message.id, selectedEmoji, channel.userMessageReactions && channel.userMessageReactions[0] && channel.userMessageReactions[0].messageId === message.id && channel.userMessageReactions[0].key === selectedEmoji));
+      dispatch(deleteReactionAC(channel.id, message.id, selectedEmoji, channel.newReactions && channel.newReactions[0] && channel.newReactions[0].messageId === message.id && channel.newReactions[0].key === selectedEmoji));
     } else {
       var score = 1;
       var reason = 'mmm';
@@ -25506,8 +25507,8 @@ var MessageList = function MessageList(_ref2) {
     dispatch(getMessagesAC(channel));
 
     if (channel.id) {
-      if (channel.unreadMessageCount && channel.unreadMessageCount > 0) {
-        setUnreadMessageId(channel.lastReadMessageId);
+      if (channel.newMessageCount && channel.newMessageCount > 0) {
+        setUnreadMessageId(channel.lastDisplayedMsgId);
       } else {
         setUnreadMessageId('');
       }
@@ -25591,12 +25592,12 @@ var MessageList = function MessageList(_ref2) {
     }
   }, [connectionStatus]);
   React.useEffect(function () {
-    if (channel.unreadMessageCount && channel.unreadMessageCount > 0 && getUnreadScrollTo()) {
+    if (channel.newMessageCount && channel.newMessageCount > 0 && getUnreadScrollTo()) {
       if (scrollRef.current) {
         scrollRef.current.style.scrollBehavior = 'inherit';
       }
 
-      var lastReadMessageNode = document.getElementById(channel.lastReadMessageId);
+      var lastReadMessageNode = document.getElementById(channel.lastDisplayedMsgId);
 
       if (lastReadMessageNode) {
         scrollRef.current.scrollTop = lastReadMessageNode.offsetTop;
@@ -26416,18 +26417,11 @@ var SendMessageInput = function SendMessageInput(_ref) {
     var messageTextToFormat = editMessageText || messageText;
     var currentText = "" + messageTextToFormat.slice(0, mentionToChange ? mentionToChange.start + 1 : currentMentions.start + 1) + mentionDisplayName + messageTextToFormat.slice(mentionToChange ? mentionToChange.end : currentMentions.start + 1 + currentMentions.typed.length);
     var mentionedMembersPositions = [];
-    var editingMentions = [];
-
-    if (messageToEdit && messageToEdit.mentionedUsers && messageToEdit.mentionedUsers.length > 0) {
-      editingMentions = getDuplicateMentionsFromMeta(messageToEdit.metadata, messageToEdit.mentionedUsers);
-    }
-
-    var mentions = editingMentions && editingMentions.length ? [].concat(editingMentions, mentionedMembers) : mentionedMembers;
 
-    if (mentions && mentions.length > 0) {
+    if (mentionedMembers && mentionedMembers.length > 0) {
       var lastFoundIndex = 0;
       var starts = {};
-      mentions.forEach(function (menMem) {
+      mentionedMembers.forEach(function (menMem) {
         var mentionDisplayName = "@" + makeUsername(contactsMap[menMem.id], menMem, getFromContacts).trim();
         var menIndex = currentText.indexOf(mentionDisplayName, lastFoundIndex);
         lastFoundIndex = menIndex + mentionDisplayName.length;
@@ -26546,7 +26540,7 @@ var SendMessageInput = function SendMessageInput(_ref) {
         var starts = {};
         var updatedMentionedMembers = [];
         mentionedMembers.forEach(function (menMem) {
-          var mentionDisplayName = mentionedMembersDisplayName[menMem.id].displayName;
+          var mentionDisplayName = menMem.displayName || mentionedMembersDisplayName[menMem.id].displayName;
           var menIndex = currentText.indexOf(mentionDisplayName, lastFoundIndex);
           lastFoundIndex = menIndex + mentionDisplayName.length;
 
@@ -26556,7 +26550,7 @@ var SendMessageInput = function SendMessageInput(_ref) {
               end: menIndex + mentionDisplayName.length
             }));
             mentionedMembersPositions.push({
-              displayName: mentionedMembersDisplayName[menMem.id].displayName,
+              displayName: mentionDisplayName,
               start: menIndex,
               end: menIndex + mentionDisplayName.length
             });
@@ -26572,7 +26566,13 @@ var SendMessageInput = function SendMessageInput(_ref) {
         messageInputRef.current.innerHTML = currentTextCont;
       }
 
-      setMessageText(currentText);
+      if (messageToEdit) {
+        setEditMessageText(currentText);
+      } else {
+        setMessageText(currentText);
+      }
+
+      console.log('set pos .. . ', selPos);
 
       if (selPos > 0) {
         setCursorPosition(messageInputRef.current, selPos);
@@ -26744,11 +26744,10 @@ var SendMessageInput = function SendMessageInput(_ref) {
     var mentionedMembersPositions = [];
     var mentionedUserForSend = [];
 
-    if (messageToEdit.mentionedUsers && messageToEdit.mentionedUsers.length) {
-      var mentions = [].concat(messageToEdit.mentionedUsers, mentionedMembers);
+    if (mentionedMembers && mentionedMembers.length) {
       var lastFoundIndex = 0;
       var starts = {};
-      mentions.forEach(function (menMem) {
+      mentionedMembers.forEach(function (menMem) {
         var mentionDisplayName = ("@" + makeUsername(contactsMap[menMem.id], menMem, getFromContacts)).trim();
         var menIndex = messageTexToSend.indexOf(mentionDisplayName, lastFoundIndex);
 
@@ -27169,6 +27168,7 @@ var SendMessageInput = function SendMessageInput(_ref) {
         setEditMessageText(formattedText);
         var mentions = getDuplicateMentionsFromMeta(messageToEdit.metadata, messageToEdit.mentionedUsers);
         var mentionedMembersPositions = [];
+        var editingMentionedMembers = [];
         var lastFoundIndex = 0;
         var starts = {};
         mentions.forEach(function (menMem) {
@@ -27177,15 +27177,18 @@ var SendMessageInput = function SendMessageInput(_ref) {
           lastFoundIndex = menIndex + mentionDisplayName.length;
 
           if (!starts[menIndex]) {
-            mentionedMembersPositions.push({
+            var mentionInfo = {
               displayName: mentionDisplayName,
               start: menIndex,
               end: menIndex + mentionDisplayName.length
-            });
+            };
+            editingMentionedMembers.push(_extends({}, menMem, mentionInfo));
+            mentionedMembersPositions.push(mentionInfo);
           }
 
           starts[menIndex] = true;
         });
+        setMentionedMembers(editingMentionedMembers);
         var currentTextCont = typingTextFormat({
           text: messageToEdit.body,
           mentionedMembers: [].concat(mentionedMembersPositions)
@@ -27981,9 +27984,9 @@ var Actions$1 = function Actions(_ref) {
   };
 
   var handleToggleChannelMarkAs = function handleToggleChannelMarkAs() {
-    console.log('handle action mark read ', channel.markedAsUnread);
+    console.log('handle action mark read ', channel.unread);
 
-    if (channel.markedAsUnread) {
+    if (channel.unread) {
       dispatch(markChannelAsReadAC(channel.id));
     } else {
       dispatch(markChannelAsUnReadAC(channel.id));
@@ -28069,7 +28072,7 @@ var Actions$1 = function Actions(_ref) {
     iconColor: pinChannelIconColor || colors.gray4,
     color: pinChannelTextColor || colors.gray6,
     hoverColor: pinChannelTextColor || colors.gray6
-  }, React__default.createElement(React__default.Fragment, null, pinChannelIcon || React__default.createElement(SvgPin, null), " Pin")), showMarkAsReadUnread && (isDirectChannel && directChannelUser ? directChannelUser.activityState !== 'Deleted' : true) && (channel.markedAsUnread ? React__default.createElement(ActionItem$1, {
+  }, React__default.createElement(React__default.Fragment, null, pinChannelIcon || React__default.createElement(SvgPin, null), " Pin")), showMarkAsReadUnread && (isDirectChannel && directChannelUser ? directChannelUser.activityState !== 'Deleted' : true) && (channel.unread ? React__default.createElement(ActionItem$1, {
     key: 3,
     onClick: handleToggleChannelMarkAs,
     order: markAsReadUnreadOrder,
@@ -30174,14 +30177,14 @@ var MessagesScrollToBottomButton = function MessagesScrollToBottomButton(_ref) {
     shadow: buttonShadow,
     onClick: handleScrollToBottom,
     bottomPos: sendMessageInputHeight
-  }, !!(channel.unreadMessageCount && channel.unreadMessageCount > 0) && React__default.createElement(UnreadCount$1, {
+  }, !!(channel.newMessageCount && channel.newMessageCount > 0) && React__default.createElement(UnreadCount$1, {
     width: unreadCountWidth,
     height: unreadCountHeight,
     textColor: unreadCountTextColor,
     fontSize: unreadCountFontSize,
     backgroundColor: colors.primary,
     isMuted: channel.muted
-  }, channel.unreadMessageCount ? channel.unreadMessageCount > 99 ? '99+' : channel.unreadMessageCount : ''), buttonIcon || React__default.createElement(SvgChevronDown, null)));
+  }, channel.newMessageCount ? channel.newMessageCount > 99 ? '99+' : channel.newMessageCount : ''), buttonIcon || React__default.createElement(SvgChevronDown, null)));
 };
 var BottomButton = styled__default.div(_templateObject$L || (_templateObject$L = _taggedTemplateLiteralLoose(["\n  position: absolute;\n  bottom: ", ";\n  right: 16px;\n  margin-right: 16px;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  background-color: ", ";\n  border: 0.5px solid rgba(0, 0, 0, 0.1);\n  border-radius: 50px;\n  width: 48px;\n  height: 48px;\n  cursor: pointer;\n  z-index: 14;\n\n  & > svg {\n    color: rgba(129, 140, 153, 1);\n  }\n\n  & > span {\n    bottom: 32px;\n    right: 0;\n  }\n"])), function (props) {
   return props.bottomPos + 45 + "px";

package/package.json

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

package/types/index.d.ts

@@ -100,27 +100,36 @@ export interface IMember extends IUser {
 }
 export interface IChannel {
     id: string;
-    createdAt: Date | number;
-    updatedAt: Date | number;
-    lastReadMessageId: string;
-    lastDeliveredMessageId: string;
-    lastMessage: any | null;
-    lastReactedMessage?: IMessage;
-    memberCount: number;
-    markedAsUnread: boolean;
-    muted: boolean;
-    muteExpireTime: Date | number;
+    parentId?: string;
+    uri?: string;
     type: string;
-    members: IMember[];
     subject?: string;
-    label?: string;
+    avatarUrl?: string;
     metadata: any;
+    createdAt: Date;
+    updatedAt: Date | null;
+    messagesClearedAt: Date | null;
+    memberCount: number;
+    messageCount: number;
+    createdBy: IUser;
     role: string;
-    avatarUrl?: string;
-    unreadMessageCount?: number;
-    unreadMentionsCount?: number;
-    unreadReactionsCount?: number;
-    userMessageReactions?: IReaction[];
+    unread: boolean;
+    newMessageCount: number;
+    newMentionCount: number;
+    newReactionCount: number;
+    hidden: boolean;
+    archived: boolean;
+    muted: boolean;
+    mutedTill: Date | null;
+    pinnedAt: Date | null;
+    lastReceivedMsgId: string;
+    lastDisplayedMsgId: string;
+    messageRetentionPeriod?: number;
+    lastMessage: IMessage;
+    messages: IMessage[];
+    members: IMember[];
+    newReactions: IReaction[];
+    lastReactedMessage?: IMessage;
     delete: () => Promise<void>;
     deleteAllMessages: (deleteForMe?: boolean) => Promise<void>;
     hide: () => Promise<boolean>;