sceyt-chat-react-uikit 1.7.9-beta.13 → 1.7.9-beta.14

package/components/ChatContainer/index.d.ts

@@ -80,6 +80,7 @@ export interface IChatClientProps {
         joinMembersEvent?: (channelId: string, joinedMembers: IMember[], members: IMember[]) => IMember[];
         updateMembersEvent?: (channelId: string, updatedMembers: IMember[], members: IMember[]) => IMember[];
     } | null;
+    showOwnMessageForward?: boolean;
 }
-declare const SceytChatContainer: ({ client, theme, themeMode, avatarColors, children, showOnlyContactUsers, handleNewMessages, sendAttachmentsAsSeparateMessages, membersDisplayTextByChannelTypesMap, defaultRolesByChannelTypesMap, channelTypeFilter, logoSrc, CustomUploader, showNotifications, hideUserPresence, openChatOnUserInteraction, autoSelectFirstChannel, logLevel, memberCount, disableFrowardMentionsCount, chatMinWidth, baseUrlForInviteMembers, useInviteLink, inviteLinkOptions, embeddedJoinGroupPopup, onUpdateChannel, disappearingSettings, customLoadMembersFunctions }: IChatClientProps) => React.JSX.Element;
+declare const SceytChatContainer: ({ client, theme, themeMode, avatarColors, children, showOnlyContactUsers, handleNewMessages, sendAttachmentsAsSeparateMessages, membersDisplayTextByChannelTypesMap, defaultRolesByChannelTypesMap, channelTypeFilter, logoSrc, CustomUploader, showNotifications, hideUserPresence, openChatOnUserInteraction, autoSelectFirstChannel, logLevel, memberCount, disableFrowardMentionsCount, chatMinWidth, baseUrlForInviteMembers, useInviteLink, inviteLinkOptions, embeddedJoinGroupPopup, onUpdateChannel, disappearingSettings, customLoadMembersFunctions, showOwnMessageForward }: IChatClientProps) => React.JSX.Element;
 export default SceytChatContainer;

package/index.js

@@ -9085,6 +9085,7 @@ var disableFrowardMentionsCount = false;
 var onUpdateChannel = function onUpdateChannel() {};
 var useInviteLink = false;
 var disappearingSettings;
