sceyt-chat-react-uikit 1.7.7-beta.15 → 1.7.7-beta.16

package/components/ChatContainer/index.d.ts

@@ -60,7 +60,13 @@ export interface IChatClientProps {
     inviteLinkOptions?: InviteLinkOptions | null;
     embeddedJoinGroupPopup?: boolean;
     onUpdateChannel?: (channel: IChannel, updatedFields: string[]) => void;
-    enableDisappearingMessages?: boolean;
+    disappearingSettings?: {
+        show?: boolean;
+        customOptions?: {
+            label: string;
+            seconds: number;
+        }[];
+    } | null;
 }
-declare const SceytChatContainer: ({ client, theme, themeMode, avatarColors, children, showOnlyContactUsers, handleNewMessages, sendAttachmentsAsSeparateMessages, membersDisplayTextByChannelTypesMap, defaultRolesByChannelTypesMap, channelTypeFilter, logoSrc, CustomUploader, showNotifications, hideUserPresence, openChatOnUserInteraction, autoSelectFirstChannel, logLevel, memberCount, disableFrowardMentionsCount, chatMinWidth, baseUrlForInviteMembers, useInviteLink, inviteLinkOptions, embeddedJoinGroupPopup, onUpdateChannel, enableDisappearingMessages }: IChatClientProps) => React.JSX.Element;
+declare const SceytChatContainer: ({ client, theme, themeMode, avatarColors, children, showOnlyContactUsers, handleNewMessages, sendAttachmentsAsSeparateMessages, membersDisplayTextByChannelTypesMap, defaultRolesByChannelTypesMap, channelTypeFilter, logoSrc, CustomUploader, showNotifications, hideUserPresence, openChatOnUserInteraction, autoSelectFirstChannel, logLevel, memberCount, disableFrowardMentionsCount, chatMinWidth, baseUrlForInviteMembers, useInviteLink, inviteLinkOptions, embeddedJoinGroupPopup, onUpdateChannel, disappearingSettings }: IChatClientProps) => React.JSX.Element;
 export default SceytChatContainer;

package/index.js

@@ -2678,42 +2678,6 @@ var FIXED_TIMER_OPTIONS = {
   '1month': 60 * 60 * 24 * 30,
   custom: 60 * 60 * 24 * 2
 };
