npm - sceyt-chat-react-uikit - Versions diffs - 1.7.9-beta.3 → 1.7.9-beta.5 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/index.js CHANGED Viewed

@@ -9059,6 +9059,7 @@ var baseUrlForInviteMembers = '';
 var autoSelectFitsChannel = false;
 var allChannels = [];
 var channelsMap = {};
+var allChannelsMap = {};
 var channelTypesMemberDisplayTextMap;
 var defaultRolesByChannelTypesMap;
 var activeChannelId = '';
@@ -9091,6 +9092,7 @@ function getInviteLinkOptions() {
 }
 function setChannelInMap(channel) {
   channelsMap[channel.id] = _extends({}, channel);
+  allChannelsMap[channel.id] = _extends({}, channel);
 }
 function setActiveChannelId(id) {
   activeChannelId = id;
@@ -9106,6 +9108,7 @@ function setChannelsInMap(channels) {
       channelsForUpdateLastReactionMessage.push(channel);
     }
     channelsMap[channel.id] = _extends({}, channel);
+    allChannelsMap[channel.id] = _extends({}, channel);
     return channel;
   });
   return {
@@ -9121,6 +9124,7 @@ function getLastChannelFromMap() {
 }
 function removeChannelFromMap(channelId) {
   delete channelsMap[channelId];
+  delete allChannelsMap[channelId];
 }
 function checkChannelExists(channelId) {
   return !!channelsMap[channelId];
@@ -9207,6 +9211,9 @@ function getChannelFromAllChannels(channelId) {
     return channel.id === channelId;
   });
 }
