sceyt-chat-react-uikit 1.7.9-beta.1 → 1.7.9-beta.3

package/index.js

@@ -11000,6 +11000,9 @@ function setMessagesToMap(channelId, messages, firstMessageId, lastMessageId) {
     }
   }
   messages.forEach(function (msg) {
+    if (msg.tid && messagesMap[channelId][msg.tid]) {
+      delete messagesMap[channelId][msg.tid];
+    }
     messagesMap[channelId][msg.id || msg.tid] = msg;
   });
 }
@@ -16344,7 +16347,7 @@ var _marked$2 = /*#__PURE__*/_regenerator().m(createChannel),
   _marked37 = /*#__PURE__*/_regenerator().m(loadMoreMutualChannels),
   _marked38 = /*#__PURE__*/_regenerator().m(ChannelsSaga);
 function createChannel(action) {
-  var payload, channelData, dontCreateIfNotExists, callback, SceytChatClient, createChannelData, fileToUpload, isSelfChannel, channelIsExistOnAllChannels, createdChannel, allChannels, memberId, checkChannelExist, messageToSend, _allChannels, _memberId, _t;
+  var payload, channelData, dontCreateIfNotExists, callback, SceytChatClient, createChannelData, fileToUpload, isSelfChannel, channelIsExistOnAllChannels, createdChannel, allChannels, memberId, whoDoesNotAdded, checkChannelExist, messageToSend, _allChannels, _memberId, _t;
   return _regenerator().w(function (_context) {
     while (1) switch (_context.p = _context.n) {
       case 0:
@@ -16436,26 +16439,38 @@ function createChannel(action) {
       case 7:
         createdChannel = _context.v;
       case 8:
+        whoDoesNotAdded = channelData.members.filter(function (mem) {
+          return !createdChannel.members.some(function (addedMem) {
+            return addedMem.id === mem.id;
+          });
+        });
+        if (!whoDoesNotAdded.length) {
+          _context.n = 9;
+          break;
+        }
+        _context.n = 9;
+        return effects.put(setActionIsRestrictedAC(true, false, whoDoesNotAdded));
+      case 9:
         checkChannelExist = false;
         if (!(createdChannel.type === DEFAULT_CHANNEL_TYPE.DIRECT)) {
-          _context.n = 10;
+          _context.n = 11;
           break;
         }
-        _context.n = 9;
+        _context.n = 10;
         return effects.call(checkChannelExists, createdChannel.id);
-      case 9:
-        checkChannelExist = _context.v;
       case 10:
+        checkChannelExist = _context.v;
+      case 11:
         createdChannel.metadata = isJSON(createdChannel.metadata) ? JSON.parse(createdChannel.metadata) : createdChannel.metadata;
         if (checkChannelExist) {
-          _context.n = 13;
+          _context.n = 14;
           break;
         }
-        _context.n = 11;
+        _context.n = 12;
         return effects.call(setChannelInMap, createdChannel);
-      case 11:
+      case 12:
         if (!(createdChannel.type !== DEFAULT_CHANNEL_TYPE.DIRECT)) {
-          _context.n = 12;
+          _context.n = 13;
           break;
         }
         messageToSend = {
@@ -16464,21 +16479,21 @@ function createChannel(action) {
           attachments: [],
           type: 'system'
         };
-        _context.n = 12;
+        _context.n = 13;
         return effects.put(sendTextMessageAC(messageToSend, createdChannel.id, CONNECTION_STATUS.CONNECTED));
-      case 12:
+      case 13:
         if (!(!dontCreateIfNotExists || channelIsExistOnAllChannels)) {
-          _context.n = 13;
+          _context.n = 14;
           break;
         }
-        _context.n = 13;
-        return effects.put(setChannelToAddAC(JSON.parse(JSON.stringify(createdChannel))));
-      case 13:
         _context.n = 14;
+        return effects.put(setChannelToAddAC(JSON.parse(JSON.stringify(createdChannel))));
+      case 14:
+        _context.n = 15;
         return effects.put(switchChannelActionAC(JSON.parse(JSON.stringify(_extends({}, createdChannel, {
           isLinkedChannel: dontCreateIfNotExists
         }))), !callback));
-      case 14:
+      case 15:
         if (dontCreateIfNotExists) {
           if (!channelIsExistOnAllChannels) {
             addChannelToAllChannels(createdChannel);
@@ -16508,33 +16523,26 @@ function createChannel(action) {
           }
         }
         if (!callback) {
-          _context.n = 15;
+          _context.n = 16;
           break;
         }
         callback(createdChannel);
-        _context.n = 16;
+        _context.n = 17;
         break;
-      case 15:
-        _context.n = 16;
-        return effects.call(setActiveChannelId, createdChannel.id);
       case 16:
+        _context.n = 17;
+        return effects.call(setActiveChannelId, createdChannel.id);
+      case 17:
         _context.n = 19;
         break;
-      case 17:
-        _context.p = 17;
-        _t = _context.v;
-        if (!(_t.code === 1041)) {
-          _context.n = 18;
-          break;
-        }
-        _context.n = 18;
-        return effects.put(setActionIsRestrictedAC(true, false, null));
       case 18:
+        _context.p = 18;
+        _t = _context.v;
         log.error(_t, 'Error on create channel');
       case 19:
         return _context.a(2);
     }
-  }, _marked$2, null, [[0, 17]]);
+  }, _marked$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, _yield$call, mappedChannels, channelsForUpdateLastReactionMessage, _Object$keys, _mappedChannels2, channelMessageMap, _activeChannel2, _activeChannel3, hiddenList, allChannelsQueryBuilder, allChannelsQuery, hasNext, totalAllChannelsAdded, i, _connectionStatus, allChannelsData, allChannelList, _t2, _t3, _t4;
@@ -18713,6 +18721,8 @@ function getChannelsWithUser(action) {
         channelsQueryBuilder = new _SceytChatClient10.ChannelListQueryBuilder();
         channelsQueryBuilder.memberCount(0);
         channelsQueryBuilder.setMutualWithUserId(userId);
+        channelsQueryBuilder.types([DEFAULT_CHANNEL_TYPE.DIRECT]);
+        channelsQueryBuilder.setWithTypes(false);
         channelsQueryBuilder.limit(15);
         _context36.n = 3;
         return effects.call(channelsQueryBuilder.build);
@@ -20765,7 +20775,7 @@ var getFilteredPendingMessages = function getFilteredPendingMessages(messages) {
   return filteredPendingMessages;
 };
 function getMessagesQuery(action) {
-  var _action$payload, channel, loadWithLastMessage, messageId, limit, highlight, behavior, scrollToMessage, networkChanged, connectionState, SceytChatClient, messageQueryBuilder, messageQuery, cachedMessages, result, _result$messages$, _result$messages, _messages$Math$floor, messages, centerMessageId, loadWithMessageId, allMessages, messageIndex, maxLengthPart, _result$messages$2, _result$messages2, secondResult, thirdResult, fourthResult, _fourthResult, _result$messages$3, _result$messages3, _channel$lastMessage4, _channel$lastMessage5, _channel$lastMessage6, _updatedMessages$, _parsedMessages$, _parsedMessages, parsedMessages, _filteredPendingMessages, updatedMessages, messageIdForLoad, filteredPendingMessages, waitToSendPendingMessages, updatedChannel, _t0, _t1, _t10, _t11, _t12, _t13, _t14, _t15, _t16, _t17, _t18, _t19, _t20;
+  var _action$payload, channel, loadWithLastMessage, messageId, limit, highlight, behavior, scrollToMessage, networkChanged, connectionState, SceytChatClient, messageQueryBuilder, messageQuery, cachedMessages, result, _result$messages$, _result$messages, _messages$Math$floor, messages, centerMessageId, loadWithMessageId, allMessages, messageIndex, maxLengthPart, _result$messages$2, _result$messages2, secondResult, thirdResult, fourthResult, _fourthResult, _result$messages$3, _result$messages3, _channel$lastMessage4, _channel$lastMessage5, _channel$lastMessage6, _filteredPendingMessages, updatedMessages, messageIdForLoad, _updatedMessages$, filteredPendingMessages, waitToSendPendingMessages, updatedChannel, _t0, _t1, _t10, _t11, _t12, _t13, _t14, _t15, _t16, _t17, _t18, _t19, _t20;
   return _regenerator().w(function (_context10) {
     while (1) switch (_context10.p = _context10.n) {
       case 0:
@@ -20776,7 +20786,7 @@ function getMessagesQuery(action) {
         _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, scrollToMessage = _action$payload.scrollToMessage, networkChanged = _action$payload.networkChanged;
         connectionState = store.getState().UserReducer.connectionStatus;
         if (!(channel !== null && channel !== void 0 && channel.id && !(channel !== null && channel !== void 0 && channel.isMockChannel))) {
-          _context10.n = 84;
+          _context10.n = 85;
           break;
         }
         SceytChatClient = getClient();
@@ -20897,7 +20907,7 @@ function getMessagesQuery(action) {
         _context10.n = 21;
         return effects.put(scrollToNewMessageAC(true));
       case 21:
-        _context10.n = 77;
+        _context10.n = 78;
         break;
       case 22:
         if (!messageId) {
@@ -21074,7 +21084,7 @@ function getMessagesQuery(action) {
         _context10.n = 51;
         return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
       case 51:
-        _context10.n = 77;
+        _context10.n = 78;
         break;
       case 52:
         if (!(channel.newMessageCount && channel.lastDisplayedMessageId)) {
@@ -21136,69 +21146,70 @@ function getMessagesQuery(action) {
         _context10.n = 63;
         return effects.put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
       case 63:
-        _context10.n = 77;
+        _context10.n = 78;
         break;
       case 64:
         if (!(cachedMessages && cachedMessages.length)) {
-          _context10.n = 66;
+          _context10.n = 67;
           break;
         }
-        parsedMessages = getFromAllMessagesByMessageId('', '', true);
-        setMessagesToMap(channel.id, parsedMessages, (_parsedMessages$ = parsedMessages[0]) === null || _parsedMessages$ === void 0 ? void 0 : _parsedMessages$.id, (_parsedMessages = parsedMessages[parsedMessages.length - 1]) === null || _parsedMessages === void 0 ? void 0 : _parsedMessages.id);
         _context10.n = 65;
-        return effects.put(setMessagesAC(JSON.parse(JSON.stringify(parsedMessages))));
+        return effects.put(setMessagesAC(JSON.parse(JSON.stringify(cachedMessages))));
       case 65:
-        _filteredPendingMessages = getFilteredPendingMessages(parsedMessages);
         _context10.n = 66;
-        return effects.put(addMessagesAC(_filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
+        return effects.delay(0);
       case 66:
+        _filteredPendingMessages = getFilteredPendingMessages(cachedMessages);
+        _context10.n = 67;
+        return effects.put(addMessagesAC(_filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
+      case 67:
         log.info('load message from server');
         result = {
           messages: [],
           hasNext: false
         };
         if (!((channel === null || channel === void 0 ? void 0 : channel.lastDisplayedMessageId) > (channel === null || channel === void 0 ? void 0 : (_channel$lastMessage4 = channel.lastMessage) === null || _channel$lastMessage4 === void 0 ? void 0 : _channel$lastMessage4.id))) {
-          _context10.n = 70;
+          _context10.n = 71;
           break;
         }
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 68;
+          _context10.n = 69;
           break;
         }
-        _context10.n = 67;
+        _context10.n = 68;
         return effects.call(messageQuery.loadPreviousMessageId, channel === null || channel === void 0 ? void 0 : channel.lastDisplayedMessageId);
-      case 67:
+      case 68:
         _t18 = _context10.v;
-        _context10.n = 69;
+        _context10.n = 70;
         break;
-      case 68:
+      case 69:
         _t18 = {
           messages: [],
           hasNext: false
         };
-      case 69:
+      case 70:
         result = _t18;
-        _context10.n = 74;
+        _context10.n = 75;
         break;
-      case 70:
+      case 71:
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 72;
+          _context10.n = 73;
           break;
         }
-        _context10.n = 71;
+        _context10.n = 72;
         return effects.call(messageQuery.loadPrevious);
-      case 71:
+      case 72:
         _t19 = _context10.v;
-        _context10.n = 73;
+        _context10.n = 74;
         break;
-      case 72:
+      case 73:
         _t19 = {
           messages: [],
           hasNext: false
         };
-      case 73:
-        result = _t19;
       case 74:
+        result = _t19;
+      case 75:
         updatedMessages = [];
         result.messages.forEach(function (msg) {
           var updatedMessage = updateMessageOnMap(channel.id, {
@@ -21209,69 +21220,73 @@ function getMessagesQuery(action) {
           updatedMessages.push(updatedMessage || msg);
         });
         messageIdForLoad = (channel === null || channel === void 0 ? void 0 : channel.lastDisplayedMessageId) > (channel === null || channel === void 0 ? void 0 : (_channel$lastMessage5 = channel.lastMessage) === null || _channel$lastMessage5 === void 0 ? void 0 : _channel$lastMessage5.id) ? (channel === null || channel === void 0 ? void 0 : channel.lastDisplayedMessageId) || '0' : (channel === null || channel === void 0 ? void 0 : (_channel$lastMessage6 = channel.lastMessage) === null || _channel$lastMessage6 === void 0 ? void 0 : _channel$lastMessage6.id) || '0';
-        _context10.n = 75;
-        return effects.call(updateMessages, channel, updatedMessages, (_updatedMessages$ = updatedMessages[0]) === null || _updatedMessages$ === void 0 ? void 0 : _updatedMessages$.id, messageIdForLoad);
-      case 75:
+        if (!updatedMessages.length) {
+          _context10.n = 78;
+          break;
+        }
         _context10.n = 76;
-        return effects.put(setMessagesHasPrevAC(true));
+        return effects.call(updateMessages, channel, updatedMessages, (_updatedMessages$ = updatedMessages[0]) === null || _updatedMessages$ === void 0 ? void 0 : _updatedMessages$.id, messageIdForLoad);
       case 76:
         _context10.n = 77;
-        return effects.put(setMessagesHasNextAC(false));
+        return effects.put(setMessagesHasPrevAC(true));
       case 77:
-        filteredPendingMessages = getFilteredPendingMessages(result.messages);
         _context10.n = 78;
-        return effects.put(addMessagesAC(filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
+        return effects.put(setMessagesHasNextAC(false));
       case 78:
+        filteredPendingMessages = getFilteredPendingMessages(result.messages);
+        _context10.n = 79;
+        return effects.put(addMessagesAC(filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
+      case 79:
         waitToSendPendingMessages = store.getState().UserReducer.waitToSendPendingMessages;
         if (!(connectionState === CONNECTION_STATUS.CONNECTED && waitToSendPendingMessages)) {
-          _context10.n = 80;
+          _context10.n = 81;
           break;
         }
-        _context10.n = 79;
-        return effects.put(setWaitToSendPendingMessagesAC(false));
-      case 79:
         _context10.n = 80;
-        return effects.spawn(sendPendingMessages, connectionState);
+        return effects.put(setWaitToSendPendingMessagesAC(false));
       case 80:
         _context10.n = 81;
-        return effects.call(SceytChatClient.getChannel, channel.id, true);
+        return effects.spawn(sendPendingMessages, connectionState);
       case 81:
+        _context10.n = 82;
+        return effects.call(SceytChatClient.getChannel, channel.id, true);
+      case 82:
         updatedChannel = _context10.v;
         if (!updatedChannel) {
-          _context10.n = 83;
+          _context10.n = 84;
           break;
         }
-        _context10.n = 82;
+        _context10.n = 83;
         return effects.put(updateChannelLastMessageAC(updatedChannel.lastMessage, updatedChannel));
-      case 82:
-        updateChannelLastMessageOnAllChannels(channel.id, updatedChannel.lastMessage);
       case 83:
-        _context10.n = 85;
-        break;
+        updateChannelLastMessageOnAllChannels(channel.id, updatedChannel.lastMessage);
       case 84:
+        _context10.n = 86;
+        break;
+      case 85:
         if (!(channel !== null && channel !== void 0 && channel.isMockChannel)) {
-          _context10.n = 85;
+          _context10.n = 86;
           break;
         }
-        _context10.n = 85;
+        _context10.n = 86;
         return effects.put(setMessagesAC([]));
-      case 85:
-        _context10.n = 87;
-        break;
       case 86:
-        _context10.p = 86;
-        _t20 = _context10.v;
-        log.error('error in message query', _t20);
+        _context10.n = 88;
+        break;
       case 87:
         _context10.p = 87;
-        _context10.n = 88;
-        return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
+        _t20 = _context10.v;
+        log.error('error in message query', _t20);
       case 88:
-        return _context10.f(87);
+        _context10.p = 88;
+        _context10.n = 89;
+        return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
       case 89:
+        return _context10.f(88);
+      case 90:
         return _context10.a(2);
     }
-  }, _marked7$1, null, [[0, 86, 87, 89]]);
+  }, _marked7$1, null, [[0, 87, 88, 90]]);
 }
 function getMessageQuery(action) {
   var payload, channelId, messageId, channel, connectionState, messages, fetchedMessage, _t21;
@@ -22910,7 +22925,7 @@ function loadMoreMembers(action) {
   }, _marked2$3, null, [[0, 7, 8, 10]]);
 }
 function addMembers(action) {
-  var payload, members, channelId, channel, membersToAdd, addedMembers, membersIds, messageToSend, updateChannelData, _action$payload, _t3;
+  var payload, members, channelId, channel, membersToAdd, addedMembers, whoDoesNotAdded, membersIds, messageToSend, updateChannelData, _t3;
   return _regenerator().w(function (_context3) {
     while (1) switch (_context3.p = _context3.n) {
       case 0:
@@ -22922,7 +22937,7 @@ function addMembers(action) {
       case 1:
         channel = _context3.v;
         if (!channel) {
-          _context3.n = 6;
+          _context3.n = 7;
           break;
         }
         membersToAdd = members.map(function (mem) {
@@ -22933,14 +22948,30 @@ function addMembers(action) {
         return effects.call(channel.addMembers, membersToAdd);
       case 2:
         addedMembers = _context3.v;
-        if (!(channel.type === DEFAULT_CHANNEL_TYPE.GROUP || channel.type === DEFAULT_CHANNEL_TYPE.PRIVATE)) {
+        whoDoesNotAdded = members.filter(function (mem) {
+          return !addedMembers.some(function (addedMem) {
+            return addedMem.id === mem.id;
+          });
+        });
+        if (!whoDoesNotAdded.length) {
           _context3.n = 3;
           break;
         }
+        _context3.n = 3;
+        return effects.put(setActionIsRestrictedAC(true, true, whoDoesNotAdded));
+      case 3:
+        if (!(channel.type === DEFAULT_CHANNEL_TYPE.GROUP || channel.type === DEFAULT_CHANNEL_TYPE.PRIVATE)) {
+          _context3.n = 4;
+          break;
+        }
         membersIds = [];
         addedMembers.forEach(function (mem) {
           membersIds.push(mem.id);
         });
+        if (!membersIds.length) {
+          _context3.n = 4;
+          break;
+        }
         messageToSend = {
           metadata: {
             m: membersIds
@@ -22950,41 +22981,34 @@ function addMembers(action) {
           attachments: [],
           type: 'system'
         };
-        _context3.n = 3;
-        return effects.put(sendTextMessageAC(messageToSend, channelId, CONNECTION_STATUS.CONNECTED));
-      case 3:
         _context3.n = 4;
-        return effects.put(addMembersToListAC(addedMembers));
+        return effects.put(sendTextMessageAC(messageToSend, channelId, CONNECTION_STATUS.CONNECTED));
       case 4:
+        _context3.n = 5;
+        return effects.put(addMembersToListAC(addedMembers));
+      case 5:
         updateChannelOnAllChannels(channel.id, {
           memberCount: channel.memberCount + addedMembers.length
         });
-        _context3.n = 5;
+        _context3.n = 6;
         return effects.call(updateActiveChannelMembersAdd, addedMembers) || {};
-      case 5:
+      case 6:
         updateChannelData = _context3.v;
-        _context3.n = 6;
+        _context3.n = 7;
         return effects.put(updateChannelDataAC(channel.id, _extends({
           memberCount: channel.memberCount + addedMembers.length
         }, updateChannelData)));
-      case 6:
+      case 7:
         _context3.n = 9;
         break;
-      case 7:
-        _context3.p = 7;
-        _t3 = _context3.v;
-        if (!(_t3.code === 1041)) {
-          _context3.n = 8;
-          break;
-        }
-        _context3.n = 8;
-        return effects.put(setActionIsRestrictedAC(true, true, (action === null || action === void 0 ? void 0 : (_action$payload = action.payload) === null || _action$payload === void 0 ? void 0 : _action$payload.members) || []));
       case 8:
+        _context3.p = 8;
+        _t3 = _context3.v;
         log.error('error on add members... ', _t3);
       case 9:
         return _context3.a(2);
     }
-  }, _marked3$2, null, [[0, 7]]);
+  }, _marked3$2, null, [[0, 8]]);
 }
 function kickMemberFromChannel(action) {
   var payload, memberId, channelId, channel, removedMembers, membersIds, messageToSend, updateChannelData;
@@ -23139,11 +23163,11 @@ function reportMember(action) {
   }, _marked7$2, null, [[1, 3]]);
 }
 function getRoles(action) {
-  var _action$payload2, timeout, attempts, SceytChatClient, roles, _t8;
+  var _action$payload, timeout, attempts, SceytChatClient, roles, _t8;
   return _regenerator().w(function (_context8) {
     while (1) switch (_context8.p = _context8.n) {
       case 0:
-        _action$payload2 = action.payload, timeout = _action$payload2.timeout, attempts = _action$payload2.attempts;
+        _action$payload = action.payload, timeout = _action$payload.timeout, attempts = _action$payload.attempts;
         _context8.p = 1;
         SceytChatClient = getClient();
         if (!(store.getState().UserReducer.connectionStatus !== CONNECTION_STATUS.CONNECTED)) {
@@ -24292,7 +24316,9 @@ var MembersText = styled__default.div(_templateObject7$1 || (_templateObject7$1
 var Center = styled__default.div(_templateObject8$1 || (_templateObject8$1 = _taggedTemplateLiteralLoose(["\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  margin-top: 24px;\n"])));
 
 var ActionRestrictedPopup = function ActionRestrictedPopup(_ref) {
-  var fromChannel = _ref.fromChannel;
+  var fromChannel = _ref.fromChannel,
+    members = _ref.members,
+    contactsMap = _ref.contactsMap;
   var dispatch = useDispatch();
   var _useColor = useColors(),
     background = _useColor[THEME_COLORS.BACKGROUND],
@@ -24309,6 +24335,29 @@ var ActionRestrictedPopup = function ActionRestrictedPopup(_ref) {
     dispatch(setOpenInviteModalAC(true));
     handleClose();
   };
+  var getExcludedContactsMessage = function getExcludedContactsMessage(fromChannel) {
+    var excludedContacts = members || [];
+    var count = excludedContacts.length;
+    var fromContact = getShowOnlyContactUsers() || false;
+    var makeName = function makeName(member) {
+      return makeUsername(contactsMap[member.id], member, fromContact, false);
+    };
+    var prefix = fromChannel ? '' : 'The group was created, but ';
+    var suffix = fromChannel ? " couldn't be added to the group. You can share an invite link with them." : " couldn't be added. You can share an invite link with them.";
+    if (count === 1) {
+      var name = makeName(excludedContacts[0]);
+      return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, prefix, /*#__PURE__*/React__default.createElement(BoltText, null, name), suffix);
+    } else if (count === 2) {
+      var name1 = makeName(excludedContacts[0]);
+      var name2 = makeName(excludedContacts[1]);
+      return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, prefix, /*#__PURE__*/React__default.createElement(BoltText, null, name1), " and ", /*#__PURE__*/React__default.createElement(BoltText, null, name2), suffix);
+    } else if (count > 2) {
+      var firstName = makeName(excludedContacts[0]);
+      var othersCount = count - 1;
+      return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, prefix, /*#__PURE__*/React__default.createElement(BoltText, null, firstName, " and ", othersCount, " others"), suffix);
+    }
+    return null;
+  };
   return /*#__PURE__*/React__default.createElement(PopupContainer, null, /*#__PURE__*/React__default.createElement(Popup, {
     backgroundColor: background,
     maxWidth: '520px',
@@ -24323,23 +24372,23 @@ var ActionRestrictedPopup = function ActionRestrictedPopup(_ref) {
   }), /*#__PURE__*/React__default.createElement(PopupName, {
     color: textPrimary,
     marginBottom: '20px'
-  }, fromChannel ? 'Privacy note' : "Can't create group"), /*#__PURE__*/React__default.createElement(PopupDescription, {
+  }, "Privacy note"), /*#__PURE__*/React__default.createElement(PopupDescription, {
     color: textPrimary,
     highlightColor: linkColor
-  }, fromChannel ? 'Couldn’t add the user. Please invite them directly instead.' : 'Not everyone can be added to this group.')), /*#__PURE__*/React__default.createElement(PopupFooter, {
+  }, getExcludedContactsMessage(fromChannel))), /*#__PURE__*/React__default.createElement(PopupFooter, {
     backgroundColor: surface1
-  }, fromChannel && (/*#__PURE__*/React__default.createElement(Button, {
+  }, /*#__PURE__*/React__default.createElement(Button, {
     type: 'button',
     color: textPrimary,
     backgroundColor: 'transparent',
     onClick: handleClose
-  }, "Cancel")), /*#__PURE__*/React__default.createElement(Button, {
+  }, "Cancel"), /*#__PURE__*/React__default.createElement(Button, {
     type: 'button',
     backgroundColor: accentColor,
     color: textOnPrimary,
     borderRadius: '8px',
-    onClick: fromChannel ? handleInvite : handleClose
-  }, fromChannel ? 'Invite' : 'Cancel'))));
+    onClick: handleInvite
+  }, "Invite"))));
 };
 
 var UnavailableInviteKeyPopup = function UnavailableInviteKeyPopup() {
@@ -24672,9 +24721,11 @@ var SceytChat = function SceytChat(_ref) {
     highlightedBackground: highlightedBackground,
     id: 'sceyt_chat_container',
     chatMinWidth: chatMinWidth
-  }, children, embeddedJoinGroupPopup && joinPopup && /*#__PURE__*/React__default.createElement(EmbeddedPopupWrapper, null, joinPopup), (restricted === null || restricted === void 0 ? void 0 : restricted.isRestricted) && /*#__PURE__*/React__default.createElement(ActionRestrictedPopup, {
-    fromChannel: restricted === null || restricted === void 0 ? void 0 : restricted.fromChannel
-  }), !channelInviteKeyAvailable && /*#__PURE__*/React__default.createElement(UnavailableInviteKeyPopup, null))) : '', !embeddedJoinGroupPopup && joinPopup);
+  }, children, embeddedJoinGroupPopup && joinPopup && /*#__PURE__*/React__default.createElement(EmbeddedPopupWrapper, null, joinPopup), (restricted === null || restricted === void 0 ? void 0 : restricted.isRestricted) && (/*#__PURE__*/React__default.createElement(ActionRestrictedPopup, {
+    fromChannel: restricted === null || restricted === void 0 ? void 0 : restricted.fromChannel,
+    members: restricted === null || restricted === void 0 ? void 0 : restricted.members,
+    contactsMap: contactsMap
+  })), !channelInviteKeyAvailable && /*#__PURE__*/React__default.createElement(UnavailableInviteKeyPopup, null))) : '', !embeddedJoinGroupPopup && joinPopup);
 };
 var Container$2 = styled__default.div(_templateObject$5 || (_templateObject$5 = _taggedTemplateLiteralLoose(["\n  display: flex;\n  height: 100vh;\n"])));
 var ChatContainer = styled__default.div(_templateObject2$4 || (_templateObject2$4 = _taggedTemplateLiteralLoose(["\n  display: flex;\n  height: 100%;\n  max-height: 100vh;\n  min-width: ", ";\n  background-color: ", ";\n  position: relative;\n\n  /* Global highlighted background styles */\n  ::selection {\n    background-color: ", ";\n  }\n\n  ::-moz-selection {\n    background-color: ", ";\n  }\n\n  /* For text selection highlighting */\n  *::selection {\n    background-color: ", ";\n  }\n\n  *::-moz-selection {\n    background-color: ", ";\n  }\n"])), function (props) {
@@ -48775,6 +48826,12 @@ var Details = function Details(_ref) {
       return Promise.reject(e);
     }
   };
+  var channelMetadata = React.useMemo(function () {
+    if (isJSON(activeChannel === null || activeChannel === void 0 ? void 0 : activeChannel.metadata)) {
+      return JSON.parse(activeChannel === null || activeChannel === void 0 ? void 0 : activeChannel.metadata);
+    }
+    return activeChannel === null || activeChannel === void 0 ? void 0 : activeChannel.metadata;
+  }, [activeChannel]);
   return /*#__PURE__*/React__default.createElement(Container$v, {
     backgroundColor: backgroundColor,
     mounted: mounted,
@@ -48860,11 +48917,11 @@ var Details = function Details(_ref) {
     color: textSecondary,
     fontSize: channelMembersFontSize,
     lineHeight: channelMembersLineHeight
-  }, activeChannel && activeChannel.memberCount, " ", displayMemberText)))), showAboutChannel && activeChannel && activeChannel.metadata && activeChannel.metadata.d && (/*#__PURE__*/React__default.createElement(AboutChannel, null, showAboutChannelTitle && /*#__PURE__*/React__default.createElement(AboutChannelTitle, {
+  }, activeChannel && activeChannel.memberCount, " ", displayMemberText)))), showAboutChannel && activeChannel && channelMetadata && (channelMetadata === null || channelMetadata === void 0 ? void 0 : channelMetadata.d) && (/*#__PURE__*/React__default.createElement(AboutChannel, null, showAboutChannelTitle && /*#__PURE__*/React__default.createElement(AboutChannelTitle, {
     color: textFootnote
   }, "About"), /*#__PURE__*/React__default.createElement(AboutChannelText, {
     color: textPrimary
-  }, activeChannel && activeChannel.metadata && activeChannel.metadata.d ? activeChannel.metadata.d : '')))), activeChannel && activeChannel.userRole && (/*#__PURE__*/React__default.createElement(Actions, {
+  }, channelMetadata !== null && channelMetadata !== void 0 && channelMetadata.d ? channelMetadata === null || channelMetadata === void 0 ? void 0 : channelMetadata.d : '')))), activeChannel && activeChannel.userRole && (/*#__PURE__*/React__default.createElement(Actions, {
     setActionsHeight: setActionsHeight,
     theme: theme,
     showMuteUnmuteNotifications: showMuteUnmuteNotifications,

package/index.modern.js

@@ -3,7 +3,7 @@ import { createSelectorHook, createDispatchHook, createStoreHook, shallowEqual,
 import log from 'loglevel';
 import createSagaMiddleware, { eventChannel } from 'redux-saga';
 import FileSaver from 'file-saver';
-import { select, put, call, take, takeLatest, takeEvery, spawn, all } from 'redux-saga/effects';
+import { select, put, call, take, takeLatest, takeEvery, spawn, delay, all } from 'redux-saga/effects';
 import { v4 } from 'uuid';
 import styled, { createGlobalStyle, keyframes } from 'styled-components';
 import LinkifyIt from 'linkify-it';
@@ -10999,6 +10999,9 @@ function setMessagesToMap(channelId, messages, firstMessageId, lastMessageId) {
     }
   }
   messages.forEach(function (msg) {
+    if (msg.tid && messagesMap[channelId][msg.tid]) {
+      delete messagesMap[channelId][msg.tid];
+    }
     messagesMap[channelId][msg.id || msg.tid] = msg;
   });
 }
@@ -16343,7 +16346,7 @@ var _marked$2 = /*#__PURE__*/_regenerator().m(createChannel),
   _marked37 = /*#__PURE__*/_regenerator().m(loadMoreMutualChannels),
   _marked38 = /*#__PURE__*/_regenerator().m(ChannelsSaga);
 function createChannel(action) {
-  var payload, channelData, dontCreateIfNotExists, callback, SceytChatClient, createChannelData, fileToUpload, isSelfChannel, channelIsExistOnAllChannels, createdChannel, allChannels, memberId, checkChannelExist, messageToSend, _allChannels, _memberId, _t;
+  var payload, channelData, dontCreateIfNotExists, callback, SceytChatClient, createChannelData, fileToUpload, isSelfChannel, channelIsExistOnAllChannels, createdChannel, allChannels, memberId, whoDoesNotAdded, checkChannelExist, messageToSend, _allChannels, _memberId, _t;
   return _regenerator().w(function (_context) {
     while (1) switch (_context.p = _context.n) {
       case 0:
@@ -16435,26 +16438,38 @@ function createChannel(action) {
       case 7:
         createdChannel = _context.v;
       case 8:
+        whoDoesNotAdded = channelData.members.filter(function (mem) {
+          return !createdChannel.members.some(function (addedMem) {
+            return addedMem.id === mem.id;
+          });
+        });
+        if (!whoDoesNotAdded.length) {
+          _context.n = 9;
+          break;
+        }
+        _context.n = 9;
+        return put(setActionIsRestrictedAC(true, false, whoDoesNotAdded));
+      case 9:
         checkChannelExist = false;
         if (!(createdChannel.type === DEFAULT_CHANNEL_TYPE.DIRECT)) {
-          _context.n = 10;
+          _context.n = 11;
           break;
         }
-        _context.n = 9;
+        _context.n = 10;
         return call(checkChannelExists, createdChannel.id);
-      case 9:
-        checkChannelExist = _context.v;
       case 10:
+        checkChannelExist = _context.v;
+      case 11:
         createdChannel.metadata = isJSON(createdChannel.metadata) ? JSON.parse(createdChannel.metadata) : createdChannel.metadata;
         if (checkChannelExist) {
-          _context.n = 13;
+          _context.n = 14;
           break;
         }
-        _context.n = 11;
+        _context.n = 12;
         return call(setChannelInMap, createdChannel);
-      case 11:
+      case 12:
         if (!(createdChannel.type !== DEFAULT_CHANNEL_TYPE.DIRECT)) {
-          _context.n = 12;
+          _context.n = 13;
           break;
         }
         messageToSend = {
@@ -16463,21 +16478,21 @@ function createChannel(action) {
           attachments: [],
           type: 'system'
         };
-        _context.n = 12;
+        _context.n = 13;
         return put(sendTextMessageAC(messageToSend, createdChannel.id, CONNECTION_STATUS.CONNECTED));
-      case 12:
+      case 13:
         if (!(!dontCreateIfNotExists || channelIsExistOnAllChannels)) {
-          _context.n = 13;
+          _context.n = 14;
           break;
         }
-        _context.n = 13;
-        return put(setChannelToAddAC(JSON.parse(JSON.stringify(createdChannel))));
-      case 13:
         _context.n = 14;
+        return put(setChannelToAddAC(JSON.parse(JSON.stringify(createdChannel))));
+      case 14:
+        _context.n = 15;
         return put(switchChannelActionAC(JSON.parse(JSON.stringify(_extends({}, createdChannel, {
           isLinkedChannel: dontCreateIfNotExists
         }))), !callback));
-      case 14:
+      case 15:
         if (dontCreateIfNotExists) {
           if (!channelIsExistOnAllChannels) {
             addChannelToAllChannels(createdChannel);
@@ -16507,33 +16522,26 @@ function createChannel(action) {
           }
         }
         if (!callback) {
-          _context.n = 15;
+          _context.n = 16;
           break;
         }
         callback(createdChannel);
-        _context.n = 16;
+        _context.n = 17;
         break;
-      case 15:
-        _context.n = 16;
-        return call(setActiveChannelId, createdChannel.id);
       case 16:
+        _context.n = 17;
+        return call(setActiveChannelId, createdChannel.id);
+      case 17:
         _context.n = 19;
         break;
-      case 17:
-        _context.p = 17;
-        _t = _context.v;
-        if (!(_t.code === 1041)) {
-          _context.n = 18;
-          break;
-        }
-        _context.n = 18;
-        return put(setActionIsRestrictedAC(true, false, null));
       case 18:
+        _context.p = 18;
+        _t = _context.v;
         log.error(_t, 'Error on create channel');
       case 19:
         return _context.a(2);
     }
-  }, _marked$2, null, [[0, 17]]);
+  }, _marked$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, _yield$call, mappedChannels, channelsForUpdateLastReactionMessage, _Object$keys, _mappedChannels2, channelMessageMap, _activeChannel2, _activeChannel3, hiddenList, allChannelsQueryBuilder, allChannelsQuery, hasNext, totalAllChannelsAdded, i, _connectionStatus, allChannelsData, allChannelList, _t2, _t3, _t4;
@@ -18712,6 +18720,8 @@ function getChannelsWithUser(action) {
         channelsQueryBuilder = new _SceytChatClient10.ChannelListQueryBuilder();
         channelsQueryBuilder.memberCount(0);
         channelsQueryBuilder.setMutualWithUserId(userId);
+        channelsQueryBuilder.types([DEFAULT_CHANNEL_TYPE.DIRECT]);
+        channelsQueryBuilder.setWithTypes(false);
         channelsQueryBuilder.limit(15);
         _context36.n = 3;
         return call(channelsQueryBuilder.build);
@@ -20764,7 +20774,7 @@ var getFilteredPendingMessages = function getFilteredPendingMessages(messages) {
   return filteredPendingMessages;
 };
 function getMessagesQuery(action) {
-  var _action$payload, channel, loadWithLastMessage, messageId, limit, highlight, behavior, scrollToMessage, networkChanged, connectionState, SceytChatClient, messageQueryBuilder, messageQuery, cachedMessages, result, _result$messages$, _result$messages, _messages$Math$floor, messages, centerMessageId, loadWithMessageId, allMessages, messageIndex, maxLengthPart, _result$messages$2, _result$messages2, secondResult, thirdResult, fourthResult, _fourthResult, _result$messages$3, _result$messages3, _channel$lastMessage4, _channel$lastMessage5, _channel$lastMessage6, _updatedMessages$, _parsedMessages$, _parsedMessages, parsedMessages, _filteredPendingMessages, updatedMessages, messageIdForLoad, filteredPendingMessages, waitToSendPendingMessages, updatedChannel, _t0, _t1, _t10, _t11, _t12, _t13, _t14, _t15, _t16, _t17, _t18, _t19, _t20;
+  var _action$payload, channel, loadWithLastMessage, messageId, limit, highlight, behavior, scrollToMessage, networkChanged, connectionState, SceytChatClient, messageQueryBuilder, messageQuery, cachedMessages, result, _result$messages$, _result$messages, _messages$Math$floor, messages, centerMessageId, loadWithMessageId, allMessages, messageIndex, maxLengthPart, _result$messages$2, _result$messages2, secondResult, thirdResult, fourthResult, _fourthResult, _result$messages$3, _result$messages3, _channel$lastMessage4, _channel$lastMessage5, _channel$lastMessage6, _filteredPendingMessages, updatedMessages, messageIdForLoad, _updatedMessages$, filteredPendingMessages, waitToSendPendingMessages, updatedChannel, _t0, _t1, _t10, _t11, _t12, _t13, _t14, _t15, _t16, _t17, _t18, _t19, _t20;
   return _regenerator().w(function (_context10) {
     while (1) switch (_context10.p = _context10.n) {
       case 0:
@@ -20775,7 +20785,7 @@ function getMessagesQuery(action) {
         _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, scrollToMessage = _action$payload.scrollToMessage, networkChanged = _action$payload.networkChanged;
         connectionState = store.getState().UserReducer.connectionStatus;
         if (!(channel !== null && channel !== void 0 && channel.id && !(channel !== null && channel !== void 0 && channel.isMockChannel))) {
-          _context10.n = 84;
+          _context10.n = 85;
           break;
         }
         SceytChatClient = getClient();
@@ -20896,7 +20906,7 @@ function getMessagesQuery(action) {
         _context10.n = 21;
         return put(scrollToNewMessageAC(true));
       case 21:
-        _context10.n = 77;
+        _context10.n = 78;
         break;
       case 22:
         if (!messageId) {
@@ -21073,7 +21083,7 @@ function getMessagesQuery(action) {
         _context10.n = 51;
         return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
       case 51:
-        _context10.n = 77;
+        _context10.n = 78;
         break;
       case 52:
         if (!(channel.newMessageCount && channel.lastDisplayedMessageId)) {
@@ -21135,69 +21145,70 @@ function getMessagesQuery(action) {
         _context10.n = 63;
         return put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
       case 63:
-        _context10.n = 77;
+        _context10.n = 78;
         break;
       case 64:
         if (!(cachedMessages && cachedMessages.length)) {
-          _context10.n = 66;
+          _context10.n = 67;
           break;
         }
-        parsedMessages = getFromAllMessagesByMessageId('', '', true);
-        setMessagesToMap(channel.id, parsedMessages, (_parsedMessages$ = parsedMessages[0]) === null || _parsedMessages$ === void 0 ? void 0 : _parsedMessages$.id, (_parsedMessages = parsedMessages[parsedMessages.length - 1]) === null || _parsedMessages === void 0 ? void 0 : _parsedMessages.id);
         _context10.n = 65;
-        return put(setMessagesAC(JSON.parse(JSON.stringify(parsedMessages))));
+        return put(setMessagesAC(JSON.parse(JSON.stringify(cachedMessages))));
       case 65:
-        _filteredPendingMessages = getFilteredPendingMessages(parsedMessages);
         _context10.n = 66;
-        return put(addMessagesAC(_filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
+        return delay(0);
       case 66:
+        _filteredPendingMessages = getFilteredPendingMessages(cachedMessages);
+        _context10.n = 67;
+        return put(addMessagesAC(_filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
+      case 67:
         log.info('load message from server');
         result = {
           messages: [],
           hasNext: false
         };
         if (!((channel === null || channel === void 0 ? void 0 : channel.lastDisplayedMessageId) > (channel === null || channel === void 0 ? void 0 : (_channel$lastMessage4 = channel.lastMessage) === null || _channel$lastMessage4 === void 0 ? void 0 : _channel$lastMessage4.id))) {
-          _context10.n = 70;
+          _context10.n = 71;
           break;
         }
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 68;
+          _context10.n = 69;
           break;
         }
-        _context10.n = 67;
+        _context10.n = 68;
         return call(messageQuery.loadPreviousMessageId, channel === null || channel === void 0 ? void 0 : channel.lastDisplayedMessageId);
-      case 67:
+      case 68:
         _t18 = _context10.v;
-        _context10.n = 69;
+        _context10.n = 70;
         break;
-      case 68:
+      case 69:
         _t18 = {
           messages: [],
           hasNext: false
         };
-      case 69:
+      case 70:
         result = _t18;
-        _context10.n = 74;
+        _context10.n = 75;
         break;
-      case 70:
+      case 71:
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 72;
+          _context10.n = 73;
           break;
         }
-        _context10.n = 71;
+        _context10.n = 72;
         return call(messageQuery.loadPrevious);
-      case 71:
+      case 72:
         _t19 = _context10.v;
-        _context10.n = 73;
+        _context10.n = 74;
         break;
-      case 72:
+      case 73:
         _t19 = {
           messages: [],
           hasNext: false
         };
-      case 73:
-        result = _t19;
       case 74:
+        result = _t19;
+      case 75:
         updatedMessages = [];
         result.messages.forEach(function (msg) {
           var updatedMessage = updateMessageOnMap(channel.id, {
@@ -21208,69 +21219,73 @@ function getMessagesQuery(action) {
           updatedMessages.push(updatedMessage || msg);
         });
         messageIdForLoad = (channel === null || channel === void 0 ? void 0 : channel.lastDisplayedMessageId) > (channel === null || channel === void 0 ? void 0 : (_channel$lastMessage5 = channel.lastMessage) === null || _channel$lastMessage5 === void 0 ? void 0 : _channel$lastMessage5.id) ? (channel === null || channel === void 0 ? void 0 : channel.lastDisplayedMessageId) || '0' : (channel === null || channel === void 0 ? void 0 : (_channel$lastMessage6 = channel.lastMessage) === null || _channel$lastMessage6 === void 0 ? void 0 : _channel$lastMessage6.id) || '0';
-        _context10.n = 75;
-        return call(updateMessages, channel, updatedMessages, (_updatedMessages$ = updatedMessages[0]) === null || _updatedMessages$ === void 0 ? void 0 : _updatedMessages$.id, messageIdForLoad);
-      case 75:
+        if (!updatedMessages.length) {
+          _context10.n = 78;
+          break;
+        }
         _context10.n = 76;
-        return put(setMessagesHasPrevAC(true));
+        return call(updateMessages, channel, updatedMessages, (_updatedMessages$ = updatedMessages[0]) === null || _updatedMessages$ === void 0 ? void 0 : _updatedMessages$.id, messageIdForLoad);
       case 76:
         _context10.n = 77;
-        return put(setMessagesHasNextAC(false));
+        return put(setMessagesHasPrevAC(true));
       case 77:
-        filteredPendingMessages = getFilteredPendingMessages(result.messages);
         _context10.n = 78;
-        return put(addMessagesAC(filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
+        return put(setMessagesHasNextAC(false));
       case 78:
+        filteredPendingMessages = getFilteredPendingMessages(result.messages);
+        _context10.n = 79;
+        return put(addMessagesAC(filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
+      case 79:
         waitToSendPendingMessages = store.getState().UserReducer.waitToSendPendingMessages;
         if (!(connectionState === CONNECTION_STATUS.CONNECTED && waitToSendPendingMessages)) {
-          _context10.n = 80;
+          _context10.n = 81;
           break;
         }
-        _context10.n = 79;
-        return put(setWaitToSendPendingMessagesAC(false));
-      case 79:
         _context10.n = 80;
-        return spawn(sendPendingMessages, connectionState);
+        return put(setWaitToSendPendingMessagesAC(false));
       case 80:
         _context10.n = 81;
-        return call(SceytChatClient.getChannel, channel.id, true);
+        return spawn(sendPendingMessages, connectionState);
       case 81:
+        _context10.n = 82;
+        return call(SceytChatClient.getChannel, channel.id, true);
+      case 82:
         updatedChannel = _context10.v;
         if (!updatedChannel) {
-          _context10.n = 83;
+          _context10.n = 84;
           break;
         }
-        _context10.n = 82;
+        _context10.n = 83;
         return put(updateChannelLastMessageAC(updatedChannel.lastMessage, updatedChannel));
-      case 82:
-        updateChannelLastMessageOnAllChannels(channel.id, updatedChannel.lastMessage);
       case 83:
-        _context10.n = 85;
-        break;
+        updateChannelLastMessageOnAllChannels(channel.id, updatedChannel.lastMessage);
       case 84:
+        _context10.n = 86;
+        break;
+      case 85:
         if (!(channel !== null && channel !== void 0 && channel.isMockChannel)) {
-          _context10.n = 85;
+          _context10.n = 86;
           break;
         }
-        _context10.n = 85;
+        _context10.n = 86;
         return put(setMessagesAC([]));
-      case 85:
-        _context10.n = 87;
-        break;
       case 86:
-        _context10.p = 86;
-        _t20 = _context10.v;
-        log.error('error in message query', _t20);
+        _context10.n = 88;
+        break;
       case 87:
         _context10.p = 87;
-        _context10.n = 88;
-        return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
+        _t20 = _context10.v;
+        log.error('error in message query', _t20);
       case 88:
-        return _context10.f(87);
+        _context10.p = 88;
+        _context10.n = 89;
+        return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
       case 89:
+        return _context10.f(88);
+      case 90:
         return _context10.a(2);
     }
-  }, _marked7$1, null, [[0, 86, 87, 89]]);
+  }, _marked7$1, null, [[0, 87, 88, 90]]);
 }
 function getMessageQuery(action) {
   var payload, channelId, messageId, channel, connectionState, messages, fetchedMessage, _t21;
@@ -22909,7 +22924,7 @@ function loadMoreMembers(action) {
   }, _marked2$3, null, [[0, 7, 8, 10]]);
 }
 function addMembers(action) {
-  var payload, members, channelId, channel, membersToAdd, addedMembers, membersIds, messageToSend, updateChannelData, _action$payload, _t3;
+  var payload, members, channelId, channel, membersToAdd, addedMembers, whoDoesNotAdded, membersIds, messageToSend, updateChannelData, _t3;
   return _regenerator().w(function (_context3) {
     while (1) switch (_context3.p = _context3.n) {
       case 0:
@@ -22921,7 +22936,7 @@ function addMembers(action) {
       case 1:
         channel = _context3.v;
         if (!channel) {
-          _context3.n = 6;
+          _context3.n = 7;
           break;
         }
         membersToAdd = members.map(function (mem) {
@@ -22932,14 +22947,30 @@ function addMembers(action) {
         return call(channel.addMembers, membersToAdd);
       case 2:
         addedMembers = _context3.v;
-        if (!(channel.type === DEFAULT_CHANNEL_TYPE.GROUP || channel.type === DEFAULT_CHANNEL_TYPE.PRIVATE)) {
+        whoDoesNotAdded = members.filter(function (mem) {
+          return !addedMembers.some(function (addedMem) {
+            return addedMem.id === mem.id;
+          });
+        });
+        if (!whoDoesNotAdded.length) {
           _context3.n = 3;
           break;
         }
+        _context3.n = 3;
+        return put(setActionIsRestrictedAC(true, true, whoDoesNotAdded));
+      case 3:
+        if (!(channel.type === DEFAULT_CHANNEL_TYPE.GROUP || channel.type === DEFAULT_CHANNEL_TYPE.PRIVATE)) {
+          _context3.n = 4;
+          break;
+        }
         membersIds = [];
         addedMembers.forEach(function (mem) {
           membersIds.push(mem.id);
         });
+        if (!membersIds.length) {
+          _context3.n = 4;
+          break;
+        }
         messageToSend = {
           metadata: {
             m: membersIds
@@ -22949,41 +22980,34 @@ function addMembers(action) {
           attachments: [],
           type: 'system'
         };
-        _context3.n = 3;
-        return put(sendTextMessageAC(messageToSend, channelId, CONNECTION_STATUS.CONNECTED));
-      case 3:
         _context3.n = 4;
-        return put(addMembersToListAC(addedMembers));
+        return put(sendTextMessageAC(messageToSend, channelId, CONNECTION_STATUS.CONNECTED));
       case 4:
+        _context3.n = 5;
+        return put(addMembersToListAC(addedMembers));
+      case 5:
         updateChannelOnAllChannels(channel.id, {
           memberCount: channel.memberCount + addedMembers.length
         });
-        _context3.n = 5;
+        _context3.n = 6;
         return call(updateActiveChannelMembersAdd, addedMembers) || {};
-      case 5:
+      case 6:
         updateChannelData = _context3.v;
-        _context3.n = 6;
+        _context3.n = 7;
         return put(updateChannelDataAC(channel.id, _extends({
           memberCount: channel.memberCount + addedMembers.length
         }, updateChannelData)));
-      case 6:
+      case 7:
         _context3.n = 9;
         break;
-      case 7:
-        _context3.p = 7;
-        _t3 = _context3.v;
-        if (!(_t3.code === 1041)) {
-          _context3.n = 8;
-          break;
-        }
-        _context3.n = 8;
-        return put(setActionIsRestrictedAC(true, true, (action === null || action === void 0 ? void 0 : (_action$payload = action.payload) === null || _action$payload === void 0 ? void 0 : _action$payload.members) || []));
       case 8:
+        _context3.p = 8;
+        _t3 = _context3.v;
         log.error('error on add members... ', _t3);
       case 9:
         return _context3.a(2);
     }
-  }, _marked3$2, null, [[0, 7]]);
+  }, _marked3$2, null, [[0, 8]]);
 }
 function kickMemberFromChannel(action) {
   var payload, memberId, channelId, channel, removedMembers, membersIds, messageToSend, updateChannelData;
@@ -23138,11 +23162,11 @@ function reportMember(action) {
   }, _marked7$2, null, [[1, 3]]);
 }
 function getRoles(action) {
-  var _action$payload2, timeout, attempts, SceytChatClient, roles, _t8;
+  var _action$payload, timeout, attempts, SceytChatClient, roles, _t8;
   return _regenerator().w(function (_context8) {
     while (1) switch (_context8.p = _context8.n) {
       case 0:
-        _action$payload2 = action.payload, timeout = _action$payload2.timeout, attempts = _action$payload2.attempts;
+        _action$payload = action.payload, timeout = _action$payload.timeout, attempts = _action$payload.attempts;
         _context8.p = 1;
         SceytChatClient = getClient();
         if (!(store.getState().UserReducer.connectionStatus !== CONNECTION_STATUS.CONNECTED)) {
@@ -24291,7 +24315,9 @@ var MembersText = styled.div(_templateObject7$1 || (_templateObject7$1 = _tagged
 var Center = styled.div(_templateObject8$1 || (_templateObject8$1 = _taggedTemplateLiteralLoose(["\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  margin-top: 24px;\n"])));
 
 var ActionRestrictedPopup = function ActionRestrictedPopup(_ref) {
-  var fromChannel = _ref.fromChannel;
+  var fromChannel = _ref.fromChannel,
+    members = _ref.members,
+    contactsMap = _ref.contactsMap;
   var dispatch = useDispatch();
   var _useColor = useColors(),
     background = _useColor[THEME_COLORS.BACKGROUND],
@@ -24308,6 +24334,29 @@ var ActionRestrictedPopup = function ActionRestrictedPopup(_ref) {
     dispatch(setOpenInviteModalAC(true));
     handleClose();
   };
+  var getExcludedContactsMessage = function getExcludedContactsMessage(fromChannel) {
+    var excludedContacts = members || [];
+    var count = excludedContacts.length;
+    var fromContact = getShowOnlyContactUsers() || false;
+    var makeName = function makeName(member) {
+      return makeUsername(contactsMap[member.id], member, fromContact, false);
+    };
+    var prefix = fromChannel ? '' : 'The group was created, but ';
+    var suffix = fromChannel ? " couldn't be added to the group. You can share an invite link with them." : " couldn't be added. You can share an invite link with them.";
+    if (count === 1) {
+      var name = makeName(excludedContacts[0]);
+      return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, prefix, /*#__PURE__*/React__default.createElement(BoltText, null, name), suffix);
+    } else if (count === 2) {
+      var name1 = makeName(excludedContacts[0]);
+      var name2 = makeName(excludedContacts[1]);
+      return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, prefix, /*#__PURE__*/React__default.createElement(BoltText, null, name1), " and ", /*#__PURE__*/React__default.createElement(BoltText, null, name2), suffix);
+    } else if (count > 2) {
+      var firstName = makeName(excludedContacts[0]);
+      var othersCount = count - 1;
+      return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, prefix, /*#__PURE__*/React__default.createElement(BoltText, null, firstName, " and ", othersCount, " others"), suffix);
+    }
+    return null;
+  };
   return /*#__PURE__*/React__default.createElement(PopupContainer, null, /*#__PURE__*/React__default.createElement(Popup, {
     backgroundColor: background,
     maxWidth: '520px',
@@ -24322,23 +24371,23 @@ var ActionRestrictedPopup = function ActionRestrictedPopup(_ref) {
   }), /*#__PURE__*/React__default.createElement(PopupName, {
     color: textPrimary,
     marginBottom: '20px'
-  }, fromChannel ? 'Privacy note' : "Can't create group"), /*#__PURE__*/React__default.createElement(PopupDescription, {
+  }, "Privacy note"), /*#__PURE__*/React__default.createElement(PopupDescription, {
     color: textPrimary,
     highlightColor: linkColor
-  }, fromChannel ? 'Couldn’t add the user. Please invite them directly instead.' : 'Not everyone can be added to this group.')), /*#__PURE__*/React__default.createElement(PopupFooter, {
+  }, getExcludedContactsMessage(fromChannel))), /*#__PURE__*/React__default.createElement(PopupFooter, {
     backgroundColor: surface1
-  }, fromChannel && (/*#__PURE__*/React__default.createElement(Button, {
+  }, /*#__PURE__*/React__default.createElement(Button, {
     type: 'button',
     color: textPrimary,
     backgroundColor: 'transparent',
     onClick: handleClose
-  }, "Cancel")), /*#__PURE__*/React__default.createElement(Button, {
+  }, "Cancel"), /*#__PURE__*/React__default.createElement(Button, {
     type: 'button',
     backgroundColor: accentColor,
     color: textOnPrimary,
     borderRadius: '8px',
-    onClick: fromChannel ? handleInvite : handleClose
-  }, fromChannel ? 'Invite' : 'Cancel'))));
+    onClick: handleInvite
+  }, "Invite"))));
 };
 
 var UnavailableInviteKeyPopup = function UnavailableInviteKeyPopup() {
@@ -24671,9 +24720,11 @@ var SceytChat = function SceytChat(_ref) {
     highlightedBackground: highlightedBackground,
     id: 'sceyt_chat_container',
     chatMinWidth: chatMinWidth
-  }, children, embeddedJoinGroupPopup && joinPopup && /*#__PURE__*/React__default.createElement(EmbeddedPopupWrapper, null, joinPopup), (restricted === null || restricted === void 0 ? void 0 : restricted.isRestricted) && /*#__PURE__*/React__default.createElement(ActionRestrictedPopup, {
-    fromChannel: restricted === null || restricted === void 0 ? void 0 : restricted.fromChannel
-  }), !channelInviteKeyAvailable && /*#__PURE__*/React__default.createElement(UnavailableInviteKeyPopup, null))) : '', !embeddedJoinGroupPopup && joinPopup);
+  }, children, embeddedJoinGroupPopup && joinPopup && /*#__PURE__*/React__default.createElement(EmbeddedPopupWrapper, null, joinPopup), (restricted === null || restricted === void 0 ? void 0 : restricted.isRestricted) && (/*#__PURE__*/React__default.createElement(ActionRestrictedPopup, {
+    fromChannel: restricted === null || restricted === void 0 ? void 0 : restricted.fromChannel,
+    members: restricted === null || restricted === void 0 ? void 0 : restricted.members,
+    contactsMap: contactsMap
+  })), !channelInviteKeyAvailable && /*#__PURE__*/React__default.createElement(UnavailableInviteKeyPopup, null))) : '', !embeddedJoinGroupPopup && joinPopup);
 };
 var Container$2 = styled.div(_templateObject$5 || (_templateObject$5 = _taggedTemplateLiteralLoose(["\n  display: flex;\n  height: 100vh;\n"])));
 var ChatContainer = styled.div(_templateObject2$4 || (_templateObject2$4 = _taggedTemplateLiteralLoose(["\n  display: flex;\n  height: 100%;\n  max-height: 100vh;\n  min-width: ", ";\n  background-color: ", ";\n  position: relative;\n\n  /* Global highlighted background styles */\n  ::selection {\n    background-color: ", ";\n  }\n\n  ::-moz-selection {\n    background-color: ", ";\n  }\n\n  /* For text selection highlighting */\n  *::selection {\n    background-color: ", ";\n  }\n\n  *::-moz-selection {\n    background-color: ", ";\n  }\n"])), function (props) {
@@ -48774,6 +48825,12 @@ var Details = function Details(_ref) {
       return Promise.reject(e);
     }
   };
+  var channelMetadata = useMemo(function () {
+    if (isJSON(activeChannel === null || activeChannel === void 0 ? void 0 : activeChannel.metadata)) {
+      return JSON.parse(activeChannel === null || activeChannel === void 0 ? void 0 : activeChannel.metadata);
+    }
+    return activeChannel === null || activeChannel === void 0 ? void 0 : activeChannel.metadata;
+  }, [activeChannel]);
   return /*#__PURE__*/React__default.createElement(Container$v, {
     backgroundColor: backgroundColor,
     mounted: mounted,
@@ -48859,11 +48916,11 @@ var Details = function Details(_ref) {
     color: textSecondary,
     fontSize: channelMembersFontSize,
     lineHeight: channelMembersLineHeight
-  }, activeChannel && activeChannel.memberCount, " ", displayMemberText)))), showAboutChannel && activeChannel && activeChannel.metadata && activeChannel.metadata.d && (/*#__PURE__*/React__default.createElement(AboutChannel, null, showAboutChannelTitle && /*#__PURE__*/React__default.createElement(AboutChannelTitle, {
+  }, activeChannel && activeChannel.memberCount, " ", displayMemberText)))), showAboutChannel && activeChannel && channelMetadata && (channelMetadata === null || channelMetadata === void 0 ? void 0 : channelMetadata.d) && (/*#__PURE__*/React__default.createElement(AboutChannel, null, showAboutChannelTitle && /*#__PURE__*/React__default.createElement(AboutChannelTitle, {
     color: textFootnote
   }, "About"), /*#__PURE__*/React__default.createElement(AboutChannelText, {
     color: textPrimary
-  }, activeChannel && activeChannel.metadata && activeChannel.metadata.d ? activeChannel.metadata.d : '')))), activeChannel && activeChannel.userRole && (/*#__PURE__*/React__default.createElement(Actions, {
+  }, channelMetadata !== null && channelMetadata !== void 0 && channelMetadata.d ? channelMetadata === null || channelMetadata === void 0 ? void 0 : channelMetadata.d : '')))), activeChannel && activeChannel.userRole && (/*#__PURE__*/React__default.createElement(Actions, {
     setActionsHeight: setActionsHeight,
     theme: theme,
     showMuteUnmuteNotifications: showMuteUnmuteNotifications,

package/package.json

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