-var CUSTOM_OPTIONS = [{
-  label: '1 day',
-  value: '1day',
-  seconds: 60 * 60 * 24
-}, {
-  label: '2 days',
-  value: '2days',
-  seconds: 60 * 60 * 24 * 2
-}, {
-  label: '3 days',
-  value: '3days',
-  seconds: 60 * 60 * 24 * 3
-}, {
-  label: '4 days',
-  value: '4days',
-  seconds: 60 * 60 * 24 * 4
-}, {
-  label: '5 days',
-  value: '5days',
-  seconds: 60 * 60 * 24 * 5
-}, {
-  label: '1 week',
-  value: '1week',
-  seconds: 60 * 60 * 24 * 7
-}, {
-  label: '2 weeks',
-  value: '2weeks',
-  seconds: 60 * 60 * 24 * 14
-}, {
-  label: '1 month',
-  value: '1month',
-  seconds: 60 * 60 * 24 * 30
-}];
-var CUSTOM_SECONDS_MAP = Object.fromEntries(CUSTOM_OPTIONS.map(function (o) {
-  return [o.value, o.seconds];
-}));
 
 // A type of promise-like that resolves synchronously and supports only one observer
 const _Pact = /*#__PURE__*/(function() {
@@ -9079,7 +9043,7 @@ var memberCount = 10;
 var disableFrowardMentionsCount = false;
 var onUpdateChannel = function onUpdateChannel() {};
 var useInviteLink = false;
-var enableDisappearingMessages = true;
+var disappearingSettings;
 var inviteLinkOptions = null;
 function setBaseUrlForInviteMembers(url) {
   baseUrlForInviteMembers = url;
@@ -9298,11 +9262,11 @@ var setShowChannelDetails = function setShowChannelDetails(state) {
 var getShowChannelDetails = function getShowChannelDetails() {
   return showChannelDetails;
 };
-var setEnableDisappearingMessages = function setEnableDisappearingMessages(state) {
-  enableDisappearingMessages = state;
+var setDisappearingSettings = function setDisappearingSettings(settings) {
+  disappearingSettings = settings;
 };
-var getEnableDisappearingMessages = function getEnableDisappearingMessages() {
-  return enableDisappearingMessages;
+var getDisappearingSettings = function getDisappearingSettings() {
+  return disappearingSettings;
 };
 var sortChannelByLastMessage = function sortChannelByLastMessage(channels) {
   return channels.sort(function (a, b) {
@@ -10094,6 +10058,7 @@ var hashString = function hashString(str) {
   }
 };
 var formatDisappearingMessageTime = function formatDisappearingMessageTime(periodInMilliseconds) {
+  var _getDisappearingSetti;
   if (!periodInMilliseconds) return 'Off';
   var periodInSeconds = periodInMilliseconds / 1000;
   switch (periodInSeconds) {
@@ -10104,7 +10069,8 @@ var formatDisappearingMessageTime = function formatDisappearingMessageTime(perio
     case FIXED_TIMER_OPTIONS['1month']:
       return '1 month';
   }
-  var customMatch = CUSTOM_OPTIONS.find(function (option) {
+  var customOptions = ((_getDisappearingSetti = getDisappearingSettings()) === null || _getDisappearingSetti === void 0 ? void 0 : _getDisappearingSetti.customOptions) || [];
+  var customMatch = customOptions.find(function (option) {
     return option.seconds === periodInSeconds;
   });
   if (customMatch) return customMatch.label;
@@ -10252,10 +10218,13 @@ function setMessageToEditAC(message) {
     message: message
   });
 }
-function getMessagesAC(channel, loadWithLastMessage, messageId, limit, withDeliveredMessages, highlight, behavior) {
+function getMessagesAC(channel, loadWithLastMessage, messageId, limit, withDeliveredMessages, highlight, behavior, scrollToMessage) {
   if (highlight === void 0) {
     highlight = true;
   }
+  if (scrollToMessage === void 0) {
+    scrollToMessage = true;
+  }
   return {
     type: GET_MESSAGES,
     payload: {
@@ -10265,7 +10234,8 @@ function getMessagesAC(channel, loadWithLastMessage, messageId, limit, withDeliv
       limit: limit,
       withDeliveredMessages: withDeliveredMessages,
       highlight: highlight,
-      behavior: behavior
+      behavior: behavior,
+      scrollToMessage: scrollToMessage
     }
   };
 }
@@ -19222,7 +19192,7 @@ function sendMessage(action) {
         }
       case 11:
         _loop2 = /*#__PURE__*/_regenerator().m(function _callee2() {
-          var messageAttachment, messageToSend, messageCopy, _attachmentsToSend, linkAttachmentToSend, linkAttachmentBuilder, messageResponse, k, pendingAttachment, attachmentsToUpdate, currentAttachmentsMap, messageUpdateData, messageToUpdate, channelUpdateParam, pendingMessage, _t;
+          var messageAttachment, messageToSend, messageCopy, _attachmentsToSend, linkAttachmentToSend, linkAttachmentBuilder, messageResponse, k, pendingAttachment, attachmentsToUpdate, currentAttachmentsMap, messageUpdateData, messageToUpdate, channelUpdateParam, pendingMessage, connectionIsDisconnected, _t;
           return _regenerator().w(function (_context2) {
             while (1) switch (_context2.p = _context2.n) {
               case 0:
@@ -19357,7 +19327,7 @@ function sendMessage(action) {
               case 12:
                 throw new Error('Connection required to send message');
               case 13:
-                _context2.n = 17;
+                _context2.n = 19;
                 break;
               case 14:
                 _context2.p = 14;
@@ -19366,24 +19336,31 @@ function sendMessage(action) {
                   return pendingMessage.tid === messageToSend.tid;
                 });
                 if (!(channel && pendingMessage && action.type !== RESEND_MESSAGE)) {
-                  _context2.n = 15;
+                  _context2.n = 17;
                   break;
                 }
-                if (!isAddToPendingMessagesMap) {
-                  _context2.n = 15;
+                connectionIsDisconnected = store.getState().UserReducer.connectionStatus !== CONNECTION_STATUS.CONNECTED;
+                if (!(isAddToPendingMessagesMap && connectionIsDisconnected)) {
+                  _context2.n = 16;
                   break;
                 }
                 _context2.n = 15;
                 return effects.call(addPendingMessage, message, pendingMessage, channel);
               case 15:
+                _context2.n = 17;
+                break;
+              case 16:
+                _context2.n = 17;
+                return effects.put(removePendingMessageAC(channel.id, pendingMessage.tid));
+              case 17:
                 log.error('Error on uploading attachment', messageToSend.tid, _t);
                 if (!(messageToSend.attachments && messageToSend.attachments.length)) {
-                  _context2.n = 16;
+                  _context2.n = 18;
                   break;
                 }
-                _context2.n = 16;
+                _context2.n = 18;
                 return effects.put(updateAttachmentUploadingStateAC(UPLOAD_STATE.FAIL, messageToSend.attachments[0].tid));
-              case 16:
+              case 18:
                 updateMessageOnMap(channel.id, {
                   messageId: messageToSend.tid,
                   params: {
@@ -19393,11 +19370,11 @@ function sendMessage(action) {
                 updateMessageOnAllMessages(messageToSend.tid, {
                   state: MESSAGE_STATUS.FAILED
                 });
-                _context2.n = 17;
+                _context2.n = 19;
                 return effects.put(updateMessageAC(messageToSend.tid, {
                   state: MESSAGE_STATUS.FAILED
                 }));
-              case 17:
+              case 19:
                 return _context2.a(2);
             }
           }, _callee2, null, [[1, 14]]);
@@ -19421,12 +19398,18 @@ function sendMessage(action) {
         _t2 = _context3.v;
         log.error('error on send message ... ', _t2);
       case 16:
+        _context3.p = 16;
+        _context3.n = 17;
+        return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
+      case 17:
+        return _context3.f(16);
+      case 18:
         return _context3.a(2);
     }
-  }, _marked$3, null, [[1, 15]]);
+  }, _marked$3, null, [[1, 15, 16, 18]]);
 }
 function sendTextMessage(action) {
-  var payload, message, connectionState, channelId, isAddToPendingMessagesMap, channel, sendMessageTid, pendingMessage, activeChannelId, SceytChatClient, createChannelData, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, createdMessage, messageToSend, _messageResponse, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, _t3;
+  var payload, message, connectionState, channelId, isAddToPendingMessagesMap, channel, sendMessageTid, pendingMessage, activeChannelId, SceytChatClient, createChannelData, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, createdMessage, messageToSend, _messageResponse, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, connectionIsDisconnected, _t3;
   return _regenerator().w(function (_context4) {
     while (1) switch (_context4.p = _context4.n) {
       case 0:
@@ -19582,25 +19565,29 @@ function sendTextMessage(action) {
       case 15:
         throw new Error('Connection required to send message');
       case 16:
-        _context4.n = 17;
-        return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
-      case 17:
         _context4.n = 21;
         break;
-      case 18:
-        _context4.p = 18;
+      case 17:
+        _context4.p = 17;
         _t3 = _context4.v;
         if (!(activeChannelId === channel.id && pendingMessage && action.type !== RESEND_MESSAGE)) {
-          _context4.n = 19;
+          _context4.n = 20;
           break;
         }
-        if (!isAddToPendingMessagesMap) {
+        connectionIsDisconnected = store.getState().UserReducer.connectionStatus !== CONNECTION_STATUS.CONNECTED;
+        if (!(isAddToPendingMessagesMap && connectionIsDisconnected)) {
           _context4.n = 19;
           break;
         }
-        _context4.n = 19;
+        _context4.n = 18;
         return effects.call(addPendingMessage, message, pendingMessage, channel);
+      case 18:
+        _context4.n = 20;
+        break;
       case 19:
+        _context4.n = 20;
+        return effects.put(removePendingMessageAC(channel.id, pendingMessage.tid));
+      case 20:
         log.error('error on send text message ... ', _t3);
         updateMessageOnMap(channel.id, {
           messageId: sendMessageTid,
@@ -19609,26 +19596,29 @@ function sendTextMessage(action) {
           }
         });
         if (!(activeChannelId === channel.id)) {
-          _context4.n = 20;
+          _context4.n = 21;
           break;
         }
         updateMessageOnAllMessages(sendMessageTid, {
           state: MESSAGE_STATUS.FAILED
         });
-        _context4.n = 20;
+        _context4.n = 21;
         return effects.put(updateMessageAC(sendMessageTid, {
           state: MESSAGE_STATUS.FAILED
         }));
-      case 20:
-        _context4.n = 21;
-        return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
       case 21:
+        _context4.p = 21;
+        _context4.n = 22;
+        return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
+      case 22:
+        return _context4.f(21);
+      case 23:
         return _context4.a(2);
     }
-  }, _marked2$2, null, [[3, 18]]);
+  }, _marked2$2, null, [[3, 17, 21, 23]]);
 }
 function forwardMessage(action) {
-  var payload, message, channelId, connectionState, isForward, isAddToPendingMessagesMap, pendingMessage, channel, activeChannelId, messageTid, SceytChatClient, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, pollDetails, messageToSend, hasNextMessages, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, _t4;
+  var payload, message, channelId, connectionState, isForward, isAddToPendingMessagesMap, pendingMessage, channel, activeChannelId, messageTid, SceytChatClient, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, pollDetails, messageToSend, hasNextMessages, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, connectionIsDisconnected, _t4;
   return _regenerator().w(function (_context5) {
     while (1) switch (_context5.p = _context5.n) {
       case 0:
@@ -19798,24 +19788,31 @@ function forwardMessage(action) {
       case 14:
         throw new Error('Connection required to forward message');
       case 15:
-        _context5.n = 20;
+        _context5.n = 21;
         break;
       case 16:
         _context5.p = 16;
         _t4 = _context5.v;
         if (!(pendingMessage && channel && action.type !== RESEND_MESSAGE)) {
-          _context5.n = 17;
+          _context5.n = 19;
           break;
         }
-        if (!isAddToPendingMessagesMap) {
-          _context5.n = 17;
+        connectionIsDisconnected = store.getState().UserReducer.connectionStatus !== CONNECTION_STATUS.CONNECTED;
+        if (!(isAddToPendingMessagesMap && connectionIsDisconnected)) {
+          _context5.n = 18;
           break;
         }
         _context5.n = 17;
         return effects.call(addPendingMessage, message, pendingMessage, channel);
       case 17:
+        _context5.n = 19;
+        break;
+      case 18:
+        _context5.n = 19;
+        return effects.put(removePendingMessageAC(channel.id, pendingMessage.tid));
+      case 19:
         if (!(channel && messageTid)) {
-          _context5.n = 18;
+          _context5.n = 20;
           break;
         }
         updateMessageOnMap(channel.id, {
@@ -19825,28 +19822,28 @@ function forwardMessage(action) {
           }
         });
         if (!(activeChannelId === channel.id)) {
-          _context5.n = 18;
+          _context5.n = 20;
           break;
         }
         updateMessageOnAllMessages(messageTid, {
           state: MESSAGE_STATUS.FAILED
         });
-        _context5.n = 18;
+        _context5.n = 20;
         return effects.put(updateMessageAC(messageTid, {
           state: MESSAGE_STATUS.FAILED
         }));
-      case 18:
-        _context5.n = 19;
-        return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
-      case 19:
-        log.error('error on forward message ... ', _t4);
       case 20:
-        _context5.n = 21;
-        return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
+        log.error('error on forward message ... ', _t4);
       case 21:
+        _context5.p = 21;
+        _context5.n = 22;
+        return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
+      case 22:
+        return _context5.f(21);
+      case 23:
         return _context5.a(2);
     }
-  }, _marked3$1, null, [[1, 16]]);
+  }, _marked3$1, null, [[1, 16, 21, 23]]);
 }
 function resendMessage(action) {
   var payload, message, connectionState, channelId, sendAttachmentsAsSeparateMessage, isVoiceMessage;
@@ -20091,7 +20088,7 @@ var sendPendingMessages = /*#__PURE__*/_regenerator().m(function _callee3(connec
   }, _callee3, null, [[3, 9]]);
 });
 function getMessagesQuery(action) {
-  var _action$payload, channel, loadWithLastMessage, messageId, limit, withDeliveredMessages, highlight, behavior, connectionState, SceytChatClient, messageQueryBuilder, messageQuery, cachedMessages, result, allMessages, havLastMessage, secondResult, sentMessages, messagesMap, filteredSentMessages, _allMessages, messageIndex, maxLengthPart, _secondResult, thirdResult, _secondResult2, _thirdResult, _secondResult3, _updatedMessages, _Object$values, previousAllMessages, _secondResult4, updatedMessages, lastMessageId, _allMessages2, setMappedAllMessages, allMessagesAfterLastMessage, pendingMessages, _messagesMap, filteredPendingMessages, waitToSendPendingMessages, _t0, _t1, _t10, _t11, _t12, _t13, _t14, _t15, _t16, _t17, _t18, _t19, _t20, _t21;
+  var _action$payload, channel, loadWithLastMessage, messageId, limit, withDeliveredMessages, highlight, behavior, scrollToMessage, connectionState, SceytChatClient, messageQueryBuilder, messageQuery, cachedMessages, result, allMessages, havLastMessage, secondResult, sentMessages, messagesMap, filteredSentMessages, _allMessages, messageIndex, maxLengthPart, _secondResult, thirdResult, _secondResult2, _thirdResult, _secondResult3, _updatedMessages, _Object$values, previousAllMessages, _secondResult4, updatedMessages, lastMessageId, _allMessages2, setMappedAllMessages, allMessagesAfterLastMessage, pendingMessages, _messagesMap, filteredPendingMessages, waitToSendPendingMessages, _t0, _t1, _t10, _t11, _t12, _t13, _t14, _t15, _t16, _t17, _t18, _t19, _t20, _t21;
   return _regenerator().w(function (_context0) {
     while (1) switch (_context0.p = _context0.n) {
       case 0:
@@ -20099,7 +20096,7 @@ function getMessagesQuery(action) {
         _context0.n = 1;
         return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADING));
       case 1:
-        _action$payload = action.payload, channel = _action$payload.channel, loadWithLastMessage = _action$payload.loadWithLastMessage, messageId = _action$payload.messageId, limit = _action$payload.limit, withDeliveredMessages = _action$payload.withDeliveredMessages, highlight = _action$payload.highlight, behavior = _action$payload.behavior;
+        _action$payload = action.payload, channel = _action$payload.channel, loadWithLastMessage = _action$payload.loadWithLastMessage, messageId = _action$payload.messageId, limit = _action$payload.limit, withDeliveredMessages = _action$payload.withDeliveredMessages, highlight = _action$payload.highlight, behavior = _action$payload.behavior, scrollToMessage = _action$payload.scrollToMessage;
         connectionState = store.getState().UserReducer.connectionStatus;
         if (!(channel.id && !channel.isMockChannel)) {
           _context0.n = 76;
@@ -20220,7 +20217,7 @@ function getMessagesQuery(action) {
         return effects.put(setMessagesHasNextAC(false));
       case 17:
         setHasNextCached(false);
-        if (!messageId) {
+        if (!(messageId && scrollToMessage)) {
           _context0.n = 18;
           break;
         }
@@ -20331,6 +20328,10 @@ function getMessagesQuery(action) {
         _context0.n = 35;
         return effects.put(setMessagesHasNextAC(true));
       case 35:
+        if (!scrollToMessage) {
+          _context0.n = 36;
+          break;
+        }
         _context0.n = 36;
         return effects.put(setScrollToMessagesAC(messageId, true, behavior));
       case 36:
@@ -23963,21 +23964,31 @@ var SceytChatContainer = function SceytChatContainer(_ref) {
     _ref$embeddedJoinGrou = _ref.embeddedJoinGroupPopup,
     embeddedJoinGroupPopup = _ref$embeddedJoinGrou === void 0 ? false : _ref$embeddedJoinGrou,
     onUpdateChannel = _ref.onUpdateChannel,
-    _ref$enableDisappeari = _ref.enableDisappearingMessages,
-    enableDisappearingMessages = _ref$enableDisappeari === void 0 ? false : _ref$enableDisappeari;
+    _ref$disappearingSett = _ref.disappearingSettings,
+    disappearingSettings = _ref$disappearingSett === void 0 ? null : _ref$disappearingSett;
   React.useEffect(function () {
     log.setLevel(logLevel);
+  }, [logLevel]);
+  React.useEffect(function () {
     if (baseUrlForInviteMembers) {
       setBaseUrlForInviteMembers(baseUrlForInviteMembers);
     }
+  }, [baseUrlForInviteMembers]);
+  React.useEffect(function () {
     if (useInviteLink) {
       setUseInviteLink(useInviteLink);
     }
+  }, [useInviteLink]);
+  React.useEffect(function () {
     if (inviteLinkOptions) {
       setInviteLinkOptions(inviteLinkOptions);
     }
-    setEnableDisappearingMessages(enableDisappearingMessages);
-  }, [baseUrlForInviteMembers, useInviteLink, inviteLinkOptions, enableDisappearingMessages]);
+  }, [inviteLinkOptions]);
+  React.useEffect(function () {
+    if (disappearingSettings) {
+      setDisappearingSettings(disappearingSettings);
+    }
+  }, [disappearingSettings]);
   return /*#__PURE__*/React__default.createElement(reactRedux.Provider, {
     store: store,
     context: SceytReduxContext
@@ -24345,7 +24356,7 @@ var ChannelMessageText = function ChannelMessageText(_ref2) {
     return mem === user.id ? ' You' : " " + systemMessageUserName(mem, contactsMap && contactsMap[mem], lastMessage.mentionedUsers);
   })) + " " + (lastMessageMetas && lastMessageMetas.m && lastMessageMetas.m.length > 5 ? "and " + (lastMessageMetas.m.length - 5) + " more" : '') : lastMessage.body === 'RM' ? " removed " + (lastMessageMetas && lastMessageMetas.m && lastMessageMetas.m.slice(0, 5).map(function (mem) {
     return mem === user.id ? ' You' : " " + systemMessageUserName(mem, contactsMap && contactsMap[mem], lastMessage.mentionedUsers);
-  })) + " " + (lastMessageMetas && lastMessageMetas.m && lastMessageMetas.m.length > 5 ? "and " + (lastMessageMetas.m.length - 5) + " more" : '') : lastMessage.body === 'LG' ? 'Left this group' : lastMessage.body === 'JL' ? 'joined via invite link' : lastMessage.body === 'ADM' && getEnableDisappearingMessages() ? !Number(lastMessageMetas === null || lastMessageMetas === void 0 ? void 0 : lastMessageMetas.autoDeletePeriod) ? 'disabled disappearing messages' : "set disappearing message time to " + formatDisappearingMessageTime(lastMessageMetas !== null && lastMessageMetas !== void 0 && lastMessageMetas.autoDeletePeriod ? Number(lastMessageMetas.autoDeletePeriod) : null) : '') : (/*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(LastMessageDescription, {
+  })) + " " + (lastMessageMetas && lastMessageMetas.m && lastMessageMetas.m.length > 5 ? "and " + (lastMessageMetas.m.length - 5) + " more" : '') : lastMessage.body === 'LG' ? 'Left this group' : lastMessage.body === 'JL' ? 'joined via invite link' : lastMessage.body === 'ADM' ? !Number(lastMessageMetas === null || lastMessageMetas === void 0 ? void 0 : lastMessageMetas.autoDeletePeriod) ? 'disabled disappearing messages' : "set the disappearing messages timer to " + formatDisappearingMessageTime(lastMessageMetas !== null && lastMessageMetas !== void 0 && lastMessageMetas.autoDeletePeriod ? Number(lastMessageMetas.autoDeletePeriod) : null) : '') : (/*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(LastMessageDescription, {
     poll: (lastMessage === null || lastMessage === void 0 ? void 0 : lastMessage.pollDetails) && (lastMessage === null || lastMessage === void 0 ? void 0 : lastMessage.type) === exports.MESSAGE_TYPE.POLL
   }, channel.lastReactedMessage && (/*#__PURE__*/React__default.createElement(React__default.Fragment, null, "Reacted", /*#__PURE__*/React__default.createElement(ReactionItem, null, channel.newReactions && channel.newReactions[0] && channel.newReactions[0].key), "to", ' "')), LastMessageAttachments({
     lastMessage: lastMessage
@@ -29574,7 +29585,7 @@ var Message = function Message(_ref) {
     return mem === user.id ? 'You' : " " + systemMessageUserName(mem, contactsMap[mem], message.mentionedUsers);
   })) + " " + (messageMetas && messageMetas.m && messageMetas.m.length > 5 ? "and " + (messageMetas.m.length - 5) + " more" : '') : message.body === 'RM' ? " removed " + (messageMetas && messageMetas.m && messageMetas.m.slice(0, 5).map(function (mem) {
     return mem === user.id ? 'You' : " " + systemMessageUserName(mem, contactsMap[mem], message.mentionedUsers);
-  })) + " " + (messageMetas && messageMetas.m && messageMetas.m.length > 5 ? "and " + (messageMetas.m.length - 5) + " more" : '') : message.body === 'LG' ? ' left the group' : message.body === 'JL' ? " joined via invite link" : message.body === 'ADM' && getEnableDisappearingMessages() ? !Number(messageMetas === null || messageMetas === void 0 ? void 0 : messageMetas.autoDeletePeriod) ? ' disabled disappearing messages' : " set disappearing message time to " + formatDisappearingMessageTime(messageMetas !== null && messageMetas !== void 0 && messageMetas.autoDeletePeriod ? Number(messageMetas.autoDeletePeriod) : null) : ''));
+  })) + " " + (messageMetas && messageMetas.m && messageMetas.m.length > 5 ? "and " + (messageMetas.m.length - 5) + " more" : '') : message.body === 'LG' ? ' left the group' : message.body === 'JL' ? " joined via invite link" : message.body === 'ADM' ? !Number(messageMetas === null || messageMetas === void 0 ? void 0 : messageMetas.autoDeletePeriod) ? ' disabled disappearing messages' : " set the disappearing messages timer to " + formatDisappearingMessageTime(messageMetas !== null && messageMetas !== void 0 && messageMetas.autoDeletePeriod ? Number(messageMetas.autoDeletePeriod) : null) : ''));
 };
 var SystemMessage = /*#__PURE__*/React__default.memo(Message, function (prevProps, nextProps) {
   return prevProps.message.deliveryStatus === nextProps.message.deliveryStatus && prevProps.message.state === nextProps.message.state && prevProps.message.userMarkers === nextProps.message.userMarkers && prevProps.nextMessage === nextProps.nextMessage && prevProps.connectionStatus === nextProps.connectionStatus && prevProps.tabIsActive === nextProps.tabIsActive;
@@ -38734,7 +38745,7 @@ var MessageList = function MessageList(_ref2) {
       nextDisableRef.current = false;
       clearMessagesMap();
       removeAllMessages();
-      dispatch(getMessagesAC(channel));
+      dispatch(getMessagesAC(channel, false, lastVisibleMessageId, 0, false, false, 'instant', false));
     }
   }, [connectionStatus]);
   React.useEffect(function () {
@@ -44283,7 +44294,7 @@ function DisappearingMessagesPopup(_ref) {
   var _useState = React.useState('off'),
     selectedOption = _useState[0],
     setSelectedOption = _useState[1];
-  var _useState2 = React.useState('2days'),
+  var _useState2 = React.useState(''),
     customValue = _useState2[0],
     setCustomValue = _useState2[1];
   var _useState3 = React.useState(true),
@@ -44294,6 +44305,22 @@ function DisappearingMessagesPopup(_ref) {
     setDropdownOpen = _useState4[1];
   var previousTimerRef = React.useRef(currentTimer);
   var hasInitializedRef = React.useRef(false);
+  var CUSTOM_OPTIONS = React.useMemo(function () {
+    var _getDisappearingSetti;
+    return ((_getDisappearingSetti = getDisappearingSettings()) === null || _getDisappearingSetti === void 0 ? void 0 : _getDisappearingSetti.customOptions) || [];
+  }, []);
+  React.useEffect(function () {
+    var _CUSTOM_OPTIONS$;
+    if (CUSTOM_OPTIONS.length > 0 && (_CUSTOM_OPTIONS$ = CUSTOM_OPTIONS[0]) !== null && _CUSTOM_OPTIONS$ !== void 0 && _CUSTOM_OPTIONS$.label) {
+      var _CUSTOM_OPTIONS$2;
+      setCustomValue(((_CUSTOM_OPTIONS$2 = CUSTOM_OPTIONS[0]) === null || _CUSTOM_OPTIONS$2 === void 0 ? void 0 : _CUSTOM_OPTIONS$2.label) || '');
+    }
+  }, [CUSTOM_OPTIONS]);
+  var CUSTOM_SECONDS_MAP = React.useMemo(function () {
+    return Object.fromEntries(CUSTOM_OPTIONS.map(function (o) {
+      return [o.label, o.seconds];
+    }));
+  }, [CUSTOM_OPTIONS]);
   React.useEffect(function () {
     if (previousTimerRef.current !== currentTimer) {
       setInitialRender(true);
@@ -44304,16 +44331,16 @@ function DisappearingMessagesPopup(_ref) {
       setSelectedOption('off');
     } else {
       var fixedMatch = Object.keys(FIXED_TIMER_OPTIONS).find(function (key) {
-        return FIXED_TIMER_OPTIONS[key] === currentTimer;
+        return (FIXED_TIMER_OPTIONS[key] || 0) * 1000 === currentTimer;
       });
       if (fixedMatch) {
         setSelectedOption(fixedMatch);
       } else {
         var customMatch = CUSTOM_OPTIONS.find(function (o) {
-          return o.seconds === currentTimer;
+          return o.seconds * 1000 === currentTimer;
         });
         setSelectedOption('custom');
-        setCustomValue((customMatch === null || customMatch === void 0 ? void 0 : customMatch.value) || '2days');
+        setCustomValue((customMatch === null || customMatch === void 0 ? void 0 : customMatch.label) || '2days');
       }
     }
   }, [currentTimer]);
@@ -44328,9 +44355,12 @@ function DisappearingMessagesPopup(_ref) {
   }, [selectedOption, customValue]);
   var isValueUnchanged = React.useMemo(function () {
     if (initialRender) return true;
-    var normalizedCurrent = currentTimer === 0 ? null : currentTimer != null ? currentTimer : null;
-    var normalizedSelected = selectedTimerValue === 0 ? null : selectedTimerValue != null ? selectedTimerValue : null;
-    return normalizedCurrent === normalizedSelected;
+    if (!selectedTimerValue && !selectedTimerValue) {
+      return true;
+    } else if (selectedTimerValue * 1000 === currentTimer) {
+      return true;
+    }
+    return false;
   }, [currentTimer, selectedTimerValue, initialRender]);
   var handleSet = React.useCallback(function () {
     if (selectedOption === 'custom') {
@@ -44343,9 +44373,9 @@ function DisappearingMessagesPopup(_ref) {
   var selectedCustomLabel = React.useMemo(function () {
     var _CUSTOM_OPTIONS$find;
     return ((_CUSTOM_OPTIONS$find = CUSTOM_OPTIONS.find(function (o) {
-      return o.value === customValue;
+      return o.label === customValue;
     })) === null || _CUSTOM_OPTIONS$find === void 0 ? void 0 : _CUSTOM_OPTIONS$find.label) || '2 days';
-  }, [customValue]);
+  }, [customValue, CUSTOM_OPTIONS]);
   return /*#__PURE__*/React__default.createElement(PopupContainer, null, /*#__PURE__*/React__default.createElement(Popup, {
     theme: theme,
     backgroundColor: background,
@@ -44391,7 +44421,7 @@ function DisappearingMessagesPopup(_ref) {
       borderRadius: '4px',
       variant: 'checkbox'
     }), option.label);
-  }), /*#__PURE__*/React__default.createElement(TimerOptionItem, {
+  }), CUSTOM_OPTIONS.length > 0 && (/*#__PURE__*/React__default.createElement(TimerOptionItem, {
     color: textPrimary,
     onClick: function onClick() {
       return setSelectedOption('custom');
@@ -44407,7 +44437,7 @@ function DisappearingMessagesPopup(_ref) {
     borderColor: iconInactive,
     borderRadius: '4px',
     variant: 'checkbox'
-  }), "Custom"), selectedOption === 'custom' && (/*#__PURE__*/React__default.createElement(CustomTimerSection, null, /*#__PURE__*/React__default.createElement(Label, {
+  }), "Custom")), selectedOption === 'custom' && (/*#__PURE__*/React__default.createElement(CustomTimerSection, null, /*#__PURE__*/React__default.createElement(Label, {
     color: textPrimary,
     marginTop: '0'
   }, "Auto-delete after"), /*#__PURE__*/React__default.createElement(CustomSelectWrapper, {
@@ -44436,9 +44466,9 @@ function DisappearingMessagesPopup(_ref) {
   }, CUSTOM_OPTIONS.map(function (o) {
     return /*#__PURE__*/React__default.createElement(CustomDropdownOptionLi, {
       hoverBackground: backgroundHovered,
-      key: o.value,
+      key: o.label,
       onClick: function onClick() {
-        return setCustomValue(o.value);
+        return setCustomValue(o.label);
       },
       textColor: textPrimary
     }, o.label);
@@ -44477,6 +44507,7 @@ var SetButton = styled__default(Button)(_templateObject8$n || (_templateObject8$
 
 var _templateObject$T, _templateObject2$O, _templateObject3$H, _templateObject4$B, _templateObject5$w, _templateObject6$s, _templateObject7$r, _templateObject8$o, _templateObject9$k, _templateObject0$i, _templateObject1$f, _templateObject10$9, _templateObject11$7, _templateObject12$6, _templateObject13$4, _templateObject14$3, _templateObject15$3, _templateObject16$3, _templateObject17$3, _templateObject18$3, _templateObject19$3, _templateObject20$3;
 var Actions = function Actions(_ref) {
+  var _getDisappearingSetti;
   var setActionsHeight = _ref.setActionsHeight,
     channel = _ref.channel,
     actionMenuOpen = _ref.actionMenuOpen,
@@ -44785,7 +44816,7 @@ var Actions = function Actions(_ref) {
     color: staredMessagesTextColor || textPrimary,
     hoverColor: staredMessagesTextColor || textPrimary,
     fontSize: actionItemsFontSize
-  }, /*#__PURE__*/React__default.createElement(React__default.Fragment, null, staredMessagesIcon || /*#__PURE__*/React__default.createElement(DefaultStarIcon, null), " Starred messages "))), getEnableDisappearingMessages() && !channel.isMockChannel && canToggleDisappearingMessages && (isDirectChannel && directChannelUser ? directChannelUser.state !== USER_STATE.DELETED : true) && (/*#__PURE__*/React__default.createElement(ActionItem, {
+  }, /*#__PURE__*/React__default.createElement(React__default.Fragment, null, staredMessagesIcon || /*#__PURE__*/React__default.createElement(DefaultStarIcon, null), " Starred messages "))), ((_getDisappearingSetti = getDisappearingSettings()) === null || _getDisappearingSetti === void 0 ? void 0 : _getDisappearingSetti.show) && !channel.isMockChannel && canToggleDisappearingMessages && (isDirectChannel && directChannelUser ? directChannelUser.state !== USER_STATE.DELETED : true) && (/*#__PURE__*/React__default.createElement(ActionItem, {
     key: 1.5,
     onClick: handleToggleDisappearingMessagesPopup,
     iconColor: iconPrimary,

package/index.modern.js

@@ -2676,42 +2676,6 @@ var FIXED_TIMER_OPTIONS = {
   '1month': 60 * 60 * 24 * 30,
   custom: 60 * 60 * 24 * 2
 };
-var CUSTOM_OPTIONS = [{
-  label: '1 day',
-  value: '1day',
-  seconds: 60 * 60 * 24
-}, {
-  label: '2 days',
-  value: '2days',
-  seconds: 60 * 60 * 24 * 2
-}, {
-  label: '3 days',
-  value: '3days',
-  seconds: 60 * 60 * 24 * 3
-}, {
-  label: '4 days',
-  value: '4days',
-  seconds: 60 * 60 * 24 * 4
-}, {
-  label: '5 days',
-  value: '5days',
-  seconds: 60 * 60 * 24 * 5
-}, {
-  label: '1 week',
-  value: '1week',
-  seconds: 60 * 60 * 24 * 7
-}, {
-  label: '2 weeks',
-  value: '2weeks',
-  seconds: 60 * 60 * 24 * 14
-}, {
-  label: '1 month',
-  value: '1month',
-  seconds: 60 * 60 * 24 * 30
-}];
-var CUSTOM_SECONDS_MAP = Object.fromEntries(CUSTOM_OPTIONS.map(function (o) {
-  return [o.value, o.seconds];
-}));
 
 // A type of promise-like that resolves synchronously and supports only one observer
 const _Pact = /*#__PURE__*/(function() {
@@ -9078,7 +9042,7 @@ var memberCount = 10;
 var disableFrowardMentionsCount = false;
 var onUpdateChannel = function onUpdateChannel() {};
 var useInviteLink = false;
-var enableDisappearingMessages = true;
+var disappearingSettings;
 var inviteLinkOptions = null;
 function setBaseUrlForInviteMembers(url) {
   baseUrlForInviteMembers = url;
@@ -9297,11 +9261,11 @@ var setShowChannelDetails = function setShowChannelDetails(state) {
 var getShowChannelDetails = function getShowChannelDetails() {
   return showChannelDetails;
 };
-var setEnableDisappearingMessages = function setEnableDisappearingMessages(state) {
-  enableDisappearingMessages = state;
+var setDisappearingSettings = function setDisappearingSettings(settings) {
+  disappearingSettings = settings;
 };
-var getEnableDisappearingMessages = function getEnableDisappearingMessages() {
-  return enableDisappearingMessages;
+var getDisappearingSettings = function getDisappearingSettings() {
+  return disappearingSettings;
 };
 var sortChannelByLastMessage = function sortChannelByLastMessage(channels) {
   return channels.sort(function (a, b) {
@@ -10093,6 +10057,7 @@ var hashString = function hashString(str) {
   }
 };
 var formatDisappearingMessageTime = function formatDisappearingMessageTime(periodInMilliseconds) {
+  var _getDisappearingSetti;
   if (!periodInMilliseconds) return 'Off';
   var periodInSeconds = periodInMilliseconds / 1000;
   switch (periodInSeconds) {
@@ -10103,7 +10068,8 @@ var formatDisappearingMessageTime = function formatDisappearingMessageTime(perio
     case FIXED_TIMER_OPTIONS['1month']:
       return '1 month';
   }
-  var customMatch = CUSTOM_OPTIONS.find(function (option) {
+  var customOptions = ((_getDisappearingSetti = getDisappearingSettings()) === null || _getDisappearingSetti === void 0 ? void 0 : _getDisappearingSetti.customOptions) || [];
+  var customMatch = customOptions.find(function (option) {
     return option.seconds === periodInSeconds;
   });
   if (customMatch) return customMatch.label;
@@ -10251,10 +10217,13 @@ function setMessageToEditAC(message) {
     message: message
   });
 }
-function getMessagesAC(channel, loadWithLastMessage, messageId, limit, withDeliveredMessages, highlight, behavior) {
+function getMessagesAC(channel, loadWithLastMessage, messageId, limit, withDeliveredMessages, highlight, behavior, scrollToMessage) {
   if (highlight === void 0) {
     highlight = true;
   }
+  if (scrollToMessage === void 0) {
+    scrollToMessage = true;
+  }
   return {
     type: GET_MESSAGES,
     payload: {
@@ -10264,7 +10233,8 @@ function getMessagesAC(channel, loadWithLastMessage, messageId, limit, withDeliv
       limit: limit,
       withDeliveredMessages: withDeliveredMessages,
       highlight: highlight,
-      behavior: behavior
+      behavior: behavior,
+      scrollToMessage: scrollToMessage
     }
   };
 }
@@ -19221,7 +19191,7 @@ function sendMessage(action) {
         }
       case 11:
         _loop2 = /*#__PURE__*/_regenerator().m(function _callee2() {
-          var messageAttachment, messageToSend, messageCopy, _attachmentsToSend, linkAttachmentToSend, linkAttachmentBuilder, messageResponse, k, pendingAttachment, attachmentsToUpdate, currentAttachmentsMap, messageUpdateData, messageToUpdate, channelUpdateParam, pendingMessage, _t;
+          var messageAttachment, messageToSend, messageCopy, _attachmentsToSend, linkAttachmentToSend, linkAttachmentBuilder, messageResponse, k, pendingAttachment, attachmentsToUpdate, currentAttachmentsMap, messageUpdateData, messageToUpdate, channelUpdateParam, pendingMessage, connectionIsDisconnected, _t;
           return _regenerator().w(function (_context2) {
             while (1) switch (_context2.p = _context2.n) {
               case 0:
@@ -19356,7 +19326,7 @@ function sendMessage(action) {
               case 12:
                 throw new Error('Connection required to send message');
               case 13:
-                _context2.n = 17;
+                _context2.n = 19;
                 break;
               case 14:
                 _context2.p = 14;
@@ -19365,24 +19335,31 @@ function sendMessage(action) {
                   return pendingMessage.tid === messageToSend.tid;
                 });
                 if (!(channel && pendingMessage && action.type !== RESEND_MESSAGE)) {
-                  _context2.n = 15;
+                  _context2.n = 17;
                   break;
                 }
-                if (!isAddToPendingMessagesMap) {
-                  _context2.n = 15;
+                connectionIsDisconnected = store.getState().UserReducer.connectionStatus !== CONNECTION_STATUS.CONNECTED;
+                if (!(isAddToPendingMessagesMap && connectionIsDisconnected)) {
+                  _context2.n = 16;
                   break;
                 }
                 _context2.n = 15;
                 return call(addPendingMessage, message, pendingMessage, channel);
               case 15:
+                _context2.n = 17;
+                break;
+              case 16:
+                _context2.n = 17;
+                return put(removePendingMessageAC(channel.id, pendingMessage.tid));
+              case 17:
                 log.error('Error on uploading attachment', messageToSend.tid, _t);
                 if (!(messageToSend.attachments && messageToSend.attachments.length)) {
-                  _context2.n = 16;
+                  _context2.n = 18;
                   break;
                 }
-                _context2.n = 16;
+                _context2.n = 18;
                 return put(updateAttachmentUploadingStateAC(UPLOAD_STATE.FAIL, messageToSend.attachments[0].tid));
-              case 16:
+              case 18:
                 updateMessageOnMap(channel.id, {
                   messageId: messageToSend.tid,
                   params: {
@@ -19392,11 +19369,11 @@ function sendMessage(action) {
                 updateMessageOnAllMessages(messageToSend.tid, {
                   state: MESSAGE_STATUS.FAILED
                 });
-                _context2.n = 17;
+                _context2.n = 19;
                 return put(updateMessageAC(messageToSend.tid, {
                   state: MESSAGE_STATUS.FAILED
                 }));
-              case 17:
+              case 19:
                 return _context2.a(2);
             }
           }, _callee2, null, [[1, 14]]);
@@ -19420,12 +19397,18 @@ function sendMessage(action) {
         _t2 = _context3.v;
         log.error('error on send message ... ', _t2);
       case 16:
+        _context3.p = 16;
+        _context3.n = 17;
+        return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
+      case 17:
+        return _context3.f(16);
+      case 18:
         return _context3.a(2);
     }
-  }, _marked$3, null, [[1, 15]]);
+  }, _marked$3, null, [[1, 15, 16, 18]]);
 }
 function sendTextMessage(action) {
-  var payload, message, connectionState, channelId, isAddToPendingMessagesMap, channel, sendMessageTid, pendingMessage, activeChannelId, SceytChatClient, createChannelData, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, createdMessage, messageToSend, _messageResponse, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, _t3;
+  var payload, message, connectionState, channelId, isAddToPendingMessagesMap, channel, sendMessageTid, pendingMessage, activeChannelId, SceytChatClient, createChannelData, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, createdMessage, messageToSend, _messageResponse, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, connectionIsDisconnected, _t3;
   return _regenerator().w(function (_context4) {
     while (1) switch (_context4.p = _context4.n) {
       case 0:
@@ -19581,25 +19564,29 @@ function sendTextMessage(action) {
       case 15:
         throw new Error('Connection required to send message');
       case 16:
-        _context4.n = 17;
-        return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
-      case 17:
         _context4.n = 21;
         break;
-      case 18:
-        _context4.p = 18;
+      case 17:
+        _context4.p = 17;
         _t3 = _context4.v;
         if (!(activeChannelId === channel.id && pendingMessage && action.type !== RESEND_MESSAGE)) {
-          _context4.n = 19;
+          _context4.n = 20;
           break;
         }
-        if (!isAddToPendingMessagesMap) {
+        connectionIsDisconnected = store.getState().UserReducer.connectionStatus !== CONNECTION_STATUS.CONNECTED;
+        if (!(isAddToPendingMessagesMap && connectionIsDisconnected)) {
           _context4.n = 19;
           break;
         }
-        _context4.n = 19;
+        _context4.n = 18;
         return call(addPendingMessage, message, pendingMessage, channel);
+      case 18:
+        _context4.n = 20;
+        break;
       case 19:
+        _context4.n = 20;
+        return put(removePendingMessageAC(channel.id, pendingMessage.tid));
+      case 20:
         log.error('error on send text message ... ', _t3);
         updateMessageOnMap(channel.id, {
           messageId: sendMessageTid,
@@ -19608,26 +19595,29 @@ function sendTextMessage(action) {
           }
         });
         if (!(activeChannelId === channel.id)) {
-          _context4.n = 20;
+          _context4.n = 21;
           break;
         }
         updateMessageOnAllMessages(sendMessageTid, {
           state: MESSAGE_STATUS.FAILED
         });
-        _context4.n = 20;
+        _context4.n = 21;
         return put(updateMessageAC(sendMessageTid, {
           state: MESSAGE_STATUS.FAILED
         }));
-      case 20:
-        _context4.n = 21;
-        return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
       case 21:
+        _context4.p = 21;
+        _context4.n = 22;
+        return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
+      case 22:
+        return _context4.f(21);
+      case 23:
         return _context4.a(2);
     }
-  }, _marked2$2, null, [[3, 18]]);
+  }, _marked2$2, null, [[3, 17, 21, 23]]);
 }
 function forwardMessage(action) {
-  var payload, message, channelId, connectionState, isForward, isAddToPendingMessagesMap, pendingMessage, channel, activeChannelId, messageTid, SceytChatClient, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, pollDetails, messageToSend, hasNextMessages, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, _t4;
+  var payload, message, channelId, connectionState, isForward, isAddToPendingMessagesMap, pendingMessage, channel, activeChannelId, messageTid, SceytChatClient, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, pollDetails, messageToSend, hasNextMessages, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, connectionIsDisconnected, _t4;
   return _regenerator().w(function (_context5) {
     while (1) switch (_context5.p = _context5.n) {
       case 0:
@@ -19797,24 +19787,31 @@ function forwardMessage(action) {
       case 14:
         throw new Error('Connection required to forward message');
       case 15:
-        _context5.n = 20;
+        _context5.n = 21;
         break;
       case 16:
         _context5.p = 16;
         _t4 = _context5.v;
         if (!(pendingMessage && channel && action.type !== RESEND_MESSAGE)) {
-          _context5.n = 17;
+          _context5.n = 19;
           break;
         }
-        if (!isAddToPendingMessagesMap) {
-          _context5.n = 17;
+        connectionIsDisconnected = store.getState().UserReducer.connectionStatus !== CONNECTION_STATUS.CONNECTED;
+        if (!(isAddToPendingMessagesMap && connectionIsDisconnected)) {
+          _context5.n = 18;
           break;
         }
         _context5.n = 17;
         return call(addPendingMessage, message, pendingMessage, channel);
       case 17:
+        _context5.n = 19;
+        break;
+      case 18:
+        _context5.n = 19;
+        return put(removePendingMessageAC(channel.id, pendingMessage.tid));
+      case 19:
         if (!(channel && messageTid)) {
-          _context5.n = 18;
+          _context5.n = 20;
           break;
         }
         updateMessageOnMap(channel.id, {
@@ -19824,28 +19821,28 @@ function forwardMessage(action) {
           }
         });
         if (!(activeChannelId === channel.id)) {
-          _context5.n = 18;
+          _context5.n = 20;
           break;
         }
         updateMessageOnAllMessages(messageTid, {
           state: MESSAGE_STATUS.FAILED
         });
-        _context5.n = 18;
+        _context5.n = 20;
         return put(updateMessageAC(messageTid, {
           state: MESSAGE_STATUS.FAILED
         }));
-      case 18:
-        _context5.n = 19;
-        return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
-      case 19:
-        log.error('error on forward message ... ', _t4);
       case 20:
-        _context5.n = 21;
-        return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
+        log.error('error on forward message ... ', _t4);
       case 21:
+        _context5.p = 21;
+        _context5.n = 22;
+        return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
+      case 22:
+        return _context5.f(21);
+      case 23:
         return _context5.a(2);
     }
-  }, _marked3$1, null, [[1, 16]]);
+  }, _marked3$1, null, [[1, 16, 21, 23]]);
 }
 function resendMessage(action) {
   var payload, message, connectionState, channelId, sendAttachmentsAsSeparateMessage, isVoiceMessage;
@@ -20090,7 +20087,7 @@ var sendPendingMessages = /*#__PURE__*/_regenerator().m(function _callee3(connec
   }, _callee3, null, [[3, 9]]);
 });
 function getMessagesQuery(action) {
-  var _action$payload, channel, loadWithLastMessage, messageId, limit, withDeliveredMessages, highlight, behavior, connectionState, SceytChatClient, messageQueryBuilder, messageQuery, cachedMessages, result, allMessages, havLastMessage, secondResult, sentMessages, messagesMap, filteredSentMessages, _allMessages, messageIndex, maxLengthPart, _secondResult, thirdResult, _secondResult2, _thirdResult, _secondResult3, _updatedMessages, _Object$values, previousAllMessages, _secondResult4, updatedMessages, lastMessageId, _allMessages2, setMappedAllMessages, allMessagesAfterLastMessage, pendingMessages, _messagesMap, filteredPendingMessages, waitToSendPendingMessages, _t0, _t1, _t10, _t11, _t12, _t13, _t14, _t15, _t16, _t17, _t18, _t19, _t20, _t21;
+  var _action$payload, channel, loadWithLastMessage, messageId, limit, withDeliveredMessages, highlight, behavior, scrollToMessage, connectionState, SceytChatClient, messageQueryBuilder, messageQuery, cachedMessages, result, allMessages, havLastMessage, secondResult, sentMessages, messagesMap, filteredSentMessages, _allMessages, messageIndex, maxLengthPart, _secondResult, thirdResult, _secondResult2, _thirdResult, _secondResult3, _updatedMessages, _Object$values, previousAllMessages, _secondResult4, updatedMessages, lastMessageId, _allMessages2, setMappedAllMessages, allMessagesAfterLastMessage, pendingMessages, _messagesMap, filteredPendingMessages, waitToSendPendingMessages, _t0, _t1, _t10, _t11, _t12, _t13, _t14, _t15, _t16, _t17, _t18, _t19, _t20, _t21;
   return _regenerator().w(function (_context0) {
     while (1) switch (_context0.p = _context0.n) {
       case 0:
@@ -20098,7 +20095,7 @@ function getMessagesQuery(action) {
         _context0.n = 1;
         return put(setMessagesLoadingStateAC(LOADING_STATE.LOADING));
       case 1:
-        _action$payload = action.payload, channel = _action$payload.channel, loadWithLastMessage = _action$payload.loadWithLastMessage, messageId = _action$payload.messageId, limit = _action$payload.limit, withDeliveredMessages = _action$payload.withDeliveredMessages, highlight = _action$payload.highlight, behavior = _action$payload.behavior;
+        _action$payload = action.payload, channel = _action$payload.channel, loadWithLastMessage = _action$payload.loadWithLastMessage, messageId = _action$payload.messageId, limit = _action$payload.limit, withDeliveredMessages = _action$payload.withDeliveredMessages, highlight = _action$payload.highlight, behavior = _action$payload.behavior, scrollToMessage = _action$payload.scrollToMessage;
         connectionState = store.getState().UserReducer.connectionStatus;
         if (!(channel.id && !channel.isMockChannel)) {
           _context0.n = 76;
@@ -20219,7 +20216,7 @@ function getMessagesQuery(action) {
         return put(setMessagesHasNextAC(false));
       case 17:
         setHasNextCached(false);
-        if (!messageId) {
+        if (!(messageId && scrollToMessage)) {
           _context0.n = 18;
           break;
         }
@@ -20330,6 +20327,10 @@ function getMessagesQuery(action) {
         _context0.n = 35;
         return put(setMessagesHasNextAC(true));
       case 35:
+        if (!scrollToMessage) {
+          _context0.n = 36;
+          break;
+        }
         _context0.n = 36;
         return put(setScrollToMessagesAC(messageId, true, behavior));
       case 36:
@@ -23962,21 +23963,31 @@ var SceytChatContainer = function SceytChatContainer(_ref) {
     _ref$embeddedJoinGrou = _ref.embeddedJoinGroupPopup,
     embeddedJoinGroupPopup = _ref$embeddedJoinGrou === void 0 ? false : _ref$embeddedJoinGrou,
     onUpdateChannel = _ref.onUpdateChannel,
-    _ref$enableDisappeari = _ref.enableDisappearingMessages,
-    enableDisappearingMessages = _ref$enableDisappeari === void 0 ? false : _ref$enableDisappeari;
+    _ref$disappearingSett = _ref.disappearingSettings,
+    disappearingSettings = _ref$disappearingSett === void 0 ? null : _ref$disappearingSett;
   useEffect(function () {
     log.setLevel(logLevel);
+  }, [logLevel]);
+  useEffect(function () {
     if (baseUrlForInviteMembers) {
       setBaseUrlForInviteMembers(baseUrlForInviteMembers);
     }
+  }, [baseUrlForInviteMembers]);
+  useEffect(function () {
     if (useInviteLink) {
       setUseInviteLink(useInviteLink);
     }
+  }, [useInviteLink]);
+  useEffect(function () {
     if (inviteLinkOptions) {
       setInviteLinkOptions(inviteLinkOptions);
     }
-    setEnableDisappearingMessages(enableDisappearingMessages);
-  }, [baseUrlForInviteMembers, useInviteLink, inviteLinkOptions, enableDisappearingMessages]);
+  }, [inviteLinkOptions]);
+  useEffect(function () {
+    if (disappearingSettings) {
+      setDisappearingSettings(disappearingSettings);
+    }
+  }, [disappearingSettings]);
   return /*#__PURE__*/React__default.createElement(Provider, {
     store: store,
     context: SceytReduxContext
@@ -24344,7 +24355,7 @@ var ChannelMessageText = function ChannelMessageText(_ref2) {
     return mem === user.id ? ' You' : " " + systemMessageUserName(mem, contactsMap && contactsMap[mem], lastMessage.mentionedUsers);
   })) + " " + (lastMessageMetas && lastMessageMetas.m && lastMessageMetas.m.length > 5 ? "and " + (lastMessageMetas.m.length - 5) + " more" : '') : lastMessage.body === 'RM' ? " removed " + (lastMessageMetas && lastMessageMetas.m && lastMessageMetas.m.slice(0, 5).map(function (mem) {
     return mem === user.id ? ' You' : " " + systemMessageUserName(mem, contactsMap && contactsMap[mem], lastMessage.mentionedUsers);
-  })) + " " + (lastMessageMetas && lastMessageMetas.m && lastMessageMetas.m.length > 5 ? "and " + (lastMessageMetas.m.length - 5) + " more" : '') : lastMessage.body === 'LG' ? 'Left this group' : lastMessage.body === 'JL' ? 'joined via invite link' : lastMessage.body === 'ADM' && getEnableDisappearingMessages() ? !Number(lastMessageMetas === null || lastMessageMetas === void 0 ? void 0 : lastMessageMetas.autoDeletePeriod) ? 'disabled disappearing messages' : "set disappearing message time to " + formatDisappearingMessageTime(lastMessageMetas !== null && lastMessageMetas !== void 0 && lastMessageMetas.autoDeletePeriod ? Number(lastMessageMetas.autoDeletePeriod) : null) : '') : (/*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(LastMessageDescription, {
+  })) + " " + (lastMessageMetas && lastMessageMetas.m && lastMessageMetas.m.length > 5 ? "and " + (lastMessageMetas.m.length - 5) + " more" : '') : lastMessage.body === 'LG' ? 'Left this group' : lastMessage.body === 'JL' ? 'joined via invite link' : lastMessage.body === 'ADM' ? !Number(lastMessageMetas === null || lastMessageMetas === void 0 ? void 0 : lastMessageMetas.autoDeletePeriod) ? 'disabled disappearing messages' : "set the disappearing messages timer to " + formatDisappearingMessageTime(lastMessageMetas !== null && lastMessageMetas !== void 0 && lastMessageMetas.autoDeletePeriod ? Number(lastMessageMetas.autoDeletePeriod) : null) : '') : (/*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(LastMessageDescription, {
     poll: (lastMessage === null || lastMessage === void 0 ? void 0 : lastMessage.pollDetails) && (lastMessage === null || lastMessage === void 0 ? void 0 : lastMessage.type) === MESSAGE_TYPE.POLL
   }, channel.lastReactedMessage && (/*#__PURE__*/React__default.createElement(React__default.Fragment, null, "Reacted", /*#__PURE__*/React__default.createElement(ReactionItem, null, channel.newReactions && channel.newReactions[0] && channel.newReactions[0].key), "to", ' "')), LastMessageAttachments({
     lastMessage: lastMessage
@@ -29573,7 +29584,7 @@ var Message = function Message(_ref) {
     return mem === user.id ? 'You' : " " + systemMessageUserName(mem, contactsMap[mem], message.mentionedUsers);
   })) + " " + (messageMetas && messageMetas.m && messageMetas.m.length > 5 ? "and " + (messageMetas.m.length - 5) + " more" : '') : message.body === 'RM' ? " removed " + (messageMetas && messageMetas.m && messageMetas.m.slice(0, 5).map(function (mem) {
     return mem === user.id ? 'You' : " " + systemMessageUserName(mem, contactsMap[mem], message.mentionedUsers);
-  })) + " " + (messageMetas && messageMetas.m && messageMetas.m.length > 5 ? "and " + (messageMetas.m.length - 5) + " more" : '') : message.body === 'LG' ? ' left the group' : message.body === 'JL' ? " joined via invite link" : message.body === 'ADM' && getEnableDisappearingMessages() ? !Number(messageMetas === null || messageMetas === void 0 ? void 0 : messageMetas.autoDeletePeriod) ? ' disabled disappearing messages' : " set disappearing message time to " + formatDisappearingMessageTime(messageMetas !== null && messageMetas !== void 0 && messageMetas.autoDeletePeriod ? Number(messageMetas.autoDeletePeriod) : null) : ''));
+  })) + " " + (messageMetas && messageMetas.m && messageMetas.m.length > 5 ? "and " + (messageMetas.m.length - 5) + " more" : '') : message.body === 'LG' ? ' left the group' : message.body === 'JL' ? " joined via invite link" : message.body === 'ADM' ? !Number(messageMetas === null || messageMetas === void 0 ? void 0 : messageMetas.autoDeletePeriod) ? ' disabled disappearing messages' : " set the disappearing messages timer to " + formatDisappearingMessageTime(messageMetas !== null && messageMetas !== void 0 && messageMetas.autoDeletePeriod ? Number(messageMetas.autoDeletePeriod) : null) : ''));
 };
 var SystemMessage = /*#__PURE__*/React__default.memo(Message, function (prevProps, nextProps) {
   return prevProps.message.deliveryStatus === nextProps.message.deliveryStatus && prevProps.message.state === nextProps.message.state && prevProps.message.userMarkers === nextProps.message.userMarkers && prevProps.nextMessage === nextProps.nextMessage && prevProps.connectionStatus === nextProps.connectionStatus && prevProps.tabIsActive === nextProps.tabIsActive;
@@ -38733,7 +38744,7 @@ var MessageList = function MessageList(_ref2) {
       nextDisableRef.current = false;
       clearMessagesMap();
       removeAllMessages();
-      dispatch(getMessagesAC(channel));
+      dispatch(getMessagesAC(channel, false, lastVisibleMessageId, 0, false, false, 'instant', false));
     }
   }, [connectionStatus]);
   useEffect(function () {
@@ -44282,7 +44293,7 @@ function DisappearingMessagesPopup(_ref) {
   var _useState = useState('off'),
     selectedOption = _useState[0],
     setSelectedOption = _useState[1];
-  var _useState2 = useState('2days'),
+  var _useState2 = useState(''),
     customValue = _useState2[0],
     setCustomValue = _useState2[1];
   var _useState3 = useState(true),
@@ -44293,6 +44304,22 @@ function DisappearingMessagesPopup(_ref) {
     setDropdownOpen = _useState4[1];
   var previousTimerRef = useRef(currentTimer);
   var hasInitializedRef = useRef(false);
+  var CUSTOM_OPTIONS = useMemo(function () {
+    var _getDisappearingSetti;
+    return ((_getDisappearingSetti = getDisappearingSettings()) === null || _getDisappearingSetti === void 0 ? void 0 : _getDisappearingSetti.customOptions) || [];
+  }, []);
+  useEffect(function () {
+    var _CUSTOM_OPTIONS$;
+    if (CUSTOM_OPTIONS.length > 0 && (_CUSTOM_OPTIONS$ = CUSTOM_OPTIONS[0]) !== null && _CUSTOM_OPTIONS$ !== void 0 && _CUSTOM_OPTIONS$.label) {
+      var _CUSTOM_OPTIONS$2;
+      setCustomValue(((_CUSTOM_OPTIONS$2 = CUSTOM_OPTIONS[0]) === null || _CUSTOM_OPTIONS$2 === void 0 ? void 0 : _CUSTOM_OPTIONS$2.label) || '');
+    }
+  }, [CUSTOM_OPTIONS]);
+  var CUSTOM_SECONDS_MAP = useMemo(function () {
+    return Object.fromEntries(CUSTOM_OPTIONS.map(function (o) {
+      return [o.label, o.seconds];
+    }));
+  }, [CUSTOM_OPTIONS]);
   useEffect(function () {
     if (previousTimerRef.current !== currentTimer) {
       setInitialRender(true);
@@ -44303,16 +44330,16 @@ function DisappearingMessagesPopup(_ref) {
       setSelectedOption('off');
     } else {
       var fixedMatch = Object.keys(FIXED_TIMER_OPTIONS).find(function (key) {
-        return FIXED_TIMER_OPTIONS[key] === currentTimer;
+        return (FIXED_TIMER_OPTIONS[key] || 0) * 1000 === currentTimer;
       });
       if (fixedMatch) {
         setSelectedOption(fixedMatch);
       } else {
         var customMatch = CUSTOM_OPTIONS.find(function (o) {
-          return o.seconds === currentTimer;
+          return o.seconds * 1000 === currentTimer;
         });
         setSelectedOption('custom');
-        setCustomValue((customMatch === null || customMatch === void 0 ? void 0 : customMatch.value) || '2days');
+        setCustomValue((customMatch === null || customMatch === void 0 ? void 0 : customMatch.label) || '2days');
       }
     }
   }, [currentTimer]);
@@ -44327,9 +44354,12 @@ function DisappearingMessagesPopup(_ref) {
   }, [selectedOption, customValue]);
   var isValueUnchanged = useMemo(function () {
     if (initialRender) return true;
-    var normalizedCurrent = currentTimer === 0 ? null : currentTimer != null ? currentTimer : null;
-    var normalizedSelected = selectedTimerValue === 0 ? null : selectedTimerValue != null ? selectedTimerValue : null;
-    return normalizedCurrent === normalizedSelected;
+    if (!selectedTimerValue && !selectedTimerValue) {
+      return true;
+    } else if (selectedTimerValue * 1000 === currentTimer) {
+      return true;
+    }
+    return false;
   }, [currentTimer, selectedTimerValue, initialRender]);
   var handleSet = useCallback(function () {
     if (selectedOption === 'custom') {
@@ -44342,9 +44372,9 @@ function DisappearingMessagesPopup(_ref) {
   var selectedCustomLabel = useMemo(function () {
     var _CUSTOM_OPTIONS$find;
     return ((_CUSTOM_OPTIONS$find = CUSTOM_OPTIONS.find(function (o) {
-      return o.value === customValue;
+      return o.label === customValue;
     })) === null || _CUSTOM_OPTIONS$find === void 0 ? void 0 : _CUSTOM_OPTIONS$find.label) || '2 days';
-  }, [customValue]);
+  }, [customValue, CUSTOM_OPTIONS]);
   return /*#__PURE__*/React__default.createElement(PopupContainer, null, /*#__PURE__*/React__default.createElement(Popup, {
     theme: theme,
     backgroundColor: background,
@@ -44390,7 +44420,7 @@ function DisappearingMessagesPopup(_ref) {
       borderRadius: '4px',
       variant: 'checkbox'
     }), option.label);
-  }), /*#__PURE__*/React__default.createElement(TimerOptionItem, {
+  }), CUSTOM_OPTIONS.length > 0 && (/*#__PURE__*/React__default.createElement(TimerOptionItem, {
     color: textPrimary,
     onClick: function onClick() {
       return setSelectedOption('custom');
@@ -44406,7 +44436,7 @@ function DisappearingMessagesPopup(_ref) {
     borderColor: iconInactive,
     borderRadius: '4px',
     variant: 'checkbox'
-  }), "Custom"), selectedOption === 'custom' && (/*#__PURE__*/React__default.createElement(CustomTimerSection, null, /*#__PURE__*/React__default.createElement(Label, {
+  }), "Custom")), selectedOption === 'custom' && (/*#__PURE__*/React__default.createElement(CustomTimerSection, null, /*#__PURE__*/React__default.createElement(Label, {
     color: textPrimary,
     marginTop: '0'
   }, "Auto-delete after"), /*#__PURE__*/React__default.createElement(CustomSelectWrapper, {
@@ -44435,9 +44465,9 @@ function DisappearingMessagesPopup(_ref) {
   }, CUSTOM_OPTIONS.map(function (o) {
     return /*#__PURE__*/React__default.createElement(CustomDropdownOptionLi, {
       hoverBackground: backgroundHovered,
-      key: o.value,
+      key: o.label,
       onClick: function onClick() {
-        return setCustomValue(o.value);
+        return setCustomValue(o.label);
       },
       textColor: textPrimary
     }, o.label);
@@ -44476,6 +44506,7 @@ var SetButton = styled(Button)(_templateObject8$n || (_templateObject8$n = _tagg
 
 var _templateObject$T, _templateObject2$O, _templateObject3$H, _templateObject4$B, _templateObject5$w, _templateObject6$s, _templateObject7$r, _templateObject8$o, _templateObject9$k, _templateObject0$i, _templateObject1$f, _templateObject10$9, _templateObject11$7, _templateObject12$6, _templateObject13$4, _templateObject14$3, _templateObject15$3, _templateObject16$3, _templateObject17$3, _templateObject18$3, _templateObject19$3, _templateObject20$3;
 var Actions = function Actions(_ref) {
+  var _getDisappearingSetti;
   var setActionsHeight = _ref.setActionsHeight,
     channel = _ref.channel,
     actionMenuOpen = _ref.actionMenuOpen,
@@ -44784,7 +44815,7 @@ var Actions = function Actions(_ref) {
     color: staredMessagesTextColor || textPrimary,
     hoverColor: staredMessagesTextColor || textPrimary,
     fontSize: actionItemsFontSize
-  }, /*#__PURE__*/React__default.createElement(React__default.Fragment, null, staredMessagesIcon || /*#__PURE__*/React__default.createElement(DefaultStarIcon, null), " Starred messages "))), getEnableDisappearingMessages() && !channel.isMockChannel && canToggleDisappearingMessages && (isDirectChannel && directChannelUser ? directChannelUser.state !== USER_STATE.DELETED : true) && (/*#__PURE__*/React__default.createElement(ActionItem, {
+  }, /*#__PURE__*/React__default.createElement(React__default.Fragment, null, staredMessagesIcon || /*#__PURE__*/React__default.createElement(DefaultStarIcon, null), " Starred messages "))), ((_getDisappearingSetti = getDisappearingSettings()) === null || _getDisappearingSetti === void 0 ? void 0 : _getDisappearingSetti.show) && !channel.isMockChannel && canToggleDisappearingMessages && (isDirectChannel && directChannelUser ? directChannelUser.state !== USER_STATE.DELETED : true) && (/*#__PURE__*/React__default.createElement(ActionItem, {
     key: 1.5,
     onClick: handleToggleDisappearingMessagesPopup,
     iconColor: iconPrimary,

package/package.json

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