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

package/index.modern.js

@@ -9122,6 +9122,65 @@ function setChannelInMap(channel) {
   channelsMap[channel.id] = _extends({}, channel);
   allChannelsMap[channel.id] = _extends({}, channel);
 }
+function updateChannelMemberInAllChannels(updatedMembers) {
+  var updatedMembersMap = {};
+  for (var _iterator = _createForOfIteratorHelperLoose(updatedMembers), _step; !(_step = _iterator()).done;) {
+    var member = _step.value;
+    updatedMembersMap[member.id] = member;
+  }
+  var updateMembers = function updateMembers(members) {
+    return members.map(function (member) {
+      return updatedMembersMap[member.id] ? _extends({}, member, updatedMembersMap[member.id]) : member;
+    });
+  };
+  allChannels = allChannels.map(function (channel) {
+    var _channel$members;
+    if ((_channel$members = channel.members) !== null && _channel$members !== void 0 && _channel$members.length) {
+      var hasMatch = channel.members.some(function (m) {
+        return updatedMembersMap[m.id];
+      });
+      if (hasMatch) {
+        return _extends({}, channel, {
+          members: updateMembers(channel.members)
+        });
+      }
+    }
+    return channel;
+  });
+  for (var channelId in channelsMap) {
+    var _channel$members2;
+    var channel = channelsMap[channelId];
+    if ((_channel$members2 = channel.members) !== null && _channel$members2 !== void 0 && _channel$members2.length && channel.members.some(function (m) {
+      return updatedMembersMap[m.id];
+    })) {
+      channelsMap[channelId] = _extends({}, channel, {
+        members: updateMembers(channel.members)
+      });
+    }
+  }
+  for (var _channelId in allChannelsMap) {
+    var _channel$members3;
+    var _channel = allChannelsMap[_channelId];
+    if ((_channel$members3 = _channel.members) !== null && _channel$members3 !== void 0 && _channel$members3.length && _channel.members.some(function (m) {
+      return updatedMembersMap[m.id];
+    })) {
+      allChannelsMap[_channelId] = _extends({}, _channel, {
+        members: updateMembers(_channel.members)
+      });
+    }
+  }
+  for (var i = 0; i < allChannels.length; i++) {
+    var _channel2$members;
+    var _channel2 = allChannels[i];
+    if ((_channel2$members = _channel2.members) !== null && _channel2$members !== void 0 && _channel2$members.length && _channel2.members.some(function (m) {
+      return updatedMembersMap[m.id];
+    })) {
+      allChannels[i] = _extends({}, _channel2, {
+        members: updateMembers(_channel2.members)
+      });
+    }
+  }
+}
 function setActiveChannelId(id) {
   activeChannelId = id;
 }
