sceyt-chat-react-uikit 1.7.0 → 1.7.1-beta.10

package/index.modern.js

@@ -1,5 +1,5 @@
 import React__default, { createElement as createElement$1, useRef, useEffect, useLayoutEffect, useState, useMemo, useCallback, memo, createRef } from 'react';
-import { useSelector, useDispatch, shallowEqual, Provider } from 'react-redux';
+import { createSelectorHook, createDispatchHook, createStoreHook, shallowEqual, Provider } from 'react-redux';
 import log from 'loglevel';
 import createSagaMiddleware, { eventChannel } from 'redux-saga';
 import FileSaver from 'file-saver';
@@ -10052,25 +10052,23 @@ function updateMessageOnMap(channelId, updatedMessage) {
   }
   var updatedMessageData = null;
   if (messagesMap[channelId]) {
-    messagesMap[channelId].map(function (mes) {
+    var messagesList = [];
+    for (var _iterator = _createForOfIteratorHelperLoose(messagesMap[channelId]), _step; !(_step = _iterator()).done;) {
+      var mes = _step.value;
       if (mes.tid === updatedMessage.messageId || mes.id === updatedMessage.messageId) {
         if (updatedMessage.params.state === MESSAGE_STATUS.DELETE) {
           updatedMessageData = _extends({}, updatedMessage.params);
-          return updatedMessageData;
+          messagesList.push(_extends({}, mes, updatedMessageData));
+          continue;
         } else {
-          var _updatedMessage$param;
-          updatedMessageData = _extends({}, mes, updatedMessage.params, {
-            attachments: [].concat(mes.attachments, ((_updatedMessage$param = updatedMessage.params) === null || _updatedMessage$param === void 0 ? void 0 : _updatedMessage$param.attachments) || []).filter(function (att, index, self) {
-              return index === self.findIndex(function (t) {
-                return t.url === att.url && t.type === att.type && t.name === att.name;
-              });
-            })
-          });
-          return updatedMessage;
+          updatedMessageData = _extends({}, mes, updatedMessage.params);
+          messagesList.push(_extends({}, mes, updatedMessageData));
+          continue;
         }
       }
-      return mes;
-    });
+      messagesList.push(mes);
+    }
+    messagesMap[channelId] = messagesList;
   }
   return updatedMessageData;
 }
@@ -11093,12 +11091,13 @@ var ThemeReducer = (function (state, _ref) {
   }
 });
 
-var createChannelAC = function createChannelAC(channelData, dontCreateIfNotExists) {
+var createChannelAC = function createChannelAC(channelData, dontCreateIfNotExists, callback) {
   return {
     type: CREATE_CHANNEL,
     payload: {
       channelData: channelData,
-      dontCreateIfNotExists: dontCreateIfNotExists
+      dontCreateIfNotExists: dontCreateIfNotExists,
+      callback: callback
     }
   };
 };
@@ -11264,11 +11263,15 @@ var setActiveChannelAC = function setActiveChannelAC(channel) {
     channel: channel
   });
 };
-var switchChannelActionAC = function switchChannelActionAC(channel) {
+var switchChannelActionAC = function switchChannelActionAC(channel, updateActiveChannel) {
+  if (updateActiveChannel === void 0) {
+    updateActiveChannel = true;
+  }
   return {
     type: SWITCH_CHANNEL,
     payload: {
-      channel: channel
+      channel: channel,
+      updateActiveChannel: updateActiveChannel
     }
   };
 };
@@ -11500,6 +11503,7 @@ var getChannelMentionsAC = function getChannelMentionsAC(channelId) {
 };
 
 var GET_MESSAGES = 'GET_MESSAGES';
+var GET_MESSAGE = 'GET_MESSAGE';
 var LOAD_MORE_MESSAGES = 'LOAD_MORE_MESSAGES';
 var SEND_MESSAGE = 'SEND_MESSAGE';
 var SEND_TEXT_MESSAGE = 'SEND_TEXT_MESSAGE';
@@ -11608,6 +11612,16 @@ function getMessagesAC(channel, loadWithLastMessage, messageId, limit, withDeliv
     }
   };
 }
