sceyt-chat-react-uikit 1.7.7 → 1.7.8-beta.1

package/index.js

@@ -11913,7 +11913,7 @@ var _messageSlice$actions = messageSlice.actions,
 var MessageReducer = messageSlice.reducer;
 
 var initialState$2 = {
-  membersLoadingState: false,
+  membersLoadingState: 0,
   membersHasNext: true,
   activeChannelMembers: [],
   roles: [],
@@ -11998,6 +11998,9 @@ var memberSlice = createSlice({
       } else {
         state.getRolesFail = undefined;
       }
+    },
+    setMembersHasNext: function setMembersHasNext(state, action) {
+      state.membersHasNext = action.payload.hasNext;
     }
   },
   extraReducers: function extraReducers(builder) {
@@ -12014,7 +12017,8 @@ var _memberSlice$actions = memberSlice.actions,
   removeMemberFromList = _memberSlice$actions.removeMemberFromList,
   setMembersLoadingState = _memberSlice$actions.setMembersLoadingState,
   getRolesSuccess = _memberSlice$actions.getRolesSuccess,
-  getRolesFail = _memberSlice$actions.getRolesFail;
+  getRolesFail = _memberSlice$actions.getRolesFail,
+  setMembersHasNext = _memberSlice$actions.setMembersHasNext;
 var MembersReducer = memberSlice.reducer;
 
 var SET_CONTACT_LOADING_STATE = 'SET_CONTACT_LOADING_STATE';
@@ -13190,7 +13194,7 @@ var updateMembersPresenceAC = function updateMembersPresenceAC(usersMap) {
 };
 var setMembersLoadingStateAC = function setMembersLoadingStateAC(state) {
   return setMembersLoadingState({
-    state: !!state
+    state: state
   });
 };
 var removeMemberFromListAC = function removeMemberFromListAC(members) {
@@ -13209,6 +13213,11 @@ var getRolesFailAC = function getRolesFailAC(timeout, attempts) {
     attempts: attempts
   });
 };