@@ -9153,8 +9212,8 @@ function getLastChannelFromMap(deletePending) {
   }
   var channels = Object.values(channelsMap);
   if (deletePending) {
-    for (var _iterator = _createForOfIteratorHelperLoose(channels), _step; !(_step = _iterator()).done;) {
-      var channel = _step.value;
+    for (var _iterator2 = _createForOfIteratorHelperLoose(channels), _step2; !(_step2 = _iterator2()).done;) {
+      var channel = _step2.value;
       if (!getPendingDeleteChannel(channel.id)) {
         return channel;
       }
@@ -9570,6 +9629,39 @@ var channelSlice = createSlice({
         state.activeChannel = _extends({}, activeChannelCopy, config);
       }
     },
+    updateChannelsMembers: function updateChannelsMembers(state, action) {
+      var _state$activeChannel$;
+      var members = action.payload.members;
+      var usersMap = {};
+      for (var _iterator = _createForOfIteratorHelperLoose(members), _step; !(_step = _iterator()).done;) {
+        var _extends2;
+        var member = _step.value;
+        usersMap = _extends({}, usersMap, (_extends2 = {}, _extends2[member.id] = member, _extends2));
+      }
+      var updateMembers = function updateMembers(members) {
+        return members.map(function (member) {
+          return usersMap[member.id] ? _extends({}, member, usersMap[member.id]) : member;
+        });
+      };
+      state.channels = state.channels.map(function (channel) {
+        var _channel$members;
+        if ((_channel$members = channel.members) !== null && _channel$members !== void 0 && _channel$members.length && channel.members.some(function (m) {
+          return usersMap[m.id];
+        })) {
+          return _extends({}, channel, {
+            members: updateMembers(channel.members)
+          });
+        }
+        return channel;
+      });
+      if (state.activeChannel.id && (_state$activeChannel$ = state.activeChannel.members) !== null && _state$activeChannel$ !== void 0 && _state$activeChannel$.length && state.activeChannel.members.some(function (m) {
+        return usersMap[m.id];
+      })) {
+        state.activeChannel = _extends({}, state.activeChannel, {
+          members: updateMembers(state.activeChannel.members)
+        });
+      }
+    },
     updateSearchedChannelData: function updateSearchedChannelData(state, action) {
       var _action$payload4 = action.payload,
         updateData = _action$payload4.updateData,
@@ -9577,13 +9669,13 @@ var channelSlice = createSlice({
         channelId = _action$payload4.channelId;
       var groupKey = groupName;
       if (state.searchedChannels[groupKey] && state.searchedChannels[groupKey].length) {
-        var _extends2;
-        state.searchedChannels = _extends({}, state.searchedChannels, (_extends2 = {}, _extends2[groupName] = [].concat(state.searchedChannels[groupKey]).map(function (channel) {
+        var _extends3;
+        state.searchedChannels = _extends({}, state.searchedChannels, (_extends3 = {}, _extends3[groupName] = [].concat(state.searchedChannels[groupKey]).map(function (channel) {
           if (channel.id === channelId) {
             return _extends({}, channel, updateData);
           }
           return channel;
-        }), _extends2));
+        }), _extends3));
       }
     },
     updateUserStatusOnChannel: function updateUserStatusOnChannel(state, action) {
@@ -9682,30 +9774,30 @@ var channelSlice = createSlice({
       state.channelEditMode = action.payload.state;
     },
     switchTypingIndicator: function switchTypingIndicator(state, action) {
-      var _extends3, _extends4;
+      var _extends4, _extends5;
       var _action$payload7 = action.payload,
         typingState = _action$payload7.typingState,
         channelId = _action$payload7.channelId,
         from = _action$payload7.from;
       var currentChannelIndicators = state.typingOrRecordingIndicator[channelId] || {};
-      var updatedChannelIndicators = _extends({}, currentChannelIndicators, (_extends3 = {}, _extends3[from.id] = _extends({}, currentChannelIndicators[from.id], {
+      var updatedChannelIndicators = _extends({}, currentChannelIndicators, (_extends4 = {}, _extends4[from.id] = _extends({}, currentChannelIndicators[from.id], {
         from: from,
         typingState: typingState
-      }), _extends3));
-      state.typingOrRecordingIndicator = _extends({}, state.typingOrRecordingIndicator, (_extends4 = {}, _extends4[channelId] = updatedChannelIndicators, _extends4));
+      }), _extends4));
+      state.typingOrRecordingIndicator = _extends({}, state.typingOrRecordingIndicator, (_extends5 = {}, _extends5[channelId] = updatedChannelIndicators, _extends5));
     },
     switchRecordingIndicator: function switchRecordingIndicator(state, action) {
-      var _extends5, _extends6;
+      var _extends6, _extends7;
       var _action$payload8 = action.payload,
         recordingState = _action$payload8.recordingState,
         channelId = _action$payload8.channelId,
         from = _action$payload8.from;
       var currentChannelIndicators = state.typingOrRecordingIndicator[channelId] || {};
-      var updatedChannelIndicators = _extends({}, currentChannelIndicators, (_extends5 = {}, _extends5[from.id] = _extends({}, currentChannelIndicators[from.id], {
+      var updatedChannelIndicators = _extends({}, currentChannelIndicators, (_extends6 = {}, _extends6[from.id] = _extends({}, currentChannelIndicators[from.id], {
         from: from,
         recordingState: recordingState
-      }), _extends5));
-      state.typingOrRecordingIndicator = _extends({}, state.typingOrRecordingIndicator, (_extends6 = {}, _extends6[channelId] = updatedChannelIndicators, _extends6));
+      }), _extends6));
+      state.typingOrRecordingIndicator = _extends({}, state.typingOrRecordingIndicator, (_extends7 = {}, _extends7[channelId] = updatedChannelIndicators, _extends7));
     },
     setIsDragging: function setIsDragging(state, action) {
       state.isDragging = action.payload.isDragging;
@@ -9737,8 +9829,8 @@ var channelSlice = createSlice({
       state.draftIsRemoved = action.payload.channelId;
     },
     setChannelInviteKeys: function setChannelInviteKeys(state, action) {
-      var _extends7;
-      state.channelInviteKeys = _extends({}, state.channelInviteKeys, (_extends7 = {}, _extends7[action.payload.channelId] = action.payload.inviteKeys, _extends7));
+      var _extends8;
+      state.channelInviteKeys = _extends({}, state.channelInviteKeys, (_extends8 = {}, _extends8[action.payload.channelId] = action.payload.inviteKeys, _extends8));
     },
     setJoinableChannel: function setJoinableChannel(state, action) {
       state.joinableChannel = action.payload.channel;
@@ -9787,6 +9879,7 @@ var _channelSlice$actions = channelSlice.actions,
   setChannelsHasNext = _channelSlice$actions.setChannelsHasNext,
   setActiveChannel = _channelSlice$actions.setActiveChannel,
   updateChannelData = _channelSlice$actions.updateChannelData,
+  updateChannelsMembers = _channelSlice$actions.updateChannelsMembers,
   updateSearchedChannelData = _channelSlice$actions.updateSearchedChannelData,
   updateUserStatusOnChannel = _channelSlice$actions.updateUserStatusOnChannel,
   updateChannelLastMessage = _channelSlice$actions.updateChannelLastMessage,
@@ -12275,6 +12368,10 @@ var initialState$2 = {
     fromChannel: false,
     members: []
   },
+  userBlockedForInvite: {
+    show: false,
+    userIds: []
+  },
   openInviteModal: false
 };
 var memberSlice = createSlice({
@@ -12396,6 +12493,13 @@ var memberSlice = createSlice({
       state.restricted.fromChannel = fromChannel;
       state.restricted.members = members;
     },
+    setUserBlockedForInvite: function setUserBlockedForInvite(state, action) {
+      var _action$payload9 = action.payload,
+        show = _action$payload9.show,
+        userIds = _action$payload9.userIds;
+      state.userBlockedForInvite.show = show;
+      state.userBlockedForInvite.userIds = userIds;
+    },
     setOpenInviteModal: function setOpenInviteModal(state, action) {
       state.openInviteModal = action.payload.open;
     }
@@ -12417,6 +12521,7 @@ var _memberSlice$actions = memberSlice.actions,
   getRolesFail = _memberSlice$actions.getRolesFail,
   setMembersHasNext = _memberSlice$actions.setMembersHasNext,
   setActionIsRestricted = _memberSlice$actions.setActionIsRestricted,
+  setUserBlockedForInvite = _memberSlice$actions.setUserBlockedForInvite,
   setOpenInviteModal = _memberSlice$actions.setOpenInviteModal;
 var MembersReducer = memberSlice.reducer;
 
@@ -12482,6 +12587,14 @@ var userSlice = createSlice({
     updateUserMap: function updateUserMap(state, action) {
       state.updatedUserMap = _extends({}, state.updatedUserMap, action.payload.usersMap);
     },
+    addUserInMapIfNotExists: function addUserInMapIfNotExists(state, action) {
+      var _state$updatedUserMap;
+      var user = action.payload.user;
+      if (!((_state$updatedUserMap = state.updatedUserMap) !== null && _state$updatedUserMap !== void 0 && _state$updatedUserMap[user === null || user === void 0 ? void 0 : user.id])) {
+        var _extends2;
+        state.updatedUserMap = _extends({}, state.updatedUserMap, (_extends2 = {}, _extends2[user.id] = user, _extends2));
+      }
+    },
     setContacts: function setContacts(state, action) {
       var contacts = action.payload.contacts;
       state.contactList = [].concat(contacts);
@@ -12514,6 +12627,7 @@ var _userSlice$actions = userSlice.actions,
   addUsers = _userSlice$actions.addUsers,
   setUsersLoadingState = _userSlice$actions.setUsersLoadingState,
   updateUserMap = _userSlice$actions.updateUserMap,
+  addUserInMapIfNotExists = _userSlice$actions.addUserInMapIfNotExists,
   setContacts = _userSlice$actions.setContacts,
   updateUserProfile = _userSlice$actions.updateUserProfile,
   setBrowserTabIsActive = _userSlice$actions.setBrowserTabIsActive,
@@ -12932,6 +13046,11 @@ var updateChannelDataAC = function updateChannelDataAC(channelId, config, moveUp
     sort: sort
   });
 };
+var updateChannelsMembersAC = function updateChannelsMembersAC(members) {
+  return updateChannelsMembers({
+    members: members
+  });
+};
 var updateSearchedChannelDataAC = function updateSearchedChannelDataAC(channelId, config, groupName) {
   return updateSearchedChannelData({
     updateData: config,
@@ -13374,6 +13493,11 @@ var updateUserStatusOnMapAC = function updateUserStatusOnMapAC(usersMap) {
     usersMap: usersMap
   });
 };
+var addUserInMapIfNotExistsAC = function addUserInMapIfNotExistsAC(user) {
+  return addUserInMapIfNotExists({
+    user: user
+  });
+};
 var setWaitToSendPendingMessagesAC = function setWaitToSendPendingMessagesAC(state) {
   return setWaitToSendPendingMessages({
     state: state
@@ -13684,6 +13808,12 @@ var setActionIsRestrictedAC = function setActionIsRestrictedAC(isRestricted, fro
     members: members || []
   });
 };
+var setUserBlockedForInviteAC = function setUserBlockedForInviteAC(show, userIds) {
+  return setUserBlockedForInvite({
+    show: show,
+    userIds: userIds
+  });
+};
 var setOpenInviteModalAC = function setOpenInviteModalAC(open) {
   return setOpenInviteModal({
     open: open
@@ -18793,7 +18923,7 @@ function checkUsersStatus() {
           }
         });
         if (!update) {
-          _context25.n = 4;
+          _context25.n = 5;
           break;
         }
         updateData = JSON.parse(JSON.stringify(usersToUpdateMap));
@@ -18806,16 +18936,18 @@ function checkUsersStatus() {
         _context25.n = 4;
         return put(updateUserStatusOnChannelAC(updateData));
       case 4:
-        _context25.n = 6;
-        break;
+        updateChannelMemberInAllChannels(Object.values(updateData));
       case 5:
-        _context25.p = 5;
+        _context25.n = 7;
+        break;
+      case 6:
+        _context25.p = 6;
         _t25 = _context25.v;
         log.error('ERROR in check user status : ', _t25.message);
-      case 6:
+      case 7:
         return _context25.a(2);
     }
-  }, _marked25, null, [[0, 5]]);
+  }, _marked25, null, [[0, 6]]);
 }
 function sendTyping(action) {
   var state, activeChannelId, channel, _t26;
@@ -24450,7 +24582,7 @@ function getContacts() {
   }, _marked$5, null, [[0, 4]]);
 }
 function blockUser(action) {
-  var SceytChatClient, payload, userIds, blockedUsers, activeChannelId, activeChannel, isDirectChannel, directChannelUser, _t2;
+  var SceytChatClient, payload, userIds, blockedUsers, activeChannelId, activeChannel, isDirectChannel, directChannelUser, _iterator, _step, _updateUserStatusOnMa, _updateMembersPresenc, _updateUserStatusOnCh, user, _t2;
   return _regenerator().w(function (_context2) {
     while (1) switch (_context2.p = _context2.n) {
       case 0:
@@ -24499,19 +24631,56 @@ function blockUser(action) {
           })
         });
       case 5:
+        _iterator = _createForOfIteratorHelperLoose(blockedUsers);
+      case 6:
+        if ((_step = _iterator()).done) {
+          _context2.n = 12;
+          break;
+        }
+        user = _step.value;
+        updateUserOnMap(_extends({}, user, {
+          blocked: true
+        }));
         _context2.n = 7;
+        return put(updateUserStatusOnMapAC((_updateUserStatusOnMa = {}, _updateUserStatusOnMa[user.id] = _extends({}, user, {
+          blocked: true
+        }), _updateUserStatusOnMa)));
+      case 7:
+        _context2.n = 8;
+        return put(updateMembersPresenceAC((_updateMembersPresenc = {}, _updateMembersPresenc[user.id] = _extends({}, user, {
+          blocked: true
+        }), _updateMembersPresenc)));
+      case 8:
+        _context2.n = 9;
+        return put(updateUserStatusOnChannelAC((_updateUserStatusOnCh = {}, _updateUserStatusOnCh[user.id] = _extends({}, user, {
+          blocked: true
+        }), _updateUserStatusOnCh)));
+      case 9:
+        _context2.n = 10;
+        return put(updateChannelsMembersAC([_extends({}, user, {
+          blocked: true
+        })]));
+      case 10:
+        updateChannelMemberInAllChannels([_extends({}, user, {
+          blocked: true
+        })]);
+      case 11:
+        _context2.n = 6;
         break;
-      case 6:
-        _context2.p = 6;
+      case 12:
+        _context2.n = 14;
+        break;
+      case 13:
+        _context2.p = 13;
         _t2 = _context2.v;
         log.error('error in block users', _t2.message);
-      case 7:
+      case 14:
         return _context2.a(2);
     }
-  }, _marked2$4, null, [[0, 6]]);
+  }, _marked2$4, null, [[0, 13]]);
 }
 function unblockUser(action) {
-  var SceytChatClient, payload, userIds, unblockedUsers, activeChannelId, activeChannel, isDirectChannel, directChannelUser, _t3;
+  var SceytChatClient, payload, userIds, unblockedUsers, activeChannelId, activeChannel, isDirectChannel, directChannelUser, _iterator2, _step2, _updateUserStatusOnMa2, _updateMembersPresenc2, _updateUserStatusOnCh2, user, updateData, _t3;
   return _regenerator().w(function (_context3) {
     while (1) switch (_context3.p = _context3.n) {
       case 0:
@@ -24560,16 +24729,54 @@ function unblockUser(action) {
           })
         });
       case 5:
+        _iterator2 = _createForOfIteratorHelperLoose(unblockedUsers);
+      case 6:
+        if ((_step2 = _iterator2()).done) {
+          _context3.n = 12;
+          break;
+        }
+        user = _step2.value;
+        updateData = JSON.parse(JSON.stringify(user));
+        updateUserOnMap(_extends({}, updateData, {
+          blocked: false
+        }));
         _context3.n = 7;
+        return put(updateUserStatusOnMapAC((_updateUserStatusOnMa2 = {}, _updateUserStatusOnMa2[user.id] = _extends({}, updateData, {
+          blocked: false
+        }), _updateUserStatusOnMa2)));
+      case 7:
+        _context3.n = 8;
+        return put(updateMembersPresenceAC((_updateMembersPresenc2 = {}, _updateMembersPresenc2[user.id] = _extends({}, updateData, {
+          blocked: false
+        }), _updateMembersPresenc2)));
+      case 8:
+        _context3.n = 9;
+        return put(updateUserStatusOnChannelAC((_updateUserStatusOnCh2 = {}, _updateUserStatusOnCh2[user.id] = _extends({}, updateData, {
+          blocked: false
+        }), _updateUserStatusOnCh2)));
+      case 9:
+        _context3.n = 10;
+        return put(updateChannelsMembersAC([_extends({}, user, {
+          blocked: false
+        })]));
+      case 10:
+        updateChannelMemberInAllChannels([_extends({}, user, {
+          blocked: false
+        })]);
+      case 11:
+        _context3.n = 6;
         break;
-      case 6:
-        _context3.p = 6;
+      case 12:
+        _context3.n = 14;
+        break;
+      case 13:
+        _context3.p = 13;
         _t3 = _context3.v;
         log.error('error in unblock users', _t3.message);
-      case 7:
+      case 14:
         return _context3.a(2);
     }
-  }, _marked3$3, null, [[0, 6]]);
+  }, _marked3$3, null, [[0, 13]]);
 }
 function updateProfile(action) {
   var payload, user, firstName, lastName, avatarUrl, metadata, avatarFile, updateUserProfileData, SceytChatClient, fileToUpload, updatedUser, _t4;
@@ -24917,6 +25124,9 @@ var channelsMembersHasNextMapSelector = function channelsMembersHasNextMapSelect
 var restrictedSelector = function restrictedSelector(store) {
   return store.MembersReducer.restricted;
 };
+var userBlockedForInviteSelector = function userBlockedForInviteSelector(store) {
+  return store.MembersReducer.userBlockedForInvite;
+};
 var openInviteModalSelector = function openInviteModalSelector(store) {
   return store.MembersReducer.openInviteModal;
 };
@@ -25034,6 +25244,7 @@ function useUpdatedUser(user) {
       var _updateUserStatusOnMa;
       setUserToMap(user);
       dispatch(updateUserStatusOnMapAC((_updateUserStatusOnMa = {}, _updateUserStatusOnMa[user.id] = user, _updateUserStatusOnMa)));
+      updateChannelMemberInAllChannels([user]);
     }
   }, [user === null || user === void 0 ? void 0 : user.id]);
   return useMemo(function () {
@@ -25911,6 +26122,12 @@ var SceytChat = function SceytChat(_ref) {
     }
     if (contactsMap) {
       setContactsMap(contactsMap);
+      for (var contactId in contactsMap) {
+        var contact = contactsMap[contactId];
+        var user = _extends({}, contact === null || contact === void 0 ? void 0 : contact.user);
+        dispatch(addUserInMapIfNotExistsAC(user));
+      }
+      dispatch(checkUserStatusAC());
     }
   }, [contactsMap]);
   useEffect(function () {
@@ -27332,6 +27549,62 @@ var Title$1 = styled.h4(_templateObject4$6 || (_templateObject4$6 = _taggedTempl
   return props.color;
 });
 
+var UserBlockedPopup = function UserBlockedPopup(_ref) {
+  var userIds = _ref.userIds,
+    selectUsers = _ref.selectUsers;
+  var dispatch = useDispatch();
+  var connectionStatus = useSelector(connectionStatusSelector);
+  var _useColor = useColors(),
+    background = _useColor[THEME_COLORS.BACKGROUND],
+    textPrimary = _useColor[THEME_COLORS.TEXT_PRIMARY],
+    surface1 = _useColor[THEME_COLORS.SURFACE_1],
+    iconPrimary = _useColor[THEME_COLORS.ICON_PRIMARY],
+    accentColor = _useColor[THEME_COLORS.ACCENT],
+    textOnPrimary = _useColor[THEME_COLORS.TEXT_ON_PRIMARY],
+    linkColor = _useColor[THEME_COLORS.LINK_COLOR];
+  var handleClose = function handleClose() {
+    dispatch(setUserBlockedForInviteAC(false, []));
+  };
+  var handleUnblock = function handleUnblock() {
+    dispatch(unblockUserAC(userIds));
+    if (connectionStatus === CONNECTION_STATUS.CONNECTED) {
+      selectUsers === null || selectUsers === void 0 ? void 0 : selectUsers(userIds);
+    }
+    handleClose();
+  };
+  return /*#__PURE__*/React__default.createElement(PopupContainer, null, /*#__PURE__*/React__default.createElement(Popup, {
+    backgroundColor: background,
+    maxWidth: '520px',
+    minWidth: '520px',
+    padding: '0'
+  }, /*#__PURE__*/React__default.createElement(PopupBody, {
+    paddingH: '24px',
+    paddingV: '24px'
+  }, /*#__PURE__*/React__default.createElement(CloseIcon, {
+    color: iconPrimary,
+    onClick: handleClose
+  }), /*#__PURE__*/React__default.createElement(PopupName, {
+    color: textPrimary,
+    marginBottom: '20px'
+  }, "Failed to invite"), /*#__PURE__*/React__default.createElement(PopupDescription, {
+    color: textPrimary,
+    highlightColor: linkColor
+  }, "You have blocked this user. Please unblock to invite.")), /*#__PURE__*/React__default.createElement(PopupFooter, {
+    backgroundColor: surface1
+  }, /*#__PURE__*/React__default.createElement(Button, {
+    type: 'button',
+    color: textPrimary,
+    backgroundColor: 'transparent',
+    onClick: handleClose
+  }, "Cancel"), /*#__PURE__*/React__default.createElement(Button, {
+    type: 'button',
+    backgroundColor: accentColor,
+    color: textOnPrimary,
+    borderRadius: '8px',
+    onClick: handleUnblock
+  }, "Unblock"))));
+};
+
 var _templateObject$b, _templateObject2$a, _templateObject3$8, _templateObject4$7, _templateObject5$4, _templateObject6$3, _templateObject7$3, _templateObject8$3, _templateObject9$2, _templateObject0$2, _templateObject1$2;
 var UserItem = function UserItem(_ref) {
   var user = _ref.user,
@@ -27380,6 +27653,7 @@ var UsersPopup = function UsersPopup(_ref2) {
   var getFromContacts = getShowOnlyContactUsers();
   var usersLoadingState = useSelector(usersLoadingStateSelector);
   var selectedMembersCont = useRef('');
+  var userBlockedForInvite = useSelector(userBlockedForInviteSelector);
   var _useState = useState(''),
     userSearchValue = _useState[0],
     setUserSearchValue = _useState[1];
@@ -27400,6 +27674,7 @@ var UsersPopup = function UsersPopup(_ref2) {
   var _useState6 = useState(false),
     isSelectedMembersScrolling = _useState6[0],
     setIsSelectedMembersScrolling = _useState6[1];
+  var usersMap = useSelector(usersMapSelector);
   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) {
@@ -27484,7 +27759,10 @@ var UsersPopup = function UsersPopup(_ref2) {
     if (getFromContacts) {
       if (!userSearchValue) {
         var userList = contactList.map(function (cont) {
-          return cont.user;
+          var _usersMap$cont$id;
+          return _extends({}, cont.user, {
+            blocked: !!(usersMap !== null && usersMap !== void 0 && (_usersMap$cont$id = usersMap[cont.id]) !== null && _usersMap$cont$id !== void 0 && _usersMap$cont$id.blocked)
+          });
         });
         if (actionType === 'createChat') {
           userList.unshift(selfUser);
@@ -27498,7 +27776,7 @@ var UsersPopup = function UsersPopup(_ref2) {
       }
       setFilteredUsers(_userList);
     }
-  }, [contactList, usersList]);
+  }, [contactList, usersList, usersMap]);
   useDidUpdate(function () {
     if (getFromContacts) {
       if (userSearchValue) {
@@ -27511,11 +27789,17 @@ var UsersPopup = function UsersPopup(_ref2) {
           });
         }
         setFilteredUsers(filteredContacts.map(function (cont) {
-          return cont.user;
+          var _usersMap$cont$id2;
+          return _extends({}, cont.user, {
+            blocked: !!(usersMap !== null && usersMap !== void 0 && (_usersMap$cont$id2 = usersMap[cont.id]) !== null && _usersMap$cont$id2 !== void 0 && _usersMap$cont$id2.blocked)
+          });
         }));
       } else {
         var userList = contactList.map(function (cont) {
-          return cont.user;
+          var _usersMap$cont$id3;
+          return _extends({}, cont.user, {
+            blocked: !!(usersMap !== null && usersMap !== void 0 && (_usersMap$cont$id3 = usersMap[cont.id]) !== null && _usersMap$cont$id3 !== void 0 && _usersMap$cont$id3.blocked)
+          });
         });
         if (actionType === 'createChat') {
           userList.unshift(selfUser);
@@ -27529,7 +27813,7 @@ var UsersPopup = function UsersPopup(_ref2) {
         limit: 50
       }));
     }
-  }, [userSearchValue]);
+  }, [userSearchValue, usersMap]);
   useEffect(function () {
     if (selectedMembersCont.current) {
       setUsersContHeight(selectedMembersCont.current.offsetHeight);
@@ -27640,13 +27924,18 @@ var UsersPopup = function UsersPopup(_ref2) {
       hoverBackground: backgroundHovered,
       key: user.id,
       onClick: function onClick() {
+        if (user !== null && user !== void 0 && user.blocked) {
+          dispatch(setUserBlockedForInviteAC(true, [user.id]));
+          return;
+        }
         actionType === 'createChat' && handleAddMember(user);
         handleUserSelect(!isSelected, {
           id: user.id,
           displayName: memberDisplayName,
           avatarUrl: user.avatarUrl
         });
-      }
+      },
+      disabled: user === null || user === void 0 ? void 0 : user.blocked
     }, /*#__PURE__*/React__default.createElement(Avatar, {
       image: user.avatarUrl,
       name: user.firstName || user.id,
@@ -27665,7 +27954,8 @@ var UsersPopup = function UsersPopup(_ref2) {
       onClick: function onClick(e) {
         e.stopPropagation();
       },
-      size: '18px'
+      size: '18px',
+      disabled: user === null || user === void 0 ? void 0 : user.blocked
     })));
   }))), actionType !== 'createChat' && (/*#__PURE__*/React__default.createElement(PopupFooter, {
     backgroundColor: surface1Background,
@@ -27689,7 +27979,32 @@ var UsersPopup = function UsersPopup(_ref2) {
     onClick: function onClick() {
       return handleCreateChannel();
     }
-  }, actionType === 'selectUsers' ? 'Create' : 'Add')))));
+  }, actionType === 'selectUsers' ? 'Create' : 'Add')))), userBlockedForInvite.show && (/*#__PURE__*/React__default.createElement(UserBlockedPopup, {
+    userIds: userBlockedForInvite.userIds,
+    selectUsers: function selectUsers(userIds) {
+      var _loop = function _loop() {
+        var userId = _step.value;
+        var user = filteredUsers.find(function (user) {
+          return user.id === userId;
+        });
+        if (!user) {
+          return 1;
+        }
+        var memberDisplayName = selfUser.id === userId ? 'Me' : makeUsername(contactsMap[userId], user, selfUser.id !== userId && getFromContacts);
+        if (user) {
+          actionType === 'createChat' && handleAddMember(user);
+          handleUserSelect(true, {
+            id: user.id,
+            displayName: memberDisplayName,
+            avatarUrl: user.avatarUrl
+          });
+        }
+      };
+      for (var _iterator = _createForOfIteratorHelperLoose(userIds), _step; !(_step = _iterator()).done;) {
+        if (_loop()) continue;
+      }
+    }
+  })));
 };
 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  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) {
@@ -27707,7 +28022,9 @@ var SearchUsersInput = styled.input(_templateObject4$7 || (_templateObject4$7 =
 }, function (props) {
   return props.placeholderColor;
 });
-var ListRow = styled.div(_templateObject5$4 || (_templateObject5$4 = _taggedTemplateLiteralLoose(["\n  display: flex;\n  justify-content: space-between;\n  flex-direction: row;\n  align-items: center;\n  padding: 7px 12px;\n  cursor: pointer;\n  border-radius: 6px;\n  transition: all 0.2s;\n  &:hover {\n    background-color: ", ";\n  }\n\n  & ", " {\n    width: 10px;\n    height: 10px;\n  }\n"])), function (props) {
+var ListRow = styled.div(_templateObject5$4 || (_templateObject5$4 = _taggedTemplateLiteralLoose(["\n  display: flex;\n  justify-content: space-between;\n  flex-direction: row;\n  align-items: center;\n  padding: 7px 12px;\n  cursor: pointer;\n  border-radius: 6px;\n  transition: all 0.2s;\n  opacity: ", ";\n  &:hover {\n    background-color: ", ";\n  }\n\n  & ", " {\n    width: 10px;\n    height: 10px;\n  }\n"])), function (props) {
+  return props.disabled ? 0.5 : 1;
+}, function (props) {
   return props.hoverBackground;
 }, UserStatus);
 var UserNamePresence = styled.div(_templateObject6$3 || (_templateObject6$3 = _taggedTemplateLiteralLoose(["\n  width: 100%;\n  max-width: calc(100% - 70px);\n  margin: 0 auto 0 8px;\n  line-height: 10px;\n"])));
@@ -29069,7 +29386,22 @@ var ChannelList = function ChannelList(_ref) {
   }, [channels]);
   var setSelectedChannel = function setSelectedChannel(channel) {
     if (activeChannel.id !== channel.id) {
-      dispatch(sendTypingAC(false));
+      if (activeChannel) {
+        var _getClient;
+        var user = (_getClient = getClient()) === null || _getClient === void 0 ? void 0 : _getClient.user;
+        var isAllUsersBlcked = true;
+        for (var i = 0; i < (activeChannel === null || activeChannel === void 0 ? void 0 : (_activeChannel$member2 = activeChannel.members) === null || _activeChannel$member2 === void 0 ? void 0 : _activeChannel$member2.length); i++) {
+          var _activeChannel$member2;
+          var member = activeChannel === null || activeChannel === void 0 ? void 0 : activeChannel.members[i];
+          if (!(member !== null && member !== void 0 && member.blocked) && user.id !== member.id) {
+            isAllUsersBlcked = false;
+            break;
+          }
+        }
+        if (!isAllUsersBlcked) {
+          dispatch(sendTypingAC(false));
+        }
+      }
       dispatch(clearMessagesAC());
       dispatch(switchChannelActionAC(channel));
     }