+var showOwnMessageForward = true;
 var customLoadMembersFunctions;
 var inviteLinkOptions = null;
 function setBaseUrlForInviteMembers(url) {
@@ -9341,6 +9342,12 @@ var setDisappearingSettings = function setDisappearingSettings(settings) {
 var setCustomLoadMembersFunctions = function setCustomLoadMembersFunctions(functions) {
   customLoadMembersFunctions = functions;
 };
+var setShowOwnMessageForward = function setShowOwnMessageForward(show) {
+  showOwnMessageForward = show;
+};
+var getShowOwnMessageForward = function getShowOwnMessageForward() {
+  return showOwnMessageForward;
+};
 var getDisappearingSettings = function getDisappearingSettings() {
   return disappearingSettings;
 };
@@ -19119,7 +19126,7 @@ function getChannelsWithUser(action) {
         channelsQueryBuilder = new _SceytChatClient10.ChannelListQueryBuilder();
         channelsQueryBuilder.memberCount(0);
         channelsQueryBuilder.setMutualWithUserId(userId);
-        channelsQueryBuilder.withExcludeTypes([DEFAULT_CHANNEL_TYPE.DIRECT]);
+        channelsQueryBuilder.types([DEFAULT_CHANNEL_TYPE.PRIVATE]);
         channelsQueryBuilder.limit(15);
         _context37.n = 3;
         return effects.call(channelsQueryBuilder.build);
@@ -19873,10 +19880,13 @@ var addPendingMessage = function addPendingMessage(message, messageCopy, channel
     return Promise.reject(e);
   }
 };
-var updateMessage$1 = function updateMessage(actionType, pending, channelId, scrollToNewMessage, message) {
+var updateMessage$1 = function updateMessage(actionType, pending, channelId, scrollToNewMessage, message, isNotShowOwnMessageForward) {
   if (scrollToNewMessage === void 0) {
     scrollToNewMessage = true;
   }
+  if (isNotShowOwnMessageForward === void 0) {
+    isNotShowOwnMessageForward = false;
+  }
   return /*#__PURE__*/_regenerator().m(function _callee() {
     var activeChannelId, channel, messages, _channel$lastMessage2, repliedMessage, scrollRef, _channel$lastMessage3;
     return _regenerator().w(function (_context) {
@@ -19888,14 +19898,18 @@ var updateMessage$1 = function updateMessage(actionType, pending, channelId, scr
             break;
           }
           if (activeChannelId === channelId) {
-            addAllMessages([pending], MESSAGE_LOAD_DIRECTION.NEXT);
+            addAllMessages([_extends({}, pending, isNotShowOwnMessageForward ? {
+              forwardingDetails: undefined
+            } : {})], MESSAGE_LOAD_DIRECTION.NEXT);
           }
           if (!(activeChannelId === channelId)) {
             _context.n = 1;
             break;
           }
           _context.n = 1;
-          return effects.put(addMessageAC(pending));
+          return effects.put(addMessageAC(_extends({}, pending, isNotShowOwnMessageForward ? {
+            forwardingDetails: undefined
+          } : {})));
         case 1:
           _context.n = 2;
           return effects.call(addPendingMessage, message, pending, channelId);
@@ -20565,12 +20579,15 @@ function sendTextMessage(action) {
   }, _marked2$2, null, [[3, 20, 23, 25]]);
 }
 function forwardMessage(action) {
-  var payload, message, channelId, connectionState, isForward, pendingMessage, channel, activeChannelId, messageTid, SceytChatClient, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, pollDetails, messageToSend, hasNextMessages, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, _channel5, isErrorResendable, _channel6, _activeChannelId2, _t4;
+  var payload, message, channelId, connectionState, isForward, showOwnMessageForward, SceytChatClient, isNotShowOwnMessageForward, pendingMessage, channel, activeChannelId, messageTid, _SceytChatClient, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, pollDetails, messageToSend, hasNextMessages, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, _channel5, isErrorResendable, _channel6, _activeChannelId2, _t4;
   return _regenerator().w(function (_context6) {
     while (1) switch (_context6.p = _context6.n) {
       case 0:
         payload = action.payload;
         message = payload.message, channelId = payload.channelId, connectionState = payload.connectionState, isForward = payload.isForward;
+        showOwnMessageForward = getShowOwnMessageForward();
+        SceytChatClient = getClient();
+        isNotShowOwnMessageForward = message.user.id === SceytChatClient.user.id && !showOwnMessageForward;
         pendingMessage = null;
         channel = null;
         activeChannelId = getActiveChannelId();
@@ -20592,9 +20609,9 @@ function forwardMessage(action) {
           _context6.n = 5;
           break;
         }
-        SceytChatClient = getClient();
+        _SceytChatClient = getClient();
         _context6.n = 4;
-        return effects.call(SceytChatClient.getChannel, channelId);
+        return effects.call(_SceytChatClient.getChannel, channelId);
       case 4:
         channel = _context6.v;
       case 5:
@@ -20650,7 +20667,8 @@ function forwardMessage(action) {
         }) : messageBuilder.create();
         messageTid = messageToSend.tid;
         pendingMessage = _extends({}, messageToSend, {
-          createdAt: new Date(Date.now())
+          createdAt: new Date(Date.now()),
+          user: message.user
         });
         if (isForward && pendingMessage && action.type !== RESEND_MESSAGE) {
           if (message.forwardingDetails) {
@@ -20687,14 +20705,16 @@ function forwardMessage(action) {
           break;
         }
         _context6.n = 9;
-        return effects.call(updateMessage$1, action.type, pendingMessage, channel.id, false, message);
+        return effects.call(updateMessage$1, action.type, pendingMessage, channel.id, false, message, isNotShowOwnMessageForward);
       case 9:
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
           _context6.n = 16;
           break;
         }
         _context6.n = 10;
-        return effects.call(channel.sendMessage, messageToSend);
+        return effects.call(channel.sendMessage, _extends({}, messageToSend, isNotShowOwnMessageForward ? {
+          forwardingDetails: null
+        } : {}));
       case 10:
         messageResponse = _context6.v;
         messageUpdateData = _extends({}, messageResponse, {
@@ -25169,7 +25189,9 @@ var SceytChatContainer = function SceytChatContainer(_ref) {
     _ref$disappearingSett = _ref.disappearingSettings,
     disappearingSettings = _ref$disappearingSett === void 0 ? null : _ref$disappearingSett,
     _ref$customLoadMember = _ref.customLoadMembersFunctions,
-    customLoadMembersFunctions = _ref$customLoadMember === void 0 ? null : _ref$customLoadMember;
+    customLoadMembersFunctions = _ref$customLoadMember === void 0 ? null : _ref$customLoadMember,
+    _ref$showOwnMessageFo = _ref.showOwnMessageForward,
+    showOwnMessageForward = _ref$showOwnMessageFo === void 0 ? true : _ref$showOwnMessageFo;
   React.useEffect(function () {
     log.setLevel(logLevel);
   }, [logLevel]);
@@ -25198,6 +25220,9 @@ var SceytChatContainer = function SceytChatContainer(_ref) {
       setCustomLoadMembersFunctions(customLoadMembersFunctions);
     }
   }, [customLoadMembersFunctions]);
+  React.useEffect(function () {
+    setShowOwnMessageForward(showOwnMessageForward);
+  }, [showOwnMessageForward]);
   return /*#__PURE__*/React__default.createElement(reactRedux.Provider, {
     store: store,
     context: SceytReduxContext
@@ -26517,6 +26542,9 @@ var UsersPopup = function UsersPopup(_ref2) {
   var _useState5 = React.useState(false),
     isScrolling = _useState5[0],
     setIsScrolling = _useState5[1];
+  var _useState6 = React.useState(false),
+    isSelectedMembersScrolling = _useState6[0],
+    setIsSelectedMembersScrolling = _useState6[1];
   var popupTitleText = channel && (memberDisplayText && memberDisplayText[channel.type] ? "Add " + memberDisplayText[channel.type] + "s" : channel.type === DEFAULT_CHANNEL_TYPE.BROADCAST || channel.type === DEFAULT_CHANNEL_TYPE.PUBLIC ? 'Subscribers' : 'Members');
   var handleMembersListScroll = function handleMembersListScroll(event) {
     if (!userSearchValue && event.target.scrollHeight - event.target.scrollTop <= event.target.offsetHeight + 300) {
@@ -26706,7 +26734,15 @@ var UsersPopup = function UsersPopup(_ref2) {
       return setUserSearchValue('');
     }
   })), actionType !== 'createChat' && selectedMembers.length !== 0 && (/*#__PURE__*/React__default.createElement(SelectedMembersContainer, {
-    ref: selectedMembersCont
+    ref: selectedMembersCont,
+    thumbColor: surface2,
+    className: isSelectedMembersScrolling ? 'show-scrollbar' : '',
+    onMouseEnter: function onMouseEnter() {
+      return setIsSelectedMembersScrolling(true);
+    },
+    onMouseLeave: function onMouseLeave() {
+      return setIsSelectedMembersScrolling(false);
+    }
   }, selectedMembers.map(function (member) {
     return /*#__PURE__*/React__default.createElement(SelectedMemberBubble, {
       backgroundColor: surface1,
@@ -26803,7 +26839,7 @@ var UsersPopup = function UsersPopup(_ref2) {
   }, actionType === 'selectUsers' ? 'Create' : 'Add')))));
 };
 var List = styled__default.div(_templateObject$b || (_templateObject$b = _taggedTemplateLiteralLoose(["\n  display: flex;\n  flex-direction: column;\n  width: 100%;\n  height: 100%;\n  overflow-y: scroll;\n  overflow-x: hidden;\n  margin-top: 12px;\n  min-height: 150px;\n  box-sizing: border-box;\n"])));
-var MembersContainer = styled__default(List)(_templateObject2$a || (_templateObject2$a = _taggedTemplateLiteralLoose(["\n  display: flex;\n  flex-direction: column;\n  //margin-top: 24px;\n  position: relative;\n  max-height: ", ";\n  overflow-y: auto;\n\n  //width: calc(100% + 16px);\n  padding-right: 16px;\n\n  &::-webkit-scrollbar {\n    width: 8px;\n    background: transparent;\n  }\n  &::-webkit-scrollbar-thumb {\n    background: transparent;\n  }\n\n  &.show-scrollbar::-webkit-scrollbar-thumb {\n    background: ", ";\n    border-radius: 4px;\n  }\n  &.show-scrollbar::-webkit-scrollbar-track {\n    background: transparent;\n  }\n"])), function (props) {
+var MembersContainer = styled__default(List)(_templateObject2$a || (_templateObject2$a = _taggedTemplateLiteralLoose(["\n  display: flex;\n  flex-direction: column;\n  position: relative;\n  max-height: ", ";\n  overflow-y: auto;\n  padding-right: 16px;\n\n  &::-webkit-scrollbar {\n    width: 8px;\n    background: transparent;\n  }\n  &::-webkit-scrollbar-thumb {\n    background: transparent;\n  }\n\n  &.show-scrollbar::-webkit-scrollbar-thumb {\n    background: ", ";\n    border-radius: 4px;\n  }\n  &.show-scrollbar::-webkit-scrollbar-track {\n    background: transparent;\n  }\n"])), function (props) {
   return "calc(100% - (" + ((props.isAdd ? 67 : 70) + props.selectedMembersHeight) + "px))";
 }, function (props) {
   return props.thumbColor;
@@ -26825,7 +26861,9 @@ var UserNamePresence = styled__default.div(_templateObject6$3 || (_templateObjec
 var MemberName = styled__default.h4(_templateObject7$3 || (_templateObject7$3 = _taggedTemplateLiteralLoose(["\n  font-style: normal;\n  font-size: 15px;\n  font-weight: 500;\n  line-height: 16px;\n  color: ", ";\n  margin: 0;\n  max-width: calc(100% - 10px);\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  overflow: hidden;\n"])), function (props) {
   return props.color;
 });
-var SelectedMembersContainer = styled__default.div(_templateObject8$3 || (_templateObject8$3 = _taggedTemplateLiteralLoose(["\n  display: flex;\n  justify-content: flex-start;\n  flex-wrap: wrap;\n  width: 100%;\n  max-height: 85px;\n  overflow-x: hidden;\n  padding: 2px 12px 0;\n  box-sizing: border-box;\n  //flex: 0 0 auto;\n"])));
+var SelectedMembersContainer = styled__default.div(_templateObject8$3 || (_templateObject8$3 = _taggedTemplateLiteralLoose(["\n  display: flex;\n  justify-content: flex-start;\n  flex-wrap: wrap;\n  width: 100%;\n  max-height: 85px;\n  overflow-x: hidden;\n  padding: 2px 12px 0;\n  box-sizing: border-box;\n  overflow-y: auto;\n\n  &::-webkit-scrollbar {\n    width: 8px;\n    background: transparent;\n  }\n  &::-webkit-scrollbar-thumb {\n    background: transparent;\n  }\n\n  &.show-scrollbar::-webkit-scrollbar-thumb {\n    background: ", ";\n    border-radius: 4px;\n  }\n  &.show-scrollbar::-webkit-scrollbar-track {\n    background: transparent;\n  }\n"])), function (props) {
+  return props.thumbColor;
+});
 var SelectedMemberBubble = styled__default.div(_templateObject9$2 || (_templateObject9$2 = _taggedTemplateLiteralLoose(["\n  display: flex;\n  justify-content: space-between;\n  background: ", ";\n  border-radius: 16px;\n  align-items: center;\n  padding: 4px 10px 4px 0;\n  height: 28px;\n  margin: 8px 8px 0 0;\n  box-sizing: border-box;\n"])), function (props) {
   return props.backgroundColor;
 });
@@ -43884,6 +43922,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     accentColor = _useColor[THEME_COLORS.ACCENT],
     backgroundSections = _useColor[THEME_COLORS.BACKGROUND_SECTIONS],
     surface1Background = _useColor[THEME_COLORS.SURFACE_1],
+    surface2 = _useColor[THEME_COLORS.SURFACE_2],
     textPrimary = _useColor[THEME_COLORS.TEXT_PRIMARY],
     textSecondary = _useColor[THEME_COLORS.TEXT_SECONDARY],
     iconInactive = _useColor[THEME_COLORS.ICON_INACTIVE],
@@ -44027,6 +44066,9 @@ var SendMessageInput = function SendMessageInput(_ref3) {
   var _useState29 = React.useState(false),
     isSmallWidthViewport = _useState29[0],
     setIsSmallWidthViewport = _useState29[1];
+  var _useState30 = React.useState(false),
+    isScrolling = _useState30[0],
+    setIsScrolling = _useState30[1];
   var addAttachmentByMenu = showChooseFileAttachment && showChooseMediaAttachment;
   function onChange(editorState) {
     setRealEditorState(editorState);
@@ -45319,7 +45361,8 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     className: inputCustomClassname,
     highlightedBackground: textSelectionBackgroundColor || highlightedBackground,
     borderRadius: inputBorderRadius,
-    color: textPrimary
+    color: textPrimary,
+    thumbColor: surface2
   }, /*#__PURE__*/React__default.createElement(LexicalComposer.LexicalComposer, {
     initialConfig: initialConfig
   }, /*#__PURE__*/React__default.createElement(AutoFocusPlugin, {
@@ -45364,7 +45407,13 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     contentEditable: /*#__PURE__*/React__default.createElement("div", {
       onKeyDown: handleSendEditMessage,
       onDoubleClick: handleDoubleClick,
-      className: 'rich_text_editor',
+      className: "rich_text_editor " + (isScrolling ? 'show-scrollbar' : ''),
+      onMouseEnter: function onMouseEnter() {
+        return setIsScrolling(true);
+      },
+      onMouseLeave: function onMouseLeave() {
+        return setIsScrolling(false);
+      },
       ref: onRef
     }, /*#__PURE__*/React__default.createElement(LexicalContentEditable.ContentEditable, {
       className: 'content_editable_input'
@@ -45472,7 +45521,7 @@ var MessageInputWrapper = styled__default.div(_templateObject10$8 || (_templateO
 }, function (props) {
   return props.borderRadius || '18px';
 });
-var LexicalWrapper = styled__default.div(_templateObject11$6 || (_templateObject11$6 = _taggedTemplateLiteralLoose(["\n  position: relative;\n  width: 100%;\n\n  & .rich_text_editor {\n    width: 100%;\n    max-height: 80px;\n    min-height: 20px;\n    display: block;\n    border: none;\n    box-sizing: border-box;\n    outline: none !important;\n    overflow: auto;\n    border-radius: ", ";\n    background-color: ", ";\n    padding: ", ";\n    color: ", ";\n    order: ", ";\n\n    & p {\n      font-size: 15px;\n      line-height: 20px;\n      color: ", ";\n    }\n\n    &::selection {\n      background-color: ", ";\n    }\n\n    & *::selection {\n      background-color: ", ";\n    }\n\n    & span::selection {\n      background-color: ", ";\n    }\n\n    &:empty:before {\n      content: attr(data-placeholder);\n    }\n\n    & .content_editable_input {\n      border: none !important;\n      outline: none !important;\n    }\n\n    & .mention {\n      color: ", ";\n      background-color: inherit !important;\n      user-modify: read-only;\n    }\n\n    & span.bold {\n      font-weight: bold;\n    }\n\n    & .editor_paragraph {\n      margin: 0;\n    }\n\n    & .text_bold {\n      font-weight: 600;\n    }\n\n    & .text_italic {\n      font-style: italic;\n    }\n\n    & .text_underline {\n      text-decoration: underline;\n    }\n\n    & .text_strikethrough {\n      text-decoration: line-through;\n    }\n\n    & .text_underlineStrikethrough {\n      text-decoration: underline line-through;\n    }\n\n    & code {\n      font-family: inherit;\n      letter-spacing: 4px;\n    }\n  }\n"])), function (props) {
+var LexicalWrapper = styled__default.div(_templateObject11$6 || (_templateObject11$6 = _taggedTemplateLiteralLoose(["\n  position: relative;\n  width: 100%;\n\n  & .rich_text_editor {\n    width: 100%;\n    max-height: 80px;\n    min-height: 20px;\n    display: block;\n    border: none;\n    box-sizing: border-box;\n    outline: none !important;\n    border-radius: ", ";\n    background-color: ", ";\n    padding: ", ";\n    color: ", ";\n    order: ", ";\n    overflow-y: auto;\n    overflow-x: hidden;\n\n    &::-webkit-scrollbar {\n      width: 8px;\n      background: transparent;\n    }\n    &::-webkit-scrollbar-thumb {\n      background: transparent;\n    }\n\n    &.show-scrollbar::-webkit-scrollbar-thumb {\n      background: ", ";\n      border-radius: 4px;\n    }\n    &.show-scrollbar::-webkit-scrollbar-track {\n      background: transparent;\n    }\n\n    & p {\n      font-size: 15px;\n      line-height: 20px;\n      color: ", ";\n    }\n\n    &::selection {\n      background-color: ", ";\n    }\n\n    & *::selection {\n      background-color: ", ";\n    }\n\n    & span::selection {\n      background-color: ", ";\n    }\n\n    &:empty:before {\n      content: attr(data-placeholder);\n    }\n\n    & .content_editable_input {\n      border: none !important;\n      outline: none !important;\n    }\n\n    & .mention {\n      color: ", ";\n      background-color: inherit !important;\n      user-modify: read-only;\n    }\n\n    & span.bold {\n      font-weight: bold;\n    }\n\n    & .editor_paragraph {\n      margin: 0;\n    }\n\n    & .text_bold {\n      font-weight: 600;\n    }\n\n    & .text_italic {\n      font-style: italic;\n    }\n\n    & .text_underline {\n      text-decoration: underline;\n    }\n\n    & .text_strikethrough {\n      text-decoration: line-through;\n    }\n\n    & .text_underlineStrikethrough {\n      text-decoration: underline line-through;\n    }\n\n    & code {\n      font-family: inherit;\n      letter-spacing: 4px;\n    }\n  }\n"])), function (props) {
   return props.borderRadius;
 }, function (props) {
   return props.backgroundColor;
@@ -45482,6 +45531,8 @@ var LexicalWrapper = styled__default.div(_templateObject11$6 || (_templateObject
   return props.color;
 }, function (props) {
   return props.order === 0 || props.order ? props.order : 1;
+}, function (props) {
+  return props.thumbColor;
 }, function (props) {
   return props.color;
 }, function (props) {
@@ -48364,14 +48415,8 @@ var Members = function Members(_ref) {
     setCloseMenu = _useState8[1];
   var contactsMap = useSelector(contactsMapSelector) || {};
   var openInviteModal = useSelector(openInviteModalSelector);
-  var channelsMembersHasNext = useSelector(channelsMembersHasNextMapSelector, reactRedux.shallowEqual);
-  var membersHasNext = React.useMemo(function () {
-    return channelsMembersHasNext === null || channelsMembersHasNext === void 0 ? void 0 : channelsMembersHasNext[channel.id];
-  }, [channelsMembersHasNext === null || channelsMembersHasNext === void 0 ? void 0 : channelsMembersHasNext[channel.id]]);
-  var channelsMembersLoadingState = useSelector(channelsMembersLoadingStateSelector, reactRedux.shallowEqual);
-  var membersLoading = React.useMemo(function () {
-    return channelsMembersLoadingState === null || channelsMembersLoadingState === void 0 ? void 0 : channelsMembersLoadingState[channel.id];
-  }, [channelsMembersLoadingState === null || channelsMembersLoadingState === void 0 ? void 0 : channelsMembersLoadingState[channel.id]]);
+  var rolesMap = useSelector(rolesMapSelector, reactRedux.shallowEqual);
+  var connectionStatus = useSelector(connectionStatusSelector);
   var user = getClient().user;
   var memberDisplayText = getChannelTypesMemberDisplayTextMap();
   var channelTypeRoleMap = getDefaultRolesByChannelTypesMap();
@@ -48471,13 +48516,15 @@ var Members = function Members(_ref) {
     setAddMemberPopupOpen(false);
   };
   React.useEffect(function () {
-    if (getFromContacts) {
-      dispatch(getContactsAC());
-    }
-    if (channel !== null && channel !== void 0 && channel.id && membersHasNext === undefined && membersLoading !== LOADING_STATE.LOADING) {
-      dispatch(getMembersAC(channel.id));
+    if (connectionStatus === CONNECTION_STATUS.CONNECTED) {
+      if (getFromContacts) {
+        dispatch(getContactsAC());
+      }
+      if (channel !== null && channel !== void 0 && channel.id) {
+        dispatch(getMembersAC(channel.id));
+      }
     }
-  }, [channel === null || channel === void 0 ? void 0 : channel.id]);
+  }, [channel === null || channel === void 0 ? void 0 : channel.id, connectionStatus]);
   var currentUserRole = (_members$find = members.find(function (member) {
     return member.id === user.id;
   })) === null || _members$find === void 0 ? void 0 : _members$find.role;
@@ -48492,6 +48539,7 @@ var Members = function Members(_ref) {
     fontSize: addMemberFontSize,
     addMemberBackground: surface1
   }, addMemberIcon || /*#__PURE__*/React__default.createElement(SvgAddMember, null), "Add " + displayMemberText)), !!members.length && members.map(function (member, index) {
+    var _rolesMap$member$role, _rolesMap$currentUser, _rolesMap$member$role2, _rolesMap$currentUser2;
     return /*#__PURE__*/React__default.createElement(MemberItem$1, {
       addMemberIconColor: iconInactive,
       key: member.id + index,
@@ -48519,7 +48567,7 @@ var Members = function Members(_ref) {
       color: textSecondary,
       margin: '1px 0 0',
       fontSize: memberPresenceFontSize
-    }, member.presence && member.presence.state === USER_PRESENCE_STATUS.ONLINE ? 'Online' : member.presence && member.presence.lastActiveAt && userLastActiveDateFormat(member.presence.lastActiveAt))), !noMemberEditPermissions && member.role !== 'owner' && member.id !== user.id && (/*#__PURE__*/React__default.createElement(DropDown, {
+    }, member.presence && member.presence.state === USER_PRESENCE_STATUS.ONLINE ? 'Online' : member.presence && member.presence.lastActiveAt && userLastActiveDateFormat(member.presence.lastActiveAt))), !noMemberEditPermissions && member.role !== 'owner' && currentUserRole && (rolesMap === null || rolesMap === void 0 ? void 0 : (_rolesMap$member$role = rolesMap[member.role]) === null || _rolesMap$member$role === void 0 ? void 0 : _rolesMap$member$role.priority) && (rolesMap === null || rolesMap === void 0 ? void 0 : (_rolesMap$currentUser = rolesMap[currentUserRole]) === null || _rolesMap$currentUser === void 0 ? void 0 : _rolesMap$currentUser.priority) && (rolesMap === null || rolesMap === void 0 ? void 0 : (_rolesMap$member$role2 = rolesMap[member.role]) === null || _rolesMap$member$role2 === void 0 ? void 0 : _rolesMap$member$role2.priority) < (rolesMap === null || rolesMap === void 0 ? void 0 : (_rolesMap$currentUser2 = rolesMap[currentUserRole]) === null || _rolesMap$currentUser2 === void 0 ? void 0 : _rolesMap$currentUser2.priority) && member.id !== user.id && (/*#__PURE__*/React__default.createElement(DropDown, {
       theme: theme,
       isSelect: true,
       forceClose: !!(closeMenu && closeMenu !== member.id),

package/index.modern.js

@@ -9084,6 +9084,7 @@ var disableFrowardMentionsCount = false;
 var onUpdateChannel = function onUpdateChannel() {};
 var useInviteLink = false;
 var disappearingSettings;
+var showOwnMessageForward = true;
 var customLoadMembersFunctions;
 var inviteLinkOptions = null;
 function setBaseUrlForInviteMembers(url) {
@@ -9340,6 +9341,12 @@ var setDisappearingSettings = function setDisappearingSettings(settings) {
 var setCustomLoadMembersFunctions = function setCustomLoadMembersFunctions(functions) {
   customLoadMembersFunctions = functions;
 };
+var setShowOwnMessageForward = function setShowOwnMessageForward(show) {
+  showOwnMessageForward = show;
+};
+var getShowOwnMessageForward = function getShowOwnMessageForward() {
+  return showOwnMessageForward;
+};
 var getDisappearingSettings = function getDisappearingSettings() {
   return disappearingSettings;
 };
@@ -19118,7 +19125,7 @@ function getChannelsWithUser(action) {
         channelsQueryBuilder = new _SceytChatClient10.ChannelListQueryBuilder();
         channelsQueryBuilder.memberCount(0);
         channelsQueryBuilder.setMutualWithUserId(userId);
-        channelsQueryBuilder.withExcludeTypes([DEFAULT_CHANNEL_TYPE.DIRECT]);
+        channelsQueryBuilder.types([DEFAULT_CHANNEL_TYPE.PRIVATE]);
         channelsQueryBuilder.limit(15);
         _context37.n = 3;
         return call(channelsQueryBuilder.build);
@@ -19872,10 +19879,13 @@ var addPendingMessage = function addPendingMessage(message, messageCopy, channel
     return Promise.reject(e);
   }
 };
-var updateMessage$1 = function updateMessage(actionType, pending, channelId, scrollToNewMessage, message) {
+var updateMessage$1 = function updateMessage(actionType, pending, channelId, scrollToNewMessage, message, isNotShowOwnMessageForward) {
   if (scrollToNewMessage === void 0) {
     scrollToNewMessage = true;
   }
+  if (isNotShowOwnMessageForward === void 0) {
+    isNotShowOwnMessageForward = false;
+  }
   return /*#__PURE__*/_regenerator().m(function _callee() {
     var activeChannelId, channel, messages, _channel$lastMessage2, repliedMessage, scrollRef, _channel$lastMessage3;
     return _regenerator().w(function (_context) {
@@ -19887,14 +19897,18 @@ var updateMessage$1 = function updateMessage(actionType, pending, channelId, scr
             break;
           }
           if (activeChannelId === channelId) {
-            addAllMessages([pending], MESSAGE_LOAD_DIRECTION.NEXT);
+            addAllMessages([_extends({}, pending, isNotShowOwnMessageForward ? {
+              forwardingDetails: undefined
+            } : {})], MESSAGE_LOAD_DIRECTION.NEXT);
           }
           if (!(activeChannelId === channelId)) {
             _context.n = 1;
             break;
           }
           _context.n = 1;
-          return put(addMessageAC(pending));
+          return put(addMessageAC(_extends({}, pending, isNotShowOwnMessageForward ? {
+            forwardingDetails: undefined
+          } : {})));
         case 1:
           _context.n = 2;
           return call(addPendingMessage, message, pending, channelId);
@@ -20564,12 +20578,15 @@ function sendTextMessage(action) {
   }, _marked2$2, null, [[3, 20, 23, 25]]);
 }
 function forwardMessage(action) {
-  var payload, message, channelId, connectionState, isForward, pendingMessage, channel, activeChannelId, messageTid, SceytChatClient, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, pollDetails, messageToSend, hasNextMessages, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, _channel5, isErrorResendable, _channel6, _activeChannelId2, _t4;
+  var payload, message, channelId, connectionState, isForward, showOwnMessageForward, SceytChatClient, isNotShowOwnMessageForward, pendingMessage, channel, activeChannelId, messageTid, _SceytChatClient, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, pollDetails, messageToSend, hasNextMessages, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, _channel5, isErrorResendable, _channel6, _activeChannelId2, _t4;
   return _regenerator().w(function (_context6) {
     while (1) switch (_context6.p = _context6.n) {
       case 0:
         payload = action.payload;
         message = payload.message, channelId = payload.channelId, connectionState = payload.connectionState, isForward = payload.isForward;
+        showOwnMessageForward = getShowOwnMessageForward();
+        SceytChatClient = getClient();
+        isNotShowOwnMessageForward = message.user.id === SceytChatClient.user.id && !showOwnMessageForward;
         pendingMessage = null;
         channel = null;
         activeChannelId = getActiveChannelId();
@@ -20591,9 +20608,9 @@ function forwardMessage(action) {
           _context6.n = 5;
           break;
         }
-        SceytChatClient = getClient();
+        _SceytChatClient = getClient();
         _context6.n = 4;
-        return call(SceytChatClient.getChannel, channelId);
+        return call(_SceytChatClient.getChannel, channelId);
       case 4:
         channel = _context6.v;
       case 5:
@@ -20649,7 +20666,8 @@ function forwardMessage(action) {
         }) : messageBuilder.create();
         messageTid = messageToSend.tid;
         pendingMessage = _extends({}, messageToSend, {
-          createdAt: new Date(Date.now())
+          createdAt: new Date(Date.now()),
+          user: message.user
         });
         if (isForward && pendingMessage && action.type !== RESEND_MESSAGE) {
           if (message.forwardingDetails) {
@@ -20686,14 +20704,16 @@ function forwardMessage(action) {
           break;
         }
         _context6.n = 9;
-        return call(updateMessage$1, action.type, pendingMessage, channel.id, false, message);
+        return call(updateMessage$1, action.type, pendingMessage, channel.id, false, message, isNotShowOwnMessageForward);
       case 9:
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
           _context6.n = 16;
           break;
         }
         _context6.n = 10;
-        return call(channel.sendMessage, messageToSend);
+        return call(channel.sendMessage, _extends({}, messageToSend, isNotShowOwnMessageForward ? {
+          forwardingDetails: null
+        } : {}));
       case 10:
         messageResponse = _context6.v;
         messageUpdateData = _extends({}, messageResponse, {
@@ -25168,7 +25188,9 @@ var SceytChatContainer = function SceytChatContainer(_ref) {
     _ref$disappearingSett = _ref.disappearingSettings,
     disappearingSettings = _ref$disappearingSett === void 0 ? null : _ref$disappearingSett,
     _ref$customLoadMember = _ref.customLoadMembersFunctions,
-    customLoadMembersFunctions = _ref$customLoadMember === void 0 ? null : _ref$customLoadMember;
+    customLoadMembersFunctions = _ref$customLoadMember === void 0 ? null : _ref$customLoadMember,
+    _ref$showOwnMessageFo = _ref.showOwnMessageForward,
+    showOwnMessageForward = _ref$showOwnMessageFo === void 0 ? true : _ref$showOwnMessageFo;
   useEffect(function () {
     log.setLevel(logLevel);
   }, [logLevel]);
@@ -25197,6 +25219,9 @@ var SceytChatContainer = function SceytChatContainer(_ref) {
       setCustomLoadMembersFunctions(customLoadMembersFunctions);
     }
   }, [customLoadMembersFunctions]);
+  useEffect(function () {
+    setShowOwnMessageForward(showOwnMessageForward);
+  }, [showOwnMessageForward]);
   return /*#__PURE__*/React__default.createElement(Provider, {
     store: store,
     context: SceytReduxContext
@@ -26516,6 +26541,9 @@ var UsersPopup = function UsersPopup(_ref2) {
   var _useState5 = useState(false),
     isScrolling = _useState5[0],
     setIsScrolling = _useState5[1];
+  var _useState6 = useState(false),
+    isSelectedMembersScrolling = _useState6[0],
+    setIsSelectedMembersScrolling = _useState6[1];
   var popupTitleText = channel && (memberDisplayText && memberDisplayText[channel.type] ? "Add " + memberDisplayText[channel.type] + "s" : channel.type === DEFAULT_CHANNEL_TYPE.BROADCAST || channel.type === DEFAULT_CHANNEL_TYPE.PUBLIC ? 'Subscribers' : 'Members');
   var handleMembersListScroll = function handleMembersListScroll(event) {
     if (!userSearchValue && event.target.scrollHeight - event.target.scrollTop <= event.target.offsetHeight + 300) {
@@ -26705,7 +26733,15 @@ var UsersPopup = function UsersPopup(_ref2) {
       return setUserSearchValue('');
     }
   })), actionType !== 'createChat' && selectedMembers.length !== 0 && (/*#__PURE__*/React__default.createElement(SelectedMembersContainer, {
-    ref: selectedMembersCont
+    ref: selectedMembersCont,
+    thumbColor: surface2,
+    className: isSelectedMembersScrolling ? 'show-scrollbar' : '',
+    onMouseEnter: function onMouseEnter() {
+      return setIsSelectedMembersScrolling(true);
+    },
+    onMouseLeave: function onMouseLeave() {
+      return setIsSelectedMembersScrolling(false);
+    }
   }, selectedMembers.map(function (member) {
     return /*#__PURE__*/React__default.createElement(SelectedMemberBubble, {
       backgroundColor: surface1,
@@ -26802,7 +26838,7 @@ var UsersPopup = function UsersPopup(_ref2) {
   }, actionType === 'selectUsers' ? 'Create' : 'Add')))));
 };
 var List = styled.div(_templateObject$b || (_templateObject$b = _taggedTemplateLiteralLoose(["\n  display: flex;\n  flex-direction: column;\n  width: 100%;\n  height: 100%;\n  overflow-y: scroll;\n  overflow-x: hidden;\n  margin-top: 12px;\n  min-height: 150px;\n  box-sizing: border-box;\n"])));
-var MembersContainer = styled(List)(_templateObject2$a || (_templateObject2$a = _taggedTemplateLiteralLoose(["\n  display: flex;\n  flex-direction: column;\n  //margin-top: 24px;\n  position: relative;\n  max-height: ", ";\n  overflow-y: auto;\n\n  //width: calc(100% + 16px);\n  padding-right: 16px;\n\n  &::-webkit-scrollbar {\n    width: 8px;\n    background: transparent;\n  }\n  &::-webkit-scrollbar-thumb {\n    background: transparent;\n  }\n\n  &.show-scrollbar::-webkit-scrollbar-thumb {\n    background: ", ";\n    border-radius: 4px;\n  }\n  &.show-scrollbar::-webkit-scrollbar-track {\n    background: transparent;\n  }\n"])), function (props) {
+var MembersContainer = styled(List)(_templateObject2$a || (_templateObject2$a = _taggedTemplateLiteralLoose(["\n  display: flex;\n  flex-direction: column;\n  position: relative;\n  max-height: ", ";\n  overflow-y: auto;\n  padding-right: 16px;\n\n  &::-webkit-scrollbar {\n    width: 8px;\n    background: transparent;\n  }\n  &::-webkit-scrollbar-thumb {\n    background: transparent;\n  }\n\n  &.show-scrollbar::-webkit-scrollbar-thumb {\n    background: ", ";\n    border-radius: 4px;\n  }\n  &.show-scrollbar::-webkit-scrollbar-track {\n    background: transparent;\n  }\n"])), function (props) {
   return "calc(100% - (" + ((props.isAdd ? 67 : 70) + props.selectedMembersHeight) + "px))";
 }, function (props) {
   return props.thumbColor;
@@ -26824,7 +26860,9 @@ var UserNamePresence = styled.div(_templateObject6$3 || (_templateObject6$3 = _t
 var MemberName = styled.h4(_templateObject7$3 || (_templateObject7$3 = _taggedTemplateLiteralLoose(["\n  font-style: normal;\n  font-size: 15px;\n  font-weight: 500;\n  line-height: 16px;\n  color: ", ";\n  margin: 0;\n  max-width: calc(100% - 10px);\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  overflow: hidden;\n"])), function (props) {
   return props.color;
 });
-var SelectedMembersContainer = styled.div(_templateObject8$3 || (_templateObject8$3 = _taggedTemplateLiteralLoose(["\n  display: flex;\n  justify-content: flex-start;\n  flex-wrap: wrap;\n  width: 100%;\n  max-height: 85px;\n  overflow-x: hidden;\n  padding: 2px 12px 0;\n  box-sizing: border-box;\n  //flex: 0 0 auto;\n"])));
+var SelectedMembersContainer = styled.div(_templateObject8$3 || (_templateObject8$3 = _taggedTemplateLiteralLoose(["\n  display: flex;\n  justify-content: flex-start;\n  flex-wrap: wrap;\n  width: 100%;\n  max-height: 85px;\n  overflow-x: hidden;\n  padding: 2px 12px 0;\n  box-sizing: border-box;\n  overflow-y: auto;\n\n  &::-webkit-scrollbar {\n    width: 8px;\n    background: transparent;\n  }\n  &::-webkit-scrollbar-thumb {\n    background: transparent;\n  }\n\n  &.show-scrollbar::-webkit-scrollbar-thumb {\n    background: ", ";\n    border-radius: 4px;\n  }\n  &.show-scrollbar::-webkit-scrollbar-track {\n    background: transparent;\n  }\n"])), function (props) {
+  return props.thumbColor;
+});
 var SelectedMemberBubble = styled.div(_templateObject9$2 || (_templateObject9$2 = _taggedTemplateLiteralLoose(["\n  display: flex;\n  justify-content: space-between;\n  background: ", ";\n  border-radius: 16px;\n  align-items: center;\n  padding: 4px 10px 4px 0;\n  height: 28px;\n  margin: 8px 8px 0 0;\n  box-sizing: border-box;\n"])), function (props) {
   return props.backgroundColor;
 });
@@ -43883,6 +43921,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     accentColor = _useColor[THEME_COLORS.ACCENT],
     backgroundSections = _useColor[THEME_COLORS.BACKGROUND_SECTIONS],
     surface1Background = _useColor[THEME_COLORS.SURFACE_1],
+    surface2 = _useColor[THEME_COLORS.SURFACE_2],
     textPrimary = _useColor[THEME_COLORS.TEXT_PRIMARY],
     textSecondary = _useColor[THEME_COLORS.TEXT_SECONDARY],
     iconInactive = _useColor[THEME_COLORS.ICON_INACTIVE],
@@ -44026,6 +44065,9 @@ var SendMessageInput = function SendMessageInput(_ref3) {
   var _useState29 = useState(false),
     isSmallWidthViewport = _useState29[0],
     setIsSmallWidthViewport = _useState29[1];
+  var _useState30 = useState(false),
+    isScrolling = _useState30[0],
+    setIsScrolling = _useState30[1];
   var addAttachmentByMenu = showChooseFileAttachment && showChooseMediaAttachment;
   function onChange(editorState) {
     setRealEditorState(editorState);
@@ -45318,7 +45360,8 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     className: inputCustomClassname,
     highlightedBackground: textSelectionBackgroundColor || highlightedBackground,
     borderRadius: inputBorderRadius,
-    color: textPrimary
+    color: textPrimary,
+    thumbColor: surface2
   }, /*#__PURE__*/React__default.createElement(LexicalComposer, {
     initialConfig: initialConfig
   }, /*#__PURE__*/React__default.createElement(AutoFocusPlugin, {
@@ -45363,7 +45406,13 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     contentEditable: /*#__PURE__*/React__default.createElement("div", {
       onKeyDown: handleSendEditMessage,
       onDoubleClick: handleDoubleClick,
-      className: 'rich_text_editor',
+      className: "rich_text_editor " + (isScrolling ? 'show-scrollbar' : ''),
+      onMouseEnter: function onMouseEnter() {
+        return setIsScrolling(true);
+      },
+      onMouseLeave: function onMouseLeave() {
+        return setIsScrolling(false);
+      },
       ref: onRef
     }, /*#__PURE__*/React__default.createElement(ContentEditable, {
       className: 'content_editable_input'
@@ -45471,7 +45520,7 @@ var MessageInputWrapper = styled.div(_templateObject10$8 || (_templateObject10$8
 }, function (props) {
   return props.borderRadius || '18px';
 });
-var LexicalWrapper = styled.div(_templateObject11$6 || (_templateObject11$6 = _taggedTemplateLiteralLoose(["\n  position: relative;\n  width: 100%;\n\n  & .rich_text_editor {\n    width: 100%;\n    max-height: 80px;\n    min-height: 20px;\n    display: block;\n    border: none;\n    box-sizing: border-box;\n    outline: none !important;\n    overflow: auto;\n    border-radius: ", ";\n    background-color: ", ";\n    padding: ", ";\n    color: ", ";\n    order: ", ";\n\n    & p {\n      font-size: 15px;\n      line-height: 20px;\n      color: ", ";\n    }\n\n    &::selection {\n      background-color: ", ";\n    }\n\n    & *::selection {\n      background-color: ", ";\n    }\n\n    & span::selection {\n      background-color: ", ";\n    }\n\n    &:empty:before {\n      content: attr(data-placeholder);\n    }\n\n    & .content_editable_input {\n      border: none !important;\n      outline: none !important;\n    }\n\n    & .mention {\n      color: ", ";\n      background-color: inherit !important;\n      user-modify: read-only;\n    }\n\n    & span.bold {\n      font-weight: bold;\n    }\n\n    & .editor_paragraph {\n      margin: 0;\n    }\n\n    & .text_bold {\n      font-weight: 600;\n    }\n\n    & .text_italic {\n      font-style: italic;\n    }\n\n    & .text_underline {\n      text-decoration: underline;\n    }\n\n    & .text_strikethrough {\n      text-decoration: line-through;\n    }\n\n    & .text_underlineStrikethrough {\n      text-decoration: underline line-through;\n    }\n\n    & code {\n      font-family: inherit;\n      letter-spacing: 4px;\n    }\n  }\n"])), function (props) {
+var LexicalWrapper = styled.div(_templateObject11$6 || (_templateObject11$6 = _taggedTemplateLiteralLoose(["\n  position: relative;\n  width: 100%;\n\n  & .rich_text_editor {\n    width: 100%;\n    max-height: 80px;\n    min-height: 20px;\n    display: block;\n    border: none;\n    box-sizing: border-box;\n    outline: none !important;\n    border-radius: ", ";\n    background-color: ", ";\n    padding: ", ";\n    color: ", ";\n    order: ", ";\n    overflow-y: auto;\n    overflow-x: hidden;\n\n    &::-webkit-scrollbar {\n      width: 8px;\n      background: transparent;\n    }\n    &::-webkit-scrollbar-thumb {\n      background: transparent;\n    }\n\n    &.show-scrollbar::-webkit-scrollbar-thumb {\n      background: ", ";\n      border-radius: 4px;\n    }\n    &.show-scrollbar::-webkit-scrollbar-track {\n      background: transparent;\n    }\n\n    & p {\n      font-size: 15px;\n      line-height: 20px;\n      color: ", ";\n    }\n\n    &::selection {\n      background-color: ", ";\n    }\n\n    & *::selection {\n      background-color: ", ";\n    }\n\n    & span::selection {\n      background-color: ", ";\n    }\n\n    &:empty:before {\n      content: attr(data-placeholder);\n    }\n\n    & .content_editable_input {\n      border: none !important;\n      outline: none !important;\n    }\n\n    & .mention {\n      color: ", ";\n      background-color: inherit !important;\n      user-modify: read-only;\n    }\n\n    & span.bold {\n      font-weight: bold;\n    }\n\n    & .editor_paragraph {\n      margin: 0;\n    }\n\n    & .text_bold {\n      font-weight: 600;\n    }\n\n    & .text_italic {\n      font-style: italic;\n    }\n\n    & .text_underline {\n      text-decoration: underline;\n    }\n\n    & .text_strikethrough {\n      text-decoration: line-through;\n    }\n\n    & .text_underlineStrikethrough {\n      text-decoration: underline line-through;\n    }\n\n    & code {\n      font-family: inherit;\n      letter-spacing: 4px;\n    }\n  }\n"])), function (props) {
   return props.borderRadius;
 }, function (props) {
   return props.backgroundColor;
@@ -45481,6 +45530,8 @@ var LexicalWrapper = styled.div(_templateObject11$6 || (_templateObject11$6 = _t
   return props.color;
 }, function (props) {
   return props.order === 0 || props.order ? props.order : 1;
+}, function (props) {
+  return props.thumbColor;
 }, function (props) {
   return props.color;
 }, function (props) {
@@ -48363,14 +48414,8 @@ var Members = function Members(_ref) {
     setCloseMenu = _useState8[1];
   var contactsMap = useSelector(contactsMapSelector) || {};
   var openInviteModal = useSelector(openInviteModalSelector);
-  var channelsMembersHasNext = useSelector(channelsMembersHasNextMapSelector, shallowEqual);
-  var membersHasNext = useMemo(function () {
-    return channelsMembersHasNext === null || channelsMembersHasNext === void 0 ? void 0 : channelsMembersHasNext[channel.id];
-  }, [channelsMembersHasNext === null || channelsMembersHasNext === void 0 ? void 0 : channelsMembersHasNext[channel.id]]);
-  var channelsMembersLoadingState = useSelector(channelsMembersLoadingStateSelector, shallowEqual);
-  var membersLoading = useMemo(function () {
-    return channelsMembersLoadingState === null || channelsMembersLoadingState === void 0 ? void 0 : channelsMembersLoadingState[channel.id];
-  }, [channelsMembersLoadingState === null || channelsMembersLoadingState === void 0 ? void 0 : channelsMembersLoadingState[channel.id]]);
+  var rolesMap = useSelector(rolesMapSelector, shallowEqual);
+  var connectionStatus = useSelector(connectionStatusSelector);
   var user = getClient().user;
   var memberDisplayText = getChannelTypesMemberDisplayTextMap();
   var channelTypeRoleMap = getDefaultRolesByChannelTypesMap();
@@ -48470,13 +48515,15 @@ var Members = function Members(_ref) {
     setAddMemberPopupOpen(false);
   };
   useEffect(function () {
-    if (getFromContacts) {
-      dispatch(getContactsAC());
-    }
-    if (channel !== null && channel !== void 0 && channel.id && membersHasNext === undefined && membersLoading !== LOADING_STATE.LOADING) {
-      dispatch(getMembersAC(channel.id));
+    if (connectionStatus === CONNECTION_STATUS.CONNECTED) {
+      if (getFromContacts) {
+        dispatch(getContactsAC());
+      }
+      if (channel !== null && channel !== void 0 && channel.id) {
+        dispatch(getMembersAC(channel.id));
+      }
     }
-  }, [channel === null || channel === void 0 ? void 0 : channel.id]);
+  }, [channel === null || channel === void 0 ? void 0 : channel.id, connectionStatus]);
   var currentUserRole = (_members$find = members.find(function (member) {
     return member.id === user.id;
   })) === null || _members$find === void 0 ? void 0 : _members$find.role;
@@ -48491,6 +48538,7 @@ var Members = function Members(_ref) {
     fontSize: addMemberFontSize,
     addMemberBackground: surface1
   }, addMemberIcon || /*#__PURE__*/React__default.createElement(SvgAddMember, null), "Add " + displayMemberText)), !!members.length && members.map(function (member, index) {
+    var _rolesMap$member$role, _rolesMap$currentUser, _rolesMap$member$role2, _rolesMap$currentUser2;
     return /*#__PURE__*/React__default.createElement(MemberItem$1, {
       addMemberIconColor: iconInactive,
       key: member.id + index,
@@ -48518,7 +48566,7 @@ var Members = function Members(_ref) {
       color: textSecondary,
       margin: '1px 0 0',
       fontSize: memberPresenceFontSize
-    }, member.presence && member.presence.state === USER_PRESENCE_STATUS.ONLINE ? 'Online' : member.presence && member.presence.lastActiveAt && userLastActiveDateFormat(member.presence.lastActiveAt))), !noMemberEditPermissions && member.role !== 'owner' && member.id !== user.id && (/*#__PURE__*/React__default.createElement(DropDown, {
+    }, member.presence && member.presence.state === USER_PRESENCE_STATUS.ONLINE ? 'Online' : member.presence && member.presence.lastActiveAt && userLastActiveDateFormat(member.presence.lastActiveAt))), !noMemberEditPermissions && member.role !== 'owner' && currentUserRole && (rolesMap === null || rolesMap === void 0 ? void 0 : (_rolesMap$member$role = rolesMap[member.role]) === null || _rolesMap$member$role === void 0 ? void 0 : _rolesMap$member$role.priority) && (rolesMap === null || rolesMap === void 0 ? void 0 : (_rolesMap$currentUser = rolesMap[currentUserRole]) === null || _rolesMap$currentUser === void 0 ? void 0 : _rolesMap$currentUser.priority) && (rolesMap === null || rolesMap === void 0 ? void 0 : (_rolesMap$member$role2 = rolesMap[member.role]) === null || _rolesMap$member$role2 === void 0 ? void 0 : _rolesMap$member$role2.priority) < (rolesMap === null || rolesMap === void 0 ? void 0 : (_rolesMap$currentUser2 = rolesMap[currentUserRole]) === null || _rolesMap$currentUser2 === void 0 ? void 0 : _rolesMap$currentUser2.priority) && member.id !== user.id && (/*#__PURE__*/React__default.createElement(DropDown, {
       theme: theme,
       isSelect: true,
       forceClose: !!(closeMenu && closeMenu !== member.id),

package/package.json

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