+function getMessageAC(channelId, messageId, limit) {
+  return {
+    type: GET_MESSAGE,
+    payload: {
+      channelId: channelId,
+      messageId: messageId,
+      limit: limit
+    }
+  };
+}
 function setScrollToMessagesAC(messageId, highlight) {
   if (highlight === void 0) {
     highlight = true;
@@ -14740,13 +14754,13 @@ var _marked$2 = /*#__PURE__*/_regenerator().m(createChannel),
   _marked27 = /*#__PURE__*/_regenerator().m(watchForChannelEvents),
   _marked28 = /*#__PURE__*/_regenerator().m(ChannelsSaga);
 function createChannel(action) {
-  var payload, channelData, dontCreateIfNotExists, SceytChatClient, createChannelData, fileToUpload, isSelfChannel, channelIsExistOnAllChannels, createdChannel, allChannels, memberId, checkChannelExist, messageToSend, _allChannels, _memberId, _t;
+  var payload, channelData, dontCreateIfNotExists, callback, SceytChatClient, createChannelData, fileToUpload, isSelfChannel, channelIsExistOnAllChannels, createdChannel, allChannels, memberId, checkChannelExist, messageToSend, _allChannels, _memberId, _t;
   return _regenerator().w(function (_context) {
     while (1) switch (_context.p = _context.n) {
       case 0:
         _context.p = 0;
         payload = action.payload;
-        channelData = payload.channelData, dontCreateIfNotExists = payload.dontCreateIfNotExists;
+        channelData = payload.channelData, dontCreateIfNotExists = payload.dontCreateIfNotExists, callback = payload.callback;
         SceytChatClient = getClient();
         createChannelData = _extends({}, channelData);
         if (!createChannelData.avatarFile) {
@@ -14782,8 +14796,8 @@ function createChannel(action) {
         allChannels.forEach(function (channel) {
           if (channel.type === DEFAULT_CHANNEL_TYPE.DIRECT) {
             if (isSelfChannel) {
-              var meta = isJSON(channel.metadata) ? JSON.parse(channel.metadata) : channel.metadata;
-              if (meta !== null && meta !== void 0 && meta.s) {
+              var _channel$members;
+              if (((_channel$members = channel.members) === null || _channel$members === void 0 ? void 0 : _channel$members.length) === 1 && channel.members[0].id === memberId) {
                 channelIsExistOnAllChannels = true;
               }
             } else {
@@ -14873,7 +14887,7 @@ function createChannel(action) {
         _context.n = 14;
         return put(switchChannelActionAC(JSON.parse(JSON.stringify(_extends({}, createdChannel, {
           isLinkedChannel: dontCreateIfNotExists
-        })))));
+        }))), !callback));
       case 14:
         if (dontCreateIfNotExists) {
           if (!channelIsExistOnAllChannels) {
@@ -14903,19 +14917,27 @@ function createChannel(action) {
             addChannelToAllChannels(createdChannel);
           }
         }
-        _context.n = 15;
-        return call(setActiveChannelId, createdChannel.id);
-      case 15:
-        _context.n = 17;
+        if (!callback) {
+          _context.n = 15;
+          break;
+        }
+        callback(createdChannel);
+        _context.n = 16;
         break;
+      case 15:
+        _context.n = 16;
+        return call(setActiveChannelId, createdChannel.id);
       case 16:
-        _context.p = 16;
+        _context.n = 18;
+        break;
+      case 17:
+        _context.p = 17;
         _t = _context.v;
         log.error(_t, 'Error on create channel');
-      case 17:
+      case 18:
         return _context.a(2);
     }
-  }, _marked$2, null, [[0, 16]]);
+  }, _marked$2, null, [[0, 17]]);
 }
 function getChannels(action) {
   var _params$filter, _types, payload, params, SceytChatClient, channelQueryBuilder, channelTypesFilter, types, channelQuery, channelsData, channelList, channelId, activeChannel, _yield$call, mappedChannels, channelsForUpdateLastReactionMessage, channelMessageMap, hiddenList, allChannelsQueryBuilder, allChannelsQuery, hasNext, i, allChannelsData, allChannelList, _t2, _t3, _t4;
@@ -15097,7 +15119,7 @@ function getChannels(action) {
   }, _marked2$1, null, [[18, 20], [0, 23]]);
 }
 function searchChannels(action) {
-  var payload, params, contactsMap, SceytChatClient, getFromContacts, searchBy, _params$filter2, _types2, channelQueryBuilder, channelTypesFilter, types, allChannels, publicChannels, chatsGroups, contactsList, contactsWithChannelsMap, lowerCaseSearchBy, channelQuery, channelsData, channelsToAdd, _t5;
+  var payload, params, contactsMap, SceytChatClient, getFromContacts, searchBy, _params$filter2, _types2, channelQueryBuilder, channelTypesFilter, types, allChannels, publicChannels, chatsGroups, contactsList, contactsWithChannelsMap, lowerCaseSearchBy, handleChannels, channelsMap, _iterator, _step, channel, channelQuery, channelsData, _iterator2, _step2, _channel, channelsToAdd, _t5;
   return _regenerator().w(function (_context3) {
     while (1) switch (_context3.p = _context3.n) {
       case 0:
@@ -15136,31 +15158,38 @@ function searchChannels(action) {
         contactsList = [];
         contactsWithChannelsMap = {};
         lowerCaseSearchBy = searchBy.toLowerCase();
-        allChannels.forEach(function (channel) {
-          if (channel.type === DEFAULT_CHANNEL_TYPE.DIRECT) {
-            var _channel$metadata;
-            channel.metadata = isJSON(channel.metadata) ? JSON.parse(channel.metadata) : channel.metadata;
-            var isSelfChannel = (_channel$metadata = channel.metadata) === null || _channel$metadata === void 0 ? void 0 : _channel$metadata.s;
-            var directChannelUser = isSelfChannel ? SceytChatClient.user : channel.members.find(function (member) {
-              return member.id !== SceytChatClient.user.id;
-            });
-            if (directChannelUser && contactsMap[directChannelUser.id]) {
-              contactsWithChannelsMap[directChannelUser.id] = true;
-            }
-            var userName = makeUsername(directChannelUser && contactsMap[directChannelUser.id], directChannelUser, getFromContacts).toLowerCase();
-            if (userName.includes(lowerCaseSearchBy) || isSelfChannel && 'me'.includes(lowerCaseSearchBy)) {
-              chatsGroups.push(channel);
-            }
-          } else {
-            if (channel.subject && channel.subject.toLowerCase().includes(lowerCaseSearchBy)) {
-              if (channel.type === DEFAULT_CHANNEL_TYPE.PUBLIC || channel.type === DEFAULT_CHANNEL_TYPE.BROADCAST) {
-                publicChannels.push(channel);
-              } else {
+        handleChannels = function handleChannels(channels) {
+          channels.forEach(function (channel) {
+            if (channel.type === DEFAULT_CHANNEL_TYPE.DIRECT) {
+              channel.metadata = isJSON(channel.metadata) ? JSON.parse(channel.metadata) : channel.metadata;
+              var isSelfChannel = channel.memberCount === 1 && channel.members.length > 0 && channel.members[0].id === SceytChatClient.user.id;
+              var directChannelUser = isSelfChannel ? SceytChatClient.user : channel.members.find(function (member) {
+                return member.id !== SceytChatClient.user.id;
+              });
+              if (directChannelUser && contactsMap[directChannelUser.id]) {
+                contactsWithChannelsMap[directChannelUser.id] = true;
+              }
+              var userName = makeUsername(directChannelUser && contactsMap[directChannelUser.id], directChannelUser, getFromContacts).toLowerCase();
+              if (userName.includes(lowerCaseSearchBy) || isSelfChannel && 'me'.includes(lowerCaseSearchBy)) {
                 chatsGroups.push(channel);
               }
+            } else {
+              if (channel.subject && channel.subject.toLowerCase().includes(lowerCaseSearchBy)) {
+                if (channel.type === DEFAULT_CHANNEL_TYPE.PUBLIC || channel.type === DEFAULT_CHANNEL_TYPE.BROADCAST) {
+                  publicChannels.push(channel);
+                } else {
+                  chatsGroups.push(channel);
+                }
+              }
             }
-          }
-        });
+          });
+        };
+        channelsMap = {};
+        for (_iterator = _createForOfIteratorHelperLoose(allChannels); !(_step = _iterator()).done;) {
+          channel = _step.value;
+          channelsMap[channel.id] = channel;
+        }
+        handleChannels(allChannels);
         if (getFromContacts) {
           Object.values(contactsMap).forEach(function (contact) {
             if (!contactsWithChannelsMap[contact.id]) {
@@ -15194,6 +15223,13 @@ function searchChannels(action) {
         return call(channelQuery.loadNextPage);
       case 5:
         channelsData = _context3.v;
+        for (_iterator2 = _createForOfIteratorHelperLoose(channelsData.channels); !(_step2 = _iterator2()).done;) {
+          _channel = _step2.value;
+          channelsMap[_channel.id] = _channel;
+        }
+        chatsGroups = [];
+        publicChannels = [];
+        handleChannels(Object.values(channelsMap));
         channelsToAdd = channelsData.channels.filter(function (channel) {
           return channel.type === DEFAULT_CHANNEL_TYPE.PUBLIC || channel.type === DEFAULT_CHANNEL_TYPE.BROADCAST;
         });
@@ -15216,16 +15252,16 @@ function searchChannels(action) {
   }, _marked3, null, [[0, 7]]);
 }
 function getChannelsForForward() {
-  var SceytChatClient, channelQueryBuilder, channelTypesFilter, channelQuery, channelsData, channelsToAdd, _yield$call2, mappedChannels, _t6;
+  var _SceytChatClient, channelQueryBuilder, channelTypesFilter, channelQuery, channelsData, channelsToAdd, _yield$call2, mappedChannels, _t6;
   return _regenerator().w(function (_context4) {
     while (1) switch (_context4.p = _context4.n) {
       case 0:
         _context4.p = 0;
-        SceytChatClient = getClient();
+        _SceytChatClient = getClient();
         _context4.n = 1;
         return put(setChannelsLoadingStateAC(LOADING_STATE.LOADING, true));
       case 1:
-        channelQueryBuilder = new SceytChatClient.ChannelListQueryBuilder();
+        channelQueryBuilder = new _SceytChatClient.ChannelListQueryBuilder();
         channelTypesFilter = getChannelTypesFilter();
         channelQueryBuilder.order('lastMessage');
         if (channelTypesFilter !== null && channelTypesFilter !== void 0 && channelTypesFilter.length) {
@@ -15244,11 +15280,10 @@ function getChannelsForForward() {
         return put(channelHasNextAC(channelsData.hasNext, true));
       case 4:
         channelsToAdd = channelsData.channels.filter(function (channel) {
-          var _channel$metadata2;
           channel.metadata = isJSON(channel.metadata) ? JSON.parse(channel.metadata) : channel.metadata;
-          var isSelfChannel = (_channel$metadata2 = channel.metadata) === null || _channel$metadata2 === void 0 ? void 0 : _channel$metadata2.s;
+          var isSelfChannel = channel.memberCount === 1 && channel.members.length > 0 && channel.members[0].id === _SceytChatClient.user.id;
           return channel.type === DEFAULT_CHANNEL_TYPE.BROADCAST || channel.type === DEFAULT_CHANNEL_TYPE.PUBLIC ? channel.userRole === 'admin' || channel.userRole === 'owner' : channel.type === DEFAULT_CHANNEL_TYPE.DIRECT ? isSelfChannel || channel.members.find(function (member) {
-            return member.id && member.id !== SceytChatClient.user.id;
+            return member.id && member.id !== _SceytChatClient.user.id;
           }) : true;
         });
         _context4.n = 5;
@@ -15275,15 +15310,15 @@ function getChannelsForForward() {
   }, _marked4, null, [[0, 8]]);
 }
 function searchChannelsForForward(action) {
-  var payload, params, contactsMap, SceytChatClient, getFromContacts, searchBy, _params$filter3, _types3, channelQueryBuilder, channelTypesFilter, types, allChannels, publicChannels, chatsGroups, contactsList, contactsWithChannelsMap, lowerCaseSearchBy, channelQuery, channelsData, channelsToAdd, _t7;
+  var payload, params, _contactsMap, _SceytChatClient2, _getFromContacts, searchBy, _params$filter3, _types3, channelQueryBuilder, channelTypesFilter, types, allChannels, _publicChannels, _chatsGroups, contactsList, _contactsWithChannelsMap, _lowerCaseSearchBy, handleChannels, channelsMap, _iterator3, _step3, channel, channelQuery, channelsData, _iterator4, _step4, _channel2, channelsToAdd, _t7;
   return _regenerator().w(function (_context5) {
     while (1) switch (_context5.p = _context5.n) {
       case 0:
         _context5.p = 0;
         payload = action.payload;
-        params = payload.params, contactsMap = payload.contactsMap;
-        SceytChatClient = getClient();
-        getFromContacts = getShowOnlyContactUsers();
+        params = payload.params, _contactsMap = payload.contactsMap;
+        _SceytChatClient2 = getClient();
+        _getFromContacts = getShowOnlyContactUsers();
         _context5.n = 1;
         return put(setChannelsLoadingStateAC(LOADING_STATE.LOADING, true));
       case 1:
@@ -15292,7 +15327,7 @@ function searchChannelsForForward(action) {
           _context5.n = 6;
           break;
         }
-        channelQueryBuilder = new SceytChatClient.ChannelListQueryBuilder();
+        channelQueryBuilder = new _SceytChatClient2.ChannelListQueryBuilder();
         channelTypesFilter = getChannelTypesFilter();
         types = [];
         if (channelTypesFilter !== null && channelTypesFilter !== void 0 && channelTypesFilter.length) {
@@ -15305,41 +15340,48 @@ function searchChannelsForForward(action) {
           channelQueryBuilder.types(types);
         }
         allChannels = getAllChannels();
-        publicChannels = [];
-        chatsGroups = [];
+        _publicChannels = [];
+        _chatsGroups = [];
         contactsList = [];
-        contactsWithChannelsMap = {};
-        lowerCaseSearchBy = searchBy.toLowerCase();
-        allChannels.forEach(function (channel) {
-          if (channel.type === DEFAULT_CHANNEL_TYPE.DIRECT) {
-            var _channel$metadata3;
-            channel.metadata = isJSON(channel.metadata) ? JSON.parse(channel.metadata) : channel.metadata;
-            var isSelfChannel = (_channel$metadata3 = channel.metadata) === null || _channel$metadata3 === void 0 ? void 0 : _channel$metadata3.s;
-            var directChannelUser = isSelfChannel ? SceytChatClient.user : channel.members.find(function (member) {
-              return member.id !== SceytChatClient.user.id;
-            });
-            if (directChannelUser && contactsMap[directChannelUser.id]) {
-              contactsWithChannelsMap[directChannelUser.id] = true;
-            }
-            var userName = makeUsername(directChannelUser && contactsMap[directChannelUser.id], directChannelUser, getFromContacts).toLowerCase();
-            if (userName.includes(lowerCaseSearchBy) || isSelfChannel && 'me'.includes(lowerCaseSearchBy)) {
-              chatsGroups.push(channel);
-            }
-          } else {
-            if (channel.subject && channel.subject.toLowerCase().includes(lowerCaseSearchBy)) {
-              if (channel.type === DEFAULT_CHANNEL_TYPE.PUBLIC || channel.type === DEFAULT_CHANNEL_TYPE.BROADCAST) {
-                publicChannels.push(channel);
-              } else {
-                chatsGroups.push(channel);
+        _contactsWithChannelsMap = {};
+        _lowerCaseSearchBy = searchBy.toLowerCase();
+        handleChannels = function handleChannels(channels) {
+          channels.forEach(function (channel) {
+            if (channel.type === DEFAULT_CHANNEL_TYPE.DIRECT) {
+              channel.metadata = isJSON(channel.metadata) ? JSON.parse(channel.metadata) : channel.metadata;
+              var isSelfChannel = channel.memberCount === 1 && channel.members.length > 0 && channel.members[0].id === _SceytChatClient2.user.id;
+              var directChannelUser = isSelfChannel ? _SceytChatClient2.user : channel.members.find(function (member) {
+                return member.id !== _SceytChatClient2.user.id;
+              });
+              if (directChannelUser && _contactsMap[directChannelUser.id]) {
+                _contactsWithChannelsMap[directChannelUser.id] = true;
+              }
+              var userName = makeUsername(directChannelUser && _contactsMap[directChannelUser.id], directChannelUser, _getFromContacts).toLowerCase();
+              if (userName.includes(_lowerCaseSearchBy) || isSelfChannel && 'me'.includes(_lowerCaseSearchBy)) {
+                _chatsGroups.push(channel);
+              }
+            } else {
+              if (channel.subject && channel.subject.toLowerCase().includes(_lowerCaseSearchBy)) {
+                if (channel.type === DEFAULT_CHANNEL_TYPE.PUBLIC || channel.type === DEFAULT_CHANNEL_TYPE.BROADCAST) {
+                  _publicChannels.push(channel);
+                } else {
+                  _chatsGroups.push(channel);
+                }
               }
             }
-          }
-        });
-        if (getFromContacts) {
-          Object.values(contactsMap).forEach(function (contact) {
-            if (!contactsWithChannelsMap[contact.id]) {
+          });
+        };
+        channelsMap = {};
+        for (_iterator3 = _createForOfIteratorHelperLoose(allChannels); !(_step3 = _iterator3()).done;) {
+          channel = _step3.value;
+          channelsMap[channel.id] = channel;
+        }
+        handleChannels(allChannels);
+        if (_getFromContacts) {
+          Object.values(_contactsMap).forEach(function (contact) {
+            if (!_contactsWithChannelsMap[contact.id]) {
               var userName = makeUsername(contact, undefined, true).toLowerCase();
-              if (userName.includes(lowerCaseSearchBy)) {
+              if (userName.includes(_lowerCaseSearchBy)) {
                 contactsList.push(contact);
               }
             }
@@ -15347,15 +15389,15 @@ function searchChannelsForForward(action) {
         }
         _context5.n = 2;
         return put(setSearchedChannelsForForwardAC({
-          chats_groups: JSON.parse(JSON.stringify(chatsGroups)),
-          channels: JSON.parse(JSON.stringify(publicChannels)),
+          chats_groups: JSON.parse(JSON.stringify(_chatsGroups)),
+          channels: JSON.parse(JSON.stringify(_publicChannels)),
           contacts: JSON.parse(JSON.stringify(contactsList))
         }));
       case 2:
         _context5.n = 3;
         return put(setChannelsLoadingStateAC(LOADING_STATE.LOADED, true));
       case 3:
-        channelQueryBuilder.query(lowerCaseSearchBy);
+        channelQueryBuilder.query(_lowerCaseSearchBy);
         channelQueryBuilder.limit(params.limit || 50);
         channelQueryBuilder.order('lastMessage');
         channelQueryBuilder.filterKey(['subject']);
@@ -15368,12 +15410,19 @@ function searchChannelsForForward(action) {
         return call(channelQuery.loadNextPage);
       case 5:
         channelsData = _context5.v;
+        for (_iterator4 = _createForOfIteratorHelperLoose(channelsData.channels); !(_step4 = _iterator4()).done;) {
+          _channel2 = _step4.value;
+          channelsMap[_channel2.id] = _channel2;
+        }
+        _chatsGroups = [];
+        _publicChannels = [];
+        handleChannels(Object.values(channelsMap));
         channelsToAdd = channelsData.channels.filter(function (channel) {
           return channel.type === DEFAULT_CHANNEL_TYPE.PUBLIC || channel.type === DEFAULT_CHANNEL_TYPE.BROADCAST;
         });
         _context5.n = 6;
         return put(setSearchedChannelsForForwardAC({
-          chats_groups: JSON.parse(JSON.stringify(chatsGroups)),
+          chats_groups: JSON.parse(JSON.stringify(_chatsGroups)),
           channels: JSON.parse(JSON.stringify(channelsToAdd)),
           contacts: JSON.parse(JSON.stringify(contactsList))
         }));
@@ -15470,15 +15519,15 @@ function channelsLoadMore(action) {
   }, _marked6, null, [[0, 9]]);
 }
 function getChannelMentions(action) {
-  var payload, channelId, SceytChatClient, mentionsQueryBuilder, mentionsQuery, mentions, _t9;
+  var payload, channelId, _SceytChatClient3, mentionsQueryBuilder, mentionsQuery, mentions, _t9;
   return _regenerator().w(function (_context7) {
     while (1) switch (_context7.p = _context7.n) {
       case 0:
         _context7.p = 0;
         payload = action.payload;
         channelId = payload.channelId;
-        SceytChatClient = getClient();
-        mentionsQueryBuilder = new SceytChatClient.MentionsListQueryBuilder();
+        _SceytChatClient3 = getClient();
+        mentionsQueryBuilder = new _SceytChatClient3.MentionsListQueryBuilder();
         mentionsQueryBuilder.setChannelId(channelId);
         mentionsQueryBuilder.limit(10);
         mentionsQueryBuilder.setDirection(queryDirection.NEXT);
@@ -15507,14 +15556,14 @@ function getChannelMentions(action) {
   }, _marked7, null, [[0, 4]]);
 }
 function channelsForForwardLoadMore(action) {
-  var payload, limit, SceytChatClient, channelQueryForward, channelsData, channelsToAdd, _yield$call4, mappedChannels, _t0;
+  var payload, limit, _SceytChatClient4, channelQueryForward, channelsData, channelsToAdd, _yield$call4, mappedChannels, _t0;
   return _regenerator().w(function (_context8) {
     while (1) switch (_context8.p = _context8.n) {
       case 0:
         _context8.p = 0;
         payload = action.payload;
         limit = payload.limit;
-        SceytChatClient = getClient();
+        _SceytChatClient4 = getClient();
         channelQueryForward = query.channelQueryForward;
         if (limit) {
           channelQueryForward.limit = limit;
@@ -15531,7 +15580,7 @@ function channelsForForwardLoadMore(action) {
       case 3:
         channelsToAdd = channelsData.channels.filter(function (channel) {
           return channel.type === DEFAULT_CHANNEL_TYPE.BROADCAST || channel.type === DEFAULT_CHANNEL_TYPE.PUBLIC ? channel.userRole === 'admin' || channel.userRole === 'owner' : channel.type === DEFAULT_CHANNEL_TYPE.DIRECT ? channel.members.find(function (member) {
-            return member.id && member.id !== SceytChatClient.user.id;
+            return member.id && member.id !== _SceytChatClient4.user.id;
           }) : true;
         });
         _context8.n = 4;
@@ -15557,7 +15606,7 @@ function channelsForForwardLoadMore(action) {
   }, _marked8, null, [[0, 7]]);
 }
 function markMessagesRead(action) {
-  var payload, channelId, messageIds, channel, messageListMarker, _iterator, _step, messageId, updateParams, _t1;
+  var payload, channelId, messageIds, channel, messageListMarker, _iterator5, _step5, messageId, updateParams, _t1;
   return _regenerator().w(function (_context9) {
     while (1) switch (_context9.p = _context9.n) {
       case 0:
@@ -15590,13 +15639,13 @@ function markMessagesRead(action) {
         updateChannelOnAllChannels(channel.id, {
           lastReadMessageId: channel.lastDisplayedMessageId
         });
-        _iterator = _createForOfIteratorHelperLoose(messageListMarker.messageIds);
+        _iterator5 = _createForOfIteratorHelperLoose(messageListMarker.messageIds);
       case 5:
-        if ((_step = _iterator()).done) {
+        if ((_step5 = _iterator5()).done) {
           _context9.n = 8;
           break;
         }
-        messageId = _step.value;
+        messageId = _step5.value;
         updateParams = {
           deliveryStatus: MESSAGE_DELIVERY_STATUS.READ,
           userMarkers: [{
@@ -15667,15 +15716,15 @@ function markMessagesDelivered(action) {
   }, _marked0, null, [[1, 4]]);
 }
 function switchChannel(action) {
-  var payload, channel, channelToSwitch, existingChannel, addChannel, SceytChatClient, fetchedChannel, channelFromMap, currentActiveChannel, _t11;
+  var payload, channel, updateActiveChannel, channelToSwitch, existingChannel, addChannel, _SceytChatClient5, fetchedChannel, channelFromMap, currentActiveChannel, _t11;
   return _regenerator().w(function (_context1) {
     while (1) switch (_context1.p = _context1.n) {
       case 0:
         _context1.p = 0;
         payload = action.payload;
-        channel = payload.channel;
+        channel = payload.channel, updateActiveChannel = payload.updateActiveChannel;
         channelToSwitch = channel;
-        if (channel !== null && channel !== void 0 && channel.id) {
+        if (!(!(channel !== null && channel !== void 0 && channel.id) && updateActiveChannel)) {
           _context1.n = 3;
           break;
         }
@@ -15705,9 +15754,9 @@ function switchChannel(action) {
         _context1.n = 8;
         break;
       case 5:
-        SceytChatClient = getClient();
+        _SceytChatClient5 = getClient();
         _context1.n = 6;
-        return call(SceytChatClient.getChannel, channel.id);
+        return call(_SceytChatClient5.getChannel, channel.id);
       case 6:
         fetchedChannel = _context1.v;
         addChannelToAllChannels(fetchedChannel);
@@ -15723,6 +15772,10 @@ function switchChannel(action) {
         channelFromMap = getChannelFromMap(channel.id);
         channelToSwitch = _extends({}, channelToSwitch, channelFromMap);
       case 10:
+        if (!updateActiveChannel) {
+          _context1.n = 13;
+          break;
+        }
         currentActiveChannel = getChannelFromMap(getActiveChannelId());
         _context1.n = 11;
         return call(setUnreadScrollTo, true);
@@ -16139,14 +16192,14 @@ function blockChannel(action) {
   }, _marked19, null, [[0, 5]]);
 }
 function updateChannel(action) {
-  var payload, channelId, config, SceytChatClient, channel, paramsToUpdate, fileToUpload, _yield$call5, subject, avatarUrl, metadata, _t21;
+  var payload, channelId, config, _SceytChatClient6, channel, paramsToUpdate, fileToUpload, _yield$call5, subject, avatarUrl, metadata, _t21;
   return _regenerator().w(function (_context20) {
     while (1) switch (_context20.p = _context20.n) {
       case 0:
         _context20.p = 0;
         payload = action.payload;
         channelId = payload.channelId, config = payload.config;
-        SceytChatClient = getClient();
+        _SceytChatClient6 = getClient();
         _context20.n = 1;
         return call(getChannelFromMap, channelId);
       case 1:
@@ -16171,7 +16224,7 @@ function updateChannel(action) {
           }
         };
         _context20.n = 2;
-        return call(SceytChatClient.uploadFile, fileToUpload);
+        return call(_SceytChatClient6.uploadFile, fileToUpload);
       case 2:
         paramsToUpdate.avatarUrl = _context20.v;
       case 3:
@@ -16215,15 +16268,15 @@ function updateChannel(action) {
   }, _marked20, null, [[0, 6]]);
 }
 function checkUsersStatus() {
-  var SceytChatClient, usersForUpdate, updatedUsers, usersToUpdateMap, update, updateData, _t22;
+  var _SceytChatClient7, usersForUpdate, updatedUsers, usersToUpdateMap, update, updateData, _t22;
   return _regenerator().w(function (_context21) {
     while (1) switch (_context21.p = _context21.n) {
       case 0:
         _context21.p = 0;
-        SceytChatClient = getClient();
+        _SceytChatClient7 = getClient();
         usersForUpdate = Object.keys(usersMap);
         _context21.n = 1;
-        return call(SceytChatClient.getUsers, usersForUpdate);
+        return call(_SceytChatClient7.getUsers, usersForUpdate);
       case 1:
         updatedUsers = _context21.v;
         usersToUpdateMap = {};
@@ -16481,14 +16534,14 @@ function deleteAllMessages(action) {
   }, _marked25, null, [[0, 9]]);
 }
 function joinChannel(action) {
-  var payload, channelId, SceytChatClient, channel, joinedChannel, _t27;
+  var payload, channelId, _SceytChatClient8, channel, joinedChannel, _t27;
   return _regenerator().w(function (_context26) {
     while (1) switch (_context26.p = _context26.n) {
       case 0:
         _context26.p = 0;
         payload = action.payload;
         channelId = payload.channelId;
-        SceytChatClient = getClient();
+        _SceytChatClient8 = getClient();
         _context26.n = 1;
         return call(getChannelFromMap, channelId);
       case 1:
@@ -16501,7 +16554,7 @@ function joinChannel(action) {
           break;
         }
         _context26.n = 2;
-        return call(SceytChatClient.getChannel, channelId);
+        return call(_SceytChatClient8.getChannel, channelId);
       case 2:
         channel = _context26.v;
       case 3:
@@ -17114,16 +17167,17 @@ var _marked$3 = /*#__PURE__*/_regenerator().m(sendMessage),
   _marked5$1 = /*#__PURE__*/_regenerator().m(deleteMessage),
   _marked6$1 = /*#__PURE__*/_regenerator().m(editMessage),
   _marked7$1 = /*#__PURE__*/_regenerator().m(getMessagesQuery),
-  _marked8$1 = /*#__PURE__*/_regenerator().m(loadMoreMessages),
-  _marked9$1 = /*#__PURE__*/_regenerator().m(addReaction),
-  _marked0$1 = /*#__PURE__*/_regenerator().m(deleteReaction),
-  _marked1$1 = /*#__PURE__*/_regenerator().m(getReactions),
-  _marked10$1 = /*#__PURE__*/_regenerator().m(loadMoreReactions),
-  _marked11$1 = /*#__PURE__*/_regenerator().m(getMessageAttachments),
-  _marked12$1 = /*#__PURE__*/_regenerator().m(loadMoreMessageAttachments),
-  _marked13$1 = /*#__PURE__*/_regenerator().m(pauseAttachmentUploading),
-  _marked14$1 = /*#__PURE__*/_regenerator().m(resumeAttachmentUploading),
-  _marked15$1 = /*#__PURE__*/_regenerator().m(MessageSaga);
+  _marked8$1 = /*#__PURE__*/_regenerator().m(getMessageQuery),
+  _marked9$1 = /*#__PURE__*/_regenerator().m(loadMoreMessages),
+  _marked0$1 = /*#__PURE__*/_regenerator().m(addReaction),
+  _marked1$1 = /*#__PURE__*/_regenerator().m(deleteReaction),
+  _marked10$1 = /*#__PURE__*/_regenerator().m(getReactions),
+  _marked11$1 = /*#__PURE__*/_regenerator().m(loadMoreReactions),
+  _marked12$1 = /*#__PURE__*/_regenerator().m(getMessageAttachments),
+  _marked13$1 = /*#__PURE__*/_regenerator().m(loadMoreMessageAttachments),
+  _marked14$1 = /*#__PURE__*/_regenerator().m(pauseAttachmentUploading),
+  _marked15$1 = /*#__PURE__*/_regenerator().m(resumeAttachmentUploading),
+  _marked16$1 = /*#__PURE__*/_regenerator().m(MessageSaga);
 var handleUploadAttachments = function handleUploadAttachments(attachments, message, channel) {
   try {
     return Promise.resolve(Promise.all(attachments.map(function (attachment) {
@@ -17603,7 +17657,7 @@ function sendMessage(action) {
   }, _marked$3, null, [[1, 18]]);
 }
 function sendTextMessage(action) {
-  var payload, message, connectionState, channelId, channel, sendMessageTid, SceytChatClient, createChannelData, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, messageToSend, pendingMessage, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, _t3;
+  var payload, message, connectionState, channelId, channel, sendMessageTid, activeChannelId, SceytChatClient, createChannelData, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, messageToSend, pendingMessage, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, _t3;
   return _regenerator().w(function (_context4) {
     while (1) switch (_context4.p = _context4.n) {
       case 0:
@@ -17622,6 +17676,7 @@ function sendTextMessage(action) {
             setChannelInMap(channel);
           }
         }
+        activeChannelId = getActiveChannelId();
         _context4.p = 3;
         if (!channel.isMockChannel) {
           _context4.n = 6;
@@ -17657,7 +17712,7 @@ function sendTextMessage(action) {
           attachments = [att];
         }
         messageBuilder = channel.createMessageBuilder();
-        messageBuilder.setBody(message.body).setBodyAttributes(message.bodyAttributes).setAttachments(attachments).setMentionUserIds(mentionedUserIds).setType(message.type).setDisplayCount(message.type === 'system' ? 0 : 1).setSilent(message.type === 'system').setMetadata(JSON.stringify(message.metadata));
+        messageBuilder.setBody(message.body).setBodyAttributes(message.bodyAttributes).setAttachments(attachments).setMentionUserIds(mentionedUserIds).setType(message.type).setDisplayCount((message === null || message === void 0 ? void 0 : message.displayCount) !== undefined ? message.displayCount : message.type === 'system' ? 0 : 1).setSilent((message === null || message === void 0 ? void 0 : message.silent) !== undefined ? message.silent : message.type === 'system').setMetadata(JSON.stringify(message.metadata));
         if (message.parentMessage) {
           messageBuilder.setParentMessageId(message.parentMessage ? message.parentMessage.id : null);
         }
@@ -17674,6 +17729,10 @@ function sendTextMessage(action) {
         if (pendingMessage.metadata) {
           pendingMessage.metadata = JSON.parse(pendingMessage.metadata);
         }
+        if (!(activeChannelId === channel.id)) {
+          _context4.n = 8;
+          break;
+        }
         _context4.n = 8;
         return call(addPendingMessage, message, pendingMessage, channel);
       case 8:
@@ -17710,8 +17769,13 @@ function sendTextMessage(action) {
           metadata: messageResponse.metadata,
           parentMessage: messageResponse.parentMessage,
           repliedInThread: messageResponse.repliedInThread,
-          createdAt: messageResponse.createdAt
+          createdAt: messageResponse.createdAt,
+          channelId: channel.id
         };
+        if (!(activeChannelId === channel.id)) {
+          _context4.n = 13;
+          break;
+        }
         _context4.n = 13;
         return put(updateMessageAC(messageToSend.tid, messageUpdateData));
       case 13:
@@ -17719,7 +17783,9 @@ function sendTextMessage(action) {
           messageId: messageToSend.tid,
           params: messageUpdateData
         });
-        updateMessageOnAllMessages(messageToSend.tid, messageUpdateData);
+        if (activeChannelId === channel.id) {
+          updateMessageOnAllMessages(messageToSend.tid, messageUpdateData);
+        }
         messageToUpdate = JSON.parse(JSON.stringify(messageResponse));
         updateChannelLastMessageOnAllChannels(channel.id, messageToUpdate);
         channelUpdateParam = {
@@ -17760,6 +17826,10 @@ function sendTextMessage(action) {
             state: MESSAGE_STATUS.FAILED
           }
         });
+        if (!(activeChannelId === channel.id)) {
+          _context4.n = 21;
+          break;
+        }
         updateMessageOnAllMessages(sendMessageTid, {
           state: MESSAGE_STATUS.FAILED
         });
@@ -18737,23 +18807,61 @@ function getMessagesQuery(action) {
     }
   }, _marked7$1, null, [[0, 49, 50, 52]]);
 }
-function loadMoreMessages(action) {
-  var payload, limit, direction, channelId, messageId, hasNext, SceytChatClient, messageQueryBuilder, messageQuery, result, _t0;
+function getMessageQuery(action) {
+  var payload, channelId, messageId, channel, messages, _t0;
   return _regenerator().w(function (_context0) {
     while (1) switch (_context0.p = _context0.n) {
       case 0:
         _context0.p = 0;
         payload = action.payload;
+        channelId = payload.channelId, messageId = payload.messageId;
+        _context0.n = 1;
+        return call(getChannelFromMap, channelId);
+      case 1:
+        channel = _context0.v;
+        _context0.n = 2;
+        return call(channel.getMessagesById, [messageId]);
+      case 2:
+        messages = _context0.v;
+        _context0.n = 3;
+        return put(updateMessageAC(messageId, messages[0]));
+      case 3:
+        updateMessageOnMap(channel.id, {
+          messageId: messageId,
+          params: messages[0]
+        });
+        updateMessageOnAllMessages(messageId, messages[0]);
+        _context0.n = 4;
+        return put(setScrollToMessagesAC(messageId, false));
+      case 4:
+        _context0.n = 6;
+        break;
+      case 5:
+        _context0.p = 5;
+        _t0 = _context0.v;
+        log.error('error in message query', _t0);
+      case 6:
+        return _context0.a(2);
+    }
+  }, _marked8$1, null, [[0, 5]]);
+}
+function loadMoreMessages(action) {
+  var payload, limit, direction, channelId, messageId, hasNext, SceytChatClient, messageQueryBuilder, messageQuery, result, _t1;
+  return _regenerator().w(function (_context1) {
+    while (1) switch (_context1.p = _context1.n) {
+      case 0:
+        _context1.p = 0;
+        payload = action.payload;
         limit = payload.limit, direction = payload.direction, channelId = payload.channelId, messageId = payload.messageId, hasNext = payload.hasNext;
         SceytChatClient = getClient();
         messageQueryBuilder = new SceytChatClient.MessageListQueryBuilder(channelId);
         messageQueryBuilder.reverse(true);
-        _context0.n = 1;
+        _context1.n = 1;
         return call(messageQueryBuilder.build);
       case 1:
-        messageQuery = _context0.v;
+        messageQuery = _context1.v;
         messageQuery.limit = limit || 5;
-        _context0.n = 2;
+        _context1.n = 2;
         return put(setMessagesLoadingStateAC(LOADING_STATE.LOADING));
       case 2:
         result = {
@@ -18761,116 +18869,116 @@ function loadMoreMessages(action) {
           hasNext: false
         };
         if (!(direction === MESSAGE_LOAD_DIRECTION.PREV)) {
-          _context0.n = 6;
+          _context1.n = 6;
           break;
         }
         if (!getHasPrevCached()) {
-          _context0.n = 3;
+          _context1.n = 3;
           break;
         }
         result.messages = getFromAllMessagesByMessageId(messageId, MESSAGE_LOAD_DIRECTION.PREV);
-        _context0.n = 5;
+        _context1.n = 5;
         break;
       case 3:
         if (!hasNext) {
-          _context0.n = 5;
+          _context1.n = 5;
           break;
         }
-        _context0.n = 4;
+        _context1.n = 4;
         return call(messageQuery.loadPreviousMessageId, messageId);
       case 4:
-        result = _context0.v;
+        result = _context1.v;
         if (result.messages.length) {
           addAllMessages(result.messages, MESSAGE_LOAD_DIRECTION.PREV);
         }
-        _context0.n = 5;
+        _context1.n = 5;
         return put(setMessagesHasPrevAC(result.hasNext));
       case 5:
-        _context0.n = 10;
+        _context1.n = 10;
         break;
       case 6:
         if (!getHasNextCached()) {
-          _context0.n = 7;
+          _context1.n = 7;
           break;
         }
         result.messages = getFromAllMessagesByMessageId(messageId, MESSAGE_LOAD_DIRECTION.NEXT);
-        _context0.n = 9;
+        _context1.n = 9;
         break;
       case 7:
         if (!hasNext) {
-          _context0.n = 9;
+          _context1.n = 9;
           break;
         }
         log.info('saga load next from server ... ', messageId);
         messageQuery.reverse = false;
-        _context0.n = 8;
+        _context1.n = 8;
         return call(messageQuery.loadNextMessageId, messageId);
       case 8:
-        result = _context0.v;
+        result = _context1.v;
         log.info('result from server next ... ', result);
         if (result.messages.length) {
           addAllMessages(result.messages, MESSAGE_LOAD_DIRECTION.NEXT);
         }
-        _context0.n = 9;
+        _context1.n = 9;
         return put(setMessagesHasNextAC(result.hasNext));
       case 9:
-        _context0.n = 10;
+        _context1.n = 10;
         return put(setMessagesHasPrevAC(true));
       case 10:
         if (!(result.messages && result.messages.length && result.messages.length > 0)) {
-          _context0.n = 12;
+          _context1.n = 12;
           break;
         }
-        _context0.n = 11;
+        _context1.n = 11;
         return put(addMessagesAC(JSON.parse(JSON.stringify(result.messages)), direction));
       case 11:
-        _context0.n = 13;
+        _context1.n = 13;
         break;
       case 12:
-        _context0.n = 13;
+        _context1.n = 13;
         return put(addMessagesAC([], direction));
       case 13:
-        _context0.n = 14;
+        _context1.n = 14;
         return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
       case 14:
-        _context0.n = 16;
+        _context1.n = 16;
         break;
       case 15:
-        _context0.p = 15;
-        _t0 = _context0.v;
-        log.error('error in load more messages', _t0);
+        _context1.p = 15;
+        _t1 = _context1.v;
+        log.error('error in load more messages', _t1);
       case 16:
-        return _context0.a(2);
+        return _context1.a(2);
     }
-  }, _marked8$1, null, [[0, 15]]);
+  }, _marked9$1, null, [[0, 15]]);
 }
 function addReaction(action) {
-  var payload, channelId, messageId, key, score, reason, enforceUnique, user, channel, _yield$call, _message2, reaction, channelUpdateParam, _t1;
-  return _regenerator().w(function (_context1) {
-    while (1) switch (_context1.p = _context1.n) {
+  var payload, channelId, messageId, key, score, reason, enforceUnique, user, channel, _yield$call, _message2, reaction, channelUpdateParam, _t10;
+  return _regenerator().w(function (_context10) {
+    while (1) switch (_context10.p = _context10.n) {
       case 0:
-        _context1.p = 0;
+        _context10.p = 0;
         payload = action.payload;
         channelId = payload.channelId, messageId = payload.messageId, key = payload.key, score = payload.score, reason = payload.reason, enforceUnique = payload.enforceUnique;
         user = getClient().user;
-        _context1.n = 1;
+        _context10.n = 1;
         return call(getChannelFromMap, channelId);
       case 1:
-        channel = _context1.v;
+        channel = _context10.v;
         if (!channel) {
           channel = getChannelFromAllChannels(channelId);
           if (channel) {
             setChannelInMap(channel);
           }
         }
-        _context1.n = 2;
+        _context10.n = 2;
         return call(channel.addReaction, messageId, key, score, reason, enforceUnique);
       case 2:
-        _yield$call = _context1.v;
+        _yield$call = _context10.v;
         _message2 = _yield$call.message;
         reaction = _yield$call.reaction;
         if (!(user.id === _message2.user.id)) {
-          _context1.n = 4;
+          _context10.n = 4;
           break;
         }
         channelUpdateParam = {
@@ -18878,100 +18986,100 @@ function addReaction(action) {
           lastReactedMessage: _message2,
           newReactions: [reaction]
         };
-        _context1.n = 3;
+        _context10.n = 3;
         return put(updateChannelDataAC(channel.id, channelUpdateParam));
       case 3:
         updateChannelOnAllChannels(channel.id, channelUpdateParam);
       case 4:
-        _context1.n = 5;
+        _context10.n = 5;
         return put(addChannelAC(JSON.parse(JSON.stringify(channel))));
       case 5:
-        _context1.n = 6;
+        _context10.n = 6;
         return put(addReactionToListAC(reaction));
       case 6:
-        _context1.n = 7;
+        _context10.n = 7;
         return put(addReactionToMessageAC(_message2, reaction, true));
       case 7:
         addReactionToMessageOnMap(channelId, _message2, reaction, true);
         addReactionOnAllMessages(_message2, reaction, true);
-        _context1.n = 9;
+        _context10.n = 9;
         break;
       case 8:
-        _context1.p = 8;
-        _t1 = _context1.v;
-        log.error('ERROR in add reaction', _t1.message);
+        _context10.p = 8;
+        _t10 = _context10.v;
+        log.error('ERROR in add reaction', _t10.message);
       case 9:
-        return _context1.a(2);
+        return _context10.a(2);
     }
-  }, _marked9$1, null, [[0, 8]]);
+  }, _marked0$1, null, [[0, 8]]);
 }
 function deleteReaction(action) {
-  var payload, channelId, messageId, key, isLastReaction, channel, _yield$call2, _message3, reaction, channelUpdateParam, _t10;
-  return _regenerator().w(function (_context10) {
-    while (1) switch (_context10.p = _context10.n) {
+  var payload, channelId, messageId, key, isLastReaction, channel, _yield$call2, _message3, reaction, channelUpdateParam, _t11;
+  return _regenerator().w(function (_context11) {
+    while (1) switch (_context11.p = _context11.n) {
       case 0:
-        _context10.p = 0;
+        _context11.p = 0;
         payload = action.payload;
         channelId = payload.channelId, messageId = payload.messageId, key = payload.key, isLastReaction = payload.isLastReaction;
-        _context10.n = 1;
+        _context11.n = 1;
         return call(getChannelFromMap, channelId);
       case 1:
-        channel = _context10.v;
+        channel = _context11.v;
         if (!channel) {
           channel = getChannelFromAllChannels(channelId);
           if (channel) {
             setChannelInMap(channel);
           }
         }
-        _context10.n = 2;
+        _context11.n = 2;
         return call(channel.deleteReaction, messageId, key);
       case 2:
-        _yield$call2 = _context10.v;
+        _yield$call2 = _context11.v;
         _message3 = _yield$call2.message;
         reaction = _yield$call2.reaction;
         if (!isLastReaction) {
-          _context10.n = 4;
+          _context11.n = 4;
           break;
         }
         channelUpdateParam = {
           userMessageReactions: [],
           lastReactedMessage: null
         };
-        _context10.n = 3;
+        _context11.n = 3;
         return put(updateChannelDataAC(channel.id, channelUpdateParam));
       case 3:
         updateChannelOnAllChannels(channel.id, channelUpdateParam);
       case 4:
         log.info('message received. ... ', _message3);
-        _context10.n = 5;
+        _context11.n = 5;
         return put(deleteReactionFromListAC(reaction));
       case 5:
-        _context10.n = 6;
+        _context11.n = 6;
         return put(deleteReactionFromMessageAC(_message3, reaction, true));
       case 6:
         removeReactionToMessageOnMap(channelId, _message3, reaction, true);
         removeReactionOnAllMessages(_message3, reaction, true);
-        _context10.n = 8;
+        _context11.n = 8;
         break;
       case 7:
-        _context10.p = 7;
-        _t10 = _context10.v;
-        log.error('ERROR in delete reaction', _t10.message);
+        _context11.p = 7;
+        _t11 = _context11.v;
+        log.error('ERROR in delete reaction', _t11.message);
       case 8:
-        return _context10.a(2);
+        return _context11.a(2);
     }
-  }, _marked0$1, null, [[0, 7]]);
+  }, _marked1$1, null, [[0, 7]]);
 }
 function getReactions(action) {
-  var payload, messageId, key, limit, SceytChatClient, reactionQueryBuilder, reactionQuery, result, _t11;
-  return _regenerator().w(function (_context11) {
-    while (1) switch (_context11.p = _context11.n) {
+  var payload, messageId, key, limit, SceytChatClient, reactionQueryBuilder, reactionQuery, result, _t12;
+  return _regenerator().w(function (_context12) {
+    while (1) switch (_context12.p = _context12.n) {
       case 0:
-        _context11.p = 0;
+        _context12.p = 0;
         payload = action.payload;
         messageId = payload.messageId, key = payload.key, limit = payload.limit;
         SceytChatClient = getClient();
-        _context11.n = 1;
+        _context12.n = 1;
         return put(setReactionsLoadingStateAC(LOADING_STATE.LOADING));
       case 1:
         reactionQueryBuilder = new SceytChatClient.ReactionListQueryBuilder(messageId);
@@ -18979,74 +19087,74 @@ function getReactions(action) {
         if (key) {
           reactionQueryBuilder.setKey(key);
         }
-        _context11.n = 2;
+        _context12.n = 2;
         return call(reactionQueryBuilder.build);
       case 2:
-        reactionQuery = _context11.v;
-        _context11.n = 3;
+        reactionQuery = _context12.v;
+        _context12.n = 3;
         return call(reactionQuery.loadNext);
       case 3:
-        result = _context11.v;
+        result = _context12.v;
         query.ReactionsQuery = reactionQuery;
-        _context11.n = 4;
+        _context12.n = 4;
         return put(setReactionsListAC(result.reactions, result.hasNext));
       case 4:
-        _context11.n = 5;
+        _context12.n = 5;
         return put(setReactionsLoadingStateAC(LOADING_STATE.LOADED));
       case 5:
-        _context11.n = 7;
+        _context12.n = 7;
         break;
       case 6:
-        _context11.p = 6;
-        _t11 = _context11.v;
-        log.error('ERROR in get reactions', _t11.message);
+        _context12.p = 6;
+        _t12 = _context12.v;
+        log.error('ERROR in get reactions', _t12.message);
       case 7:
-        return _context11.a(2);
+        return _context12.a(2);
     }
-  }, _marked1$1, null, [[0, 6]]);
+  }, _marked10$1, null, [[0, 6]]);
 }
 function loadMoreReactions(action) {
-  var payload, limit, ReactionQuery, result, _t12;
-  return _regenerator().w(function (_context12) {
-    while (1) switch (_context12.p = _context12.n) {
+  var payload, limit, ReactionQuery, result, _t13;
+  return _regenerator().w(function (_context13) {
+    while (1) switch (_context13.p = _context13.n) {
       case 0:
-        _context12.p = 0;
+        _context13.p = 0;
         payload = action.payload;
         limit = payload.limit;
-        _context12.n = 1;
+        _context13.n = 1;
         return put(setReactionsLoadingStateAC(LOADING_STATE.LOADING));
       case 1:
         ReactionQuery = query.ReactionsQuery;
         if (limit) {
           ReactionQuery.limit = limit;
         }
-        _context12.n = 2;
+        _context13.n = 2;
         return call(ReactionQuery.loadNext);
       case 2:
-        result = _context12.v;
-        _context12.n = 3;
+        result = _context13.v;
+        _context13.n = 3;
         return put(addReactionsToListAC(result.reactions, result.hasNext));
       case 3:
-        _context12.n = 4;
+        _context13.n = 4;
         return put(setReactionsLoadingStateAC(LOADING_STATE.LOADED));
       case 4:
-        _context12.n = 6;
+        _context13.n = 6;
         break;
       case 5:
-        _context12.p = 5;
-        _t12 = _context12.v;
-        log.error('ERROR in load more reactions', _t12.message);
+        _context13.p = 5;
+        _t13 = _context13.v;
+        log.error('ERROR in load more reactions', _t13.message);
       case 6:
-        return _context12.a(2);
+        return _context13.a(2);
     }
-  }, _marked10$1, null, [[0, 5]]);
+  }, _marked11$1, null, [[0, 5]]);
 }
 function getMessageAttachments(action) {
-  var _action$payload2, channelId, attachmentType, limit, direction, attachmentId, forPopup, SceytChatClient, typeList, AttachmentByTypeQueryBuilder, AttachmentByTypeQuery, result, _t13;
-  return _regenerator().w(function (_context13) {
-    while (1) switch (_context13.p = _context13.n) {
+  var _action$payload2, channelId, attachmentType, limit, direction, attachmentId, forPopup, SceytChatClient, typeList, AttachmentByTypeQueryBuilder, AttachmentByTypeQuery, result, _t14;
+  return _regenerator().w(function (_context14) {
+    while (1) switch (_context14.p = _context14.n) {
       case 0:
-        _context13.p = 0;
+        _context14.p = 0;
         _action$payload2 = action.payload, channelId = _action$payload2.channelId, attachmentType = _action$payload2.attachmentType, limit = _action$payload2.limit, direction = _action$payload2.direction, attachmentId = _action$payload2.attachmentId, forPopup = _action$payload2.forPopup;
         SceytChatClient = getClient();
         typeList = [attachmentTypes.video, attachmentTypes.image, attachmentTypes.file, attachmentTypes.link, attachmentTypes.voice];
@@ -19061,240 +19169,243 @@ function getMessageAttachments(action) {
         }
         AttachmentByTypeQueryBuilder = new SceytChatClient.AttachmentListQueryBuilder(channelId, typeList);
         AttachmentByTypeQueryBuilder.limit(limit || 34);
-        _context13.n = 1;
+        _context14.n = 1;
         return call(AttachmentByTypeQueryBuilder.build);
       case 1:
-        AttachmentByTypeQuery = _context13.v;
+        AttachmentByTypeQuery = _context14.v;
         if (forPopup) {
           AttachmentByTypeQuery.reverse = true;
         }
         if (!(direction === queryDirection.NEXT)) {
-          _context13.n = 3;
+          _context14.n = 3;
           break;
         }
-        _context13.n = 2;
+        _context14.n = 2;
         return call(AttachmentByTypeQuery.loadPrevious);
       case 2:
-        result = _context13.v;
-        _context13.n = 7;
+        result = _context14.v;
+        _context14.n = 7;
         break;
       case 3:
         if (!(direction === queryDirection.NEAR)) {
-          _context13.n = 5;
+          _context14.n = 5;
           break;
         }
-        _context13.n = 4;
+        _context14.n = 4;
         return call(AttachmentByTypeQuery.loadNearMessageId, attachmentId);
       case 4:
-        result = _context13.v;
-        _context13.n = 7;
+        result = _context14.v;
+        _context14.n = 7;
         break;
       case 5:
-        _context13.n = 6;
+        _context14.n = 6;
         return call(AttachmentByTypeQuery.loadPrevious);
       case 6:
-        result = _context13.v;
+        result = _context14.v;
       case 7:
         if (!forPopup) {
-          _context13.n = 10;
+          _context14.n = 10;
           break;
         }
         query.AttachmentByTypeQueryForPopup = AttachmentByTypeQuery;
-        _context13.n = 8;
+        _context14.n = 8;
         return put(setAttachmentsForPopupAC(JSON.parse(JSON.stringify(result.attachments))));
       case 8:
-        _context13.n = 9;
+        _context14.n = 9;
         return put(setAttachmentsCompleteForPopupAC(result.hasNext));
       case 9:
-        _context13.n = 12;
+        _context14.n = 12;
         break;
       case 10:
         query.AttachmentByTypeQuery = AttachmentByTypeQuery;
-        _context13.n = 11;
+        _context14.n = 11;
         return put(setAttachmentsCompleteAC(result.hasNext));
       case 11:
-        _context13.n = 12;
+        _context14.n = 12;
         return put(setAttachmentsAC(JSON.parse(JSON.stringify(result.attachments))));
       case 12:
-        _context13.n = 14;
+        _context14.n = 14;
         break;
       case 13:
-        _context13.p = 13;
-        _t13 = _context13.v;
-        log.error('error in message attachment query', _t13);
+        _context14.p = 13;
+        _t14 = _context14.v;
+        log.error('error in message attachment query', _t14);
       case 14:
-        return _context13.a(2);
+        return _context14.a(2);
     }
-  }, _marked11$1, null, [[0, 13]]);
+  }, _marked12$1, null, [[0, 13]]);
 }
 function loadMoreMessageAttachments(action) {
-  var _action$payload3, limit, direction, forPopup, AttachmentQuery, _yield$call3, attachments, hasNext, _t14;
-  return _regenerator().w(function (_context14) {
-    while (1) switch (_context14.p = _context14.n) {
+  var _action$payload3, limit, direction, forPopup, AttachmentQuery, _yield$call3, attachments, hasNext, _t15;
+  return _regenerator().w(function (_context15) {
+    while (1) switch (_context15.p = _context15.n) {
       case 0:
-        _context14.p = 0;
+        _context15.p = 0;
         _action$payload3 = action.payload, limit = _action$payload3.limit, direction = _action$payload3.direction, forPopup = _action$payload3.forPopup;
         if (forPopup) {
           AttachmentQuery = query.AttachmentByTypeQueryForPopup;
         } else {
           AttachmentQuery = query.AttachmentByTypeQuery;
         }
-        _context14.n = 1;
+        _context15.n = 1;
         return put(setMessagesLoadingStateAC(LOADING_STATE.LOADING));
       case 1:
         AttachmentQuery.limit = limit;
-        _context14.n = 2;
+        _context15.n = 2;
         return call(AttachmentQuery.loadPrevious);
       case 2:
-        _yield$call3 = _context14.v;
+        _yield$call3 = _context15.v;
         attachments = _yield$call3.attachments;
         hasNext = _yield$call3.hasNext;
         if (!forPopup) {
-          _context14.n = 4;
+          _context15.n = 4;
           break;
         }
-        _context14.n = 3;
+        _context15.n = 3;
         return put(addAttachmentsForPopupAC(attachments, direction));
       case 3:
-        _context14.n = 7;
+        _context15.n = 7;
         break;
       case 4:
-        _context14.n = 5;
+        _context15.n = 5;
         return put(setAttachmentsCompleteAC(hasNext));
       case 5:
-        _context14.n = 6;
+        _context15.n = 6;
         return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
       case 6:
-        _context14.n = 7;
+        _context15.n = 7;
         return put(addAttachmentsAC(attachments));
       case 7:
-        _context14.n = 9;
+        _context15.n = 9;
         break;
       case 8:
-        _context14.p = 8;
-        _t14 = _context14.v;
-        log.error('error in message attachment query', _t14);
+        _context15.p = 8;
+        _t15 = _context15.v;
+        log.error('error in message attachment query', _t15);
       case 9:
-        return _context14.a(2);
+        return _context15.a(2);
     }
-  }, _marked12$1, null, [[0, 8]]);
+  }, _marked13$1, null, [[0, 8]]);
 }
 function pauseAttachmentUploading(action) {
-  var attachmentId, isPaused, _t15;
-  return _regenerator().w(function (_context15) {
-    while (1) switch (_context15.p = _context15.n) {
+  var attachmentId, isPaused, _t16;
+  return _regenerator().w(function (_context16) {
+    while (1) switch (_context16.p = _context16.n) {
       case 0:
-        _context15.p = 0;
+        _context16.p = 0;
         attachmentId = action.payload.attachmentId;
         if (!getCustomUploader()) {
-          _context15.n = 1;
+          _context16.n = 1;
           break;
         }
         isPaused = pauseUpload(attachmentId);
         if (!isPaused) {
-          _context15.n = 1;
+          _context16.n = 1;
           break;
         }
-        _context15.n = 1;
+        _context16.n = 1;
         return put(updateAttachmentUploadingStateAC(UPLOAD_STATE.PAUSED, attachmentId));
       case 1:
-        _context15.n = 3;
+        _context16.n = 3;
         break;
       case 2:
-        _context15.p = 2;
-        _t15 = _context15.v;
-        log.error('error in pause attachment uploading', _t15);
+        _context16.p = 2;
+        _t16 = _context16.v;
+        log.error('error in pause attachment uploading', _t16);
       case 3:
-        return _context15.a(2);
+        return _context16.a(2);
     }
-  }, _marked13$1, null, [[0, 2]]);
+  }, _marked14$1, null, [[0, 2]]);
 }
 function resumeAttachmentUploading(action) {
-  var attachmentId, isResumed, _t16;
-  return _regenerator().w(function (_context16) {
-    while (1) switch (_context16.p = _context16.n) {
+  var attachmentId, isResumed, _t17;
+  return _regenerator().w(function (_context17) {
+    while (1) switch (_context17.p = _context17.n) {
       case 0:
-        _context16.p = 0;
+        _context17.p = 0;
         attachmentId = action.payload.attachmentId;
         log.info('resume for attachment ... ', attachmentId);
         if (!getCustomUploader()) {
-          _context16.n = 1;
+          _context17.n = 1;
           break;
         }
         isResumed = resumeUpload(attachmentId);
         if (!isResumed) {
-          _context16.n = 1;
+          _context17.n = 1;
           break;
         }
-        _context16.n = 1;
+        _context17.n = 1;
         return put(updateAttachmentUploadingStateAC(UPLOAD_STATE.UPLOADING, attachmentId));
       case 1:
-        _context16.n = 3;
+        _context17.n = 3;
         break;
       case 2:
-        _context16.p = 2;
-        _t16 = _context16.v;
-        log.error('error in resume attachment uploading', _t16);
+        _context17.p = 2;
+        _t17 = _context17.v;
+        log.error('error in resume attachment uploading', _t17);
       case 3:
-        return _context16.a(2);
+        return _context17.a(2);
     }
-  }, _marked14$1, null, [[0, 2]]);
+  }, _marked15$1, null, [[0, 2]]);
 }
 function MessageSaga() {
-  return _regenerator().w(function (_context17) {
-    while (1) switch (_context17.n) {
+  return _regenerator().w(function (_context18) {
+    while (1) switch (_context18.n) {
       case 0:
-        _context17.n = 1;
+        _context18.n = 1;
         return takeEvery(SEND_MESSAGE, sendMessage);
       case 1:
-        _context17.n = 2;
+        _context18.n = 2;
         return takeEvery(SEND_TEXT_MESSAGE, sendTextMessage);
       case 2:
-        _context17.n = 3;
+        _context18.n = 3;
         return takeEvery(FORWARD_MESSAGE, forwardMessage);
       case 3:
-        _context17.n = 4;
+        _context18.n = 4;
         return takeEvery(RESEND_MESSAGE, resendMessage);
       case 4:
-        _context17.n = 5;
+        _context18.n = 5;
         return takeLatest(EDIT_MESSAGE, editMessage);
       case 5:
-        _context17.n = 6;
+        _context18.n = 6;
         return takeEvery(DELETE_MESSAGE, deleteMessage);
       case 6:
-        _context17.n = 7;
+        _context18.n = 7;
         return takeLatest(GET_MESSAGES, getMessagesQuery);
       case 7:
-        _context17.n = 8;
-        return takeLatest(GET_MESSAGES_ATTACHMENTS, getMessageAttachments);
+        _context18.n = 8;
+        return takeLatest(GET_MESSAGE, getMessageQuery);
       case 8:
-        _context17.n = 9;
-        return takeLatest(LOAD_MORE_MESSAGES_ATTACHMENTS, loadMoreMessageAttachments);
+        _context18.n = 9;
+        return takeLatest(GET_MESSAGES_ATTACHMENTS, getMessageAttachments);
       case 9:
-        _context17.n = 10;
-        return takeLatest(ADD_REACTION, addReaction);
+        _context18.n = 10;
+        return takeLatest(LOAD_MORE_MESSAGES_ATTACHMENTS, loadMoreMessageAttachments);
       case 10:
-        _context17.n = 11;
-        return takeLatest(DELETE_REACTION, deleteReaction);
+        _context18.n = 11;
+        return takeLatest(ADD_REACTION, addReaction);
       case 11:
-        _context17.n = 12;
-        return takeEvery(LOAD_MORE_MESSAGES, loadMoreMessages);
+        _context18.n = 12;
+        return takeLatest(DELETE_REACTION, deleteReaction);
       case 12:
-        _context17.n = 13;
-        return takeEvery(GET_REACTIONS, getReactions);
+        _context18.n = 13;
+        return takeEvery(LOAD_MORE_MESSAGES, loadMoreMessages);
       case 13:
-        _context17.n = 14;
-        return takeEvery(LOAD_MORE_REACTIONS, loadMoreReactions);
+        _context18.n = 14;
+        return takeEvery(GET_REACTIONS, getReactions);
       case 14:
-        _context17.n = 15;
-        return takeEvery(PAUSE_ATTACHMENT_UPLOADING, pauseAttachmentUploading);
+        _context18.n = 15;
+        return takeEvery(LOAD_MORE_REACTIONS, loadMoreReactions);
       case 15:
-        _context17.n = 16;
-        return takeEvery(RESUME_ATTACHMENT_UPLOADING, resumeAttachmentUploading);
+        _context18.n = 16;
+        return takeEvery(PAUSE_ATTACHMENT_UPLOADING, pauseAttachmentUploading);
       case 16:
-        return _context17.a(2);
+        _context18.n = 17;
+        return takeEvery(RESUME_ATTACHMENT_UPLOADING, resumeAttachmentUploading);
+      case 17:
+        return _context18.a(2);
     }
-  }, _marked15$1);
+  }, _marked16$1);
 }
 
 var _marked$4 = /*#__PURE__*/_regenerator().m(getMembers),
@@ -20062,6 +20173,12 @@ var store = configureStore({
 });
 sagaMiddleware.run(rootSaga);
 
+var SceytReduxContext = /*#__PURE__*/React__default.createContext(null);
+
+var useSelector = createSelectorHook(SceytReduxContext);
+var useDispatch = createDispatchHook(SceytReduxContext);
+var useStore = createStoreHook(SceytReduxContext);
+
 var channelsSelector = function channelsSelector(store) {
   return store.ChannelReducer.channels;
 };
@@ -20545,7 +20662,8 @@ var SceytChatContainer = function SceytChatContainer(_ref) {
     log.setLevel(logLevel);
   }, []);
   return /*#__PURE__*/React__default.createElement(Provider, {
-    store: store
+    store: store,
+    context: SceytReduxContext
   }, /*#__PURE__*/React__default.createElement(SceytChat, {
     client: client,
     theme: theme,
@@ -21002,7 +21120,6 @@ var ChannelMessageText = function ChannelMessageText(_ref2) {
   }), channel.lastReactedMessage && '"')))));
 };
 var Channel = function Channel(_ref3) {
-  var _channel$metadata, _channel$metadata2;
   var channel = _ref3.channel,
     theme = _ref3.theme,
     _ref3$showAvatar = _ref3.showAvatar,
@@ -21047,7 +21164,7 @@ var Channel = function Channel(_ref3) {
   var activeChannel = useSelector(activeChannelSelector) || {};
   var channelDraftIsRemoved = useSelector(channelMessageDraftIsRemovedSelector);
   var isDirectChannel = channel.type === DEFAULT_CHANNEL_TYPE.DIRECT;
-  var isSelfChannel = isDirectChannel && ((_channel$metadata = channel.metadata) === null || _channel$metadata === void 0 ? void 0 : _channel$metadata.s);
+  var isSelfChannel = isDirectChannel && channel.memberCount === 1 && channel.members.length > 0 && channel.members[0].id === user.id;
   var directChannelUser = isDirectChannel && channel.members.find(function (member) {
     return member.id !== user.id;
   });
@@ -21189,7 +21306,7 @@ var Channel = function Channel(_ref3) {
     subjectLineHeight: channelSubjectLineHeight,
     subjectColor: channelSubjectColor || textPrimary,
     avatarSize: channelAvatarSize
-  }, /*#__PURE__*/React__default.createElement("h3", null, channel.subject || (isDirectChannel && directChannelUser ? makeUsername(contactsMap && contactsMap[directChannelUser.id], directChannelUser, getFromContacts) : (_channel$metadata2 = channel.metadata) !== null && _channel$metadata2 !== void 0 && _channel$metadata2.s ? 'Me' : '')), channel.muted && (/*#__PURE__*/React__default.createElement(MutedIcon, {
+  }, /*#__PURE__*/React__default.createElement("h3", null, channel.subject || (isDirectChannel && directChannelUser ? makeUsername(contactsMap && contactsMap[directChannelUser.id], directChannelUser, getFromContacts) : isSelfChannel ? 'Me' : '')), channel.muted && (/*#__PURE__*/React__default.createElement(MutedIcon, {
     color: notificationsIsMutedIconColor || iconInactive
   }, notificationsIsMutedIcon || /*#__PURE__*/React__default.createElement(SvgUnmuteNotifications, null))), (lastMessage || typingOrRecording.items.length > 0 || draftMessageText) && (/*#__PURE__*/React__default.createElement(LastMessage, {
     color: textSecondary,
@@ -23957,7 +24074,6 @@ function SvgInfo(props) {
 
 var _templateObject$i, _templateObject2$g, _templateObject3$c, _templateObject4$a, _templateObject5$8, _templateObject6$6, _templateObject7$5, _templateObject8$5, _templateObject9$5, _templateObject0$4;
 function ChatHeader(_ref) {
-  var _activeChannel$metada;
   var infoIcon = _ref.infoIcon,
     backgroundColor = _ref.backgroundColor,
     titleColor = _ref.titleColor,
@@ -23996,7 +24112,7 @@ function ChatHeader(_ref) {
   var channelListHidden = useSelector(channelListHiddenSelector);
   var channelDetailsIsOpen = useSelector(channelInfoIsOpenSelector, shallowEqual);
   var isDirectChannel = activeChannel.type === DEFAULT_CHANNEL_TYPE.DIRECT;
-  var isSelfChannel = isDirectChannel && ((_activeChannel$metada = activeChannel.metadata) === null || _activeChannel$metada === void 0 ? void 0 : _activeChannel$metada.s);
+  var isSelfChannel = isDirectChannel && activeChannel.memberCount === 1 && activeChannel.members.length > 0 && activeChannel.members[0].id === user.id;
   var directChannelUser = isDirectChannel && activeChannel.members.find(function (member) {
     return member.id !== user.id;
   });
@@ -24882,10 +24998,9 @@ function ForwardMessagePopup(_ref) {
     setSearchValue('');
   };
   var handleChannelSelect = function handleChannelSelect(isSelected, channel) {
-    var _channel$metadata;
     var newSelectedChannels = [].concat(selectedChannels);
     var isDirectChannel = channel.type === DEFAULT_CHANNEL_TYPE.DIRECT;
-    var isSelfChannel = isDirectChannel && ((_channel$metadata = channel.metadata) === null || _channel$metadata === void 0 ? void 0 : _channel$metadata.s);
+    var isSelfChannel = isDirectChannel && channel.memberCount === 1 && channel.members.length > 0 && channel.members[0].id === user.id;
     var directChannelUser = isDirectChannel && channel.members.find(function (member) {
       return member.id !== user.id;
     });
@@ -24998,12 +25113,11 @@ function ForwardMessagePopup(_ref) {
     color: textSecondary,
     margin: '0 0 12px'
   }, "Chats & Groups"), searchedChannels.chats_groups.map(function (channel) {
-    var _channel$metadata2;
     var isSelected = selectedChannels.findIndex(function (chan) {
       return chan.id === channel.id;
     }) >= 0;
     var isDirectChannel = channel.type === DEFAULT_CHANNEL_TYPE.DIRECT;
-    var isSelfChannel = isDirectChannel && ((_channel$metadata2 = channel.metadata) === null || _channel$metadata2 === void 0 ? void 0 : _channel$metadata2.s);
+    var isSelfChannel = isDirectChannel && channel.memberCount === 1 && channel.members.length > 0 && channel.members[0].id === user.id;
     var directChannelUser = isDirectChannel && isSelfChannel ? user : channel.members.find(function (member) {
       return member.id !== user.id;
     });
@@ -25074,9 +25188,8 @@ function ForwardMessagePopup(_ref) {
   }))), !searchedChannels.chats_groups.length && !searchedChannels.channels.length && (/*#__PURE__*/React__default.createElement(NoResults, {
     color: textSecondary
   }, "No channels found")))) : channels.map(function (channel) {
-    var _channel$metadata3;
     var isDirectChannel = channel.type === DEFAULT_CHANNEL_TYPE.DIRECT;
-    var isSelfChannel = isDirectChannel && ((_channel$metadata3 = channel.metadata) === null || _channel$metadata3 === void 0 ? void 0 : _channel$metadata3.s);
+    var isSelfChannel = isDirectChannel && channel.memberCount === 1 && channel.members.length > 0 && channel.members[0].id === user.id;
     var directChannelUser = isDirectChannel && isSelfChannel ? user : channel.members.find(function (member) {
       return member.id !== user.id;
     });
@@ -27004,7 +27117,7 @@ var VideoPreview = /*#__PURE__*/memo(function VideoPreview(_ref) {
     preload: 'auto',
     id: 'video',
     src: file.attachmentUrl || videoUrl
-  }), videoCurrentTime && (/*#__PURE__*/React__default.createElement(VideoControls, null, !isPreview && !!videoCurrentTime && !isRepliedMessage && !uploading && !isDetailsView && (
+  }), videoCurrentTime && !isRepliedMessage && (/*#__PURE__*/React__default.createElement(VideoControls, null, !isPreview && !!videoCurrentTime && !isRepliedMessage && !uploading && !isDetailsView && (
   /*#__PURE__*/
   React__default.createElement(VideoPlayButton, null, /*#__PURE__*/React__default.createElement(SvgPlayVideo, null))), /*#__PURE__*/React__default.createElement(VideoTime, {
     isDetailsView: isDetailsView,
@@ -31057,6 +31170,12 @@ var OGMetadata = function OGMetadata(_ref) {
   var _useState = useState(null),
     metadata = _useState[0],
     setMetadata = _useState[1];
+  var _useState2 = useState(true),
+    imageLoadError = _useState2[0],
+    setImageLoadError = _useState2[1];
+  var _useState3 = useState(true),
+    faviconLoadError = _useState3[0],
+    setFaviconLoadError = _useState3[1];
   var attachment = useMemo(function () {
     return attachments.find(function (attachment) {
       return attachment.type === attachmentTypes.link;
@@ -31078,6 +31197,7 @@ var OGMetadata = function OGMetadata(_ref) {
             });
           }, function () {
             console.log('Failed to fetch OG metadata');
+            setMetadata(null);
           });
           if (_temp && _temp.then) return _temp.then(function () {});
         }
@@ -31129,13 +31249,25 @@ var OGMetadata = function OGMetadata(_ref) {
       window.open(attachment === null || attachment === void 0 ? void 0 : attachment.url, '_blank');
     }
   }, /*#__PURE__*/React__default.createElement(ImageContainer, {
-    showOGMetadata: !!showOGMetadata
-  }, metadata !== null && metadata !== void 0 && (_metadata$og4 = metadata.og) !== null && _metadata$og4 !== void 0 && (_metadata$og4$image = _metadata$og4.image) !== null && _metadata$og4$image !== void 0 && (_metadata$og4$image$ = _metadata$og4$image[0]) !== null && _metadata$og4$image$ !== void 0 && _metadata$og4$image$.url ? /*#__PURE__*/React__default.createElement(Img, {
+    showOGMetadata: !!showOGMetadata && !imageLoadError
+  }, metadata !== null && metadata !== void 0 && (_metadata$og4 = metadata.og) !== null && _metadata$og4 !== void 0 && (_metadata$og4$image = _metadata$og4.image) !== null && _metadata$og4$image !== void 0 && (_metadata$og4$image$ = _metadata$og4$image[0]) !== null && _metadata$og4$image$ !== void 0 && _metadata$og4$image$.url ? (/*#__PURE__*/React__default.createElement(Img, {
     src: metadata === null || metadata === void 0 ? void 0 : (_metadata$og5 = metadata.og) === null || _metadata$og5 === void 0 ? void 0 : (_metadata$og5$image = _metadata$og5.image) === null || _metadata$og5$image === void 0 ? void 0 : (_metadata$og5$image$ = _metadata$og5$image[0]) === null || _metadata$og5$image$ === void 0 ? void 0 : _metadata$og5$image$.url,
-    alt: 'OG metadata image'
-  }) : null), showOGMetadata ? (/*#__PURE__*/React__default.createElement(OGText, null, /*#__PURE__*/React__default.createElement(Url, null, ogUrl), metadata !== null && metadata !== void 0 && (_metadata$og6 = metadata.og) !== null && _metadata$og6 !== void 0 && _metadata$og6.title ? (/*#__PURE__*/React__default.createElement(Title, null, metadata !== null && metadata !== void 0 && (_metadata$og7 = metadata.og) !== null && _metadata$og7 !== void 0 && (_metadata$og7$favicon = _metadata$og7.favicon) !== null && _metadata$og7$favicon !== void 0 && _metadata$og7$favicon.url ? /*#__PURE__*/React__default.createElement(Favicon, {
-    src: metadata === null || metadata === void 0 ? void 0 : (_metadata$og8 = metadata.og) === null || _metadata$og8 === void 0 ? void 0 : (_metadata$og8$favicon = _metadata$og8.favicon) === null || _metadata$og8$favicon === void 0 ? void 0 : _metadata$og8$favicon.url
-  }) : null, /*#__PURE__*/React__default.createElement("span", null, metadata === null || metadata === void 0 ? void 0 : (_metadata$og9 = metadata.og) === null || _metadata$og9 === void 0 ? void 0 : _metadata$og9.title))) : null, metadata !== null && metadata !== void 0 && (_metadata$og0 = metadata.og) !== null && _metadata$og0 !== void 0 && _metadata$og0.description ? /*#__PURE__*/React__default.createElement(Desc, null, metadata === null || metadata === void 0 ? void 0 : (_metadata$og1 = metadata.og) === null || _metadata$og1 === void 0 ? void 0 : _metadata$og1.description) : null)) : null));
+    alt: 'OG metadata image',
+    onLoad: function onLoad() {
+      return setImageLoadError(false);
+    },
+    onError: function onError() {
+      return setImageLoadError(true);
+    }
+  })) : null), showOGMetadata ? (/*#__PURE__*/React__default.createElement(OGText, null, /*#__PURE__*/React__default.createElement(Url, null, ogUrl), metadata !== null && metadata !== void 0 && (_metadata$og6 = metadata.og) !== null && _metadata$og6 !== void 0 && _metadata$og6.title ? (/*#__PURE__*/React__default.createElement(Title, null, metadata !== null && metadata !== void 0 && (_metadata$og7 = metadata.og) !== null && _metadata$og7 !== void 0 && (_metadata$og7$favicon = _metadata$og7.favicon) !== null && _metadata$og7$favicon !== void 0 && _metadata$og7$favicon.url && !faviconLoadError ? (/*#__PURE__*/React__default.createElement(Favicon, {
+    src: metadata === null || metadata === void 0 ? void 0 : (_metadata$og8 = metadata.og) === null || _metadata$og8 === void 0 ? void 0 : (_metadata$og8$favicon = _metadata$og8.favicon) === null || _metadata$og8$favicon === void 0 ? void 0 : _metadata$og8$favicon.url,
+    onLoad: function onLoad() {
+      return setFaviconLoadError(false);
+    },
+    onError: function onError() {
+      return setFaviconLoadError(true);
+    }
+  })) : null, /*#__PURE__*/React__default.createElement("span", null, metadata === null || metadata === void 0 ? void 0 : (_metadata$og9 = metadata.og) === null || _metadata$og9 === void 0 ? void 0 : _metadata$og9.title))) : null, metadata !== null && metadata !== void 0 && (_metadata$og0 = metadata.og) !== null && _metadata$og0 !== void 0 && _metadata$og0.description ? /*#__PURE__*/React__default.createElement(Desc, null, metadata === null || metadata === void 0 ? void 0 : (_metadata$og1 = metadata.og) === null || _metadata$og1 === void 0 ? void 0 : _metadata$og1.description) : null)) : null));
 };
 var OGMetadataContainer = styled.div(_templateObject$A || (_templateObject$A = _taggedTemplateLiteralLoose(["\n  min-width: inherit;\n  max-width: inherit;\n  display: grid;\n  grid-template-columns: 1fr;\n  background-color: rgba(0, 0, 0, 0.034);\n  border-radius: 6px;\n  margin-bottom: 0.4rem;\n  margin: 0 auto;\n  margin-bottom: ", ";\n  &:hover {\n    background-color: rgba(0, 0, 0, 0.1);\n    cursor: pointer;\n  }\n"])), function (_ref2) {
   var showOGMetadata = _ref2.showOGMetadata;
@@ -32038,6 +32170,7 @@ var Message$1 = function Message(_ref) {
   };
   useEffect(function () {
     if (isVisible) {
+      var _channel$lastMessage;
       if (setLastVisibleMessageId) {
         setLastVisibleMessageId(message.id);
       }
@@ -32045,7 +32178,7 @@ var Message$1 = function Message(_ref) {
       if (!channel.isLinkedChannel) {
         setMessageToVisibleMessagesMap(message);
       }
-      if (scrollToNewMessage.scrollToBottom && (message.id === channel.lastMessage.id || !message.id)) {
+      if (scrollToNewMessage.scrollToBottom && ((message === null || message === void 0 ? void 0 : message.id) === ((_channel$lastMessage = channel.lastMessage) === null || _channel$lastMessage === void 0 ? void 0 : _channel$lastMessage.id) || !(message !== null && message !== void 0 && message.id))) {
         dispatch(scrollToNewMessageAC(false, false, false));
         dispatch(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
       }
@@ -32382,7 +32515,7 @@ var Message$1 = function Message(_ref) {
   })));
 };
 var Message$2 = /*#__PURE__*/React__default.memo(Message$1, function (prevProps, nextProps) {
-  return prevProps.message.deliveryStatus === nextProps.message.deliveryStatus && prevProps.message.state === nextProps.message.state && prevProps.message.userReactions === nextProps.message.userReactions && prevProps.message.body === nextProps.message.body && prevProps.message.reactionTotals === nextProps.message.reactionTotals && prevProps.message.attachments === nextProps.message.attachments && prevProps.message.userMarkers === nextProps.message.userMarkers && prevProps.prevMessage === nextProps.prevMessage && prevProps.nextMessage === nextProps.nextMessage && prevProps.selectedMessagesMap === nextProps.selectedMessagesMap && prevProps.contactsMap === nextProps.contactsMap && prevProps.connectionStatus === nextProps.connectionStatus && prevProps.openedMessageMenuId === nextProps.openedMessageMenuId && prevProps.theme === nextProps.theme;
+  return prevProps.message.deliveryStatus === nextProps.message.deliveryStatus && prevProps.message.state === nextProps.message.state && prevProps.message.userReactions === nextProps.message.userReactions && prevProps.message.body === nextProps.message.body && prevProps.message.reactionTotals === nextProps.message.reactionTotals && prevProps.message.attachments === nextProps.message.attachments && prevProps.message.metadata === nextProps.message.metadata && prevProps.message.userMarkers === nextProps.message.userMarkers && prevProps.prevMessage === nextProps.prevMessage && prevProps.nextMessage === nextProps.nextMessage && prevProps.selectedMessagesMap === nextProps.selectedMessagesMap && prevProps.contactsMap === nextProps.contactsMap && prevProps.connectionStatus === nextProps.connectionStatus && prevProps.openedMessageMenuId === nextProps.openedMessageMenuId && prevProps.theme === nextProps.theme;
 });
 var MessageReactionKey = styled.span(_templateObject$C || (_templateObject$C = _taggedTemplateLiteralLoose(["\n  display: inline-flex;\n  align-items: center;\n  font-family:\n    apple color emoji,\n    segoe ui emoji,\n    noto color emoji,\n    android emoji,\n    emojisymbols,\n    emojione mozilla,\n    twemoji mozilla,\n    segoe ui symbol;\n"])));
 var ReactionItemCount = styled.span(_templateObject2$x || (_templateObject2$x = _taggedTemplateLiteralLoose(["\n  margin-left: 2px;\n  font-family: Inter, sans-serif;\n  font-weight: 400;\n  font-size: 14px;\n  line-height: 16px;\n  color: ", ";\n"])), function (props) {
@@ -35982,8 +36115,12 @@ var AudioRecord = function AudioRecord(_ref) {
     }
   }, [currentRecordedFile]);
   useEffect(function () {
+    if (!showRecording) {
+      setCurrentTime(0);
+    }
     return function () {
       handleStopRecording();
+      setCurrentTime(0);
     };
   }, [showRecording]);
   useEffect(function () {
@@ -38067,7 +38204,6 @@ function SvgUnpin(props) {
 
 var _templateObject$K, _templateObject2$F, _templateObject3$y, _templateObject4$t, _templateObject5$p, _templateObject6$l, _templateObject7$j, _templateObject8$h, _templateObject9$e, _templateObject0$d, _templateObject1$a, _templateObject10$6, _templateObject11$6, _templateObject12$5, _templateObject13$4, _templateObject14$3, _templateObject15$3, _templateObject16$3;
 var Actions = function Actions(_ref) {
-  var _channel$metadata;
   var setActionsHeight = _ref.setActionsHeight,
     channel = _ref.channel,
     actionMenuOpen = _ref.actionMenuOpen,
@@ -38185,7 +38321,7 @@ var Actions = function Actions(_ref) {
   var twoHours = oneHour * 2;
   var oneDay = oneHour * 24;
   var isDirectChannel = channel.type === DEFAULT_CHANNEL_TYPE.DIRECT;
-  var isSelfChannel = isDirectChannel && ((_channel$metadata = channel.metadata) === null || _channel$metadata === void 0 ? void 0 : _channel$metadata.s);
+  var isSelfChannel = isDirectChannel && channel.memberCount === 1 && channel.members.length > 0 && channel.members[0].id === user.id;
   var directChannelUser = isDirectChannel && channel.members.find(function (member) {
     return member.id !== user.id;
   });
@@ -39254,7 +39390,7 @@ var Files = function Files(_ref) {
       lineHeight: fileSizeLineHeight,
       color: filePreviewSizeColor || textSecondary
     }, file.size ? bytesToSize(file.size) : '')), /*#__PURE__*/React__default.createElement(DownloadWrapper, {
-      visible: downloadingFilesMap[file.id],
+      visible: !!downloadingFilesMap[file.id],
       iconColor: accentColor,
       onClick: function onClick() {
         return handleDownloadFile(file);
@@ -40092,7 +40228,7 @@ var EditChannel = function EditChannel(_ref) {
 
 var _templateObject$V, _templateObject2$O, _templateObject3$F, _templateObject4$z, _templateObject5$u, _templateObject6$p, _templateObject7$n, _templateObject8$l, _templateObject9$g, _templateObject0$e, _templateObject1$b, _templateObject10$7;
 var Details = function Details(_ref) {
-  var _activeChannel$metada;
+  var _activeChannel$member;
   var detailsTitleText = _ref.detailsTitleText,
     editDetailsTitleText = _ref.editDetailsTitleText,
     detailsTitleFontSize = _ref.detailsTitleFontSize,
@@ -40247,12 +40383,12 @@ var Details = function Details(_ref) {
   var detailsHeaderRef = useRef(null);
   var openTimeOut = useRef(null);
   var isDirectChannel = activeChannel && activeChannel.type === DEFAULT_CHANNEL_TYPE.DIRECT;
-  var isSelfChannel = isDirectChannel && ((_activeChannel$metada = activeChannel.metadata) === null || _activeChannel$metada === void 0 ? void 0 : _activeChannel$metada.s);
+  var isSelfChannel = isDirectChannel && activeChannel.memberCount === 1 && activeChannel.members.length > 0 && activeChannel.members[0].id === user.id;
   var memberDisplayText = getChannelTypesMemberDisplayTextMap();
   var displayMemberText = memberDisplayText && (memberDisplayText[activeChannel.type] ? activeChannel.memberCount > 1 ? memberDisplayText[activeChannel.type] + "s" : memberDisplayText[activeChannel.type] : activeChannel.type === DEFAULT_CHANNEL_TYPE.BROADCAST || activeChannel.type === DEFAULT_CHANNEL_TYPE.PUBLIC ? activeChannel.memberCount > 1 ? 'subscribers' : 'subscriber' : activeChannel.memberCount > 1 ? 'members' : 'member');
-  var directChannelUser = isDirectChannel && activeChannel.members.find(function (member) {
+  var directChannelUser = isDirectChannel && (activeChannel.members.find(function (member) {
     return member.id !== user.id;
-  });
+  }) || (activeChannel === null || activeChannel === void 0 ? void 0 : (_activeChannel$member = activeChannel.members) === null || _activeChannel$member === void 0 ? void 0 : _activeChannel$member[0]));
   var handleMembersListScroll = function handleMembersListScroll(event) {
     if (event.target.scrollTop >= event.target.scrollHeight - event.target.offsetHeight - 100) {
       if (activeTab === channelDetailsTabs.member) {
@@ -40361,7 +40497,7 @@ var Details = function Details(_ref) {
     color: textSecondary,
     fontSize: channelMembersFontSize,
     lineHeight: channelMembersLineHeight
-  }, showPhoneNumber ? "+" + directChannelUser.id : hideUserPresence && directChannelUser && hideUserPresence(directChannelUser) ? '' : directChannelUser && directChannelUser.presence && (directChannelUser.presence.state === USER_PRESENCE_STATUS.ONLINE ? 'Online' : directChannelUser.presence.lastActiveAt && userLastActiveDateFormat(directChannelUser.presence.lastActiveAt)))) : (/*#__PURE__*/React__default.createElement(SubTitle, {
+  }, showPhoneNumber && directChannelUser !== null && directChannelUser !== void 0 && directChannelUser.id ? "+" + (directChannelUser === null || directChannelUser === void 0 ? void 0 : directChannelUser.id) : hideUserPresence && directChannelUser && hideUserPresence(directChannelUser) ? '' : directChannelUser && directChannelUser.presence && (directChannelUser.presence.state === USER_PRESENCE_STATUS.ONLINE ? 'Online' : directChannelUser.presence.lastActiveAt && userLastActiveDateFormat(directChannelUser.presence.lastActiveAt)))) : (/*#__PURE__*/React__default.createElement(SubTitle, {
     color: textSecondary,
     fontSize: channelMembersFontSize,
     lineHeight: channelMembersLineHeight
@@ -41082,5 +41218,36 @@ var UnreadCount$2 = styled.span(_templateObject2$Q || (_templateObject2$Q = _tag
   return props.textColor || '#fff';
 });
 
-export { Attachment$1 as Attachment, Avatar, Channel, ChannelDetailsContainer as ChannelDetails, ChannelList, ChannelSearch, Chat, ChatHeader, CreateChannel, DropDown, EmojisPopup, FrequentlyEmojis, MessagesContainer as MessageList, MessageStatusIcon, MessageTextFormat, MessagesScrollToBottomButton, MessagesScrollToUnreadMentionsButton, OGMetadata, SceytChatContainer as SceytChat, SendMessageInput as SendMessage, THEME_COLORS };
+var createOrGetDirectChannel = function createOrGetDirectChannel(user, callback) {
+  try {
+    if (user) {
+      store.dispatch(createChannelAC({
+        metadata: '',
+        type: DEFAULT_CHANNEL_TYPE.DIRECT,
+        members: [_extends({}, user, {
+          role: 'owner'
+        })]
+      }, false, callback));
+    }
+    return Promise.resolve();
+  } catch (e) {
+    return Promise.reject(e);
+  }
+};
+var switchChannelActiveChannel = function switchChannelActiveChannel(channel) {
+  try {
+    store.dispatch(switchChannelActionAC(channel, true));
+    return Promise.resolve();
+  } catch (e) {
+    return Promise.reject(e);
+  }
+};
+var handleSendMessage = function handleSendMessage(message, channelId, connectionState) {
+  return store.dispatch(sendTextMessageAC(message, channelId, connectionState));
+};
+var handleGetMessage = function handleGetMessage(channelId, messageId) {
+  return store.dispatch(getMessageAC(channelId, messageId));
+};
+
+export { Attachment$1 as Attachment, Avatar, Channel, ChannelDetailsContainer as ChannelDetails, ChannelList, ChannelSearch, Chat, ChatHeader, CreateChannel, DropDown, EmojisPopup, FrequentlyEmojis, MessagesContainer as MessageList, MessageStatusIcon, MessageTextFormat, MessagesScrollToBottomButton, MessagesScrollToUnreadMentionsButton, OGMetadata, SceytChatContainer as SceytChat, SendMessageInput as SendMessage, THEME_COLORS, createOrGetDirectChannel, handleGetMessage, handleSendMessage, switchChannelActiveChannel };
 //# sourceMappingURL=index.modern.js.map