+function getChannelFromAllChannelsMap(channelId) {
+  return allChannelsMap[channelId];
+}
 function deleteChannelFromAllChannels(channelId) {
   allChannels = allChannels.filter(function (channel) {
     return channel.id !== channelId;
@@ -9224,6 +9231,9 @@ function updateChannelLastMessageOnAllChannels(channelId, message) {
           channelsMap[channelId] = _extends({}, chan, {
             lastMessage: message
           });
+          allChannelsMap[channelId] = _extends({}, chan, {
+            lastMessage: message
+          });
           return _extends({}, chan, {
             lastMessage: message
           });
@@ -9246,6 +9256,7 @@ function updateChannelLastMessageOnAllChannels(channelId, message) {
         lastMessage: updateMessage
       });
       channelsMap[channelId] = updateChannel;
+      allChannelsMap[channelId] = updateChannel;
       allChannels = [updateChannel].concat(updatedChannels);
     }
   }
@@ -9268,6 +9279,7 @@ function updateChannelOnAllChannels(channelId, config, messageUpdateData) {
   });
   if (channelsMap[channelId]) {
     channelsMap[channelId] = _extends({}, channelsMap[channelId], config);
+    allChannelsMap[channelId] = _extends({}, channelsMap[channelId], config);
   }
 }
 var getChannelGroupName = function getChannelGroupName(channel) {
@@ -16545,23 +16557,23 @@ function createChannel(action) {
   }, _marked$2, null, [[0, 18]]);
 }
 function getChannels(action) {
-  var _params$filter, _types, _activeChannel, _mappedChannels, _mappedChannels3, _mappedChannels4, payload, params, SceytChatClient, connectionStatus, channelQueryBuilder, channelTypesFilter, types, limit, channelQuery, channelsData, channelList, channelId, activeChannel, _yield$call, mappedChannels, channelsForUpdateLastReactionMessage, _Object$keys, _mappedChannels2, channelMessageMap, _activeChannel2, _activeChannel3, hiddenList, allChannelsQueryBuilder, allChannelsQuery, hasNext, totalAllChannelsAdded, i, _connectionStatus, allChannelsData, allChannelList, _t2, _t3, _t4;
+  var _params$filter, _types, _activeChannel, _mappedChannels, _mappedChannels3, _mappedChannels4, payload, params, SceytChatClient, connectionStatus, channelQueryBuilder, channelTypesFilter, types, limit, channelQuery, channelsData, channelList, channelId, activeChannel, _yield$call, mappedChannels, channelsForUpdateLastReactionMessage, _Object$keys, _Object$keys2, _mappedChannels2, channelMessageMap, _activeChannel2, _activeChannel3, hiddenList, allChannelsQueryBuilder, allChannelsQuery, hasNext, totalAllChannelsAdded, i, _connectionStatus, allChannelsData, allChannelList, _t2, _t3, _t4;
   return _regenerator().w(function (_context2) {
     while (1) switch (_context2.p = _context2.n) {
       case 0:
-        log.info('[getChannels] start get channels');
+        log.info(new Date().toISOString() + " [getChannels] start get channels");
         _context2.p = 1;
         payload = action.payload;
         params = payload.params;
-        log.info('[getChannels] input params:', JSON.stringify(params));
+        log.info(new Date().toISOString() + " [getChannels] input params: " + JSON.stringify(params));
         SceytChatClient = getClient();
         connectionStatus = store.getState().UserReducer.connectionStatus;
-        log.info('[getChannels] connection status:', connectionStatus);
+        log.info(new Date().toISOString() + " [getChannels] connection status: " + connectionStatus);
         if (!(connectionStatus !== CONNECTION_STATUS.CONNECTED)) {
           _context2.n = 2;
           break;
         }
-        log.warn('[getChannels] connection not ready, aborting. Status:', connectionStatus);
+        log.warn(new Date().toISOString() + " [getChannels] connection not ready, aborting. Status: " + connectionStatus);
         return _context2.a(2);
       case 2:
         _context2.n = 3;
@@ -16569,7 +16581,7 @@ function getChannels(action) {
       case 3:
         channelQueryBuilder = new SceytChatClient.ChannelListQueryBuilder();
         channelTypesFilter = getChannelTypesFilter();
-        log.info('[getChannels] channelTypesFilter:', JSON.stringify(channelTypesFilter));
+        log.info(new Date().toISOString() + " [getChannels] channelTypesFilter: " + JSON.stringify(channelTypesFilter));
         types = [];
         if (channelTypesFilter !== null && channelTypesFilter !== void 0 && channelTypesFilter.length) {
           types = channelTypesFilter;
@@ -16577,29 +16589,29 @@ function getChannels(action) {
         if (params !== null && params !== void 0 && (_params$filter = params.filter) !== null && _params$filter !== void 0 && _params$filter.channelType) {
           types.push(params.filter.channelType);
         }
-        log.info('[getChannels] final types array:', JSON.stringify(types));
+        log.info(new Date().toISOString() + " [getChannels] final types array: " + JSON.stringify(types));
         if ((_types = types) !== null && _types !== void 0 && _types.length) {
           channelQueryBuilder.types(types);
         }
         if (params.memberCount) {
-          log.info('[getChannels] setting memberCount filter:', params === null || params === void 0 ? void 0 : params.memberCount);
+          log.info(new Date().toISOString() + " [getChannels] setting memberCount filter: " + (params === null || params === void 0 ? void 0 : params.memberCount));
           channelQueryBuilder.memberCount(params.memberCount);
         }
         channelQueryBuilder.order('lastMessage');
         limit = params.limit || 50;
-        log.info('[getChannels] query limit:', limit);
+        log.info(new Date().toISOString() + " [getChannels] query limit: " + limit);
         channelQueryBuilder.limit(limit);
         _context2.n = 4;
         return effects.call(channelQueryBuilder.build);
       case 4:
         channelQuery = _context2.v;
-        log.info('[getChannels] query built successfully');
+        log.info(new Date().toISOString() + " [getChannels] query built successfully");
         _context2.n = 5;
         return effects.call(channelQuery.loadNextPage);
       case 5:
         channelsData = _context2.v;
         channelList = channelsData.channels;
-        log.info('[getChannels] channelsData received:', JSON.stringify({
+        log.info(new Date().toISOString() + " [getChannels] channelsData received: " + JSON.stringify({
           channelsCount: (channelList === null || channelList === void 0 ? void 0 : channelList.length) || 0,
           hasNext: channelsData.hasNext
         }));
@@ -16610,7 +16622,7 @@ function getChannels(action) {
         return effects.call(getActiveChannelId);
       case 7:
         channelId = _context2.v;
-        log.info('[getChannels] active channelId:', channelId);
+        log.info(new Date().toISOString() + " [getChannels] active channelId: " + channelId);
         if (!channelId) {
           _context2.n = 9;
           break;
@@ -16625,27 +16637,27 @@ function getChannels(action) {
         _t2 = null;
       case 10:
         activeChannel = _t2;
-        log.info('[getChannels] activeChannel from map:', activeChannel ? (_activeChannel = activeChannel) === null || _activeChannel === void 0 ? void 0 : _activeChannel.id : 'null');
+        log.info(new Date().toISOString() + " [getChannels] activeChannel from map: " + (activeChannel ? (_activeChannel = activeChannel) === null || _activeChannel === void 0 ? void 0 : _activeChannel.id : 'null'));
         _context2.n = 11;
         return effects.call(destroyChannelsMap);
       case 11:
-        log.info('[getChannels] channels map destroyed');
+        log.info(new Date().toISOString() + " [getChannels] channels map destroyed");
         _context2.n = 12;
         return effects.call(setChannelsInMap, channelList);
       case 12:
         _yield$call = _context2.v;
         mappedChannels = _yield$call.channels;
         channelsForUpdateLastReactionMessage = _yield$call.channelsForUpdateLastReactionMessage;
-        log.info('[getChannels] setChannelsInMap result:', JSON.stringify({
+        log.info(new Date().toISOString() + " [getChannels] setChannelsInMap result: " + JSON.stringify({
           mappedChannelsCount: ((_mappedChannels = mappedChannels) === null || _mappedChannels === void 0 ? void 0 : _mappedChannels.length) || 0,
           channelsForUpdateLastReactionMessageCount: (channelsForUpdateLastReactionMessage === null || channelsForUpdateLastReactionMessage === void 0 ? void 0 : channelsForUpdateLastReactionMessage.length) || 0
         }));
-        log.info('channelsForUpdateLastReactionMessage', channelsForUpdateLastReactionMessage === null || channelsForUpdateLastReactionMessage === void 0 ? void 0 : channelsForUpdateLastReactionMessage.length);
+        log.info(new Date().toISOString() + " channelsForUpdateLastReactionMessage: " + (channelsForUpdateLastReactionMessage === null || channelsForUpdateLastReactionMessage === void 0 ? void 0 : channelsForUpdateLastReactionMessage.length));
         if (!(channelsForUpdateLastReactionMessage !== null && channelsForUpdateLastReactionMessage !== void 0 && channelsForUpdateLastReactionMessage.length)) {
           _context2.n = 14;
           break;
         }
-        log.info('[getChannels] processing channels for reaction message update:', channelsForUpdateLastReactionMessage === null || channelsForUpdateLastReactionMessage === void 0 ? void 0 : channelsForUpdateLastReactionMessage.length);
+        log.info(new Date().toISOString() + " [getChannels] processing channels for\n        reaction message update: " + (channelsForUpdateLastReactionMessage === null || channelsForUpdateLastReactionMessage === void 0 ? void 0 : channelsForUpdateLastReactionMessage.length));
         channelMessageMap = {};
         _context2.n = 13;
         return effects.call(function () {
@@ -16655,10 +16667,10 @@ function getChannels(action) {
                 return Promise.resolve(new Promise(function (resolve) {
                   channel.getMessagesById([channel.newReactions[0].messageId]).then(function (messages) {
                     channelMessageMap[channel === null || channel === void 0 ? void 0 : channel.id] = messages[0];
-                    log.info('[getChannels] successfully fetched reaction message for channel:', channel === null || channel === void 0 ? void 0 : channel.id);
+                    log.info(new Date().toISOString() + " [getChannels] successfully fetched reaction message for channel: " + (channel === null || channel === void 0 ? void 0 : channel.id));
                     resolve(true);
                   })["catch"](function (e) {
-                    log.error(e, 'Error on getMessagesById for channel:', channel === null || channel === void 0 ? void 0 : channel.id);
+                    log.error(e, "Error on getMessagesById for channel: " + (channel === null || channel === void 0 ? void 0 : channel.id));
                     resolve(true);
                   });
                 }));
@@ -16671,29 +16683,29 @@ function getChannels(action) {
           }
         });
       case 13:
-        log.info('[getChannels] reaction messages fetched:', channelMessageMap ? (_Object$keys = Object.keys(channelMessageMap)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length : 0);
+        log.info(new Date().toISOString() + " [getChannels] reaction messages fetched: " + (channelMessageMap ? (_Object$keys = Object.keys(channelMessageMap)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length : 0), channelMessageMap ? (_Object$keys2 = Object.keys(channelMessageMap)) === null || _Object$keys2 === void 0 ? void 0 : _Object$keys2.length : 0);
         mappedChannels = mappedChannels.map(function (channel) {
           if (channelMessageMap[channel === null || channel === void 0 ? void 0 : channel.id]) {
             channel.lastReactedMessage = channelMessageMap[channel === null || channel === void 0 ? void 0 : channel.id];
           }
           return channel;
         });
-        log.info('[getChannels] mappedChannels updated with reaction messages, final count:', ((_mappedChannels2 = mappedChannels) === null || _mappedChannels2 === void 0 ? void 0 : _mappedChannels2.length) || 0);
+        log.info(new Date().toISOString() + " [getChannels] mappedChannels updated with reaction messages, final count: " + (((_mappedChannels2 = mappedChannels) === null || _mappedChannels2 === void 0 ? void 0 : _mappedChannels2.length) || 0));
       case 14:
-        log.info('[getChannels] setting channels in state, count:', ((_mappedChannels3 = mappedChannels) === null || _mappedChannels3 === void 0 ? void 0 : _mappedChannels3.length) || 0);
+        log.info(new Date().toISOString() + " [getChannels] setting channels in state, count: " + (((_mappedChannels3 = mappedChannels) === null || _mappedChannels3 === void 0 ? void 0 : _mappedChannels3.length) || 0));
         _context2.n = 15;
         return effects.put(setChannelsAC(mappedChannels));
       case 15:
         if (!channelId) {
           activeChannel = channelList[0];
-          log.info('[getChannels] no active channelId, setting first channel as active:', (_activeChannel2 = activeChannel) === null || _activeChannel2 === void 0 ? void 0 : _activeChannel2.id);
+          log.info(new Date().toISOString() + " [getChannels] no active channelId, setting first channel as active: " + ((_activeChannel2 = activeChannel) === null || _activeChannel2 === void 0 ? void 0 : _activeChannel2.id));
         }
         query.channelQuery = channelQuery;
         if (!(activeChannel && getAutoSelectFitsChannel())) {
           _context2.n = 16;
           break;
         }
-        log.info('[getChannels] auto-selecting channel:', (_activeChannel3 = activeChannel) === null || _activeChannel3 === void 0 ? void 0 : _activeChannel3.id);
+        log.info(new Date().toISOString() + " [getChannels] auto-selecting channel: " + ((_activeChannel3 = activeChannel) === null || _activeChannel3 === void 0 ? void 0 : _activeChannel3.id));
         _context2.n = 16;
         return effects.put(switchChannelActionAC(JSON.parse(JSON.stringify(activeChannel))));
       case 16:
@@ -16701,28 +16713,28 @@ function getChannels(action) {
         return effects.put(setChannelsLoadingStateAC(LOADING_STATE.LOADED));
       case 17:
         hiddenList = store.getState().ChannelReducer.hideChannelList;
-        log.info('[getChannels] hiddenList state:', hiddenList);
+        log.info(new Date().toISOString() + " [getChannels] hiddenList state: " + hiddenList);
         if (hiddenList) {
           _context2.n = 28;
           break;
         }
-        log.info('[getChannels] starting all channels query (hiddenList is false)');
+        log.info(new Date().toISOString() + " [getChannels] starting all channels query (hiddenList is false)");
         allChannelsQueryBuilder = new SceytChatClient.ChannelListQueryBuilder();
         allChannelsQueryBuilder.order('lastMessage');
         if (channelTypesFilter !== null && channelTypesFilter !== void 0 && channelTypesFilter.length) {
           allChannelsQueryBuilder.types(channelTypesFilter);
-          log.info('[getChannels] allChannelsQuery types:', JSON.stringify(channelTypesFilter));
+          log.info(new Date().toISOString() + " [getChannels] allChannelsQuery types: " + JSON.stringify(channelTypesFilter));
         }
         if (params !== null && params !== void 0 && params.memberCount) {
           allChannelsQueryBuilder.memberCount(params.memberCount);
-          log.info('[getChannels] allChannelsQuery memberCount:', params === null || params === void 0 ? void 0 : params.memberCount);
+          log.info(new Date().toISOString() + " [getChannels] allChannelsQuery memberCount: " + (params === null || params === void 0 ? void 0 : params.memberCount));
         }
         allChannelsQueryBuilder.limit(50);
         _context2.n = 18;
         return effects.call(allChannelsQueryBuilder.build);
       case 18:
         allChannelsQuery = _context2.v;
-        log.info('[getChannels] allChannelsQuery built');
+        log.info(new Date().toISOString() + " [getChannels] allChannelsQuery built");
         hasNext = true;
         totalAllChannelsAdded = 0;
         i = 0;
@@ -16741,58 +16753,58 @@ function getChannels(action) {
           _context2.n = 21;
           break;
         }
-        log.warn('[getChannels] connection not ready, aborting. Status:', _connectionStatus);
+        log.warn(new Date().toISOString() + " [getChannels] connection not ready, aborting. Status: " + _connectionStatus);
         return _context2.a(3, 27);
       case 21:
-        log.info('[getChannels] loading all channels page:', i + 1);
+        log.info(new Date().toISOString() + " [getChannels] loading all channels page: " + (i + 1));
         _context2.n = 22;
         return effects.call(allChannelsQuery.loadNextPage);
       case 22:
         allChannelsData = _context2.v;
         hasNext = allChannelsData.hasNext;
         allChannelList = allChannelsData.channels;
-        log.info('[getChannels] all channels page', i + 1, 'loaded:', JSON.stringify({
+        log.info(new Date().toISOString() + " [getChannels] all channels page: " + (i + 1), i + 1, 'loaded:', JSON.stringify({
           channelsCount: (allChannelList === null || allChannelList === void 0 ? void 0 : allChannelList.length) || 0,
           hasNext: hasNext
         }));
         addChannelsToAllChannels(allChannelList);
         totalAllChannelsAdded += (allChannelList === null || allChannelList === void 0 ? void 0 : allChannelList.length) || 0;
-        log.info('[getChannels] total all channels added so far:', totalAllChannelsAdded);
+        log.info(new Date().toISOString() + " [getChannels] total all channels added so far: " + totalAllChannelsAdded);
         _context2.n = 24;
         break;
       case 23:
         _context2.p = 23;
         _t3 = _context2.v;
-        log.error(_t3, 'Error on get all channels page:', i + 1);
+        log.error(_t3, "Error on get all channels page: " + (i + 1));
         return _context2.a(3, 27);
       case 24:
         _context2.n = 26;
         break;
       case 25:
-        log.info('[getChannels] no more pages available, stopping at iteration:', i);
+        log.info(new Date().toISOString() + " [getChannels] no more pages available, stopping at iteration: " + i);
       case 26:
         i++;
         _context2.n = 19;
         break;
       case 27:
-        log.info('[getChannels] all channels query completed, total channels added:', totalAllChannelsAdded);
+        log.info(new Date().toISOString() + " [getChannels] all channels query completed, total channels added: " + totalAllChannelsAdded);
         _context2.n = 29;
         break;
       case 28:
-        log.info('[getChannels] skipping all channels query (hiddenList is true)');
+        log.info(new Date().toISOString() + " [getChannels] skipping all channels query (hiddenList is true)");
       case 29:
-        log.info('[getChannels] completed successfully. Final mapped channels count:', ((_mappedChannels4 = mappedChannels) === null || _mappedChannels4 === void 0 ? void 0 : _mappedChannels4.length) || 0);
+        log.info(new Date().toISOString() + " [getChannels] completed successfully. Final mapped channels count: " + (((_mappedChannels4 = mappedChannels) === null || _mappedChannels4 === void 0 ? void 0 : _mappedChannels4.length) || 0));
         _context2.n = 31;
         break;
       case 30:
         _context2.p = 30;
         _t4 = _context2.v;
-        log.error('[getChannels] error occurred:', JSON.stringify(_t4), 'Error on get channels');
-        log.error('[getChannels] error details:', {
+        log.error(new Date().toISOString() + " [getChannels] error occurred: " + JSON.stringify(_t4), 'Error on get channels');
+        log.error(new Date().toISOString() + " [getChannels] error details: " + JSON.stringify({
           message: _t4.message,
           code: _t4.code,
           stack: _t4.stack
-        });
+        }));
       case 31:
         return _context2.a(2);
     }
@@ -17119,56 +17131,56 @@ function searchChannelsForForward(action) {
   }, _marked5, null, [[0, 7]]);
 }
 function channelsLoadMore(action) {
-  var _mappedChannels5, _mappedChannels7, _mappedChannels8, payload, limit, channelQuery, channelsData, channelList, _yield$call3, mappedChannels, channelsForUpdateLastReactionMessage, _Object$keys2, _mappedChannels6, channelMessageMap, _t8;
+  var _mappedChannels5, _mappedChannels7, _mappedChannels8, payload, limit, channelQuery, channelsData, channelList, _yield$call3, mappedChannels, channelsForUpdateLastReactionMessage, _Object$keys3, _mappedChannels6, channelMessageMap, _t8;
   return _regenerator().w(function (_context6) {
     while (1) switch (_context6.p = _context6.n) {
       case 0:
-        log.info('[channelsLoadMore] start load more channels');
+        log.info(new Date().toISOString() + " [channelsLoadMore] start load more channels");
         _context6.p = 1;
         payload = action.payload;
         limit = payload.limit;
-        log.info('[channelsLoadMore] input payload:', JSON.stringify({
+        log.info(new Date().toISOString() + " [channelsLoadMore] input payload:", JSON.stringify({
           limit: limit
         }));
         channelQuery = query.channelQuery;
-        log.info('[channelsLoadMore] channelQuery exists:', !!channelQuery);
+        log.info(new Date().toISOString() + " [channelsLoadMore] channelQuery exists:", !!channelQuery);
         if (channelQuery) {
           _context6.n = 2;
           break;
         }
-        log.error('[channelsLoadMore] channelQuery is null or undefined, cannot load more');
+        log.error(new Date().toISOString() + " [channelsLoadMore] channelQuery is null or undefined, cannot load more");
         return _context6.a(2);
       case 2:
         if (limit) {
-          log.info('[channelsLoadMore] setting query limit to:', limit);
+          log.info(new Date().toISOString() + " [channelsLoadMore] setting query limit to:", limit);
           channelQuery.limit = limit;
         } else {
-          log.info('[channelsLoadMore] no limit provided, using existing query limit');
+          log.info(new Date().toISOString() + " [channelsLoadMore] no limit provided, using existing query limit");
         }
         _context6.n = 3;
         return effects.put(setChannelsLoadingStateAC(LOADING_STATE.LOADING));
       case 3:
-        log.info('[channelsLoadMore] loading next page...');
+        log.info(new Date().toISOString() + " [channelsLoadMore] loading next page...");
         _context6.n = 4;
         return effects.call(channelQuery.loadNextPage);
       case 4:
         channelsData = _context6.v;
         channelList = channelsData.channels;
-        log.info('[channelsLoadMore] channelsData received:', JSON.stringify({
+        log.info(new Date().toISOString() + " [channelsLoadMore] channelsData received:", JSON.stringify({
           channelsCount: (channelList === null || channelList === void 0 ? void 0 : channelList.length) || 0,
           hasNext: channelsData.hasNext
         }));
         _context6.n = 5;
         return effects.put(channelHasNextAC(channelsData.hasNext));
       case 5:
-        log.info('[channelsLoadMore] hasNext set to:', channelsData.hasNext);
+        log.info(new Date().toISOString() + " [channelsLoadMore] hasNext set to:", channelsData.hasNext);
         _context6.n = 6;
         return effects.call(setChannelsInMap, channelsData.channels);
       case 6:
         _yield$call3 = _context6.v;
         mappedChannels = _yield$call3.channels;
         channelsForUpdateLastReactionMessage = _yield$call3.channelsForUpdateLastReactionMessage;
-        log.info('[channelsLoadMore] setChannelsInMap result:', JSON.stringify({
+        log.info(new Date().toISOString() + " [channelsLoadMore] setChannelsInMap result:", JSON.stringify({
           mappedChannelsCount: ((_mappedChannels5 = mappedChannels) === null || _mappedChannels5 === void 0 ? void 0 : _mappedChannels5.length) || 0,
           channelsForUpdateLastReactionMessageCount: (channelsForUpdateLastReactionMessage === null || channelsForUpdateLastReactionMessage === void 0 ? void 0 : channelsForUpdateLastReactionMessage.length) || 0
         }));
@@ -17176,7 +17188,7 @@ function channelsLoadMore(action) {
           _context6.n = 8;
           break;
         }
-        log.info('[channelsLoadMore] processing channels for reaction message update:', channelsForUpdateLastReactionMessage === null || channelsForUpdateLastReactionMessage === void 0 ? void 0 : channelsForUpdateLastReactionMessage.length);
+        log.info(new Date().toISOString() + " [channelsLoadMore] processing channels for reaction message update:", channelsForUpdateLastReactionMessage === null || channelsForUpdateLastReactionMessage === void 0 ? void 0 : channelsForUpdateLastReactionMessage.length);
         channelMessageMap = {};
         _context6.n = 7;
         return effects.call(function () {
@@ -17186,7 +17198,7 @@ function channelsLoadMore(action) {
                 return Promise.resolve(new Promise(function (resolve) {
                   channel.getMessagesById([channel.newReactions[0].messageId]).then(function (messages) {
                     channelMessageMap[channel.id] = messages[0];
-                    log.info('[channelsLoadMore] successfully fetched reaction message for channel:', channel === null || channel === void 0 ? void 0 : channel.id);
+                    log.info(new Date().toISOString() + " [channelsLoadMore] successfully fetched reaction message for channel:", channel === null || channel === void 0 ? void 0 : channel.id);
                     resolve(true);
                   })["catch"](function (e) {
                     log.error(e, 'Error on getMessagesById for channel:', channel === null || channel === void 0 ? void 0 : channel.id);
@@ -17202,34 +17214,34 @@ function channelsLoadMore(action) {
           }
         });
       case 7:
-        log.info('[channelsLoadMore] reaction messages fetched:', channelMessageMap ? (_Object$keys2 = Object.keys(channelMessageMap)) === null || _Object$keys2 === void 0 ? void 0 : _Object$keys2.length : 0);
+        log.info(new Date().toISOString() + " [channelsLoadMore] reaction messages fetched:", channelMessageMap ? (_Object$keys3 = Object.keys(channelMessageMap)) === null || _Object$keys3 === void 0 ? void 0 : _Object$keys3.length : 0);
         mappedChannels = mappedChannels.map(function (channel) {
           if (channelMessageMap[channel.id]) {
             channel.lastReactedMessage = channelMessageMap[channel.id];
           }
           return channel;
         });
-        log.info('[channelsLoadMore] mappedChannels updated with reaction messages, final count:', ((_mappedChannels6 = mappedChannels) === null || _mappedChannels6 === void 0 ? void 0 : _mappedChannels6.length) || 0);
+        log.info(new Date().toISOString() + " [channelsLoadMore] mappedChannels updated with reaction messages, final count:", ((_mappedChannels6 = mappedChannels) === null || _mappedChannels6 === void 0 ? void 0 : _mappedChannels6.length) || 0);
         _context6.n = 9;
         break;
       case 8:
-        log.info('[channelsLoadMore] no channels need reaction message update');
+        log.info(new Date().toISOString() + " [channelsLoadMore] no channels need reaction message update");
       case 9:
-        log.info('[channelsLoadMore] adding channels to state, count:', ((_mappedChannels7 = mappedChannels) === null || _mappedChannels7 === void 0 ? void 0 : _mappedChannels7.length) || 0);
+        log.info(new Date().toISOString() + " [channelsLoadMore] adding channels to state, count:", ((_mappedChannels7 = mappedChannels) === null || _mappedChannels7 === void 0 ? void 0 : _mappedChannels7.length) || 0);
         _context6.n = 10;
         return effects.put(addChannelsAC(mappedChannels));
       case 10:
         _context6.n = 11;
         return effects.put(setChannelsLoadingStateAC(LOADING_STATE.LOADED));
       case 11:
-        log.info('[channelsLoadMore] completed successfully. Total channels added:', ((_mappedChannels8 = mappedChannels) === null || _mappedChannels8 === void 0 ? void 0 : _mappedChannels8.length) || 0);
+        log.info(new Date().toISOString() + " [channelsLoadMore] completed successfully. Total channels added:", ((_mappedChannels8 = mappedChannels) === null || _mappedChannels8 === void 0 ? void 0 : _mappedChannels8.length) || 0);
         _context6.n = 13;
         break;
       case 12:
         _context6.p = 12;
         _t8 = _context6.v;
-        log.error('[channelsLoadMore] error occurred:', _t8);
-        log.error('[channelsLoadMore] error details:', JSON.stringify({
+        log.error(new Date().toISOString() + " [channelsLoadMore] error occurred:", _t8);
+        log.error(new Date().toISOString() + " [channelsLoadMore] error details:", JSON.stringify({
           message: _t8 === null || _t8 === void 0 ? void 0 : _t8.message,
           code: _t8 === null || _t8 === void 0 ? void 0 : _t8.code,
           stack: _t8 === null || _t8 === void 0 ? void 0 : _t8.stack
@@ -19621,6 +19633,9 @@ function sendMessage(action) {
           if (channel) {
             setChannelInMap(channel);
           }
+          if (!channel) {
+            channel = getChannelFromAllChannelsMap(channelId);
+          }
         }
         if (!channel.isMockChannel) {
           _context4.n = 6;
@@ -19807,7 +19822,7 @@ function sendMessage(action) {
         messagesToSend.push(messageToSend);
       case 12:
         _loop2 = /*#__PURE__*/_regenerator().m(function _callee3() {
-          var messageAttachment, messageToSend, messageCopy, _attachmentsToSend, linkAttachmentToSend, linkAttachmentBuilder, messageResponse, k, pendingAttachment, attachmentsToUpdate, currentAttachmentsMap, messageUpdateData, stringifiedMessageUpdateData, activeChannelId, messageToUpdate, channelUpdateParam, isErrorResendable, _t;
+          var messageAttachment, messageToSend, messageCopy, _attachmentsToSend, linkAttachmentToSend, linkAttachmentBuilder, messageResponse, k, pendingAttachment, attachmentsToUpdate, currentAttachmentsMap, messageUpdateData, stringifiedMessageUpdateData, activeChannelId, messageToUpdate, channelUpdateParam, _channel, _messageToSend2, _channel2, isErrorResendable, _t;
           return _regenerator().w(function (_context3) {
             while (1) switch (_context3.p = _context3.n) {
               case 0:
@@ -19951,7 +19966,7 @@ function sendMessage(action) {
                 _context3.p = 15;
                 _t = _context3.v;
                 isErrorResendable = isResendableError(_t === null || _t === void 0 ? void 0 : _t.type);
-                if (isErrorResendable) {
+                if (!(!isErrorResendable && (_channel = channel) !== null && _channel !== void 0 && _channel.id && (_messageToSend2 = messageToSend) !== null && _messageToSend2 !== void 0 && _messageToSend2.tid)) {
                   _context3.n = 17;
                   break;
                 }
@@ -19961,6 +19976,10 @@ function sendMessage(action) {
                 _context3.n = 19;
                 break;
               case 17:
+                if (!((_channel2 = channel) !== null && _channel2 !== void 0 && _channel2.id)) {
+                  _context3.n = 19;
+                  break;
+                }
                 log.error('Error on uploading attachment', messageToSend.tid, _t);
                 if (!(messageToSend.attachments && messageToSend.attachments.length)) {
                   _context3.n = 18;
@@ -20017,7 +20036,7 @@ function sendMessage(action) {
   }, _marked$3, null, [[1, 16, 17, 19]]);
 }
 function sendTextMessage(action) {
-  var payload, message, connectionState, channelId, channel, sendMessageTid, pendingMessage, SceytChatClient, createChannelData, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, createdMessage, messageToSend, _messageResponse, messageResponse, messageUpdateData, activeChannelId, stringifiedMessageUpdateData, messageToUpdate, channelUpdateParam, isErrorResendable, _activeChannelId, _t3;
+  var payload, message, connectionState, channelId, channel, sendMessageTid, pendingMessage, SceytChatClient, createChannelData, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, createdMessage, messageToSend, _messageResponse, messageResponse, messageUpdateData, activeChannelId, stringifiedMessageUpdateData, messageToUpdate, channelUpdateParam, _channel3, _channel4, isErrorResendable, _activeChannelId, _t3;
   return _regenerator().w(function (_context5) {
     while (1) switch (_context5.p = _context5.n) {
       case 0:
@@ -20035,6 +20054,9 @@ function sendTextMessage(action) {
           if (channel) {
             setChannelInMap(channel);
           }
+          if (!channel) {
+            channel = getChannelFromAllChannelsMap(channelId);
+          }
         }
         sendMessageTid = null;
         pendingMessage = null;
@@ -20190,7 +20212,7 @@ function sendTextMessage(action) {
         _t3 = _context5.v;
         log.error('error on send text message ... ', _t3 === null || _t3 === void 0 ? void 0 : _t3.type);
         isErrorResendable = isResendableError(_t3 === null || _t3 === void 0 ? void 0 : _t3.type);
-        if (!(!isErrorResendable && channel.id && sendMessageTid)) {
+        if (!(!isErrorResendable && (_channel3 = channel) !== null && _channel3 !== void 0 && _channel3.id && sendMessageTid)) {
           _context5.n = 22;
           break;
         }
@@ -20200,7 +20222,7 @@ function sendTextMessage(action) {
         _context5.n = 23;
         break;
       case 22:
-        if (!(channel.id && sendMessageTid)) {
+        if (!((_channel4 = channel) !== null && _channel4 !== void 0 && _channel4.id && sendMessageTid)) {
           _context5.n = 23;
           break;
         }
@@ -20234,7 +20256,7 @@ function sendTextMessage(action) {
   }, _marked2$2, null, [[3, 20, 23, 25]]);
 }
 function forwardMessage(action) {
-  var payload, message, channelId, connectionState, isForward, pendingMessage, channel, activeChannelId, messageTid, SceytChatClient, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, pollDetails, messageToSend, hasNextMessages, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, isErrorResendable, _activeChannelId2, _t4;
+  var payload, message, channelId, connectionState, isForward, pendingMessage, channel, activeChannelId, messageTid, SceytChatClient, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, pollDetails, messageToSend, hasNextMessages, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, _channel5, isErrorResendable, _channel6, _activeChannelId2, _t4;
   return _regenerator().w(function (_context6) {
     while (1) switch (_context6.p = _context6.n) {
       case 0:
@@ -20270,6 +20292,9 @@ function forwardMessage(action) {
         if (channel) {
           setChannelInMap(channel);
         }
+        if (!channel) {
+          channel = getChannelFromAllChannelsMap(channelId);
+        }
       case 6:
         if (channel) {
           _context6.n = 7;
@@ -20419,7 +20444,7 @@ function forwardMessage(action) {
         _context6.p = 18;
         _t4 = _context6.v;
         isErrorResendable = isResendableError(_t4 === null || _t4 === void 0 ? void 0 : _t4.type);
-        if (isErrorResendable) {
+        if (!(!isErrorResendable && (_channel5 = channel) !== null && _channel5 !== void 0 && _channel5.id && messageTid)) {
           _context6.n = 20;
           break;
         }
@@ -20429,7 +20454,7 @@ function forwardMessage(action) {
         _context6.n = 21;
         break;
       case 20:
-        if (!(channel && messageTid)) {
+        if (!((_channel6 = channel) !== null && _channel6 !== void 0 && _channel6.id && messageTid)) {
           _context6.n = 21;
           break;
         }
@@ -21252,7 +21277,7 @@ function getMessagesQuery(action) {
         return effects.call(SceytChatClient.getChannel, channel.id, true);
       case 82:
         updatedChannel = _context10.v;
-        if (!updatedChannel) {
+        if (!(updatedChannel && updatedChannel !== null && updatedChannel !== void 0 && updatedChannel.lastMessage)) {
           _context10.n = 84;
           break;
         }
@@ -45748,7 +45773,8 @@ var GroupsInCommonPopup = function GroupsInCommonPopup(_ref2) {
     textSecondary = _useColor[THEME_COLORS.TEXT_SECONDARY],
     background = _useColor[THEME_COLORS.BACKGROUND],
     iconPrimary = _useColor[THEME_COLORS.ICON_PRIMARY],
-    backgroundHovered = _useColor[THEME_COLORS.BACKGROUND_HOVERED];
+    backgroundHovered = _useColor[THEME_COLORS.BACKGROUND_HOVERED],
+    surface2 = _useColor[THEME_COLORS.SURFACE_2];
   var contactsMap = useSelector(contactsMapSelector);
   var getFromContacts = getShowOnlyContactUsers();
   var dispatch = useDispatch();
@@ -45813,7 +45839,7 @@ var GroupsInCommonPopup = function GroupsInCommonPopup(_ref2) {
     onMouseLeave: function onMouseLeave() {
       return setIsScrolling(false);
     },
-    thumbColor: background
+    thumbColor: surface2
   }, isLoadingInitial ? (/*#__PURE__*/React__default.createElement(LoadingText$1, {
     color: textSecondary
   }, "Loading...")) : mutualChannels.length > 0 ? mutualChannels.map(function (channel) {
@@ -45836,7 +45862,7 @@ var GroupsInCommonPopup = function GroupsInCommonPopup(_ref2) {
     color: textSecondary
   }, "Loading more...")))));
 };
-var ChannelsList$1 = styled__default.div(_templateObject$U || (_templateObject$U = _taggedTemplateLiteralLoose(["\n  max-height: 400px;\n  overflow-y: auto;\n  overflow-x: hidden;\n\n  &::-webkit-scrollbar {\n    width: 6px;\n  }\n\n  &::-webkit-scrollbar-track {\n    background: transparent;\n  }\n\n  &::-webkit-scrollbar-thumb {\n    background: ", ";\n    border-radius: 3px;\n    opacity: 0.3;\n  }\n\n  &.show-scrollbar::-webkit-scrollbar-thumb {\n    opacity: 0.6;\n  }\n"])), function (props) {
+var ChannelsList$1 = styled__default.div(_templateObject$U || (_templateObject$U = _taggedTemplateLiteralLoose(["\n  max-height: 400px;\n  overflow-y: auto;\n  overflow-x: hidden;\n\n  &::-webkit-scrollbar {\n    width: 8px;\n    background: transparent;\n  }\n  &::-webkit-scrollbar-thumb {\n    background: transparent;\n  }\n\n  &.show-scrollbar::-webkit-scrollbar-thumb {\n    background: ", ";\n    border-radius: 4px;\n  }\n  &.show-scrollbar::-webkit-scrollbar-track {\n    background: transparent;\n  }\n"])), function (props) {
   return props.thumbColor;
 });
 var ChannelItem$1 = styled__default.div(_templateObject2$P || (_templateObject2$P = _taggedTemplateLiteralLoose(["\n  display: flex;\n  align-items: center;\n  padding: 6px 2px 6px 6px;\n  border-radius: 8px;\n  cursor: pointer;\n  transition: background-color 0.2s;\n\n  &:hover {\n    background-color: ", ";\n  }\n"])), function (props) {

package/index.modern.js CHANGED Viewed

@@ -9058,6 +9058,7 @@ var baseUrlForInviteMembers = '';
 var autoSelectFitsChannel = false;
 var allChannels = [];
 var channelsMap = {};
+var allChannelsMap = {};
 var channelTypesMemberDisplayTextMap;
 var defaultRolesByChannelTypesMap;
 var activeChannelId = '';
@@ -9090,6 +9091,7 @@ function getInviteLinkOptions() {
 }
 function setChannelInMap(channel) {
   channelsMap[channel.id] = _extends({}, channel);
+  allChannelsMap[channel.id] = _extends({}, channel);
 }
 function setActiveChannelId(id) {
   activeChannelId = id;
@@ -9105,6 +9107,7 @@ function setChannelsInMap(channels) {
       channelsForUpdateLastReactionMessage.push(channel);
     }
     channelsMap[channel.id] = _extends({}, channel);
+    allChannelsMap[channel.id] = _extends({}, channel);
     return channel;
   });
   return {
@@ -9120,6 +9123,7 @@ function getLastChannelFromMap() {
 }
 function removeChannelFromMap(channelId) {
   delete channelsMap[channelId];
+  delete allChannelsMap[channelId];
 }
 function checkChannelExists(channelId) {
   return !!channelsMap[channelId];
@@ -9206,6 +9210,9 @@ function getChannelFromAllChannels(channelId) {
     return channel.id === channelId;
   });
 }
+function getChannelFromAllChannelsMap(channelId) {
+  return allChannelsMap[channelId];
+}
 function deleteChannelFromAllChannels(channelId) {
   allChannels = allChannels.filter(function (channel) {
     return channel.id !== channelId;
@@ -9223,6 +9230,9 @@ function updateChannelLastMessageOnAllChannels(channelId, message) {
           channelsMap[channelId] = _extends({}, chan, {
             lastMessage: message
           });
+          allChannelsMap[channelId] = _extends({}, chan, {
+            lastMessage: message
+          });
           return _extends({}, chan, {
             lastMessage: message
           });
@@ -9245,6 +9255,7 @@ function updateChannelLastMessageOnAllChannels(channelId, message) {
         lastMessage: updateMessage
       });
       channelsMap[channelId] = updateChannel;
+      allChannelsMap[channelId] = updateChannel;
       allChannels = [updateChannel].concat(updatedChannels);
     }
   }
@@ -9267,6 +9278,7 @@ function updateChannelOnAllChannels(channelId, config, messageUpdateData) {
   });
   if (channelsMap[channelId]) {
     channelsMap[channelId] = _extends({}, channelsMap[channelId], config);
+    allChannelsMap[channelId] = _extends({}, channelsMap[channelId], config);
   }
 }
 var getChannelGroupName = function getChannelGroupName(channel) {
@@ -16544,23 +16556,23 @@ function createChannel(action) {
   }, _marked$2, null, [[0, 18]]);
 }
 function getChannels(action) {
-  var _params$filter, _types, _activeChannel, _mappedChannels, _mappedChannels3, _mappedChannels4, payload, params, SceytChatClient, connectionStatus, channelQueryBuilder, channelTypesFilter, types, limit, channelQuery, channelsData, channelList, channelId, activeChannel, _yield$call, mappedChannels, channelsForUpdateLastReactionMessage, _Object$keys, _mappedChannels2, channelMessageMap, _activeChannel2, _activeChannel3, hiddenList, allChannelsQueryBuilder, allChannelsQuery, hasNext, totalAllChannelsAdded, i, _connectionStatus, allChannelsData, allChannelList, _t2, _t3, _t4;
+  var _params$filter, _types, _activeChannel, _mappedChannels, _mappedChannels3, _mappedChannels4, payload, params, SceytChatClient, connectionStatus, channelQueryBuilder, channelTypesFilter, types, limit, channelQuery, channelsData, channelList, channelId, activeChannel, _yield$call, mappedChannels, channelsForUpdateLastReactionMessage, _Object$keys, _Object$keys2, _mappedChannels2, channelMessageMap, _activeChannel2, _activeChannel3, hiddenList, allChannelsQueryBuilder, allChannelsQuery, hasNext, totalAllChannelsAdded, i, _connectionStatus, allChannelsData, allChannelList, _t2, _t3, _t4;
   return _regenerator().w(function (_context2) {
     while (1) switch (_context2.p = _context2.n) {
       case 0:
-        log.info('[getChannels] start get channels');
+        log.info(new Date().toISOString() + " [getChannels] start get channels");
         _context2.p = 1;
         payload = action.payload;
         params = payload.params;
-        log.info('[getChannels] input params:', JSON.stringify(params));
+        log.info(new Date().toISOString() + " [getChannels] input params: " + JSON.stringify(params));
         SceytChatClient = getClient();
         connectionStatus = store.getState().UserReducer.connectionStatus;
-        log.info('[getChannels] connection status:', connectionStatus);
+        log.info(new Date().toISOString() + " [getChannels] connection status: " + connectionStatus);
         if (!(connectionStatus !== CONNECTION_STATUS.CONNECTED)) {
           _context2.n = 2;
           break;
         }
-        log.warn('[getChannels] connection not ready, aborting. Status:', connectionStatus);
+        log.warn(new Date().toISOString() + " [getChannels] connection not ready, aborting. Status: " + connectionStatus);
         return _context2.a(2);
       case 2:
         _context2.n = 3;
@@ -16568,7 +16580,7 @@ function getChannels(action) {
       case 3:
         channelQueryBuilder = new SceytChatClient.ChannelListQueryBuilder();
         channelTypesFilter = getChannelTypesFilter();
-        log.info('[getChannels] channelTypesFilter:', JSON.stringify(channelTypesFilter));
+        log.info(new Date().toISOString() + " [getChannels] channelTypesFilter: " + JSON.stringify(channelTypesFilter));
         types = [];
         if (channelTypesFilter !== null && channelTypesFilter !== void 0 && channelTypesFilter.length) {
           types = channelTypesFilter;
@@ -16576,29 +16588,29 @@ function getChannels(action) {
         if (params !== null && params !== void 0 && (_params$filter = params.filter) !== null && _params$filter !== void 0 && _params$filter.channelType) {
           types.push(params.filter.channelType);
         }
-        log.info('[getChannels] final types array:', JSON.stringify(types));
+        log.info(new Date().toISOString() + " [getChannels] final types array: " + JSON.stringify(types));
         if ((_types = types) !== null && _types !== void 0 && _types.length) {
           channelQueryBuilder.types(types);
         }
         if (params.memberCount) {
-          log.info('[getChannels] setting memberCount filter:', params === null || params === void 0 ? void 0 : params.memberCount);
+          log.info(new Date().toISOString() + " [getChannels] setting memberCount filter: " + (params === null || params === void 0 ? void 0 : params.memberCount));
           channelQueryBuilder.memberCount(params.memberCount);
         }
         channelQueryBuilder.order('lastMessage');
         limit = params.limit || 50;
-        log.info('[getChannels] query limit:', limit);
+        log.info(new Date().toISOString() + " [getChannels] query limit: " + limit);
         channelQueryBuilder.limit(limit);
         _context2.n = 4;
         return call(channelQueryBuilder.build);
       case 4:
         channelQuery = _context2.v;
-        log.info('[getChannels] query built successfully');
+        log.info(new Date().toISOString() + " [getChannels] query built successfully");
         _context2.n = 5;
         return call(channelQuery.loadNextPage);
       case 5:
         channelsData = _context2.v;
         channelList = channelsData.channels;
-        log.info('[getChannels] channelsData received:', JSON.stringify({
+        log.info(new Date().toISOString() + " [getChannels] channelsData received: " + JSON.stringify({
           channelsCount: (channelList === null || channelList === void 0 ? void 0 : channelList.length) || 0,
           hasNext: channelsData.hasNext
         }));
@@ -16609,7 +16621,7 @@ function getChannels(action) {
         return call(getActiveChannelId);
       case 7:
         channelId = _context2.v;
-        log.info('[getChannels] active channelId:', channelId);
+        log.info(new Date().toISOString() + " [getChannels] active channelId: " + channelId);
         if (!channelId) {
           _context2.n = 9;
           break;
@@ -16624,27 +16636,27 @@ function getChannels(action) {
         _t2 = null;
       case 10:
         activeChannel = _t2;
-        log.info('[getChannels] activeChannel from map:', activeChannel ? (_activeChannel = activeChannel) === null || _activeChannel === void 0 ? void 0 : _activeChannel.id : 'null');
+        log.info(new Date().toISOString() + " [getChannels] activeChannel from map: " + (activeChannel ? (_activeChannel = activeChannel) === null || _activeChannel === void 0 ? void 0 : _activeChannel.id : 'null'));
         _context2.n = 11;
         return call(destroyChannelsMap);
       case 11:
-        log.info('[getChannels] channels map destroyed');
+        log.info(new Date().toISOString() + " [getChannels] channels map destroyed");
         _context2.n = 12;
         return call(setChannelsInMap, channelList);
       case 12:
         _yield$call = _context2.v;
         mappedChannels = _yield$call.channels;
         channelsForUpdateLastReactionMessage = _yield$call.channelsForUpdateLastReactionMessage;
-        log.info('[getChannels] setChannelsInMap result:', JSON.stringify({
+        log.info(new Date().toISOString() + " [getChannels] setChannelsInMap result: " + JSON.stringify({
           mappedChannelsCount: ((_mappedChannels = mappedChannels) === null || _mappedChannels === void 0 ? void 0 : _mappedChannels.length) || 0,
           channelsForUpdateLastReactionMessageCount: (channelsForUpdateLastReactionMessage === null || channelsForUpdateLastReactionMessage === void 0 ? void 0 : channelsForUpdateLastReactionMessage.length) || 0
         }));
-        log.info('channelsForUpdateLastReactionMessage', channelsForUpdateLastReactionMessage === null || channelsForUpdateLastReactionMessage === void 0 ? void 0 : channelsForUpdateLastReactionMessage.length);
+        log.info(new Date().toISOString() + " channelsForUpdateLastReactionMessage: " + (channelsForUpdateLastReactionMessage === null || channelsForUpdateLastReactionMessage === void 0 ? void 0 : channelsForUpdateLastReactionMessage.length));
         if (!(channelsForUpdateLastReactionMessage !== null && channelsForUpdateLastReactionMessage !== void 0 && channelsForUpdateLastReactionMessage.length)) {
           _context2.n = 14;
           break;
         }
-        log.info('[getChannels] processing channels for reaction message update:', channelsForUpdateLastReactionMessage === null || channelsForUpdateLastReactionMessage === void 0 ? void 0 : channelsForUpdateLastReactionMessage.length);
+        log.info(new Date().toISOString() + " [getChannels] processing channels for\n        reaction message update: " + (channelsForUpdateLastReactionMessage === null || channelsForUpdateLastReactionMessage === void 0 ? void 0 : channelsForUpdateLastReactionMessage.length));
         channelMessageMap = {};
         _context2.n = 13;
         return call(function () {
@@ -16654,10 +16666,10 @@ function getChannels(action) {
                 return Promise.resolve(new Promise(function (resolve) {
                   channel.getMessagesById([channel.newReactions[0].messageId]).then(function (messages) {
                     channelMessageMap[channel === null || channel === void 0 ? void 0 : channel.id] = messages[0];
-                    log.info('[getChannels] successfully fetched reaction message for channel:', channel === null || channel === void 0 ? void 0 : channel.id);
+                    log.info(new Date().toISOString() + " [getChannels] successfully fetched reaction message for channel: " + (channel === null || channel === void 0 ? void 0 : channel.id));
                     resolve(true);
                   })["catch"](function (e) {
-                    log.error(e, 'Error on getMessagesById for channel:', channel === null || channel === void 0 ? void 0 : channel.id);
+                    log.error(e, "Error on getMessagesById for channel: " + (channel === null || channel === void 0 ? void 0 : channel.id));
                     resolve(true);
                   });
                 }));
@@ -16670,29 +16682,29 @@ function getChannels(action) {
           }
         });
       case 13:
-        log.info('[getChannels] reaction messages fetched:', channelMessageMap ? (_Object$keys = Object.keys(channelMessageMap)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length : 0);
+        log.info(new Date().toISOString() + " [getChannels] reaction messages fetched: " + (channelMessageMap ? (_Object$keys = Object.keys(channelMessageMap)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length : 0), channelMessageMap ? (_Object$keys2 = Object.keys(channelMessageMap)) === null || _Object$keys2 === void 0 ? void 0 : _Object$keys2.length : 0);
         mappedChannels = mappedChannels.map(function (channel) {
           if (channelMessageMap[channel === null || channel === void 0 ? void 0 : channel.id]) {
             channel.lastReactedMessage = channelMessageMap[channel === null || channel === void 0 ? void 0 : channel.id];
           }
           return channel;
         });
-        log.info('[getChannels] mappedChannels updated with reaction messages, final count:', ((_mappedChannels2 = mappedChannels) === null || _mappedChannels2 === void 0 ? void 0 : _mappedChannels2.length) || 0);
+        log.info(new Date().toISOString() + " [getChannels] mappedChannels updated with reaction messages, final count: " + (((_mappedChannels2 = mappedChannels) === null || _mappedChannels2 === void 0 ? void 0 : _mappedChannels2.length) || 0));
       case 14:
-        log.info('[getChannels] setting channels in state, count:', ((_mappedChannels3 = mappedChannels) === null || _mappedChannels3 === void 0 ? void 0 : _mappedChannels3.length) || 0);
+        log.info(new Date().toISOString() + " [getChannels] setting channels in state, count: " + (((_mappedChannels3 = mappedChannels) === null || _mappedChannels3 === void 0 ? void 0 : _mappedChannels3.length) || 0));
         _context2.n = 15;
         return put(setChannelsAC(mappedChannels));
       case 15:
         if (!channelId) {
           activeChannel = channelList[0];
-          log.info('[getChannels] no active channelId, setting first channel as active:', (_activeChannel2 = activeChannel) === null || _activeChannel2 === void 0 ? void 0 : _activeChannel2.id);
+          log.info(new Date().toISOString() + " [getChannels] no active channelId, setting first channel as active: " + ((_activeChannel2 = activeChannel) === null || _activeChannel2 === void 0 ? void 0 : _activeChannel2.id));
         }
         query.channelQuery = channelQuery;
         if (!(activeChannel && getAutoSelectFitsChannel())) {
           _context2.n = 16;
           break;
         }
-        log.info('[getChannels] auto-selecting channel:', (_activeChannel3 = activeChannel) === null || _activeChannel3 === void 0 ? void 0 : _activeChannel3.id);
+        log.info(new Date().toISOString() + " [getChannels] auto-selecting channel: " + ((_activeChannel3 = activeChannel) === null || _activeChannel3 === void 0 ? void 0 : _activeChannel3.id));
         _context2.n = 16;
         return put(switchChannelActionAC(JSON.parse(JSON.stringify(activeChannel))));
       case 16:
@@ -16700,28 +16712,28 @@ function getChannels(action) {
         return put(setChannelsLoadingStateAC(LOADING_STATE.LOADED));
       case 17:
         hiddenList = store.getState().ChannelReducer.hideChannelList;
-        log.info('[getChannels] hiddenList state:', hiddenList);
+        log.info(new Date().toISOString() + " [getChannels] hiddenList state: " + hiddenList);
         if (hiddenList) {
           _context2.n = 28;
           break;
         }
-        log.info('[getChannels] starting all channels query (hiddenList is false)');
+        log.info(new Date().toISOString() + " [getChannels] starting all channels query (hiddenList is false)");
         allChannelsQueryBuilder = new SceytChatClient.ChannelListQueryBuilder();
         allChannelsQueryBuilder.order('lastMessage');
         if (channelTypesFilter !== null && channelTypesFilter !== void 0 && channelTypesFilter.length) {
           allChannelsQueryBuilder.types(channelTypesFilter);
-          log.info('[getChannels] allChannelsQuery types:', JSON.stringify(channelTypesFilter));
+          log.info(new Date().toISOString() + " [getChannels] allChannelsQuery types: " + JSON.stringify(channelTypesFilter));
         }
         if (params !== null && params !== void 0 && params.memberCount) {
           allChannelsQueryBuilder.memberCount(params.memberCount);
-          log.info('[getChannels] allChannelsQuery memberCount:', params === null || params === void 0 ? void 0 : params.memberCount);
+          log.info(new Date().toISOString() + " [getChannels] allChannelsQuery memberCount: " + (params === null || params === void 0 ? void 0 : params.memberCount));
         }
         allChannelsQueryBuilder.limit(50);
         _context2.n = 18;
         return call(allChannelsQueryBuilder.build);
       case 18:
         allChannelsQuery = _context2.v;
-        log.info('[getChannels] allChannelsQuery built');
+        log.info(new Date().toISOString() + " [getChannels] allChannelsQuery built");
         hasNext = true;
         totalAllChannelsAdded = 0;
         i = 0;
@@ -16740,58 +16752,58 @@ function getChannels(action) {
           _context2.n = 21;
           break;
         }
-        log.warn('[getChannels] connection not ready, aborting. Status:', _connectionStatus);
+        log.warn(new Date().toISOString() + " [getChannels] connection not ready, aborting. Status: " + _connectionStatus);
         return _context2.a(3, 27);
       case 21:
-        log.info('[getChannels] loading all channels page:', i + 1);
+        log.info(new Date().toISOString() + " [getChannels] loading all channels page: " + (i + 1));
         _context2.n = 22;
         return call(allChannelsQuery.loadNextPage);
       case 22:
         allChannelsData = _context2.v;
         hasNext = allChannelsData.hasNext;
         allChannelList = allChannelsData.channels;
-        log.info('[getChannels] all channels page', i + 1, 'loaded:', JSON.stringify({
+        log.info(new Date().toISOString() + " [getChannels] all channels page: " + (i + 1), i + 1, 'loaded:', JSON.stringify({
           channelsCount: (allChannelList === null || allChannelList === void 0 ? void 0 : allChannelList.length) || 0,
           hasNext: hasNext
         }));
         addChannelsToAllChannels(allChannelList);
         totalAllChannelsAdded += (allChannelList === null || allChannelList === void 0 ? void 0 : allChannelList.length) || 0;
-        log.info('[getChannels] total all channels added so far:', totalAllChannelsAdded);
+        log.info(new Date().toISOString() + " [getChannels] total all channels added so far: " + totalAllChannelsAdded);
         _context2.n = 24;
         break;
       case 23:
         _context2.p = 23;
         _t3 = _context2.v;
-        log.error(_t3, 'Error on get all channels page:', i + 1);
+        log.error(_t3, "Error on get all channels page: " + (i + 1));
         return _context2.a(3, 27);
       case 24:
         _context2.n = 26;
         break;
       case 25:
-        log.info('[getChannels] no more pages available, stopping at iteration:', i);
+        log.info(new Date().toISOString() + " [getChannels] no more pages available, stopping at iteration: " + i);
       case 26:
         i++;
         _context2.n = 19;
         break;
       case 27:
-        log.info('[getChannels] all channels query completed, total channels added:', totalAllChannelsAdded);
+        log.info(new Date().toISOString() + " [getChannels] all channels query completed, total channels added: " + totalAllChannelsAdded);
         _context2.n = 29;
         break;
       case 28:
-        log.info('[getChannels] skipping all channels query (hiddenList is true)');
+        log.info(new Date().toISOString() + " [getChannels] skipping all channels query (hiddenList is true)");
       case 29:
-        log.info('[getChannels] completed successfully. Final mapped channels count:', ((_mappedChannels4 = mappedChannels) === null || _mappedChannels4 === void 0 ? void 0 : _mappedChannels4.length) || 0);
+        log.info(new Date().toISOString() + " [getChannels] completed successfully. Final mapped channels count: " + (((_mappedChannels4 = mappedChannels) === null || _mappedChannels4 === void 0 ? void 0 : _mappedChannels4.length) || 0));
         _context2.n = 31;
         break;
       case 30:
         _context2.p = 30;
         _t4 = _context2.v;
-        log.error('[getChannels] error occurred:', JSON.stringify(_t4), 'Error on get channels');
-        log.error('[getChannels] error details:', {
+        log.error(new Date().toISOString() + " [getChannels] error occurred: " + JSON.stringify(_t4), 'Error on get channels');
+        log.error(new Date().toISOString() + " [getChannels] error details: " + JSON.stringify({
           message: _t4.message,
           code: _t4.code,
           stack: _t4.stack
-        });
+        }));
       case 31:
         return _context2.a(2);
     }
@@ -17118,56 +17130,56 @@ function searchChannelsForForward(action) {
   }, _marked5, null, [[0, 7]]);
 }
 function channelsLoadMore(action) {
-  var _mappedChannels5, _mappedChannels7, _mappedChannels8, payload, limit, channelQuery, channelsData, channelList, _yield$call3, mappedChannels, channelsForUpdateLastReactionMessage, _Object$keys2, _mappedChannels6, channelMessageMap, _t8;
+  var _mappedChannels5, _mappedChannels7, _mappedChannels8, payload, limit, channelQuery, channelsData, channelList, _yield$call3, mappedChannels, channelsForUpdateLastReactionMessage, _Object$keys3, _mappedChannels6, channelMessageMap, _t8;
   return _regenerator().w(function (_context6) {
     while (1) switch (_context6.p = _context6.n) {
       case 0:
-        log.info('[channelsLoadMore] start load more channels');
+        log.info(new Date().toISOString() + " [channelsLoadMore] start load more channels");
         _context6.p = 1;
         payload = action.payload;
         limit = payload.limit;
-        log.info('[channelsLoadMore] input payload:', JSON.stringify({
+        log.info(new Date().toISOString() + " [channelsLoadMore] input payload:", JSON.stringify({
           limit: limit
         }));
         channelQuery = query.channelQuery;
-        log.info('[channelsLoadMore] channelQuery exists:', !!channelQuery);
+        log.info(new Date().toISOString() + " [channelsLoadMore] channelQuery exists:", !!channelQuery);
         if (channelQuery) {
           _context6.n = 2;
           break;
         }
-        log.error('[channelsLoadMore] channelQuery is null or undefined, cannot load more');
+        log.error(new Date().toISOString() + " [channelsLoadMore] channelQuery is null or undefined, cannot load more");
         return _context6.a(2);
       case 2:
         if (limit) {
-          log.info('[channelsLoadMore] setting query limit to:', limit);
+          log.info(new Date().toISOString() + " [channelsLoadMore] setting query limit to:", limit);
           channelQuery.limit = limit;
         } else {
-          log.info('[channelsLoadMore] no limit provided, using existing query limit');
+          log.info(new Date().toISOString() + " [channelsLoadMore] no limit provided, using existing query limit");
         }
         _context6.n = 3;
         return put(setChannelsLoadingStateAC(LOADING_STATE.LOADING));
       case 3:
-        log.info('[channelsLoadMore] loading next page...');
+        log.info(new Date().toISOString() + " [channelsLoadMore] loading next page...");
         _context6.n = 4;
         return call(channelQuery.loadNextPage);
       case 4:
         channelsData = _context6.v;
         channelList = channelsData.channels;
-        log.info('[channelsLoadMore] channelsData received:', JSON.stringify({
+        log.info(new Date().toISOString() + " [channelsLoadMore] channelsData received:", JSON.stringify({
           channelsCount: (channelList === null || channelList === void 0 ? void 0 : channelList.length) || 0,
           hasNext: channelsData.hasNext
         }));
         _context6.n = 5;
         return put(channelHasNextAC(channelsData.hasNext));
       case 5:
-        log.info('[channelsLoadMore] hasNext set to:', channelsData.hasNext);
+        log.info(new Date().toISOString() + " [channelsLoadMore] hasNext set to:", channelsData.hasNext);
         _context6.n = 6;
         return call(setChannelsInMap, channelsData.channels);
       case 6:
         _yield$call3 = _context6.v;
         mappedChannels = _yield$call3.channels;
         channelsForUpdateLastReactionMessage = _yield$call3.channelsForUpdateLastReactionMessage;
-        log.info('[channelsLoadMore] setChannelsInMap result:', JSON.stringify({
+        log.info(new Date().toISOString() + " [channelsLoadMore] setChannelsInMap result:", JSON.stringify({
           mappedChannelsCount: ((_mappedChannels5 = mappedChannels) === null || _mappedChannels5 === void 0 ? void 0 : _mappedChannels5.length) || 0,
           channelsForUpdateLastReactionMessageCount: (channelsForUpdateLastReactionMessage === null || channelsForUpdateLastReactionMessage === void 0 ? void 0 : channelsForUpdateLastReactionMessage.length) || 0
         }));
@@ -17175,7 +17187,7 @@ function channelsLoadMore(action) {
           _context6.n = 8;
           break;
         }
-        log.info('[channelsLoadMore] processing channels for reaction message update:', channelsForUpdateLastReactionMessage === null || channelsForUpdateLastReactionMessage === void 0 ? void 0 : channelsForUpdateLastReactionMessage.length);
+        log.info(new Date().toISOString() + " [channelsLoadMore] processing channels for reaction message update:", channelsForUpdateLastReactionMessage === null || channelsForUpdateLastReactionMessage === void 0 ? void 0 : channelsForUpdateLastReactionMessage.length);
         channelMessageMap = {};
         _context6.n = 7;
         return call(function () {
@@ -17185,7 +17197,7 @@ function channelsLoadMore(action) {
                 return Promise.resolve(new Promise(function (resolve) {
                   channel.getMessagesById([channel.newReactions[0].messageId]).then(function (messages) {
                     channelMessageMap[channel.id] = messages[0];
-                    log.info('[channelsLoadMore] successfully fetched reaction message for channel:', channel === null || channel === void 0 ? void 0 : channel.id);
+                    log.info(new Date().toISOString() + " [channelsLoadMore] successfully fetched reaction message for channel:", channel === null || channel === void 0 ? void 0 : channel.id);
                     resolve(true);
                   })["catch"](function (e) {
                     log.error(e, 'Error on getMessagesById for channel:', channel === null || channel === void 0 ? void 0 : channel.id);
@@ -17201,34 +17213,34 @@ function channelsLoadMore(action) {
           }
         });
       case 7:
-        log.info('[channelsLoadMore] reaction messages fetched:', channelMessageMap ? (_Object$keys2 = Object.keys(channelMessageMap)) === null || _Object$keys2 === void 0 ? void 0 : _Object$keys2.length : 0);
+        log.info(new Date().toISOString() + " [channelsLoadMore] reaction messages fetched:", channelMessageMap ? (_Object$keys3 = Object.keys(channelMessageMap)) === null || _Object$keys3 === void 0 ? void 0 : _Object$keys3.length : 0);
         mappedChannels = mappedChannels.map(function (channel) {
           if (channelMessageMap[channel.id]) {
             channel.lastReactedMessage = channelMessageMap[channel.id];
           }
           return channel;
         });
-        log.info('[channelsLoadMore] mappedChannels updated with reaction messages, final count:', ((_mappedChannels6 = mappedChannels) === null || _mappedChannels6 === void 0 ? void 0 : _mappedChannels6.length) || 0);
+        log.info(new Date().toISOString() + " [channelsLoadMore] mappedChannels updated with reaction messages, final count:", ((_mappedChannels6 = mappedChannels) === null || _mappedChannels6 === void 0 ? void 0 : _mappedChannels6.length) || 0);
         _context6.n = 9;
         break;
       case 8:
-        log.info('[channelsLoadMore] no channels need reaction message update');
+        log.info(new Date().toISOString() + " [channelsLoadMore] no channels need reaction message update");
       case 9:
-        log.info('[channelsLoadMore] adding channels to state, count:', ((_mappedChannels7 = mappedChannels) === null || _mappedChannels7 === void 0 ? void 0 : _mappedChannels7.length) || 0);
+        log.info(new Date().toISOString() + " [channelsLoadMore] adding channels to state, count:", ((_mappedChannels7 = mappedChannels) === null || _mappedChannels7 === void 0 ? void 0 : _mappedChannels7.length) || 0);
         _context6.n = 10;
         return put(addChannelsAC(mappedChannels));
       case 10:
         _context6.n = 11;
         return put(setChannelsLoadingStateAC(LOADING_STATE.LOADED));
       case 11:
-        log.info('[channelsLoadMore] completed successfully. Total channels added:', ((_mappedChannels8 = mappedChannels) === null || _mappedChannels8 === void 0 ? void 0 : _mappedChannels8.length) || 0);
+        log.info(new Date().toISOString() + " [channelsLoadMore] completed successfully. Total channels added:", ((_mappedChannels8 = mappedChannels) === null || _mappedChannels8 === void 0 ? void 0 : _mappedChannels8.length) || 0);
         _context6.n = 13;
         break;
       case 12:
         _context6.p = 12;
         _t8 = _context6.v;
-        log.error('[channelsLoadMore] error occurred:', _t8);
-        log.error('[channelsLoadMore] error details:', JSON.stringify({
+        log.error(new Date().toISOString() + " [channelsLoadMore] error occurred:", _t8);
+        log.error(new Date().toISOString() + " [channelsLoadMore] error details:", JSON.stringify({
           message: _t8 === null || _t8 === void 0 ? void 0 : _t8.message,
           code: _t8 === null || _t8 === void 0 ? void 0 : _t8.code,
           stack: _t8 === null || _t8 === void 0 ? void 0 : _t8.stack
@@ -19620,6 +19632,9 @@ function sendMessage(action) {
           if (channel) {
             setChannelInMap(channel);
           }
+          if (!channel) {
+            channel = getChannelFromAllChannelsMap(channelId);
+          }
         }
         if (!channel.isMockChannel) {
           _context4.n = 6;
@@ -19806,7 +19821,7 @@ function sendMessage(action) {
         messagesToSend.push(messageToSend);
       case 12:
         _loop2 = /*#__PURE__*/_regenerator().m(function _callee3() {
-          var messageAttachment, messageToSend, messageCopy, _attachmentsToSend, linkAttachmentToSend, linkAttachmentBuilder, messageResponse, k, pendingAttachment, attachmentsToUpdate, currentAttachmentsMap, messageUpdateData, stringifiedMessageUpdateData, activeChannelId, messageToUpdate, channelUpdateParam, isErrorResendable, _t;
+          var messageAttachment, messageToSend, messageCopy, _attachmentsToSend, linkAttachmentToSend, linkAttachmentBuilder, messageResponse, k, pendingAttachment, attachmentsToUpdate, currentAttachmentsMap, messageUpdateData, stringifiedMessageUpdateData, activeChannelId, messageToUpdate, channelUpdateParam, _channel, _messageToSend2, _channel2, isErrorResendable, _t;
           return _regenerator().w(function (_context3) {
             while (1) switch (_context3.p = _context3.n) {
               case 0:
@@ -19950,7 +19965,7 @@ function sendMessage(action) {
                 _context3.p = 15;
                 _t = _context3.v;
                 isErrorResendable = isResendableError(_t === null || _t === void 0 ? void 0 : _t.type);
-                if (isErrorResendable) {
+                if (!(!isErrorResendable && (_channel = channel) !== null && _channel !== void 0 && _channel.id && (_messageToSend2 = messageToSend) !== null && _messageToSend2 !== void 0 && _messageToSend2.tid)) {
                   _context3.n = 17;
                   break;
                 }
@@ -19960,6 +19975,10 @@ function sendMessage(action) {
                 _context3.n = 19;
                 break;
               case 17:
+                if (!((_channel2 = channel) !== null && _channel2 !== void 0 && _channel2.id)) {
+                  _context3.n = 19;
+                  break;
+                }
                 log.error('Error on uploading attachment', messageToSend.tid, _t);
                 if (!(messageToSend.attachments && messageToSend.attachments.length)) {
                   _context3.n = 18;
@@ -20016,7 +20035,7 @@ function sendMessage(action) {
   }, _marked$3, null, [[1, 16, 17, 19]]);
 }
 function sendTextMessage(action) {
-  var payload, message, connectionState, channelId, channel, sendMessageTid, pendingMessage, SceytChatClient, createChannelData, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, createdMessage, messageToSend, _messageResponse, messageResponse, messageUpdateData, activeChannelId, stringifiedMessageUpdateData, messageToUpdate, channelUpdateParam, isErrorResendable, _activeChannelId, _t3;
+  var payload, message, connectionState, channelId, channel, sendMessageTid, pendingMessage, SceytChatClient, createChannelData, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, createdMessage, messageToSend, _messageResponse, messageResponse, messageUpdateData, activeChannelId, stringifiedMessageUpdateData, messageToUpdate, channelUpdateParam, _channel3, _channel4, isErrorResendable, _activeChannelId, _t3;
   return _regenerator().w(function (_context5) {
     while (1) switch (_context5.p = _context5.n) {
       case 0:
@@ -20034,6 +20053,9 @@ function sendTextMessage(action) {
           if (channel) {
             setChannelInMap(channel);
           }
+          if (!channel) {
+            channel = getChannelFromAllChannelsMap(channelId);
+          }
         }
         sendMessageTid = null;
         pendingMessage = null;
@@ -20189,7 +20211,7 @@ function sendTextMessage(action) {
         _t3 = _context5.v;
         log.error('error on send text message ... ', _t3 === null || _t3 === void 0 ? void 0 : _t3.type);
         isErrorResendable = isResendableError(_t3 === null || _t3 === void 0 ? void 0 : _t3.type);
-        if (!(!isErrorResendable && channel.id && sendMessageTid)) {
+        if (!(!isErrorResendable && (_channel3 = channel) !== null && _channel3 !== void 0 && _channel3.id && sendMessageTid)) {
           _context5.n = 22;
           break;
         }
@@ -20199,7 +20221,7 @@ function sendTextMessage(action) {
         _context5.n = 23;
         break;
       case 22:
-        if (!(channel.id && sendMessageTid)) {
+        if (!((_channel4 = channel) !== null && _channel4 !== void 0 && _channel4.id && sendMessageTid)) {
           _context5.n = 23;
           break;
         }
@@ -20233,7 +20255,7 @@ function sendTextMessage(action) {
   }, _marked2$2, null, [[3, 20, 23, 25]]);
 }
 function forwardMessage(action) {
-  var payload, message, channelId, connectionState, isForward, pendingMessage, channel, activeChannelId, messageTid, SceytChatClient, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, pollDetails, messageToSend, hasNextMessages, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, isErrorResendable, _activeChannelId2, _t4;
+  var payload, message, channelId, connectionState, isForward, pendingMessage, channel, activeChannelId, messageTid, SceytChatClient, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, pollDetails, messageToSend, hasNextMessages, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, _channel5, isErrorResendable, _channel6, _activeChannelId2, _t4;
   return _regenerator().w(function (_context6) {
     while (1) switch (_context6.p = _context6.n) {
       case 0:
@@ -20269,6 +20291,9 @@ function forwardMessage(action) {
         if (channel) {
           setChannelInMap(channel);
         }
+        if (!channel) {
+          channel = getChannelFromAllChannelsMap(channelId);
+        }
       case 6:
         if (channel) {
           _context6.n = 7;
@@ -20418,7 +20443,7 @@ function forwardMessage(action) {
         _context6.p = 18;
         _t4 = _context6.v;
         isErrorResendable = isResendableError(_t4 === null || _t4 === void 0 ? void 0 : _t4.type);
-        if (isErrorResendable) {
+        if (!(!isErrorResendable && (_channel5 = channel) !== null && _channel5 !== void 0 && _channel5.id && messageTid)) {
           _context6.n = 20;
           break;
         }
@@ -20428,7 +20453,7 @@ function forwardMessage(action) {
         _context6.n = 21;
         break;
       case 20:
-        if (!(channel && messageTid)) {
+        if (!((_channel6 = channel) !== null && _channel6 !== void 0 && _channel6.id && messageTid)) {
           _context6.n = 21;
           break;
         }
@@ -21251,7 +21276,7 @@ function getMessagesQuery(action) {
         return call(SceytChatClient.getChannel, channel.id, true);
       case 82:
         updatedChannel = _context10.v;
-        if (!updatedChannel) {
+        if (!(updatedChannel && updatedChannel !== null && updatedChannel !== void 0 && updatedChannel.lastMessage)) {
           _context10.n = 84;
           break;
         }
@@ -45747,7 +45772,8 @@ var GroupsInCommonPopup = function GroupsInCommonPopup(_ref2) {
     textSecondary = _useColor[THEME_COLORS.TEXT_SECONDARY],
     background = _useColor[THEME_COLORS.BACKGROUND],
     iconPrimary = _useColor[THEME_COLORS.ICON_PRIMARY],
-    backgroundHovered = _useColor[THEME_COLORS.BACKGROUND_HOVERED];
+    backgroundHovered = _useColor[THEME_COLORS.BACKGROUND_HOVERED],
+    surface2 = _useColor[THEME_COLORS.SURFACE_2];
   var contactsMap = useSelector(contactsMapSelector);
   var getFromContacts = getShowOnlyContactUsers();
   var dispatch = useDispatch();
@@ -45812,7 +45838,7 @@ var GroupsInCommonPopup = function GroupsInCommonPopup(_ref2) {
     onMouseLeave: function onMouseLeave() {
       return setIsScrolling(false);
     },
-    thumbColor: background
+    thumbColor: surface2
   }, isLoadingInitial ? (/*#__PURE__*/React__default.createElement(LoadingText$1, {
     color: textSecondary
   }, "Loading...")) : mutualChannels.length > 0 ? mutualChannels.map(function (channel) {
@@ -45835,7 +45861,7 @@ var GroupsInCommonPopup = function GroupsInCommonPopup(_ref2) {
     color: textSecondary
   }, "Loading more...")))));
 };
-var ChannelsList$1 = styled.div(_templateObject$U || (_templateObject$U = _taggedTemplateLiteralLoose(["\n  max-height: 400px;\n  overflow-y: auto;\n  overflow-x: hidden;\n\n  &::-webkit-scrollbar {\n    width: 6px;\n  }\n\n  &::-webkit-scrollbar-track {\n    background: transparent;\n  }\n\n  &::-webkit-scrollbar-thumb {\n    background: ", ";\n    border-radius: 3px;\n    opacity: 0.3;\n  }\n\n  &.show-scrollbar::-webkit-scrollbar-thumb {\n    opacity: 0.6;\n  }\n"])), function (props) {
+var ChannelsList$1 = styled.div(_templateObject$U || (_templateObject$U = _taggedTemplateLiteralLoose(["\n  max-height: 400px;\n  overflow-y: auto;\n  overflow-x: hidden;\n\n  &::-webkit-scrollbar {\n    width: 8px;\n    background: transparent;\n  }\n  &::-webkit-scrollbar-thumb {\n    background: transparent;\n  }\n\n  &.show-scrollbar::-webkit-scrollbar-thumb {\n    background: ", ";\n    border-radius: 4px;\n  }\n  &.show-scrollbar::-webkit-scrollbar-track {\n    background: transparent;\n  }\n"])), function (props) {
   return props.thumbColor;
 });
 var ChannelItem$1 = styled.div(_templateObject2$P || (_templateObject2$P = _taggedTemplateLiteralLoose(["\n  display: flex;\n  align-items: center;\n  padding: 6px 2px 6px 6px;\n  border-radius: 8px;\n  cursor: pointer;\n  transition: background-color 0.2s;\n\n  &:hover {\n    background-color: ", ";\n  }\n"])), function (props) {

package/package.json CHANGED Viewed

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