+var setMembersHasNextAC = function setMembersHasNextAC(hasNext) {
+  return setMembersHasNext({
+    hasNext: hasNext
+  });
+};
 
 var connectionStatusSelector = function connectionStatusSelector(store) {
   return store.UserReducer.connectionStatus;
@@ -14157,7 +14166,7 @@ var MessageTextFormat = function MessageTextFormat(_ref2) {
 var _marked = /*#__PURE__*/_regenerator().m(updateActiveChannelMembersAdd),
   _marked2 = /*#__PURE__*/_regenerator().m(updateActiveChannelMembersRemove);
 function updateActiveChannelMembersAdd(addedMembers) {
-  var state, activeChannel, updatedMembers;
+  var state, activeChannel, members, shouldUpdateMembers, updatedMembers;
   return _regenerator().w(function (_context) {
     while (1) switch (_context.n) {
       case 0:
@@ -14166,11 +14175,17 @@ function updateActiveChannelMembersAdd(addedMembers) {
       case 1:
         state = _context.v;
         activeChannel = state.ChannelReducer.activeChannel;
+        members = (activeChannel === null || activeChannel === void 0 ? void 0 : activeChannel.members) || [];
+        shouldUpdateMembers = addedMembers.filter(function (member) {
+          return !members.some(function (m) {
+            return m.id === member.id;
+          });
+        });
         if (!(activeChannel && activeChannel.id)) {
           _context.n = 2;
           break;
         }
-        updatedMembers = [].concat(activeChannel.members || [], addedMembers);
+        updatedMembers = [].concat(activeChannel.members || [], shouldUpdateMembers);
         updatedMembers = Array.from(new Set(updatedMembers));
         return _context.a(2, {
           members: updatedMembers
@@ -22245,54 +22260,71 @@ var _marked$4 = /*#__PURE__*/_regenerator().m(getMembers),
   _marked8$2 = /*#__PURE__*/_regenerator().m(getRoles),
   _marked9$2 = /*#__PURE__*/_regenerator().m(MembersSaga);
 function getMembers(action) {
-  var payload, channelId, SceytChatClient, membersQueryBuilder, membersQuery, _yield$call, members, _t;
+  var payload, channelId, SceytChatClient, membersQueryBuilder, membersQuery, _yield$call, members, hasNext, updateChannelData, _t;
   return _regenerator().w(function (_context) {
     while (1) switch (_context.p = _context.n) {
       case 0:
         _context.p = 0;
+        _context.n = 1;
+        return effects.put(setMembersHasNextAC(true));
+      case 1:
         payload = action.payload;
         channelId = payload.channelId;
         if (channelId) {
-          _context.n = 1;
+          _context.n = 2;
           break;
         }
         return _context.a(2);
-      case 1:
+      case 2:
         SceytChatClient = getClient();
         membersQueryBuilder = new SceytChatClient.MemberListQueryBuilder(channelId);
         membersQueryBuilder.all().byAffiliationOrder().orderKeyByUsername().limit(50);
-        _context.n = 2;
+        _context.n = 3;
         return effects.call(membersQueryBuilder.build);
-      case 2:
+      case 3:
         membersQuery = _context.v;
         query.membersQuery = membersQuery;
-        _context.n = 3;
-        return effects.put(setMembersLoadingStateAC(LOADING_STATE.LOADING));
-      case 3:
         _context.n = 4;
-        return effects.call(membersQuery.loadNextPage);
+        return effects.put(setMembersLoadingStateAC(LOADING_STATE.LOADING));
       case 4:
-        _yield$call = _context.v;
-        members = _yield$call.members;
         _context.n = 5;
-        return effects.put(setMembersToListAC(members));
+        return effects.call(membersQuery.loadNextPage);
       case 5:
+        _yield$call = _context.v;
+        members = _yield$call.members;
+        hasNext = _yield$call.hasNext;
         _context.n = 6;
-        return effects.put(setMembersLoadingStateAC(LOADING_STATE.LOADED));
+        return effects.put(setMembersToListAC(members));
       case 6:
+        _context.n = 7;
+        return effects.put(setMembersHasNextAC(hasNext));
+      case 7:
         _context.n = 8;
+        return effects.call(updateActiveChannelMembersAdd, members) || {};
+      case 8:
+        updateChannelData = _context.v;
+        _context.n = 9;
+        return effects.put(updateChannelDataAC(channelId, updateChannelData));
+      case 9:
+        _context.n = 11;
         break;
-      case 7:
-        _context.p = 7;
+      case 10:
+        _context.p = 10;
         _t = _context.v;
         log.error('ERROR in get members - ', _t.message);
-      case 8:
+      case 11:
+        _context.p = 11;
+        _context.n = 12;
+        return effects.put(setMembersLoadingStateAC(LOADING_STATE.LOADED));
+      case 12:
+        return _context.f(11);
+      case 13:
         return _context.a(2);
     }
-  }, _marked$4, null, [[0, 7]]);
+  }, _marked$4, null, [[0, 10, 11, 13]]);
 }
 function loadMoreMembers(action) {
-  var payload, limit, channelId, membersQuery, _yield$call2, members, updateChannelData;
+  var payload, limit, channelId, membersQuery, _yield$call2, members, hasNext, updateChannelData;
   return _regenerator().w(function (_context2) {
     while (1) switch (_context2.p = _context2.n) {
       case 0:
@@ -22312,27 +22344,34 @@ function loadMoreMembers(action) {
       case 2:
         _yield$call2 = _context2.v;
         members = _yield$call2.members;
+        hasNext = _yield$call2.hasNext;
         _context2.n = 3;
         return effects.put(addMembersToListAC(members));
       case 3:
         _context2.n = 4;
-        return effects.put(setMembersLoadingStateAC(LOADING_STATE.LOADED));
+        return effects.put(setMembersHasNextAC(hasNext));
       case 4:
         _context2.n = 5;
         return effects.call(updateActiveChannelMembersAdd, members) || {};
       case 5:
         updateChannelData = _context2.v;
         _context2.n = 6;
-        return effects.put(updateChannelDataAC(channelId, _extends({}, updateChannelData)));
+        return effects.put(updateChannelDataAC(channelId, updateChannelData));
       case 6:
         _context2.n = 8;
         break;
       case 7:
         _context2.p = 7;
       case 8:
+        _context2.p = 8;
+        _context2.n = 9;
+        return effects.put(setMembersLoadingStateAC(LOADING_STATE.LOADED));
+      case 9:
+        return _context2.f(8);
+      case 10:
         return _context2.a(2);
     }
-  }, _marked2$3, null, [[0, 7]]);
+  }, _marked2$3, null, [[0, 7, 8, 10]]);
 }
 function addMembers(action) {
   var payload, members, channelId, channel, membersToAdd, addedMembers, membersIds, messageToSend, updateChannelData, _t3;
@@ -23108,6 +23147,9 @@ var rolesMapSelector = function rolesMapSelector(store) {
 var membersLoadingStateSelector = function membersLoadingStateSelector(store) {
   return store.MembersReducer.membersLoadingState;
 };
+var membersHasNextSelector = function membersHasNextSelector(store) {
+  return store.MembersReducer.membersHasNext;
+};
 
 var useDidUpdate = function useDidUpdate(callback, deps) {
   var hasMount = React.useRef(false);
@@ -43329,7 +43371,9 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     if (activeChannel.id) {
       prevActiveChannelId = activeChannel.id;
     }
-    dispatch(getMembersAC(activeChannel.id));
+    if (activeChannel.id) {
+      dispatch(getMembersAC(activeChannel.id));
+    }
     setMentionedUsers([]);
   }, [activeChannel.id]);
   React.useEffect(function () {
@@ -45939,19 +45983,11 @@ var Members = function Members(_ref) {
     setCloseMenu = _useState9[1];
   var members = useSelector(activeChannelMembersSelector) || [];
   var contactsMap = useSelector(contactsMapSelector) || {};
-  var membersLoading = useSelector(membersLoadingStateSelector) || {};
   var user = getClient().user;
   var memberDisplayText = getChannelTypesMemberDisplayTextMap();
   var channelTypeRoleMap = getDefaultRolesByChannelTypesMap();
   var displayMemberText = memberDisplayText && memberDisplayText[channel.type] ? memberDisplayText[channel.type] + "s" : channel.type === DEFAULT_CHANNEL_TYPE.BROADCAST || channel.type === DEFAULT_CHANNEL_TYPE.PUBLIC ? 'subscribers' : 'members';
   var noMemberEditPermissions = !checkActionPermission('changeMemberRole') && !checkActionPermission('kickAndBlockMember') && !checkActionPermission('kickMember');
-  var handleMembersListScroll = function handleMembersListScroll(event) {
-    if (event.target.scrollTop >= event.target.scrollHeight - event.target.offsetHeight - 100) {
-      if (membersLoading === LOADING_STATE.LOADED) {
-        dispatch(loadMoreMembersAC(15, channel.id));
-      }
-    }
-  };
   var watchDropdownState = function watchDropdownState(state, memberId) {
     if (state) {
       setCloseMenu(memberId);
@@ -46049,16 +46085,16 @@ var Members = function Members(_ref) {
     if (getFromContacts) {
       dispatch(getContactsAC());
     }
-    dispatch(getMembersAC(channel.id));
-  }, [channel]);
+    if (channel !== null && channel !== void 0 && channel.id) {
+      dispatch(getMembersAC(channel.id));
+    }
+  }, [channel === null || channel === void 0 ? void 0 : channel.id]);
   var currentUserRole = (_members$find = members.find(function (member) {
     return member.id === user.id;
   })) === null || _members$find === void 0 ? void 0 : _members$find.role;
   return /*#__PURE__*/React__default.createElement(Container$o, {
     theme: theme
-  }, /*#__PURE__*/React__default.createElement(ActionsMenu$1, null, /*#__PURE__*/React__default.createElement(MembersList, {
-    onScroll: handleMembersListScroll
-  }, checkActionPermission('addMember') && (currentUserRole === 'owner' || currentUserRole === 'admin') && (/*#__PURE__*/React__default.createElement(MemberItem$1, {
+  }, /*#__PURE__*/React__default.createElement(ActionsMenu$1, null, /*#__PURE__*/React__default.createElement(MembersList, null, checkActionPermission('addMember') && (currentUserRole === 'owner' || currentUserRole === 'admin') && (/*#__PURE__*/React__default.createElement(MemberItem$1, {
     key: 1,
     onClick: handleAddMemberPopup,
     color: textPrimary,
@@ -47463,6 +47499,7 @@ var Details = function Details(_ref) {
   var _usePermissions = usePermissions(activeChannel ? activeChannel.userRole : ''),
     checkActionPermission = _usePermissions[0];
   var membersLoading = useSelector(membersLoadingStateSelector);
+  var membersHasNext = useSelector(membersHasNextSelector);
   var messagesLoading = useSelector(messagesLoadingState);
   var attachmentsHasNex = useSelector(activeTabAttachmentsHasNextSelector);
   var contactsMap = useSelector(contactsMapSelector);
@@ -47486,7 +47523,7 @@ var Details = function Details(_ref) {
   var handleMembersListScroll = function handleMembersListScroll(event) {
     if (event.target.scrollTop >= event.target.scrollHeight - event.target.offsetHeight - 100) {
       if (activeTab === channelDetailsTabs.member) {
-        if (membersLoading === LOADING_STATE.LOADED) {
+        if (membersLoading === LOADING_STATE.LOADED && membersHasNext) {
           dispatch(loadMoreMembersAC(15, activeChannel.id));
         }
       } else if (messagesLoading === LOADING_STATE.LOADED && attachmentsHasNex) {

package/index.modern.js

@@ -11912,7 +11912,7 @@ var _messageSlice$actions = messageSlice.actions,
 var MessageReducer = messageSlice.reducer;
 
 var initialState$2 = {
-  membersLoadingState: false,
+  membersLoadingState: 0,
   membersHasNext: true,
   activeChannelMembers: [],
   roles: [],
@@ -11997,6 +11997,9 @@ var memberSlice = createSlice({
       } else {
         state.getRolesFail = undefined;
       }
+    },
+    setMembersHasNext: function setMembersHasNext(state, action) {
+      state.membersHasNext = action.payload.hasNext;
     }
   },
   extraReducers: function extraReducers(builder) {
@@ -12013,7 +12016,8 @@ var _memberSlice$actions = memberSlice.actions,
   removeMemberFromList = _memberSlice$actions.removeMemberFromList,
   setMembersLoadingState = _memberSlice$actions.setMembersLoadingState,
   getRolesSuccess = _memberSlice$actions.getRolesSuccess,
-  getRolesFail = _memberSlice$actions.getRolesFail;
+  getRolesFail = _memberSlice$actions.getRolesFail,
+  setMembersHasNext = _memberSlice$actions.setMembersHasNext;
 var MembersReducer = memberSlice.reducer;
 
 var SET_CONTACT_LOADING_STATE = 'SET_CONTACT_LOADING_STATE';
@@ -13189,7 +13193,7 @@ var updateMembersPresenceAC = function updateMembersPresenceAC(usersMap) {
 };
 var setMembersLoadingStateAC = function setMembersLoadingStateAC(state) {
   return setMembersLoadingState({
-    state: !!state
+    state: state
   });
 };
 var removeMemberFromListAC = function removeMemberFromListAC(members) {
@@ -13208,6 +13212,11 @@ var getRolesFailAC = function getRolesFailAC(timeout, attempts) {
     attempts: attempts
   });
 };
+var setMembersHasNextAC = function setMembersHasNextAC(hasNext) {
+  return setMembersHasNext({
+    hasNext: hasNext
+  });
+};
 
 var connectionStatusSelector = function connectionStatusSelector(store) {
   return store.UserReducer.connectionStatus;
@@ -14156,7 +14165,7 @@ var MessageTextFormat = function MessageTextFormat(_ref2) {
 var _marked = /*#__PURE__*/_regenerator().m(updateActiveChannelMembersAdd),
   _marked2 = /*#__PURE__*/_regenerator().m(updateActiveChannelMembersRemove);
 function updateActiveChannelMembersAdd(addedMembers) {
-  var state, activeChannel, updatedMembers;
+  var state, activeChannel, members, shouldUpdateMembers, updatedMembers;
   return _regenerator().w(function (_context) {
     while (1) switch (_context.n) {
       case 0:
@@ -14165,11 +14174,17 @@ function updateActiveChannelMembersAdd(addedMembers) {
       case 1:
         state = _context.v;
         activeChannel = state.ChannelReducer.activeChannel;
+        members = (activeChannel === null || activeChannel === void 0 ? void 0 : activeChannel.members) || [];
+        shouldUpdateMembers = addedMembers.filter(function (member) {
+          return !members.some(function (m) {
+            return m.id === member.id;
+          });
+        });
         if (!(activeChannel && activeChannel.id)) {
           _context.n = 2;
           break;
         }
-        updatedMembers = [].concat(activeChannel.members || [], addedMembers);
+        updatedMembers = [].concat(activeChannel.members || [], shouldUpdateMembers);
         updatedMembers = Array.from(new Set(updatedMembers));
         return _context.a(2, {
           members: updatedMembers
@@ -22244,54 +22259,71 @@ var _marked$4 = /*#__PURE__*/_regenerator().m(getMembers),
   _marked8$2 = /*#__PURE__*/_regenerator().m(getRoles),
   _marked9$2 = /*#__PURE__*/_regenerator().m(MembersSaga);
 function getMembers(action) {
-  var payload, channelId, SceytChatClient, membersQueryBuilder, membersQuery, _yield$call, members, _t;
+  var payload, channelId, SceytChatClient, membersQueryBuilder, membersQuery, _yield$call, members, hasNext, updateChannelData, _t;
   return _regenerator().w(function (_context) {
     while (1) switch (_context.p = _context.n) {
       case 0:
         _context.p = 0;
+        _context.n = 1;
+        return put(setMembersHasNextAC(true));
+      case 1:
         payload = action.payload;
         channelId = payload.channelId;
         if (channelId) {
-          _context.n = 1;
+          _context.n = 2;
           break;
         }
         return _context.a(2);
-      case 1:
+      case 2:
         SceytChatClient = getClient();
         membersQueryBuilder = new SceytChatClient.MemberListQueryBuilder(channelId);
         membersQueryBuilder.all().byAffiliationOrder().orderKeyByUsername().limit(50);
-        _context.n = 2;
+        _context.n = 3;
         return call(membersQueryBuilder.build);
-      case 2:
+      case 3:
         membersQuery = _context.v;
         query.membersQuery = membersQuery;
-        _context.n = 3;
-        return put(setMembersLoadingStateAC(LOADING_STATE.LOADING));
-      case 3:
         _context.n = 4;
-        return call(membersQuery.loadNextPage);
+        return put(setMembersLoadingStateAC(LOADING_STATE.LOADING));
       case 4:
-        _yield$call = _context.v;
-        members = _yield$call.members;
         _context.n = 5;
-        return put(setMembersToListAC(members));
+        return call(membersQuery.loadNextPage);
       case 5:
+        _yield$call = _context.v;
+        members = _yield$call.members;
+        hasNext = _yield$call.hasNext;
         _context.n = 6;
-        return put(setMembersLoadingStateAC(LOADING_STATE.LOADED));
+        return put(setMembersToListAC(members));
       case 6:
+        _context.n = 7;
+        return put(setMembersHasNextAC(hasNext));
+      case 7:
         _context.n = 8;
+        return call(updateActiveChannelMembersAdd, members) || {};
+      case 8:
+        updateChannelData = _context.v;
+        _context.n = 9;
+        return put(updateChannelDataAC(channelId, updateChannelData));
+      case 9:
+        _context.n = 11;
         break;
-      case 7:
-        _context.p = 7;
+      case 10:
+        _context.p = 10;
         _t = _context.v;
         log.error('ERROR in get members - ', _t.message);
-      case 8:
+      case 11:
+        _context.p = 11;
+        _context.n = 12;
+        return put(setMembersLoadingStateAC(LOADING_STATE.LOADED));
+      case 12:
+        return _context.f(11);
+      case 13:
         return _context.a(2);
     }
-  }, _marked$4, null, [[0, 7]]);
+  }, _marked$4, null, [[0, 10, 11, 13]]);
 }
 function loadMoreMembers(action) {
-  var payload, limit, channelId, membersQuery, _yield$call2, members, updateChannelData;
+  var payload, limit, channelId, membersQuery, _yield$call2, members, hasNext, updateChannelData;
   return _regenerator().w(function (_context2) {
     while (1) switch (_context2.p = _context2.n) {
       case 0:
@@ -22311,27 +22343,34 @@ function loadMoreMembers(action) {
       case 2:
         _yield$call2 = _context2.v;
         members = _yield$call2.members;
+        hasNext = _yield$call2.hasNext;
         _context2.n = 3;
         return put(addMembersToListAC(members));
       case 3:
         _context2.n = 4;
-        return put(setMembersLoadingStateAC(LOADING_STATE.LOADED));
+        return put(setMembersHasNextAC(hasNext));
       case 4:
         _context2.n = 5;
         return call(updateActiveChannelMembersAdd, members) || {};
       case 5:
         updateChannelData = _context2.v;
         _context2.n = 6;
-        return put(updateChannelDataAC(channelId, _extends({}, updateChannelData)));
+        return put(updateChannelDataAC(channelId, updateChannelData));
       case 6:
         _context2.n = 8;
         break;
       case 7:
         _context2.p = 7;
       case 8:
+        _context2.p = 8;
+        _context2.n = 9;
+        return put(setMembersLoadingStateAC(LOADING_STATE.LOADED));
+      case 9:
+        return _context2.f(8);
+      case 10:
         return _context2.a(2);
     }
-  }, _marked2$3, null, [[0, 7]]);
+  }, _marked2$3, null, [[0, 7, 8, 10]]);
 }
 function addMembers(action) {
   var payload, members, channelId, channel, membersToAdd, addedMembers, membersIds, messageToSend, updateChannelData, _t3;
@@ -23107,6 +23146,9 @@ var rolesMapSelector = function rolesMapSelector(store) {
 var membersLoadingStateSelector = function membersLoadingStateSelector(store) {
   return store.MembersReducer.membersLoadingState;
 };
+var membersHasNextSelector = function membersHasNextSelector(store) {
+  return store.MembersReducer.membersHasNext;
+};
 
 var useDidUpdate = function useDidUpdate(callback, deps) {
   var hasMount = useRef(false);
@@ -43328,7 +43370,9 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     if (activeChannel.id) {
       prevActiveChannelId = activeChannel.id;
     }
-    dispatch(getMembersAC(activeChannel.id));
+    if (activeChannel.id) {
+      dispatch(getMembersAC(activeChannel.id));
+    }
     setMentionedUsers([]);
   }, [activeChannel.id]);
   useEffect(function () {
@@ -45938,19 +45982,11 @@ var Members = function Members(_ref) {
     setCloseMenu = _useState9[1];
   var members = useSelector(activeChannelMembersSelector) || [];
   var contactsMap = useSelector(contactsMapSelector) || {};
-  var membersLoading = useSelector(membersLoadingStateSelector) || {};
   var user = getClient().user;
   var memberDisplayText = getChannelTypesMemberDisplayTextMap();
   var channelTypeRoleMap = getDefaultRolesByChannelTypesMap();
   var displayMemberText = memberDisplayText && memberDisplayText[channel.type] ? memberDisplayText[channel.type] + "s" : channel.type === DEFAULT_CHANNEL_TYPE.BROADCAST || channel.type === DEFAULT_CHANNEL_TYPE.PUBLIC ? 'subscribers' : 'members';
   var noMemberEditPermissions = !checkActionPermission('changeMemberRole') && !checkActionPermission('kickAndBlockMember') && !checkActionPermission('kickMember');
-  var handleMembersListScroll = function handleMembersListScroll(event) {
-    if (event.target.scrollTop >= event.target.scrollHeight - event.target.offsetHeight - 100) {
-      if (membersLoading === LOADING_STATE.LOADED) {
-        dispatch(loadMoreMembersAC(15, channel.id));
-      }
-    }
-  };
   var watchDropdownState = function watchDropdownState(state, memberId) {
     if (state) {
       setCloseMenu(memberId);
@@ -46048,16 +46084,16 @@ var Members = function Members(_ref) {
     if (getFromContacts) {
       dispatch(getContactsAC());
     }
-    dispatch(getMembersAC(channel.id));
-  }, [channel]);
+    if (channel !== null && channel !== void 0 && channel.id) {
+      dispatch(getMembersAC(channel.id));
+    }
+  }, [channel === null || channel === void 0 ? void 0 : channel.id]);
   var currentUserRole = (_members$find = members.find(function (member) {
     return member.id === user.id;
   })) === null || _members$find === void 0 ? void 0 : _members$find.role;
   return /*#__PURE__*/React__default.createElement(Container$o, {
     theme: theme
-  }, /*#__PURE__*/React__default.createElement(ActionsMenu$1, null, /*#__PURE__*/React__default.createElement(MembersList, {
-    onScroll: handleMembersListScroll
-  }, checkActionPermission('addMember') && (currentUserRole === 'owner' || currentUserRole === 'admin') && (/*#__PURE__*/React__default.createElement(MemberItem$1, {
+  }, /*#__PURE__*/React__default.createElement(ActionsMenu$1, null, /*#__PURE__*/React__default.createElement(MembersList, null, checkActionPermission('addMember') && (currentUserRole === 'owner' || currentUserRole === 'admin') && (/*#__PURE__*/React__default.createElement(MemberItem$1, {
     key: 1,
     onClick: handleAddMemberPopup,
     color: textPrimary,
@@ -47462,6 +47498,7 @@ var Details = function Details(_ref) {
   var _usePermissions = usePermissions(activeChannel ? activeChannel.userRole : ''),
     checkActionPermission = _usePermissions[0];
   var membersLoading = useSelector(membersLoadingStateSelector);
+  var membersHasNext = useSelector(membersHasNextSelector);
   var messagesLoading = useSelector(messagesLoadingState);
   var attachmentsHasNex = useSelector(activeTabAttachmentsHasNextSelector);
   var contactsMap = useSelector(contactsMapSelector);
@@ -47485,7 +47522,7 @@ var Details = function Details(_ref) {
   var handleMembersListScroll = function handleMembersListScroll(event) {
     if (event.target.scrollTop >= event.target.scrollHeight - event.target.offsetHeight - 100) {
       if (activeTab === channelDetailsTabs.member) {
-        if (membersLoading === LOADING_STATE.LOADED) {
+        if (membersLoading === LOADING_STATE.LOADED && membersHasNext) {
           dispatch(loadMoreMembersAC(15, activeChannel.id));
         }
       } else if (messagesLoading === LOADING_STATE.LOADED && attachmentsHasNex) {

package/package.json

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