sceyt-chat-react-uikit 1.6.9-beta.9 → 1.7.0

package/index.js

@@ -25,7 +25,6 @@ var reactRedux = require('react-redux');
 var log = _interopDefault(require('loglevel'));
 var createSagaMiddleware = require('redux-saga');
 var createSagaMiddleware__default = _interopDefault(createSagaMiddleware);
-var redux = require('redux');
 var FileSaver = _interopDefault(require('file-saver'));
 var effects = require('redux-saga/effects');
 var uuid = require('uuid');
@@ -47,6 +46,366 @@ var LexicalTypeaheadMenuPlugin = require('@lexical/react/LexicalTypeaheadMenuPlu
 var offset = require('@lexical/offset');
 var LexicalHistoryPlugin = require('@lexical/react/LexicalHistoryPlugin');
 
+// src/utils/formatProdErrorMessage.ts
+function formatProdErrorMessage(code) {
+  return `Minified Redux error #${code}; visit https://redux.js.org/Errors?code=${code} for the full message or use the non-minified dev environment for full errors. `;
+}
+
+// src/utils/symbol-observable.ts
+var $$observable = /* @__PURE__ */ (() => typeof Symbol === "function" && Symbol.observable || "@@observable")();
+var symbol_observable_default = $$observable;
+
+// src/utils/actionTypes.ts
+var randomString = () => Math.random().toString(36).substring(7).split("").join(".");
+var ActionTypes = {
+  INIT: `@@redux/INIT${/* @__PURE__ */ randomString()}`,
+  REPLACE: `@@redux/REPLACE${/* @__PURE__ */ randomString()}`,
+  PROBE_UNKNOWN_ACTION: () => `@@redux/PROBE_UNKNOWN_ACTION${randomString()}`
+};
+var actionTypes_default = ActionTypes;
+
+// src/utils/isPlainObject.ts
+function isPlainObject(obj) {
+  if (typeof obj !== "object" || obj === null)
+    return false;
+  let proto = obj;
+  while (Object.getPrototypeOf(proto) !== null) {
+    proto = Object.getPrototypeOf(proto);
+  }
+  return Object.getPrototypeOf(obj) === proto || Object.getPrototypeOf(obj) === null;
+}
+
+// src/utils/kindOf.ts
+function miniKindOf(val) {
+  if (val === void 0)
+    return "undefined";
+  if (val === null)
+    return "null";
+  const type = typeof val;
+  switch (type) {
+    case "boolean":
+    case "string":
+    case "number":
+    case "symbol":
+    case "function": {
+      return type;
+    }
+  }
+  if (Array.isArray(val))
+    return "array";
+  if (isDate(val))
+    return "date";
+  if (isError(val))
+    return "error";
+  const constructorName = ctorName(val);
+  switch (constructorName) {
+    case "Symbol":
+    case "Promise":
+    case "WeakMap":
+    case "WeakSet":
+    case "Map":
+    case "Set":
+      return constructorName;
+  }
+  return Object.prototype.toString.call(val).slice(8, -1).toLowerCase().replace(/\s/g, "");
+}
+function ctorName(val) {
+  return typeof val.constructor === "function" ? val.constructor.name : null;
+}
+function isError(val) {
+  return val instanceof Error || typeof val.message === "string" && val.constructor && typeof val.constructor.stackTraceLimit === "number";
+}
+function isDate(val) {
+  if (val instanceof Date)
+    return true;
+  return typeof val.toDateString === "function" && typeof val.getDate === "function" && typeof val.setDate === "function";
+}
+function kindOf(val) {
+  let typeOfVal = typeof val;
+  if (process.env.NODE_ENV !== "production") {
+    typeOfVal = miniKindOf(val);
+  }
+  return typeOfVal;
+}
+
+// src/createStore.ts
+function createStore(reducer, preloadedState, enhancer) {
+  if (typeof reducer !== "function") {
+    throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage(2) : `Expected the root reducer to be a function. Instead, received: '${kindOf(reducer)}'`);
+  }
+  if (typeof preloadedState === "function" && typeof enhancer === "function" || typeof enhancer === "function" && typeof arguments[3] === "function") {
+    throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage(0) : "It looks like you are passing several store enhancers to createStore(). This is not supported. Instead, compose them together to a single function. See https://redux.js.org/tutorials/fundamentals/part-4-store#creating-a-store-with-enhancers for an example.");
+  }
+  if (typeof preloadedState === "function" && typeof enhancer === "undefined") {
+    enhancer = preloadedState;
+    preloadedState = void 0;
+  }
+  if (typeof enhancer !== "undefined") {
+    if (typeof enhancer !== "function") {
+      throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage(1) : `Expected the enhancer to be a function. Instead, received: '${kindOf(enhancer)}'`);
+    }
+    return enhancer(createStore)(reducer, preloadedState);
+  }
+  let currentReducer = reducer;
+  let currentState = preloadedState;
+  let currentListeners = /* @__PURE__ */ new Map();
+  let nextListeners = currentListeners;
+  let listenerIdCounter = 0;
+  let isDispatching = false;
+  function ensureCanMutateNextListeners() {
+    if (nextListeners === currentListeners) {
+      nextListeners = /* @__PURE__ */ new Map();
+      currentListeners.forEach((listener, key) => {
+        nextListeners.set(key, listener);
+      });
+    }
+  }
+  function getState() {
+    if (isDispatching) {
+      throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage(3) : "You may not call store.getState() while the reducer is executing. The reducer has already received the state as an argument. Pass it down from the top reducer instead of reading it from the store.");
+    }
+    return currentState;
+  }
+  function subscribe(listener) {
+    if (typeof listener !== "function") {
+      throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage(4) : `Expected the listener to be a function. Instead, received: '${kindOf(listener)}'`);
+    }
+    if (isDispatching) {
+      throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage(5) : "You may not call store.subscribe() while the reducer is executing. If you would like to be notified after the store has been updated, subscribe from a component and invoke store.getState() in the callback to access the latest state. See https://redux.js.org/api/store#subscribelistener for more details.");
+    }
+    let isSubscribed = true;
+    ensureCanMutateNextListeners();
+    const listenerId = listenerIdCounter++;
+    nextListeners.set(listenerId, listener);
+    return function unsubscribe() {
+      if (!isSubscribed) {
+        return;
+      }
+      if (isDispatching) {
+        throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage(6) : "You may not unsubscribe from a store listener while the reducer is executing. See https://redux.js.org/api/store#subscribelistener for more details.");
+      }
+      isSubscribed = false;
+      ensureCanMutateNextListeners();
+      nextListeners.delete(listenerId);
+      currentListeners = null;
+    };
+  }
+  function dispatch(action) {
+    if (!isPlainObject(action)) {
+      throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage(7) : `Actions must be plain objects. Instead, the actual type was: '${kindOf(action)}'. You may need to add middleware to your store setup to handle dispatching other values, such as 'redux-thunk' to handle dispatching functions. See https://redux.js.org/tutorials/fundamentals/part-4-store#middleware and https://redux.js.org/tutorials/fundamentals/part-6-async-logic#using-the-redux-thunk-middleware for examples.`);
+    }
+    if (typeof action.type === "undefined") {
+      throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage(8) : 'Actions may not have an undefined "type" property. You may have misspelled an action type string constant.');
+    }
+    if (typeof action.type !== "string") {
+      throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage(17) : `Action "type" property must be a string. Instead, the actual type was: '${kindOf(action.type)}'. Value was: '${action.type}' (stringified)`);
+    }
+    if (isDispatching) {
+      throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage(9) : "Reducers may not dispatch actions.");
+    }
+    try {
+      isDispatching = true;
+      currentState = currentReducer(currentState, action);
+    } finally {
+      isDispatching = false;
+    }
+    const listeners = currentListeners = nextListeners;
+    listeners.forEach((listener) => {
+      listener();
+    });
+    return action;
+  }
+  function replaceReducer(nextReducer) {
+    if (typeof nextReducer !== "function") {
+      throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage(10) : `Expected the nextReducer to be a function. Instead, received: '${kindOf(nextReducer)}`);
+    }
+    currentReducer = nextReducer;
+    dispatch({
+      type: actionTypes_default.REPLACE
+    });
+  }
+  function observable() {
+    const outerSubscribe = subscribe;
+    return {
+      /**
+       * The minimal observable subscription method.
+       * @param observer Any object that can be used as an observer.
+       * The observer object should have a `next` method.
+       * @returns An object with an `unsubscribe` method that can
+       * be used to unsubscribe the observable from the store, and prevent further
+       * emission of values from the observable.
+       */
+      subscribe(observer) {
+        if (typeof observer !== "object" || observer === null) {
+          throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage(11) : `Expected the observer to be an object. Instead, received: '${kindOf(observer)}'`);
+        }
+        function observeState() {
+          const observerAsObserver = observer;
+          if (observerAsObserver.next) {
+            observerAsObserver.next(getState());
+          }
+        }
+        observeState();
+        const unsubscribe = outerSubscribe(observeState);
+        return {
+          unsubscribe
+        };
+      },
+      [symbol_observable_default]() {
+        return this;
+      }
+    };
+  }
+  dispatch({
+    type: actionTypes_default.INIT
+  });
+  const store = {
+    dispatch,
+    subscribe,
+    getState,
+    replaceReducer,
+    [symbol_observable_default]: observable
+  };
+  return store;
+}
+
+// src/utils/warning.ts
+function warning(message) {
+  if (typeof console !== "undefined" && typeof console.error === "function") {
+    console.error(message);
+  }
+  try {
+    throw new Error(message);
+  } catch (e) {
+  }
+}
+
+// src/combineReducers.ts
+function getUnexpectedStateShapeWarningMessage(inputState, reducers, action, unexpectedKeyCache) {
+  const reducerKeys = Object.keys(reducers);
+  const argumentName = action && action.type === actionTypes_default.INIT ? "preloadedState argument passed to createStore" : "previous state received by the reducer";
+  if (reducerKeys.length === 0) {
+    return "Store does not have a valid reducer. Make sure the argument passed to combineReducers is an object whose values are reducers.";
+  }
+  if (!isPlainObject(inputState)) {
+    return `The ${argumentName} has unexpected type of "${kindOf(inputState)}". Expected argument to be an object with the following keys: "${reducerKeys.join('", "')}"`;
+  }
+  const unexpectedKeys = Object.keys(inputState).filter((key) => !reducers.hasOwnProperty(key) && !unexpectedKeyCache[key]);
+  unexpectedKeys.forEach((key) => {
+    unexpectedKeyCache[key] = true;
+  });
+  if (action && action.type === actionTypes_default.REPLACE)
+    return;
+  if (unexpectedKeys.length > 0) {
+    return `Unexpected ${unexpectedKeys.length > 1 ? "keys" : "key"} "${unexpectedKeys.join('", "')}" found in ${argumentName}. Expected to find one of the known reducer keys instead: "${reducerKeys.join('", "')}". Unexpected keys will be ignored.`;
+  }
+}
+function assertReducerShape(reducers) {
+  Object.keys(reducers).forEach((key) => {
+    const reducer = reducers[key];
+    const initialState = reducer(void 0, {
+      type: actionTypes_default.INIT
+    });
+    if (typeof initialState === "undefined") {
+      throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage(12) : `The slice reducer for key "${key}" returned undefined during initialization. If the state passed to the reducer is undefined, you must explicitly return the initial state. The initial state may not be undefined. If you don't want to set a value for this reducer, you can use null instead of undefined.`);
+    }
+    if (typeof reducer(void 0, {
+      type: actionTypes_default.PROBE_UNKNOWN_ACTION()
+    }) === "undefined") {
+      throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage(13) : `The slice reducer for key "${key}" returned undefined when probed with a random type. Don't try to handle '${actionTypes_default.INIT}' or other actions in "redux/*" namespace. They are considered private. Instead, you must return the current state for any unknown actions, unless it is undefined, in which case you must return the initial state, regardless of the action type. The initial state may not be undefined, but can be null.`);
+    }
+  });
+}
+function combineReducers(reducers) {
+  const reducerKeys = Object.keys(reducers);
+  const finalReducers = {};
+  for (let i = 0; i < reducerKeys.length; i++) {
+    const key = reducerKeys[i];
+    if (process.env.NODE_ENV !== "production") {
+      if (typeof reducers[key] === "undefined") {
+        warning(`No reducer provided for key "${key}"`);
+      }
+    }
+    if (typeof reducers[key] === "function") {
+      finalReducers[key] = reducers[key];
+    }
+  }
+  const finalReducerKeys = Object.keys(finalReducers);
+  let unexpectedKeyCache;
+  if (process.env.NODE_ENV !== "production") {
+    unexpectedKeyCache = {};
+  }
+  let shapeAssertionError;
+  try {
+    assertReducerShape(finalReducers);
+  } catch (e) {
+    shapeAssertionError = e;
+  }
+  return function combination(state = {}, action) {
+    if (shapeAssertionError) {
+      throw shapeAssertionError;
+    }
+    if (process.env.NODE_ENV !== "production") {
+      const warningMessage = getUnexpectedStateShapeWarningMessage(state, finalReducers, action, unexpectedKeyCache);
+      if (warningMessage) {
+        warning(warningMessage);
+      }
+    }
+    let hasChanged = false;
+    const nextState = {};
+    for (let i = 0; i < finalReducerKeys.length; i++) {
+      const key = finalReducerKeys[i];
+      const reducer = finalReducers[key];
+      const previousStateForKey = state[key];
+      const nextStateForKey = reducer(previousStateForKey, action);
+      if (typeof nextStateForKey === "undefined") {
+        const actionType = action && action.type;
+        throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage(14) : `When called with an action of type ${actionType ? `"${String(actionType)}"` : "(unknown type)"}, the slice reducer for key "${key}" returned undefined. To ignore an action, you must explicitly return the previous state. If you want this reducer to hold no value, you can return null instead of undefined.`);
+      }
+      nextState[key] = nextStateForKey;
+      hasChanged = hasChanged || nextStateForKey !== previousStateForKey;
+    }
+    hasChanged = hasChanged || finalReducerKeys.length !== Object.keys(state).length;
+    return hasChanged ? nextState : state;
+  };
+}
+
+// src/compose.ts
+function compose(...funcs) {
+  if (funcs.length === 0) {
+    return (arg) => arg;
+  }
+  if (funcs.length === 1) {
+    return funcs[0];
+  }
+  return funcs.reduce((a, b) => (...args) => a(b(...args)));
+}
+
+// src/applyMiddleware.ts
+function applyMiddleware(...middlewares) {
+  return (createStore2) => (reducer, preloadedState) => {
+    const store = createStore2(reducer, preloadedState);
+    let dispatch = () => {
+      throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage(15) : "Dispatching while constructing your middleware is not allowed. Other middleware would not be applied to this dispatch.");
+    };
+    const middlewareAPI = {
+      getState: store.getState,
+      dispatch: (action, ...args) => dispatch(action, ...args)
+    };
+    const chain = middlewares.map((middleware) => middleware(middlewareAPI));
+    dispatch = compose(...chain)(store.dispatch);
+    return {
+      ...store,
+      dispatch
+    };
+  };
+}
+
+// src/utils/isAction.ts
+function isAction(action) {
+  return isPlainObject(action) && "type" in action && typeof action.type === "string";
+}
+
 var __defProp = Object.defineProperty;
 var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
@@ -121,10 +480,10 @@ function isDraftable(value) {
   var _a;
   if (!value)
     return false;
-  return isPlainObject(value) || Array.isArray(value) || !!value[DRAFTABLE] || !!((_a = value.constructor) == null ? void 0 : _a[DRAFTABLE]) || isMap(value) || isSet(value);
+  return isPlainObject$1(value) || Array.isArray(value) || !!value[DRAFTABLE] || !!((_a = value.constructor) == null ? void 0 : _a[DRAFTABLE]) || isMap(value) || isSet(value);
 }
 var objectCtorString = Object.prototype.constructor.toString();
-function isPlainObject(value) {
+function isPlainObject$1(value) {
   if (!value || typeof value !== "object")
     return false;
   const proto = getPrototypeOf(value);
@@ -186,7 +545,7 @@ function shallowCopy(base, strict) {
   }
   if (Array.isArray(base))
     return Array.prototype.slice.call(base);
-  const isPlain = isPlainObject(base);
+  const isPlain = isPlainObject$1(base);
   if (strict === true || strict === "class_only" && !isPlain) {
     const descriptors = Object.getOwnPropertyDescriptors(base);
     delete descriptors[DRAFT_STATE];
@@ -244,6 +603,10 @@ function getPlugin(pluginKey) {
   }
   return plugin;
 }
+function loadPlugin(pluginKey, implementation) {
+  if (!plugins[pluginKey])
+    plugins[pluginKey] = implementation;
+}
 
 // src/core/scope.ts
 var currentScope;
@@ -760,6 +1123,256 @@ function currentImpl(value) {
   return copy;
 }
 
+// src/plugins/mapset.ts
+function enableMapSet() {
+  class DraftMap extends Map {
+    constructor(target, parent) {
+      super();
+      this[DRAFT_STATE] = {
+        type_: 2 /* Map */,
+        parent_: parent,
+        scope_: parent ? parent.scope_ : getCurrentScope(),
+        modified_: false,
+        finalized_: false,
+        copy_: void 0,
+        assigned_: void 0,
+        base_: target,
+        draft_: this,
+        isManual_: false,
+        revoked_: false
+      };
+    }
+    get size() {
+      return latest(this[DRAFT_STATE]).size;
+    }
+    has(key) {
+      return latest(this[DRAFT_STATE]).has(key);
+    }
+    set(key, value) {
+      const state = this[DRAFT_STATE];
+      assertUnrevoked(state);
+      if (!latest(state).has(key) || latest(state).get(key) !== value) {
+        prepareMapCopy(state);
+        markChanged(state);
+        state.assigned_.set(key, true);
+        state.copy_.set(key, value);
+        state.assigned_.set(key, true);
+      }
+      return this;
+    }
+    delete(key) {
+      if (!this.has(key)) {
+        return false;
+      }
+      const state = this[DRAFT_STATE];
+      assertUnrevoked(state);
+      prepareMapCopy(state);
+      markChanged(state);
+      if (state.base_.has(key)) {
+        state.assigned_.set(key, false);
+      } else {
+        state.assigned_.delete(key);
+      }
+      state.copy_.delete(key);
+      return true;
+    }
+    clear() {
+      const state = this[DRAFT_STATE];
+      assertUnrevoked(state);
+      if (latest(state).size) {
+        prepareMapCopy(state);
+        markChanged(state);
+        state.assigned_ = /* @__PURE__ */ new Map();
+        each(state.base_, (key) => {
+          state.assigned_.set(key, false);
+        });
+        state.copy_.clear();
+      }
+    }
+    forEach(cb, thisArg) {
+      const state = this[DRAFT_STATE];
+      latest(state).forEach((_value, key, _map) => {
+        cb.call(thisArg, this.get(key), key, this);
+      });
+    }
+    get(key) {
+      const state = this[DRAFT_STATE];
+      assertUnrevoked(state);
+      const value = latest(state).get(key);
+      if (state.finalized_ || !isDraftable(value)) {
+        return value;
+      }
+      if (value !== state.base_.get(key)) {
+        return value;
+      }
+      const draft = createProxy(value, state);
+      prepareMapCopy(state);
+      state.copy_.set(key, draft);
+      return draft;
+    }
+    keys() {
+      return latest(this[DRAFT_STATE]).keys();
+    }
+    values() {
+      const iterator = this.keys();
+      return {
+        [Symbol.iterator]: () => this.values(),
+        next: () => {
+          const r = iterator.next();
+          if (r.done)
+            return r;
+          const value = this.get(r.value);
+          return {
+            done: false,
+            value
+          };
+        }
+      };
+    }
+    entries() {
+      const iterator = this.keys();
+      return {
+        [Symbol.iterator]: () => this.entries(),
+        next: () => {
+          const r = iterator.next();
+          if (r.done)
+            return r;
+          const value = this.get(r.value);
+          return {
+            done: false,
+            value: [r.value, value]
+          };
+        }
+      };
+    }
+    [(Symbol.iterator)]() {
+      return this.entries();
+    }
+  }
+  function proxyMap_(target, parent) {
+    return new DraftMap(target, parent);
+  }
+  function prepareMapCopy(state) {
+    if (!state.copy_) {
+      state.assigned_ = /* @__PURE__ */ new Map();
+      state.copy_ = new Map(state.base_);
+    }
+  }
+  class DraftSet extends Set {
+    constructor(target, parent) {
+      super();
+      this[DRAFT_STATE] = {
+        type_: 3 /* Set */,
+        parent_: parent,
+        scope_: parent ? parent.scope_ : getCurrentScope(),
+        modified_: false,
+        finalized_: false,
+        copy_: void 0,
+        base_: target,
+        draft_: this,
+        drafts_: /* @__PURE__ */ new Map(),
+        revoked_: false,
+        isManual_: false
+      };
+    }
+    get size() {
+      return latest(this[DRAFT_STATE]).size;
+    }
+    has(value) {
+      const state = this[DRAFT_STATE];
+      assertUnrevoked(state);
+      if (!state.copy_) {
+        return state.base_.has(value);
+      }
+      if (state.copy_.has(value))
+        return true;
+      if (state.drafts_.has(value) && state.copy_.has(state.drafts_.get(value)))
+        return true;
+      return false;
+    }
+    add(value) {
+      const state = this[DRAFT_STATE];
+      assertUnrevoked(state);
+      if (!this.has(value)) {
+        prepareSetCopy(state);
+        markChanged(state);
+        state.copy_.add(value);
+      }
+      return this;
+    }
+    delete(value) {
+      if (!this.has(value)) {
+        return false;
+      }
+      const state = this[DRAFT_STATE];
+      assertUnrevoked(state);
+      prepareSetCopy(state);
+      markChanged(state);
+      return state.copy_.delete(value) || (state.drafts_.has(value) ? state.copy_.delete(state.drafts_.get(value)) : (
+        /* istanbul ignore next */
+        false
+      ));
+    }
+    clear() {
+      const state = this[DRAFT_STATE];
+      assertUnrevoked(state);
+      if (latest(state).size) {
+        prepareSetCopy(state);
+        markChanged(state);
+        state.copy_.clear();
+      }
+    }
+    values() {
+      const state = this[DRAFT_STATE];
+      assertUnrevoked(state);
+      prepareSetCopy(state);
+      return state.copy_.values();
+    }
+    entries() {
+      const state = this[DRAFT_STATE];
+      assertUnrevoked(state);
+      prepareSetCopy(state);
+      return state.copy_.entries();
+    }
+    keys() {
+      return this.values();
+    }
+    [(Symbol.iterator)]() {
+      return this.values();
+    }
+    forEach(cb, thisArg) {
+      const iterator = this.values();
+      let result = iterator.next();
+      while (!result.done) {
+        cb.call(thisArg, result.value, result.value, this);
+        result = iterator.next();
+      }
+    }
+  }
+  function proxySet_(target, parent) {
+    return new DraftSet(target, parent);
+  }
+  function prepareSetCopy(state) {
+    if (!state.copy_) {
+      state.copy_ = /* @__PURE__ */ new Set();
+      state.base_.forEach((value) => {
+        if (isDraftable(value)) {
+          const draft = createProxy(value, state);
+          state.drafts_.set(value, draft);
+          state.copy_.add(draft);
+        } else {
+          state.copy_.add(value);
+        }
+      });
+    }
+  }
+  function assertUnrevoked(state) {
+    if (state.revoked_)
+      die(3, JSON.stringify(latest(state)));
+  }
+  loadPlugin("MapSet", { proxyMap_, proxySet_ });
+}
+
 // src/immer.ts
 var immer = new Immer2();
 var produce = immer.produce;
@@ -818,8 +1431,8 @@ var __objRest = (source, exclude) => {
 };
 var composeWithDevTools = typeof window !== "undefined" && window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ ? window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ : function() {
   if (arguments.length === 0) return void 0;
-  if (typeof arguments[0] === "object") return redux.compose;
-  return redux.compose.apply(null, arguments);
+  if (typeof arguments[0] === "object") return compose;
+  return compose.apply(null, arguments);
 };
 
 // src/tsHelpers.ts
@@ -833,7 +1446,7 @@ function createAction(type, prepareAction) {
     if (prepareAction) {
       let prepared = prepareAction(...args);
       if (!prepared) {
-        throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage(0) : "prepareAction did not return an object");
+        throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage$1(0) : "prepareAction did not return an object");
       }
       return __spreadValues$1(__spreadValues$1({
         type,
@@ -851,7 +1464,7 @@ function createAction(type, prepareAction) {
   }
   actionCreator.toString = () => `${type}`;
   actionCreator.type = type;
-  actionCreator.match = (action) => redux.isAction(action) && action.type === type;
+  actionCreator.match = (action) => isAction(action) && action.type === type;
   return actionCreator;
 }
 function isActionCreator(action) {
@@ -1042,7 +1655,7 @@ function createImmutableStateInvariantMiddleware(options = {}) {
           result = tracker.detectMutations();
           tracker = track(state);
           if (result.wasMutated) {
-            throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage(19) : `A state mutation was detected between dispatches, in the path '${result.path || ""}'.  This may cause incorrect behavior. (https://redux.js.org/style-guide/style-guide#do-not-mutate-state)`);
+            throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage$1(19) : `A state mutation was detected between dispatches, in the path '${result.path || ""}'.  This may cause incorrect behavior. (https://redux.js.org/style-guide/style-guide#do-not-mutate-state)`);
           }
         });
         const dispatchedAction = next(action);
@@ -1051,7 +1664,7 @@ function createImmutableStateInvariantMiddleware(options = {}) {
           result = tracker.detectMutations();
           tracker = track(state);
           if (result.wasMutated) {
-            throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage(20) : `A state mutation was detected inside a dispatch, in the path: ${result.path || ""}. Take a look at the reducer(s) handling the action ${stringify2(action)}. (https://redux.js.org/style-guide/style-guide#do-not-mutate-state)`);
+            throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage$1(20) : `A state mutation was detected inside a dispatch, in the path: ${result.path || ""}. Take a look at the reducer(s) handling the action ${stringify2(action)}. (https://redux.js.org/style-guide/style-guide#do-not-mutate-state)`);
           }
         });
         measureUtils.warnIfExceeded();
@@ -1062,7 +1675,7 @@ function createImmutableStateInvariantMiddleware(options = {}) {
 }
 function isPlain(val) {
   const type = typeof val;
-  return val == null || type === "string" || type === "boolean" || type === "number" || Array.isArray(val) || redux.isPlainObject(val);
+  return val == null || type === "string" || type === "boolean" || type === "number" || Array.isArray(val) || isPlainObject(val);
 }
 function findNonSerializableValue(value, path = "", isSerializable = isPlain, getEntries, ignoredPaths = [], cache) {
   let foundNestedSerializable;
@@ -1132,7 +1745,7 @@ function createSerializableStateInvariantMiddleware(options = {}) {
     } = options;
     const cache = !disableCache && WeakSet ? /* @__PURE__ */ new WeakSet() : void 0;
     return (storeAPI) => (next) => (action) => {
-      if (!redux.isAction(action)) {
+      if (!isAction(action)) {
         return next(action);
       }
       const result = next(action);
@@ -1300,59 +1913,59 @@ function configureStore(options) {
   let rootReducer;
   if (typeof reducer === "function") {
     rootReducer = reducer;
-  } else if (redux.isPlainObject(reducer)) {
-    rootReducer = redux.combineReducers(reducer);
+  } else if (isPlainObject(reducer)) {
+    rootReducer = combineReducers(reducer);
   } else {
-    throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage(1) : "`reducer` is a required argument, and must be a function or an object of functions that can be passed to combineReducers");
+    throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage$1(1) : "`reducer` is a required argument, and must be a function or an object of functions that can be passed to combineReducers");
   }
   if (process.env.NODE_ENV !== "production" && middleware && typeof middleware !== "function") {
-    throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage(2) : "`middleware` field must be a callback");
+    throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage$1(2) : "`middleware` field must be a callback");
   }
   let finalMiddleware;
   if (typeof middleware === "function") {
     finalMiddleware = middleware(getDefaultMiddleware);
     if (process.env.NODE_ENV !== "production" && !Array.isArray(finalMiddleware)) {
-      throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage(3) : "when using a middleware builder function, an array of middleware must be returned");
+      throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage$1(3) : "when using a middleware builder function, an array of middleware must be returned");
     }
   } else {
     finalMiddleware = getDefaultMiddleware();
   }
   if (process.env.NODE_ENV !== "production" && finalMiddleware.some((item) => typeof item !== "function")) {
-    throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage(4) : "each middleware provided to configureStore must be a function");
+    throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage$1(4) : "each middleware provided to configureStore must be a function");
   }
   if (process.env.NODE_ENV !== "production" && duplicateMiddlewareCheck) {
     let middlewareReferences = /* @__PURE__ */ new Set();
     finalMiddleware.forEach((middleware2) => {
       if (middlewareReferences.has(middleware2)) {
-        throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage(42) : "Duplicate middleware references found when creating the store. Ensure that each middleware is only included once.");
+        throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage$1(42) : "Duplicate middleware references found when creating the store. Ensure that each middleware is only included once.");
       }
       middlewareReferences.add(middleware2);
     });
   }
-  let finalCompose = redux.compose;
+  let finalCompose = compose;
   if (devTools) {
     finalCompose = composeWithDevTools(__spreadValues$1({
       // Enable capture of stack traces for dispatched Redux actions
       trace: process.env.NODE_ENV !== "production"
     }, typeof devTools === "object" && devTools));
   }
-  const middlewareEnhancer = redux.applyMiddleware(...finalMiddleware);
+  const middlewareEnhancer = applyMiddleware(...finalMiddleware);
   const getDefaultEnhancers = buildGetDefaultEnhancers(middlewareEnhancer);
   if (process.env.NODE_ENV !== "production" && enhancers && typeof enhancers !== "function") {
-    throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage(5) : "`enhancers` field must be a callback");
+    throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage$1(5) : "`enhancers` field must be a callback");
   }
   let storeEnhancers = typeof enhancers === "function" ? enhancers(getDefaultEnhancers) : getDefaultEnhancers();
   if (process.env.NODE_ENV !== "production" && !Array.isArray(storeEnhancers)) {
-    throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage(6) : "`enhancers` callback must return an array");
+    throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage$1(6) : "`enhancers` callback must return an array");
   }
   if (process.env.NODE_ENV !== "production" && storeEnhancers.some((item) => typeof item !== "function")) {
-    throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage(7) : "each enhancer provided to configureStore must be a function");
+    throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage$1(7) : "each enhancer provided to configureStore must be a function");
   }
   if (process.env.NODE_ENV !== "production" && finalMiddleware.length && !storeEnhancers.includes(middlewareEnhancer)) {
     console.error("middlewares were provided, but middleware enhancer was not included in final enhancers - make sure to call `getDefaultEnhancers`");
   }
   const composedEnhancer = finalCompose(...storeEnhancers);
-  return redux.createStore(rootReducer, preloadedState, composedEnhancer);
+  return createStore(rootReducer, preloadedState, composedEnhancer);
 }
 
 // src/mapBuilders.ts
@@ -1364,18 +1977,18 @@ function executeReducerBuilderCallback(builderCallback) {
     addCase(typeOrActionCreator, reducer) {
       if (process.env.NODE_ENV !== "production") {
         if (actionMatchers.length > 0) {
-          throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage(26) : "`builder.addCase` should only be called before calling `builder.addMatcher`");
+          throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage$1(26) : "`builder.addCase` should only be called before calling `builder.addMatcher`");
         }
         if (defaultCaseReducer) {
-          throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage(27) : "`builder.addCase` should only be called before calling `builder.addDefaultCase`");
+          throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage$1(27) : "`builder.addCase` should only be called before calling `builder.addDefaultCase`");
         }
       }
       const type = typeof typeOrActionCreator === "string" ? typeOrActionCreator : typeOrActionCreator.type;
       if (!type) {
-        throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage(28) : "`builder.addCase` cannot be called with an empty action type");
+        throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage$1(28) : "`builder.addCase` cannot be called with an empty action type");
       }
       if (type in actionsMap) {
-        throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage(29) : `\`builder.addCase\` cannot be called with two reducers for the same action type '${type}'`);
+        throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage$1(29) : `\`builder.addCase\` cannot be called with two reducers for the same action type '${type}'`);
       }
       actionsMap[type] = reducer;
       return builder;
@@ -1383,7 +1996,7 @@ function executeReducerBuilderCallback(builderCallback) {
     addMatcher(matcher, reducer) {
       if (process.env.NODE_ENV !== "production") {
         if (defaultCaseReducer) {
-          throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage(30) : "`builder.addMatcher` should only be called before calling `builder.addDefaultCase`");
+          throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage$1(30) : "`builder.addMatcher` should only be called before calling `builder.addDefaultCase`");
         }
       }
       actionMatchers.push({
@@ -1395,7 +2008,7 @@ function executeReducerBuilderCallback(builderCallback) {
     addDefaultCase(reducer) {
       if (process.env.NODE_ENV !== "production") {
         if (defaultCaseReducer) {
-          throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage(31) : "`builder.addDefaultCase` can only be called once");
+          throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage$1(31) : "`builder.addDefaultCase` can only be called once");
         }
       }
       defaultCaseReducer = reducer;
@@ -1413,7 +2026,7 @@ function isStateFunction(x) {
 function createReducer(initialState, mapOrBuilderCallback) {
   if (process.env.NODE_ENV !== "production") {
     if (typeof mapOrBuilderCallback === "object") {
-      throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage(8) : "The object notation for `createReducer` has been removed. Please use the 'builder callback' notation instead: https://redux-toolkit.js.org/api/createReducer");
+      throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage$1(8) : "The object notation for `createReducer` has been removed. Please use the 'builder callback' notation instead: https://redux-toolkit.js.org/api/createReducer");
     }
   }
   let [actionsMap, finalActionMatchers, finalDefaultCaseReducer] = executeReducerBuilderCallback(mapOrBuilderCallback);
@@ -1480,7 +2093,7 @@ function buildCreateSlice({
       reducerPath = name
     } = options;
     if (!name) {
-      throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage(11) : "`name` is a required option for createSlice");
+      throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage$1(11) : "`name` is a required option for createSlice");
     }
     if (typeof process !== "undefined" && process.env.NODE_ENV === "development") {
       if (options.initialState === void 0) {
@@ -1499,10 +2112,10 @@ function buildCreateSlice({
       addCase(typeOrActionCreator, reducer2) {
         const type = typeof typeOrActionCreator === "string" ? typeOrActionCreator : typeOrActionCreator.type;
         if (!type) {
-          throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage(12) : "`context.addCase` cannot be called with an empty action type");
+          throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage$1(12) : "`context.addCase` cannot be called with an empty action type");
         }
         if (type in context.sliceCaseReducersByType) {
-          throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage(13) : "`context.addCase` cannot be called with two reducers for the same action type: " + type);
+          throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage$1(13) : "`context.addCase` cannot be called with two reducers for the same action type: " + type);
         }
         context.sliceCaseReducersByType[type] = reducer2;
         return contextMethods;
@@ -1539,7 +2152,7 @@ function buildCreateSlice({
     function buildReducer() {
       if (process.env.NODE_ENV !== "production") {
         if (typeof options.extraReducers === "object") {
-          throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage(14) : "The object notation for `createSlice.extraReducers` has been removed. Please use the 'builder callback' notation instead: https://redux-toolkit.js.org/api/createSlice");
+          throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage$1(14) : "The object notation for `createSlice.extraReducers` has been removed. Please use the 'builder callback' notation instead: https://redux-toolkit.js.org/api/createSlice");
         }
       }
       const [extraReducers = {}, actionMatchers = [], defaultCaseReducer = void 0] = typeof options.extraReducers === "function" ? executeReducerBuilderCallback(options.extraReducers) : [options.extraReducers];
@@ -1578,7 +2191,7 @@ function buildCreateSlice({
           if (injected) {
             sliceState = getOrInsertComputed(injectedStateCache, selectSlice, getInitialState);
           } else if (process.env.NODE_ENV !== "production") {
-            throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage(15) : "selectSlice returned undefined for an uninjected slice reducer");
+            throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage$1(15) : "selectSlice returned undefined for an uninjected slice reducer");
           }
         }
         return sliceState;
@@ -1634,7 +2247,7 @@ function wrapSelector(selector, selectState, getInitialState, injected) {
       if (injected) {
         sliceState = getInitialState();
       } else if (process.env.NODE_ENV !== "production") {
-        throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage(16) : "selectState returned undefined for an uninjected slice reducer");
+        throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage$1(16) : "selectState returned undefined for an uninjected slice reducer");
       }
     }
     return selector(sliceState, ...args);
@@ -1682,7 +2295,7 @@ function handleNormalReducerDefinition({
   let prepareCallback;
   if ("reducer" in maybeReducerWithPrepare) {
     if (createNotation && !isCaseReducerWithPrepareDefinition(maybeReducerWithPrepare)) {
-      throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage(17) : "Please use the `create.preparedReducer` notation for prepared action creators with the `create` notation.");
+      throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage$1(17) : "Please use the `create.preparedReducer` notation for prepared action creators with the `create` notation.");
     }
     caseReducer = maybeReducerWithPrepare.reducer;
     prepareCallback = maybeReducerWithPrepare.prepare;
@@ -1702,7 +2315,7 @@ function handleThunkCaseReducerDefinition({
   reducerName
 }, reducerDefinition, context, cAT) {
   if (!cAT) {
-    throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage(18) : "Cannot use `create.asyncThunk` in the built-in `createSlice`. Use `buildCreateSlice({ creators: { asyncThunk: asyncThunkCreator } })` to create a customised version of `createSlice`.");
+    throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage$1(18) : "Cannot use `create.asyncThunk` in the built-in `createSlice`. Use `buildCreateSlice({ creators: { asyncThunk: asyncThunkCreator } })` to create a customised version of `createSlice`.");
   }
   const {
     payloadCreator,
@@ -1737,7 +2350,7 @@ function noop() {
 }
 
 // src/formatProdErrorMessage.ts
-function formatProdErrorMessage(code) {
+function formatProdErrorMessage$1(code) {
   return `Minified Redux Toolkit error #${code}; visit https://redux-toolkit.js.org/Errors?code=${code} for the full message or use the non-minified dev environment for full errors. `;
 }
 
@@ -2241,182 +2854,205 @@ function _catch(body, recover) {
 	return result;
 }
 
-var currentVersion = 1;
-var _setDataToDB = function setDataToDB(dbName, storeName, data, keyPath) {
-  if (!('indexedDB' in window)) {
-    log.info("This browser doesn't support IndexedDB");
-  } else {
-    var openRequest = indexedDB.open(dbName, currentVersion);
-    openRequest.onupgradeneeded = function (event) {
-      var db = openRequest.result;
-      var transaction = event.target.transaction;
-      addData(db, storeName, keyPath, data, transaction);
+// Asynchronously await a promise and pass the result to a finally continuation
+function _finallyRethrows(body, finalizer) {
+	try {
+		var result = body();
+	} catch (e) {
+		return finalizer(true, e);
+	}
+	if (result && result.then) {
+		return result.then(finalizer.bind(null, false), finalizer.bind(null, true));
+	}
+	return finalizer(false, result);
+}
+
+var openDatabase = function openDatabase(dbName) {
+  return new Promise(function (resolve, reject) {
+    var request = indexedDB.open(dbName);
+    request.onsuccess = function () {
+      return resolve(request.result);
     };
-    openRequest.onerror = function () {
-      log.error('Indexeddb Error ', openRequest.error);
+    request.onerror = function () {
+      return reject(request.error);
     };
-    openRequest.onsuccess = function (event) {
-      var db = event.target.result;
+  });
+};
+var runUpgrade = function runUpgrade(dbName, onUpgrade) {
+  try {
+    return Promise.resolve(openDatabase(dbName)).then(function (db) {
+      var nextVersion = db.version + 1;
+      db.close();
+      return new Promise(function (resolve, reject) {
+        var request = indexedDB.open(dbName, nextVersion);
+        request.onupgradeneeded = function () {
+          var upgradeDb = request.result;
+          onUpgrade(upgradeDb);
+        };
+        request.onsuccess = function () {
+          return resolve(request.result);
+        };
+        request.onerror = function () {
+          return reject(request.error);
+        };
+        request.onblocked = function () {
+          log.warn('IndexedDB upgrade blocked; close other tabs to proceed');
+        };
+      });
+    });
+  } catch (e) {
+    return Promise.reject(e);
+  }
+};
+var ensureStore = function ensureStore(dbName, storeName, keyPath) {
+  try {
+    return Promise.resolve(openDatabase(dbName)).then(function (db) {
       if (db.objectStoreNames.contains(storeName)) {
-        addData(db, storeName, keyPath, data);
-      } else {
-        db.close();
-        currentVersion++;
-        _setDataToDB(dbName, storeName, data, keyPath);
+        return db;
       }
-      db.onversionchange = function () {
-        db.close();
-        alert('The database is out of date, please reload the page.');
-      };
-    };
-    openRequest.onblocked = function () {};
+      db.close();
+      return Promise.resolve(runUpgrade(dbName, function (upgradeDb) {
+        if (!upgradeDb.objectStoreNames.contains(storeName)) {
+          upgradeDb.createObjectStore(storeName, {
+            keyPath: keyPath
+          });
+        }
+      }));
+    });
+  } catch (e) {
+    return Promise.reject(e);
   }
 };
-var _getDataFromDB = function getDataFromDB(dbName, storeName, keyPath, keyPatName) {
+var awaitTransaction = function awaitTransaction(tx) {
   return new Promise(function (resolve, reject) {
-    var openRequest = indexedDB.open(dbName, currentVersion);
-    openRequest.onupgradeneeded = function (event) {
-      var db = event.target.result;
-      var transaction = event.target.transaction;
-      if (db.objectStoreNames.contains(storeName)) {
-        var objectStore = transaction.objectStore(storeName);
-        var request = objectStore.get(keyPath);
-        request.onsuccess = function (event) {
-          var result = event.target.result;
-          resolve(result || '');
-        };
-        request.onerror = function (event) {
-          log.error('Error retrieving data during upgrade: ', event.target.error);
-          resolve('');
-        };
-      } else {
-        db.createObjectStore(storeName, {
-          keyPath: keyPatName
-        });
-        resolve('');
-      }
+    tx.oncomplete = function () {
+      return resolve();
     };
-    openRequest.onerror = function (event) {
-      if (event.target.error.name === 'VersionError') {
-        currentVersion++;
-        resolve(_getDataFromDB(dbName, storeName, keyPath));
-      } else {
-        reject(event);
-      }
+    tx.onerror = function () {
+      return reject(tx.error);
     };
-    openRequest.onsuccess = function (event) {
-      var db = event.target.result;
-      if (db.objectStoreNames.contains(storeName)) {
-        var transaction = db.transaction(storeName, 'readonly');
-        var objectStore = transaction.objectStore(storeName);
-        var request = objectStore.get(keyPath);
-        request.onsuccess = function (event) {
-          var result = event.target.result;
-          if (result) {
-            db.close();
-            resolve(result);
-          } else {
-            log.info('No data found for the specified keyPathValue.');
-            db.close();
-            resolve('');
-          }
-        };
-        request.onerror = function (event) {
-          db.close();
-          log.error('Error retrieving data: ', event.target.error);
-        };
-      } else {
-        db.close();
-        resolve('');
-      }
+    tx.onabort = function () {
+      return reject(tx.error);
     };
   });
 };
-var addData = function addData(db, storeName, keyPath, data, transaction) {
-  if (!db.objectStoreNames.contains(storeName)) {
-    var objectStore = db.createObjectStore(storeName, {
-      keyPath: keyPath
-    });
-    data.forEach(function (value) {
-      var request = objectStore.put(value);
-      request.onsuccess = function () {
-        log.info('data added to db during upgrade.. ', request.result);
-      };
-      request.onerror = function () {
-        log.info('Error on put data to db during upgrade.. ', request.error);
-      };
-    });
-  } else {
-    if (transaction) {
-      var store = transaction.objectStore(storeName);
-      data.forEach(function (value) {
-        var request = store.put(value);
-        request.onsuccess = function () {
-          log.info('data added to db using existing transaction.. ', request.result);
-        };
-        request.onerror = function () {
-          log.info('Error on put data to db using existing transaction.. ', request.error);
-        };
+var putWithPossibleOutOfLineKey = function putWithPossibleOutOfLineKey(store, value, keyField) {
+  try {
+    if (store.keyPath !== null) {
+      store.put(value);
+      return;
+    }
+  } catch (e) {}
+  var explicitKey = value === null || value === void 0 ? void 0 : value[keyField];
+  if (explicitKey === undefined || explicitKey === null) {
+    throw new Error("IndexedDB put requires explicit key but value has no '" + keyField + "' field");
+  }
+  store.put(value, explicitKey);
+};
+var setDataToDB = function setDataToDB(dbName, storeName, data, keyPath) {
+  try {
+    if (!('indexedDB' in window)) {
+      log.info("This browser doesn't support IndexedDB");
+      return Promise.resolve();
+    }
+    return Promise.resolve(ensureStore(dbName, storeName, keyPath)).then(function (db) {
+      var _temp = _finallyRethrows(function () {
+        var tx = db.transaction(storeName, 'readwrite');
+        var store = tx.objectStore(storeName);
+        data.forEach(function (value) {
+          putWithPossibleOutOfLineKey(store, value, keyPath);
+        });
+        return Promise.resolve(awaitTransaction(tx)).then(function () {});
+      }, function (_wasThrown, _result) {
+        db.close();
+        if (_wasThrown) throw _result;
+        return _result;
       });
-    } else {
-      var newTransaction = db.transaction(storeName, 'readwrite');
-      var _store = newTransaction.objectStore(storeName);
-      data.forEach(function (value) {
-        var request = _store.put(value);
-        request.onsuccess = function () {
-          log.info('data added to db.. ', request.result);
-        };
-        request.onerror = function () {
-          log.info('Error on put channel to db .. ', request.error);
-        };
+      if (_temp && _temp.then) return _temp.then(function () {});
+    });
+  } catch (e) {
+    return Promise.reject(e);
+  }
+};
+var getDataFromDB = function getDataFromDB(dbName, storeName, keyPathValue, keyPathName) {
+  try {
+    return Promise.resolve(_catch(function () {
+      return Promise.resolve(openDatabase(dbName)).then(function (db) {
+        var _exit = false;
+        function _temp5(_result2) {
+          if (_exit) return _result2;
+          var tx = db.transaction(storeName, 'readonly');
+          var objectStore = tx.objectStore(storeName);
+          return Promise.resolve(new Promise(function (resolve, reject) {
+            var request = objectStore.get(keyPathValue);
+            request.onsuccess = function () {
+              return resolve(request.result);
+            };
+            request.onerror = function () {
+              return reject(request.error);
+            };
+          })).then(function (result) {
+            db.close();
+            return result || '';
+          });
+        }
+        var _temp4 = function () {
+          if (!db.objectStoreNames.contains(storeName)) {
+            var _temp3 = function _temp3() {
+              _exit = true;
+              return '';
+            };
+            db.close();
+            var _temp2 = function () {
+              if (keyPathName) {
+                return Promise.resolve(ensureStore(dbName, storeName, keyPathName)).then(function (upgraded) {
+                  upgraded.close();
+                });
+              }
+            }();
+            return _temp2 && _temp2.then ? _temp2.then(_temp3) : _temp3(_temp2);
+          }
+        }();
+        return _temp4 && _temp4.then ? _temp4.then(_temp5) : _temp5(_temp4);
       });
-    }
+    }, function (error) {
+      log.error('Error retrieving data: ', error);
+      return '';
+    }));
+  } catch (e) {
+    return Promise.reject(e);
   }
 };
 var getAllStoreNames = function getAllStoreNames(dbName) {
-  return new Promise(function (resolve, reject) {
-    var openRequest = indexedDB.open(dbName, currentVersion);
-    openRequest.onupgradeneeded = function (event) {
-      var db = event.target.result;
-      resolve(Array.from(db.objectStoreNames));
-    };
-    openRequest.onerror = function () {
-      log.error('Indexeddb Error ', openRequest.error);
-      reject(openRequest.error);
-    };
-    openRequest.onsuccess = function (event) {
-      var db = event.target.result;
+  try {
+    return Promise.resolve(openDatabase(dbName)).then(function (db) {
       try {
-        var storeNames = Array.from(db.objectStoreNames);
-        db.close();
-        resolve(storeNames);
-      } catch (error) {
+        return Array.from(db.objectStoreNames);
+      } finally {
         db.close();
-        reject(error);
       }
-    };
-  });
+    });
+  } catch (e) {
+    return Promise.reject(e);
+  }
 };
 var deleteStore = function deleteStore(dbName, storeName) {
-  return new Promise(function (resolve, reject) {
-    var openRequest = indexedDB.open(dbName, currentVersion + 1);
-    openRequest.onupgradeneeded = function (event) {
-      var db = event.target.result;
-      if (db.objectStoreNames.contains(storeName)) {
-        db.deleteObjectStore(storeName);
-        currentVersion++;
-      }
-    };
-    openRequest.onerror = function () {
-      log.error('Indexeddb Error ', openRequest.error);
-      reject(openRequest.error);
-    };
-    openRequest.onsuccess = function (event) {
-      var db = event.target.result;
+  try {
+    return Promise.resolve(openDatabase(dbName)).then(function (db) {
+      var shouldDelete = db.objectStoreNames.contains(storeName);
       db.close();
-      resolve();
-    };
-  });
+      if (!shouldDelete) return;
+      return Promise.resolve(runUpgrade(dbName, function (upgradeDb) {
+        if (upgradeDb.objectStoreNames.contains(storeName)) {
+          upgradeDb.deleteObjectStore(storeName);
+        }
+      })).then(function (upgraded) {
+        upgraded.close();
+      });
+    });
+  } catch (e) {
+    return Promise.reject(e);
+  }
 };
 
 var METADATA_DB_NAME = 'sceyt-metadata-db';
@@ -2439,7 +3075,7 @@ var storeMetadata = function storeMetadata(url, metadata) {
       expiresAt: Date.now() + CACHE_DURATION
     });
     var _temp = _catch(function () {
-      return Promise.resolve(_setDataToDB(METADATA_DB_NAME, currentMonth, [metadataRecord], 'url')).then(function () {});
+      return Promise.resolve(setDataToDB(METADATA_DB_NAME, currentMonth, [metadataRecord], 'url')).then(function () {});
     }, function (error) {
       console.error('Failed to store metadata in IndexedDB:', error);
     });
@@ -2487,7 +3123,7 @@ var cleanupOldMonthsMetadata = function cleanupOldMonthsMetadata() {
 var getMetadata = function getMetadata(url) {
   return Promise.resolve(_catch(function () {
     var currentMonth = getCurrentMonthKey();
-    return Promise.resolve(_getDataFromDB(METADATA_DB_NAME, currentMonth, url, 'url')).then(function (result) {
+    return Promise.resolve(getDataFromDB(METADATA_DB_NAME, currentMonth, url, 'url')).then(function (result) {
       if (!result || typeof result === 'string') {
         return null;
       }
@@ -9412,11 +10048,7 @@ function addMessageToMap(channelId, message) {
     messagesMap[channelId] = [message];
   }
   if (message.deliveryStatus === MESSAGE_DELIVERY_STATUS.PENDING) {
-    if (pendingMessagesMap[channelId]) {
-      pendingMessagesMap[channelId].push(message);
-    } else {
-      pendingMessagesMap[channelId] = [message];
-    }
+    setPendingMessage(channelId, message);
   }
 }
 function updateMessageOnMap(channelId, updatedMessage) {
@@ -9439,18 +10071,29 @@ function updateMessageOnMap(channelId, updatedMessage) {
       }
     }
   }
+  var updatedMessageData = null;
   if (messagesMap[channelId]) {
-    messagesMap[channelId] = messagesMap[channelId].map(function (mes) {
+    messagesMap[channelId].map(function (mes) {
       if (mes.tid === updatedMessage.messageId || mes.id === updatedMessage.messageId) {
         if (updatedMessage.params.state === MESSAGE_STATUS.DELETE) {
-          return _extends({}, updatedMessage.params);
+          updatedMessageData = _extends({}, updatedMessage.params);
+          return updatedMessageData;
         } else {
-          return _extends({}, mes, updatedMessage.params);
+          var _updatedMessage$param;
+          updatedMessageData = _extends({}, mes, updatedMessage.params, {
+            attachments: [].concat(mes.attachments, ((_updatedMessage$param = updatedMessage.params) === null || _updatedMessage$param === void 0 ? void 0 : _updatedMessage$param.attachments) || []).filter(function (att, index, self) {
+              return index === self.findIndex(function (t) {
+                return t.url === att.url && t.type === att.type && t.name === att.name;
+              });
+            })
+          });
+          return updatedMessage;
         }
       }
       return mes;
     });
   }
+  return updatedMessageData;
 }
 function addReactionToMessageOnMap(channelId, message, reaction, isSelf) {
   if (messagesMap[channelId]) {
@@ -9563,6 +10206,24 @@ function removePendingMessageFromMap(channelId, messageId) {
     });
   }
 }
+function updatePendingMessageOnMap(channelId, messageId, updatedMessage) {
+  if (pendingMessagesMap[channelId]) {
+    pendingMessagesMap[channelId] = pendingMessagesMap[channelId].map(function (msg) {
+      if (msg.id === messageId || msg.tid === messageId) {
+        return _extends({}, msg, updatedMessage);
+      }
+      return msg;
+    });
+  }
+}
+function getMessageFromPendingMessagesMap(channelId, messageId) {
+  if (pendingMessagesMap[channelId]) {
+    return pendingMessagesMap[channelId].find(function (msg) {
+      return msg.id === messageId || msg.tid === messageId;
+    });
+  }
+  return null;
+}
 function clearMessagesMap() {
   messagesMap = {};
 }
@@ -9601,16 +10262,18 @@ var deletePendingMessage = function deletePendingMessage(channelId, message) {
 var getPendingMessages = function getPendingMessages(channelId) {
   return pendingMessagesMap[channelId];
 };
-var addPendingMessageToMap = function addPendingMessageToMap(channelId, pendingMessage) {
-  if (pendingMessagesMap[channelId]) {
-    pendingMessagesMap[channelId].push(pendingMessage);
+var setPendingMessage = function setPendingMessage(channelId, pendingMessage) {
+  var pendingMessages = getPendingMessages(channelId);
+  if (pendingMessages && pendingMessages !== null && pendingMessages !== void 0 && pendingMessages.length) {
+    if (!(pendingMessages !== null && pendingMessages !== void 0 && pendingMessages.find(function (msg) {
+      return msg.tid === pendingMessage.tid;
+    }))) {
+      pendingMessages.push(pendingMessage);
+    }
   } else {
     pendingMessagesMap[channelId] = [pendingMessage];
   }
 };
-var setPendingMessages = function setPendingMessages(channelId, pendingMessages) {
-  pendingMessagesMap[channelId] = pendingMessages;
-};
 var getPendingMessagesMap = function getPendingMessagesMap() {
   return pendingMessagesMap;
 };
@@ -9694,7 +10357,6 @@ var messageSlice = createSlice({
   reducers: {
     addMessage: function addMessage(state, action) {
       var message = action.payload.message;
-      log.info('addMessage ... ', message);
       state.activeChannelMessages.push(message);
     },
     deleteMessageFromList: function deleteMessageFromList(state, action) {
@@ -9812,11 +10474,48 @@ var messageSlice = createSlice({
         state.activeChannelMessages.push(params);
       }
     },
-    addReactionToMessage: function addReactionToMessage(state, action) {
+    updateMessageAttachment: function updateMessageAttachment(state, action) {
       var _action$payload4 = action.payload,
-        message = _action$payload4.message,
-        reaction = _action$payload4.reaction,
-        isSelf = _action$payload4.isSelf;
+        url = _action$payload4.url,
+        messageId = _action$payload4.messageId,
+        params = _action$payload4.params;
+      state.activeChannelMessages = state.activeChannelMessages.map(function (message) {
+        if (message.id === messageId) {
+          for (var index = 0; index < message.attachments.length; index++) {
+            var attachment = message.attachments[index];
+            if (attachment.url === url) {
+              message.attachments[index] = _extends({}, attachment, params);
+            }
+          }
+        }
+        if (message.attachments.length) {
+          var detachedAttachments = message.attachments.map(function (att) {
+            var _att$user, _att$user2;
+            return _extends({}, att, {
+              user: _extends({}, att.user, {
+                metadata: _extends({}, ((_att$user = att.user) === null || _att$user === void 0 ? void 0 : _att$user.metadata) || {}),
+                presence: _extends({}, ((_att$user2 = att.user) === null || _att$user2 === void 0 ? void 0 : _att$user2.presence) || {})
+              })
+            });
+          });
+          updateMessageOnAllMessages(messageId, {
+            attachments: detachedAttachments
+          });
+          updateMessageOnMap(message.channelId, {
+            messageId: messageId,
+            params: {
+              attachments: detachedAttachments
+            }
+          });
+        }
+        return message;
+      });
+    },
+    addReactionToMessage: function addReactionToMessage(state, action) {
+      var _action$payload5 = action.payload,
+        message = _action$payload5.message,
+        reaction = _action$payload5.reaction,
+        isSelf = _action$payload5.isSelf;
       state.activeChannelMessages = state.activeChannelMessages.map(function (msg) {
         if (msg.id === message.id) {
           var slfReactions = [].concat(msg.userReactions);
@@ -9836,10 +10535,10 @@ var messageSlice = createSlice({
       });
     },
     deleteReactionFromMessage: function deleteReactionFromMessage(state, action) {
-      var _action$payload5 = action.payload,
-        reaction = _action$payload5.reaction,
-        message = _action$payload5.message,
-        isSelf = _action$payload5.isSelf;
+      var _action$payload6 = action.payload,
+        reaction = _action$payload6.reaction,
+        message = _action$payload6.message,
+        isSelf = _action$payload6.isSelf;
       state.activeChannelMessages = state.activeChannelMessages.map(function (msg) {
         if (msg.id === message.id) {
           var userReactions = msg.userReactions;
@@ -9888,9 +10587,9 @@ var messageSlice = createSlice({
       (_state$activeTabAttac = state.activeTabAttachments).push.apply(_state$activeTabAttac, action.payload.attachments);
     },
     addAttachmentsForPopup: function addAttachmentsForPopup(state, action) {
-      var _action$payload6 = action.payload,
-        attachments = _action$payload6.attachments,
-        direction = _action$payload6.direction;
+      var _action$payload7 = action.payload,
+        attachments = _action$payload7.attachments,
+        direction = _action$payload7.direction;
       if (direction === 'prev') {
         var _state$attachmentsFor;
         (_state$attachmentsFor = state.attachmentsForPopup).push.apply(_state$attachmentsFor, attachments);
@@ -9906,11 +10605,11 @@ var messageSlice = createSlice({
       state.attachmentForPopupHasNext = action.payload.hasPrev;
     },
     updateUploadProgress: function updateUploadProgress(state, action) {
-      var _action$payload7 = action.payload,
-        uploaded = _action$payload7.uploaded,
-        total = _action$payload7.total,
-        attachmentId = _action$payload7.attachmentId,
-        progress = _action$payload7.progress;
+      var _action$payload8 = action.payload,
+        uploaded = _action$payload8.uploaded,
+        total = _action$payload8.total,
+        attachmentId = _action$payload8.attachmentId,
+        progress = _action$payload8.progress;
       var updateData = {
         uploaded: uploaded,
         total: total,
@@ -9934,23 +10633,23 @@ var messageSlice = createSlice({
       state.messageForReply = action.payload.message;
     },
     uploadAttachmentCompilation: function uploadAttachmentCompilation(state, action) {
-      var _action$payload8 = action.payload,
-        attachmentUploadingState = _action$payload8.attachmentUploadingState,
-        attachmentId = _action$payload8.attachmentId;
+      var _action$payload9 = action.payload,
+        attachmentUploadingState = _action$payload9.attachmentUploadingState,
+        attachmentId = _action$payload9.attachmentId;
       state.attachmentsUploadingState[attachmentId] = attachmentUploadingState;
     },
     setReactionsList: function setReactionsList(state, action) {
-      var _action$payload9 = action.payload,
-        reactions = _action$payload9.reactions,
-        hasNext = _action$payload9.hasNext;
+      var _action$payload0 = action.payload,
+        reactions = _action$payload0.reactions,
+        hasNext = _action$payload0.hasNext;
       state.reactionsHasNext = hasNext;
       state.reactionsList = [].concat(reactions);
     },
     addReactionsToList: function addReactionsToList(state, action) {
       var _state$reactionsList;
-      var _action$payload0 = action.payload,
-        reactions = _action$payload0.reactions,
-        hasNext = _action$payload0.hasNext;
+      var _action$payload1 = action.payload,
+        reactions = _action$payload1.reactions,
+        hasNext = _action$payload1.hasNext;
       state.reactionsHasNext = hasNext;
       (_state$reactionsList = state.reactionsList).push.apply(_state$reactionsList, reactions);
     },
@@ -10011,6 +10710,7 @@ var _messageSlice$actions = messageSlice.actions,
   addMessages = _messageSlice$actions.addMessages,
   updateMessagesStatus = _messageSlice$actions.updateMessagesStatus,
   updateMessage = _messageSlice$actions.updateMessage,
+  updateMessageAttachment = _messageSlice$actions.updateMessageAttachment,
   addReactionToMessage = _messageSlice$actions.addReactionToMessage,
   deleteReactionFromMessage = _messageSlice$actions.deleteReactionFromMessage,
   setHasPrevMessages = _messageSlice$actions.setHasPrevMessages,
@@ -10325,11 +11025,11 @@ var defaultTheme = {
     light: '#D9D9DF',
     dark: '#303032'
   }, _colors[THEME_COLORS.OVERLAY_BACKGROUND] = {
-    light: 'rgba(0, 0, 0, 0.5)',
-    dark: 'rgba(0, 0, 0, 0.5)'
+    light: '#111539',
+    dark: '#111539'
   }, _colors[THEME_COLORS.OVERLAY_BACKGROUND_2] = {
-    light: 'rgba(17, 21, 57, 0.4)',
-    dark: 'rgba(17, 21, 57, 0.4)'
+    light: '#111539',
+    dark: '#111539'
   }, _colors[THEME_COLORS.WARNING] = {
     light: '#FA4C56',
     dark: '#FA4C56'
@@ -10414,14 +11114,6 @@ var ThemeReducer = (function (state, _ref) {
   }
 });
 
-var reducers = redux.combineReducers({
-  ChannelReducer: ChannelReducer,
-  MessageReducer: MessageReducer,
-  MembersReducer: MembersReducer,
-  ThemeReducer: ThemeReducer,
-  UserReducer: UserReducer
-});
-
 var createChannelAC = function createChannelAC(channelData, dontCreateIfNotExists) {
   return {
     type: CREATE_CHANNEL,
@@ -10663,11 +11355,12 @@ var sendTypingAC = function sendTypingAC(state) {
     }
   };
 };
-var sendRecordingAC = function sendRecordingAC(state) {
+var sendRecordingAC = function sendRecordingAC(state, channelId) {
   return {
     type: SEND_RECORDING,
     payload: {
-      state: state
+      state: state,
+      channelId: channelId
     }
   };
 };
@@ -11109,6 +11802,13 @@ function setMessagesHasNextAC(hasNext) {
     hasNext: hasNext
   });
 }
+function setUpdateMessageAttachmentAC(url, messageId, params) {
+  return updateMessageAttachment({
+    url: url,
+    messageId: messageId,
+    params: params
+  });
+}
 function updateMessageAC(messageId, params, addIfNotExists) {
   return updateMessage({
     messageId: messageId,
@@ -12293,7 +12993,7 @@ var UploadPercent = styled__default.span(_templateObject38 || (_templateObject38
 }, function (props) {
   return props.fileAttachment || props.isRepliedMessage || props.isDetailsView ? '40px' : '56px';
 }, function (props) {
-  return props.backgroundColor + "40";
+  return props.backgroundColor + "66";
 }, function (props) {
   return props.borderRadius ? props.borderRadius : props.fileAttachment ? '8px' : props.isRepliedMessage ? '4px' : ' 50%';
 }, function (props) {
@@ -12970,7 +13670,7 @@ function watchForEvents() {
           };
         });
         _loop = /*#__PURE__*/_regenerator().m(function _callee() {
-          var _yield$take, type, args, createdChannel, channelFilterTypes, getFromContacts, channelExists, _chan, channel, _chan2, _channel, member, _channelExists, _activeChannelId, groupName, updateChannelData, _channel2, _channelExists2, _channel3, removedMembers, _activeChannelId2, _channelExists3, activeChannel, _updateChannelData, _groupName, _channel4, addedMembers, _activeChannelId3, _channelExists4, _updateChannelData2, _groupName2, updatedChannel, _channelExists5, subject, avatarUrl, muted, mutedTill, metadata, _activeChannelId4, _groupName3, _channel5, message, messageToHandle, _channelFilterTypes, _activeChannelId5, _channelExists6, channelForAdd, hasNextMessage, _groupName4, showNotifications, tabIsActive, _state$ThemeReducer$n, _state$ThemeReducer$n2, _state$ThemeReducer$n3, _state$ThemeReducer$n4, _state$ThemeReducer$n5, _state$ThemeReducer$n6, contactsMap, _getFromContacts, state, theme, accentColor, textSecondary, messageBody, channelId, markerList, _channel6, _activeChannelId6, updateLastMessage, markersMap, lastMessage, _channelId, _channel7, _channel8, deletedMessage, _activeChannelId7, _channelExists7, _channel9, _message, _activeChannelId8, _channelExists8, _channel0, user, _message2, reaction, isSelf, _activeChannelId9, _state$ThemeReducer$n7, _state$ThemeReducer$n8, _state$ThemeReducer$n9, _state$ThemeReducer$n0, _state$ThemeReducer$n1, _state$ThemeReducer$n10, _contactsMap, _getFromContacts2, _state, _theme, _accentColor, _textSecondary, _messageBody, channelUpdateParams, _channel1, _user, _message3, _reaction, channelFromMap, _isSelf, _activeChannelId0, _channelUpdateParams, _channel10, _updatedChannel, _channel11, _activeChannelId1, channelExist, _channel12, _channel13, _channel14, _channel15, _channel16, _channel17, _channel18, _groupName5, _channel19, _groupName6, _channel20, members, _activeChannelId10, i, _channel21, _channel22, _channelId2, from, name, status, _t;
+          var _yield$take, type, args, createdChannel, channelFilterTypes, getFromContacts, channelExists, _chan, channel, _chan2, _channel, member, _channelExists, _activeChannelId, groupName, updateChannelData, _channel2, _channelExists2, _channel3, removedMembers, _activeChannelId2, _channelExists3, activeChannel, _updateChannelData, _groupName, _channel4, addedMembers, _activeChannelId3, _channelExists4, _updateChannelData2, _groupName2, updatedChannel, _channelExists5, subject, avatarUrl, muted, mutedTill, metadata, _activeChannelId4, _groupName3, _channel5, message, messageToHandle, _channelFilterTypes, _activeChannelId5, _channelExists6, channelForAdd, hasNextMessage, _groupName4, showNotifications, tabIsActive, _state$ThemeReducer$n, _state$ThemeReducer$n2, _state$ThemeReducer$n3, _state$ThemeReducer$n4, _state$ThemeReducer$n5, _state$ThemeReducer$n6, contactsMap, _getFromContacts, state, theme, accentColor, textSecondary, messageBody, channelId, markerList, _channel6, _activeChannelId6, updateLastMessage, markersMap, activeChannelMessages, lastMessage, _channelId, _channel7, _channel8, deletedMessage, _activeChannelId7, _channelExists7, _channel9, _message, _activeChannelId8, _channelExists8, _channel0, user, _message2, reaction, isSelf, _activeChannelId9, _state$ThemeReducer$n7, _state$ThemeReducer$n8, _state$ThemeReducer$n9, _state$ThemeReducer$n0, _state$ThemeReducer$n1, _state$ThemeReducer$n10, _contactsMap, _getFromContacts2, _state, _theme, _accentColor, _textSecondary, _messageBody, channelUpdateParams, _channel1, _user, _message3, _reaction, channelFromMap, _isSelf, _activeChannelId0, _channelUpdateParams, _channel10, _updatedChannel, _channel11, _activeChannelId1, channelExist, _channel12, _channel13, _channel14, _channel15, _channel16, _channel17, _channel18, _groupName5, _channel19, _groupName6, _channel20, members, _activeChannelId10, i, _channel21, _channel22, _channelId2, from, name, status, _t;
           return _regenerator().w(function (_context) {
             while (1) switch (_context.n) {
               case 0:
@@ -13456,8 +14156,20 @@ function watchForEvents() {
                 _activeChannelId6 = _context.v;
                 updateLastMessage = false;
                 markersMap = {};
+                activeChannelMessages = getMessagesFromMap(_activeChannelId6);
                 markerList.messageIds.forEach(function (messageId) {
-                  removePendingMessageFromMap(_channel6.id, messageId);
+                  if (activeChannelMessages !== null && activeChannelMessages !== void 0 && activeChannelMessages.find(function (message) {
+                    return message.id === messageId;
+                  })) {
+                    removePendingMessageFromMap(_activeChannelId6, messageId);
+                  } else {
+                    var isPendingMessage = getMessageFromPendingMessagesMap(_activeChannelId6, messageId);
+                    if (isPendingMessage) {
+                      updatePendingMessageOnMap(_activeChannelId6, messageId, {
+                        deliveryStatus: markerList.name
+                      });
+                    }
+                  }
                   markersMap[messageId] = true;
                   if (_channel6) {
                     if (_channel6.lastMessage && messageId === _channel6.lastMessage.id && _channel6.lastMessage.deliveryStatus !== MESSAGE_DELIVERY_STATUS.READ) {
@@ -15614,47 +16326,43 @@ function sendTyping(action) {
   }, _marked22, null, [[3, 7]]);
 }
 function sendRecording(action) {
-  var state, activeChannelId, channel, _t24;
+  var _action$payload, state, channelId, channel, _t24;
   return _regenerator().w(function (_context23) {
     while (1) switch (_context23.p = _context23.n) {
       case 0:
-        state = action.payload.state;
+        _action$payload = action.payload, state = _action$payload.state, channelId = _action$payload.channelId;
         _context23.n = 1;
-        return effects.call(getActiveChannelId);
+        return effects.call(getChannelFromMap, channelId);
       case 1:
-        activeChannelId = _context23.v;
-        _context23.n = 2;
-        return effects.call(getChannelFromMap, activeChannelId);
-      case 2:
         channel = _context23.v;
-        _context23.p = 3;
+        _context23.p = 2;
         if (!channel) {
-          _context23.n = 6;
+          _context23.n = 5;
           break;
         }
         if (!state) {
-          _context23.n = 5;
+          _context23.n = 4;
           break;
         }
-        _context23.n = 4;
+        _context23.n = 3;
         return effects.call(channel.startRecording);
-      case 4:
-        _context23.n = 6;
+      case 3:
+        _context23.n = 5;
         break;
-      case 5:
-        _context23.n = 6;
+      case 4:
+        _context23.n = 5;
         return effects.call(channel.stopRecording);
-      case 6:
-        _context23.n = 8;
+      case 5:
+        _context23.n = 7;
         break;
-      case 7:
-        _context23.p = 7;
+      case 6:
+        _context23.p = 6;
         _t24 = _context23.v;
         log.error('ERROR in send recording', _t24);
-      case 8:
+      case 7:
         return _context23.a(2);
     }
-  }, _marked23, null, [[3, 7]]);
+  }, _marked23, null, [[2, 6]]);
 }
 function clearHistory(action) {
   var payload, channelId, channel, activeChannelId, groupName, _t25;
@@ -16527,13 +17235,7 @@ var addPendingMessage = function addPendingMessage(message, messageCopy, channel
     })));
     addMessageToMap(channel.id, messageToAdd);
     addAllMessages([messageToAdd], MESSAGE_LOAD_DIRECTION.NEXT);
-    setPendingMessages(channel.id, [messageToAdd]);
-    var hasNextMessages = store.getState().MessageReducer.messagesHasNext;
-    var activeChannelMessages = store.getState().MessageReducer.activeChannelMessages;
-    var isLatestMessageInChannelMessages = activeChannelMessages[activeChannelMessages.length - 1].id === channel.lastMessage.id;
-    if (hasNextMessages || !isLatestMessageInChannelMessages) {
-      store.dispatch(getMessagesAC(channel, true, channel.lastMessage.id, undefined, undefined, false));
-    }
+    setPendingMessage(channel.id, messageToAdd);
     store.dispatch(scrollToNewMessageAC(true));
     store.dispatch(addMessageAC(messageToAdd));
     return Promise.resolve();
@@ -16635,7 +17337,7 @@ function sendMessage(action) {
                     } else {
                       var pendingAttachment = getPendingAttachment(attachment.tid);
                       if (!attachment.cachedUrl) {
-                        _setDataToDB(DB_NAMES.FILES_STORAGE, DB_STORE_NAMES.ATTACHMENTS, [_extends({}, updatedAttachment, {
+                        setDataToDB(DB_NAMES.FILES_STORAGE, DB_STORE_NAMES.ATTACHMENTS, [_extends({}, updatedAttachment, {
                           checksum: pendingAttachment.checksum
                         })], 'checksum');
                       }
@@ -16793,7 +17495,7 @@ function sendMessage(action) {
                 });
                 pendingAttachment = getPendingAttachment(messageAttachment[k].tid);
                 if (!messageAttachment[k].cachedUrl) {
-                  _setDataToDB(DB_NAMES.FILES_STORAGE, DB_STORE_NAMES.ATTACHMENTS, [_extends({}, messageResponse.attachments[k], {
+                  setDataToDB(DB_NAMES.FILES_STORAGE, DB_STORE_NAMES.ATTACHMENTS, [_extends({}, messageResponse.attachments[k], {
                     checksum: pendingAttachment.checksum || (pendingAttachment === null || pendingAttachment === void 0 ? void 0 : pendingAttachment.file)
                   })], 'checksum');
                 }
@@ -16872,9 +17574,13 @@ function sendMessage(action) {
               case 14:
                 _context2.p = 14;
                 _t = _context2.v;
-                log.error('Error on uploading attachment', message.tid, _t);
+                log.error('Error on uploading attachment', messageToSend.tid, _t);
+                if (!(messageToSend.attachments && messageToSend.attachments.length)) {
+                  _context2.n = 15;
+                  break;
+                }
                 _context2.n = 15;
-                return effects.put(updateAttachmentUploadingStateAC(UPLOAD_STATE.FAIL, message.tid));
+                return effects.put(updateAttachmentUploadingStateAC(UPLOAD_STATE.FAIL, messageToSend.attachments[0].tid));
               case 15:
                 updateMessageOnMap(channel.id, {
                   messageId: messageToSend.tid,
@@ -17189,7 +17895,7 @@ function forwardMessage(action) {
         if (isCachedChannel) {
           addMessageToMap(channelId, pendingMessage);
         } else {
-          addPendingMessageToMap(channelId, pendingMessage);
+          setPendingMessage(channelId, pendingMessage);
         }
       case 12:
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
@@ -17269,7 +17975,7 @@ function forwardMessage(action) {
   }, _marked3$1, null, [[0, 19]]);
 }
 function resendMessage(action) {
-  var payload, message, connectionState, channelId, channel, customUploader, attachmentCompilation, messageAttachment, messageCopy, handleUploadProgress, uri, filePath, handleUpdateLocalPath, pendingAttachment, thumbnailMetas, fileSize, meta, attachmentMeta, attachmentBuilder, attachmentToSend, messageResponse, messageUpdateData, fileType, messageToUpdate, _messageCopy2, _messageResponse, _messageUpdateData, activeChannelId, _messageToUpdate, _t5, _t6;
+  var payload, message, connectionState, channelId, channel, customUploader, attachmentCompilation, messageAttachment, messageCopy, handleUploadProgress, uri, filePath, handleUpdateLocalPath, pendingAttachment, thumbnailMetas, fileSize, meta, attachmentMeta, attachmentBuilder, attachmentToSend, messageResponse, messageUpdateData, fileType, messageToUpdate, _messageCopy2, _getMessagesFromMap, _messageResponse, _messageUpdateData, isInActiveChannel, activeChannelId, _messageToUpdate, _t5, _t6;
   return _regenerator().w(function (_context6) {
     while (1) switch (_context6.p = _context6.n) {
       case 0:
@@ -17537,7 +18243,12 @@ function resendMessage(action) {
           bodyAttributes: _messageResponse.bodyAttributes,
           createdAt: _messageResponse.createdAt
         };
-        removePendingMessageFromMap(channel.id, _messageCopy2.tid);
+        isInActiveChannel = (_getMessagesFromMap = getMessagesFromMap(channelId)) === null || _getMessagesFromMap === void 0 ? void 0 : _getMessagesFromMap.find(function (message) {
+          return message.id === _messageCopy2.tid;
+        });
+        if (isInActiveChannel) {
+          removePendingMessageFromMap(channel.id, _messageCopy2.tid);
+        }
         _context6.n = 27;
         return effects.put(updateMessageAC(_messageCopy2.tid, _messageUpdateData));
       case 27:
@@ -17650,7 +18361,7 @@ function deleteMessage(action) {
   }, _marked5$1, null, [[0, 5]]);
 }
 function editMessage(action) {
-  var payload, _message, channelId, channel, editedMessage, messageToUpdate, _t8;
+  var payload, _message, channelId, channel, linkAttachments, anotherAttachments, linkAttachmentsToSend, editedMessage, messageToUpdate, _t8;
   return _regenerator().w(function (_context8) {
     while (1) switch (_context8.p = _context8.n) {
       case 0:
@@ -17667,6 +18378,21 @@ function editMessage(action) {
             setChannelInMap(channel);
           }
         }
+        if (_message.attachments.length > 0) {
+          linkAttachments = _message.attachments.filter(function (att) {
+            return att.type === attachmentTypes.link;
+          });
+          anotherAttachments = _message.attachments.filter(function (att) {
+            return att.type !== attachmentTypes.link;
+          });
+          linkAttachmentsToSend = [];
+          linkAttachments.forEach(function (linkAttachment) {
+            var linkAttachmentBuilder = channel.createAttachmentBuilder(linkAttachment.data, linkAttachment.type);
+            var linkAttachmentToSend = linkAttachmentBuilder.setName(linkAttachment.name).setUpload(linkAttachment.upload).create();
+            linkAttachmentsToSend.push(linkAttachmentToSend);
+          });
+          _message.attachments = [].concat(anotherAttachments, linkAttachmentsToSend);
+        }
         _context8.n = 2;
         return effects.call(channel.editMessage, _extends({}, _message, {
           metadata: isJSON(_message.metadata) ? _message.metadata : JSON.stringify(_message.metadata),
@@ -17707,15 +18433,17 @@ function editMessage(action) {
   }, _marked6$1, null, [[0, 5]]);
 }
 function getMessagesQuery(action) {
-  var _action$payload, channel, loadWithLastMessage, messageId, limit, withDeliveredMessages, highlight, SceytChatClient, messageQueryBuilder, messageQuery, cachedMessages, result, allMessages, havLastMessage, secondResult, sentMessages, messagesMap, filteredSentMessages, _allMessages, messageIndex, maxLengthPart, _secondResult, thirdResult, _secondResult2, _thirdResult, _secondResult3, _secondResult4, pendingMessages, _messagesMap, filteredPendingMessages, index, mes, _t9;
+  var _action$payload, channel, loadWithLastMessage, messageId, limit, withDeliveredMessages, highlight, SceytChatClient, messageQueryBuilder, messageQuery, cachedMessages, result, allMessages, havLastMessage, secondResult, sentMessages, messagesMap, filteredSentMessages, _allMessages, messageIndex, maxLengthPart, _secondResult, thirdResult, _secondResult2, _thirdResult, _secondResult3, _secondResult4, updatedMessages, pendingMessages, _messagesMap, filteredPendingMessages, _t9;
   return _regenerator().w(function (_context9) {
     while (1) switch (_context9.p = _context9.n) {
       case 0:
-        log.info('getMessagesQuery ... ');
-        _context9.p = 1;
+        _context9.p = 0;
+        _context9.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;
         if (!(channel.id && !channel.isMockChannel)) {
-          _context9.n = 49;
+          _context9.n = 47;
           break;
         }
         SceytChatClient = getClient();
@@ -17727,42 +18455,39 @@ function getMessagesQuery(action) {
       case 2:
         messageQuery = _context9.v;
         query.messageQuery = messageQuery;
-        _context9.n = 3;
-        return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADING));
-      case 3:
         cachedMessages = getMessagesFromMap(channel.id);
         result = {
           messages: [],
           hasNext: false
         };
         if (!loadWithLastMessage) {
-          _context9.n = 15;
+          _context9.n = 13;
           break;
         }
         allMessages = getAllMessages();
         havLastMessage = allMessages && allMessages.length && channel.lastMessage && allMessages[allMessages.length - 1] && allMessages[allMessages.length - 1].id === channel.lastMessage.id;
         if (!(channel.newMessageCount && channel.newMessageCount > 0 || !havLastMessage)) {
-          _context9.n = 10;
+          _context9.n = 8;
           break;
         }
         setHasPrevCached(false);
         setAllMessages([]);
-        _context9.n = 4;
+        _context9.n = 3;
         return effects.call(messageQuery.loadPreviousMessageId, '0');
-      case 4:
+      case 3:
         result = _context9.v;
         if (!(result.messages.length === 50)) {
-          _context9.n = 6;
+          _context9.n = 5;
           break;
         }
         messageQuery.limit = 30;
-        _context9.n = 5;
+        _context9.n = 4;
         return effects.call(messageQuery.loadPreviousMessageId, result.messages[0].id);
-      case 5:
+      case 4:
         secondResult = _context9.v;
         result.messages = [].concat(secondResult.messages, result.messages);
         result.hasNext = secondResult.hasNext;
-      case 6:
+      case 5:
         sentMessages = [];
         if (withDeliveredMessages) {
           sentMessages = getFromAllMessagesByMessageId('', '', true);
@@ -17775,43 +18500,40 @@ function getMessagesQuery(action) {
           return !messagesMap[msg.tid || ''];
         });
         result.messages = [].concat(result.messages, filteredSentMessages).slice(filteredSentMessages.length);
-        _context9.n = 7;
+        _context9.n = 6;
         return effects.put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
-      case 7:
+      case 6:
         setMessagesToMap(channel.id, result.messages);
         setAllMessages(result.messages);
-        _context9.n = 8;
+        _context9.n = 7;
         return effects.put(setMessagesHasPrevAC(true));
+      case 7:
+        _context9.n = 10;
+        break;
       case 8:
+        result.messages = getFromAllMessagesByMessageId('', '', true);
         _context9.n = 9;
-        return effects.put(markChannelAsReadAC(channel.id));
+        return effects.put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
       case 9:
-        _context9.n = 12;
-        break;
+        _context9.n = 10;
+        return effects.put(setMessagesHasPrevAC(true));
       case 10:
-        result.messages = getFromAllMessagesByMessageId('', '', true);
         _context9.n = 11;
-        return effects.put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
-      case 11:
-        _context9.n = 12;
-        return effects.put(setMessagesHasPrevAC(true));
-      case 12:
-        _context9.n = 13;
         return effects.put(setMessagesHasNextAC(false));
-      case 13:
+      case 11:
         setHasNextCached(false);
         if (!messageId) {
-          _context9.n = 14;
+          _context9.n = 12;
           break;
         }
-        _context9.n = 14;
+        _context9.n = 12;
         return effects.put(setScrollToMessagesAC(messageId, highlight));
-      case 14:
+      case 12:
         _context9.n = 45;
         break;
-      case 15:
+      case 13:
         if (!messageId) {
-          _context9.n = 26;
+          _context9.n = 25;
           break;
         }
         _allMessages = getAllMessages();
@@ -17820,164 +18542,174 @@ function getMessagesQuery(action) {
         });
         maxLengthPart = MESSAGES_MAX_LENGTH / 2;
         if (!(messageIndex >= maxLengthPart)) {
-          _context9.n = 17;
+          _context9.n = 15;
           break;
         }
         result.messages = _allMessages.slice(messageIndex - maxLengthPart, messageIndex + maxLengthPart);
-        _context9.n = 16;
+        _context9.n = 14;
         return effects.put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
-      case 16:
+      case 14:
         setHasPrevCached(messageIndex > maxLengthPart);
         setHasNextCached(_allMessages.length > maxLengthPart);
-        _context9.n = 24;
+        _context9.n = 22;
         break;
-      case 17:
+      case 15:
         messageQuery.limit = MESSAGES_MAX_LENGTH;
         log.info('load by message id from server ...............', messageId);
-        _context9.n = 18;
+        _context9.n = 16;
         return effects.call(messageQuery.loadNearMessageId, messageId);
-      case 18:
+      case 16:
         result = _context9.v;
         if (!(result.messages.length === 50)) {
-          _context9.n = 21;
+          _context9.n = 19;
           break;
         }
         messageQuery.limit = (MESSAGES_MAX_LENGTH - 50) / 2;
-        _context9.n = 19;
+        _context9.n = 17;
         return effects.call(messageQuery.loadPreviousMessageId, result.messages[0].id);
-      case 19:
+      case 17:
         _secondResult = _context9.v;
         messageQuery.reverse = false;
-        _context9.n = 20;
+        _context9.n = 18;
         return effects.call(messageQuery.loadNextMessageId, result.messages[result.messages.length - 1].id);
-      case 20:
+      case 18:
         thirdResult = _context9.v;
         result.messages = [].concat(_secondResult.messages, result.messages, thirdResult.messages);
         result.hasNext = _secondResult.hasNext;
         messageQuery.reverse = true;
-      case 21:
+      case 19:
         log.info('result from server ....... ', result);
-        _context9.n = 22;
+        _context9.n = 20;
         return effects.put(setMessagesHasNextAC(true));
-      case 22:
-        _context9.n = 23;
+      case 20:
+        _context9.n = 21;
         return effects.put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
-      case 23:
+      case 21:
         setAllMessages([].concat(result.messages));
         setHasPrevCached(false);
         setHasNextCached(false);
-      case 24:
-        _context9.n = 25;
+      case 22:
+        _context9.n = 23;
         return effects.put(setScrollToMessagesAC(messageId));
-      case 25:
+      case 23:
+        _context9.n = 24;
+        return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
+      case 24:
         _context9.n = 45;
         break;
-      case 26:
+      case 25:
         if (!(channel.newMessageCount && channel.lastDisplayedMessageId)) {
-          _context9.n = 39;
+          _context9.n = 38;
           break;
         }
         setAllMessages([]);
         messageQuery.limit = MESSAGES_MAX_LENGTH;
         if (!Number(channel.lastDisplayedMessageId)) {
-          _context9.n = 32;
+          _context9.n = 31;
           break;
         }
-        _context9.n = 27;
+        _context9.n = 26;
         return effects.call(messageQuery.loadNearMessageId, channel.lastDisplayedMessageId);
-      case 27:
+      case 26:
         result = _context9.v;
         if (!(result.messages.length === 50)) {
-          _context9.n = 31;
+          _context9.n = 30;
           break;
         }
         messageQuery.limit = channel.newMessageCount > 25 ? (MESSAGES_MAX_LENGTH - 50) / 2 : MESSAGES_MAX_LENGTH - 50;
-        _context9.n = 28;
+        _context9.n = 27;
         return effects.call(messageQuery.loadPreviousMessageId, result.messages[0].id);
-      case 28:
+      case 27:
         _secondResult2 = _context9.v;
         if (!(channel.newMessageCount > 25)) {
-          _context9.n = 30;
+          _context9.n = 29;
           break;
         }
         messageQuery.reverse = false;
-        _context9.n = 29;
+        _context9.n = 28;
         return effects.call(messageQuery.loadNextMessageId, result.messages[result.messages.length - 1].id);
-      case 29:
+      case 28:
         _thirdResult = _context9.v;
         result.messages = [].concat(_secondResult2.messages, result.messages, _thirdResult.messages);
         messageQuery.reverse = true;
-        _context9.n = 31;
+        _context9.n = 30;
         break;
-      case 30:
+      case 29:
         result.messages = [].concat(_secondResult2.messages, result.messages);
-      case 31:
-        _context9.n = 35;
+      case 30:
+        _context9.n = 34;
         break;
-      case 32:
-        _context9.n = 33;
+      case 31:
+        _context9.n = 32;
         return effects.call(messageQuery.loadPrevious);
-      case 33:
+      case 32:
         result = _context9.v;
         if (!(result.messages.length === 50)) {
-          _context9.n = 35;
+          _context9.n = 34;
           break;
         }
         messageQuery.limit = MESSAGES_MAX_LENGTH - 50;
-        _context9.n = 34;
+        _context9.n = 33;
         return effects.call(messageQuery.loadPreviousMessageId, result.messages[0].id);
-      case 34:
+      case 33:
         _secondResult3 = _context9.v;
         result.messages = [].concat(_secondResult3.messages, result.messages);
         result.hasNext = _secondResult3.hasNext;
-      case 35:
+      case 34:
         setMessagesToMap(channel.id, result.messages);
-        _context9.n = 36;
+        _context9.n = 35;
         return effects.put(setMessagesHasPrevAC(true));
-      case 36:
-        _context9.n = 37;
+      case 35:
+        _context9.n = 36;
         return effects.put(setMessagesHasNextAC(channel.lastMessage && result.messages.length > 0 && channel.lastMessage.id !== result.messages[result.messages.length - 1].id));
-      case 37:
+      case 36:
         setAllMessages([].concat(result.messages));
-        _context9.n = 38;
+        _context9.n = 37;
         return effects.put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
-      case 38:
+      case 37:
         _context9.n = 45;
         break;
-      case 39:
+      case 38:
         setAllMessages([]);
         if (!(cachedMessages && cachedMessages.length)) {
-          _context9.n = 40;
+          _context9.n = 39;
           break;
         }
         setAllMessages([].concat(cachedMessages));
-        _context9.n = 40;
+        _context9.n = 39;
         return effects.put(setMessagesAC(JSON.parse(JSON.stringify(cachedMessages))));
-      case 40:
+      case 39:
         log.info('load message from server');
-        _context9.n = 41;
+        _context9.n = 40;
         return effects.call(messageQuery.loadPrevious);
-      case 41:
+      case 40:
         result = _context9.v;
         if (!(result.messages.length === 50)) {
-          _context9.n = 43;
+          _context9.n = 42;
           break;
         }
         messageQuery.limit = MESSAGES_MAX_LENGTH - 50;
-        _context9.n = 42;
+        _context9.n = 41;
         return effects.call(messageQuery.loadPreviousMessageId, result.messages[0].id);
-      case 42:
+      case 41:
         _secondResult4 = _context9.v;
         result.messages = [].concat(_secondResult4.messages, result.messages);
         result.hasNext = _secondResult4.hasNext;
-      case 43:
+      case 42:
+        updatedMessages = [];
         result.messages.forEach(function (msg) {
-          updateMessageOnMap(channel.id, {
+          var updatedMessage = updateMessageOnMap(channel.id, {
             messageId: msg.id,
             params: msg
           });
-          updateMessageOnAllMessages(msg.id, msg);
+          updateMessageOnAllMessages(msg.id, updatedMessage || msg);
+          updatedMessages.push(updatedMessage || msg);
         });
+        setMessagesToMap(channel.id, updatedMessages);
+        setAllMessages([].concat(updatedMessages));
+        _context9.n = 43;
+        return effects.put(setMessagesAC(JSON.parse(JSON.stringify(updatedMessages))));
+      case 43:
         _context9.n = 44;
         return effects.put(setMessagesHasPrevAC(result.hasNext));
       case 44:
@@ -17986,7 +18718,7 @@ function getMessagesQuery(action) {
       case 45:
         pendingMessages = getPendingMessages(channel.id);
         if (!(pendingMessages && pendingMessages.length)) {
-          _context9.n = 47;
+          _context9.n = 46;
           break;
         }
         _messagesMap = {};
@@ -17999,34 +18731,32 @@ function getMessagesQuery(action) {
         _context9.n = 46;
         return effects.put(addMessagesAC(filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
       case 46:
-        for (index = 0; index < filteredPendingMessages.length; index++) {
-          mes = filteredPendingMessages[index];
-          removePendingMessageFromMap(channel === null || channel === void 0 ? void 0 : channel.id, mes.tid || mes.id);
-        }
-      case 47:
         _context9.n = 48;
-        return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
-      case 48:
-        _context9.n = 50;
         break;
-      case 49:
+      case 47:
         if (!channel.isMockChannel) {
-          _context9.n = 50;
+          _context9.n = 48;
           break;
         }
-        _context9.n = 50;
+        _context9.n = 48;
         return effects.put(setMessagesAC([]));
-      case 50:
-        _context9.n = 52;
+      case 48:
+        _context9.n = 50;
         break;
-      case 51:
-        _context9.p = 51;
+      case 49:
+        _context9.p = 49;
         _t9 = _context9.v;
         log.error('error in message query', _t9);
+      case 50:
+        _context9.p = 50;
+        _context9.n = 51;
+        return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
+      case 51:
+        return _context9.f(50);
       case 52:
         return _context9.a(2);
     }
-  }, _marked7$1, null, [[1, 51]]);
+  }, _marked7$1, null, [[0, 49, 50, 52]]);
 }
 function loadMoreMessages(action) {
   var payload, limit, direction, channelId, messageId, hasNext, SceytChatClient, messageQueryBuilder, messageQuery, result, _t0;
@@ -19333,9 +20063,16 @@ function rootSaga() {
   }, _marked$6);
 }
 
+enableMapSet();
 var sagaMiddleware = createSagaMiddleware__default();
 var store = configureStore({
-  reducer: reducers,
+  reducer: {
+    ChannelReducer: ChannelReducer,
+    MessageReducer: MessageReducer,
+    MembersReducer: MembersReducer,
+    ThemeReducer: ThemeReducer,
+    UserReducer: UserReducer
+  },
   middleware: function middleware(getDefaultMiddleware) {
     return getDefaultMiddleware({
       thunk: false,
@@ -20261,7 +20998,15 @@ var ChannelMessageText = function ChannelMessageText(_ref2) {
     color: textPrimary
   }, ":"), typingOrRecording.isTyping ? 'typing' : 'recording', "...")), !isTypingOrRecording && (draftMessageText ? (/*#__PURE__*/React__default.createElement(DraftMessageText, {
     color: textSecondary
-  }, audioRecording && /*#__PURE__*/React__default.createElement(SvgVoiceIcon, null), draftMessageText)) : lastMessage.state === MESSAGE_STATUS.DELETE ? 'Message was deleted.' : lastMessage.type === 'system' ? (lastMessage.user && (lastMessage.user.id === user.id ? 'You ' : makeUsername(lastMessage.user && contactsMap && contactsMap[lastMessage.user.id], lastMessage.user, getFromContacts))) + " " + (lastMessage.body === 'CC' ? 'created this channel' : lastMessage.body === 'CG' ? 'created this group' : lastMessage.body === 'AM' ? " added " + (lastMessageMetas && lastMessageMetas.m && lastMessageMetas.m.slice(0, 5).map(function (mem) {
+  }, audioRecording && /*#__PURE__*/React__default.createElement(SvgVoiceIcon, null), MessageTextFormat({
+    text: draftMessageText,
+    message: lastMessage,
+    contactsMap: contactsMap,
+    getFromContacts: getFromContacts,
+    isLastMessage: true,
+    accentColor: accentColor,
+    textSecondary: textSecondary
+  }))) : lastMessage.state === MESSAGE_STATUS.DELETE ? 'Message was deleted.' : lastMessage.type === 'system' ? (lastMessage.user && (lastMessage.user.id === user.id ? 'You ' : makeUsername(lastMessage.user && contactsMap && contactsMap[lastMessage.user.id], lastMessage.user, getFromContacts))) + " " + (lastMessage.body === 'CC' ? 'created this channel' : lastMessage.body === 'CG' ? 'created this group' : lastMessage.body === 'AM' ? " added " + (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 === '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);
@@ -20331,11 +21076,14 @@ var Channel = function Channel(_ref3) {
   var _useState = React.useState(),
     draftMessageText = _useState[0],
     setDraftMessageText = _useState[1];
+  var _useState2 = React.useState(),
+    draftMessage = _useState2[0],
+    setDraftMessage = _useState2[1];
   var lastMessage = channel.lastReactedMessage || channel.lastMessage;
   var lastMessageMetas = lastMessage && lastMessage.type === 'system' && lastMessage.metadata && (isJSON(lastMessage.metadata) ? JSON.parse(lastMessage.metadata) : lastMessage.metadata);
-  var _useState2 = React.useState(0),
-    statusWidth = _useState2[0],
-    setStatusWidth = _useState2[1];
+  var _useState3 = React.useState(0),
+    statusWidth = _useState3[0],
+    setStatusWidth = _useState3[1];
   var avatarName = channel.subject || (isDirectChannel && directChannelUser ? directChannelUser.firstName || directChannelUser.id : isSelfChannel ? 'Me' : '');
   var handleChangeActiveChannel = function handleChangeActiveChannel(chan) {
     if (activeChannel.id !== chan.id) {
@@ -20359,17 +21107,25 @@ var Channel = function Channel(_ref3) {
       if (channelDraftMessage || draftAudioRecording) {
         if (channelDraftMessage) {
           setDraftMessageText(channelDraftMessage.text);
+          setDraftMessage({
+            mentionedUsers: channelDraftMessage.mentionedMembers,
+            body: channelDraftMessage.text,
+            bodyAttributes: channelDraftMessage.bodyAttributes
+          });
         } else if (draftAudioRecording) {
           setDraftMessageText('Voice');
+          setDraftMessage(undefined);
         }
       } else if (draftMessageText) {
         setDraftMessageText(undefined);
+        setDraftMessage(undefined);
       }
     }
   }, [activeChannel.id]);
   React.useEffect(function () {
     if (channelDraftIsRemoved && channelDraftIsRemoved === channel.id) {
       setDraftMessageText(undefined);
+      setDraftMessage(undefined);
       dispatch(setChannelDraftMessageIsRemovedAC());
     }
   }, [channelDraftIsRemoved]);
@@ -20397,15 +21153,15 @@ var Channel = function Channel(_ref3) {
       items: filteredItems,
       isTyping: !!filteredItems.find(function (item) {
         return item.typingState;
+      }),
+      isRecording: !!filteredItems.find(function (item) {
+        return item.recordingState;
       })
     };
   }, [typingOrRecordingIndicator]);
-  var isTypingOrRecording = React.useMemo(function () {
-    return typingOrRecording.items.length > 0;
-  }, [typingOrRecording]);
   var MessageText = React.useMemo(function () {
     return /*#__PURE__*/React__default.createElement(ChannelMessageText, {
-      isTypingOrRecording: isTypingOrRecording,
+      isTypingOrRecording: (typingOrRecording === null || typingOrRecording === void 0 ? void 0 : typingOrRecording.isTyping) || (typingOrRecording === null || typingOrRecording === void 0 ? void 0 : typingOrRecording.isRecording),
       user: user,
       contactsMap: contactsMap,
       getFromContacts: getFromContacts,
@@ -20416,10 +21172,10 @@ var Channel = function Channel(_ref3) {
       textPrimary: textPrimary,
       textSecondary: textSecondary,
       draftMessageText: draftMessageText,
-      lastMessage: lastMessage,
+      lastMessage: draftMessage || lastMessage,
       isDirectChannel: isDirectChannel
     });
-  }, [isTypingOrRecording, draftMessageText, lastMessage, user, contactsMap, getFromContacts, lastMessageMetas, accentColor, typingOrRecording, channel, isDirectChannel]);
+  }, [typingOrRecording === null || typingOrRecording === void 0 ? void 0 : typingOrRecording.isTyping, typingOrRecording === null || typingOrRecording === void 0 ? void 0 : typingOrRecording.isRecording, draftMessageText, lastMessage, user, contactsMap, getFromContacts, lastMessageMetas, accentColor, typingOrRecording, channel, isDirectChannel]);
   return /*#__PURE__*/React__default.createElement(Container$2, {
     theme: theme,
     selectedChannel: channel.id === activeChannel.id,
@@ -20462,9 +21218,9 @@ var Channel = function Channel(_ref3) {
     unreadMentions: !!(channel.newMentionCount && channel.newMentionCount > 0),
     fontSize: channelLastMessageFontSize,
     height: channelLastMessageHeight
-  }, isTypingOrRecording ? !isDirectChannel ? (/*#__PURE__*/React__default.createElement(LastMessageAuthor, {
+  }, typingOrRecording !== null && typingOrRecording !== void 0 && typingOrRecording.isTyping || typingOrRecording !== null && typingOrRecording !== void 0 && typingOrRecording.isRecording ? !isDirectChannel ? (/*#__PURE__*/React__default.createElement(LastMessageAuthor, {
     typing: typingOrRecording.isTyping,
-    recording: !typingOrRecording.isTyping,
+    recording: typingOrRecording.isRecording,
     color: textPrimary
   }, /*#__PURE__*/React__default.createElement("span", {
     ref: messageAuthorRef
@@ -20482,11 +21238,11 @@ var Channel = function Channel(_ref3) {
     color: textPrimary
   }, /*#__PURE__*/React__default.createElement("span", {
     ref: messageAuthorRef
-  }, lastMessage.user.id === user.id ? 'You' : makeUsername(contactsMap && contactsMap[lastMessage.user.id], lastMessage.user, getFromContacts, true)))), !isTypingOrRecording && (isDirectChannel ? !isTypingOrRecording && (draftMessageText || lastMessage.user && lastMessage.state !== MESSAGE_STATUS.DELETE && (channel.lastReactedMessage && channel.newReactions && channel.newReactions[0] ? channel.newReactions[0].user && channel.newReactions[0].user.id === user.id : lastMessage.user.id === user.id)) : isTypingOrRecording && draftMessageText || lastMessage && lastMessage.state !== MESSAGE_STATUS.DELETE && lastMessage.type !== 'system') && (/*#__PURE__*/React__default.createElement(Points, {
+  }, lastMessage.user.id === user.id ? 'You' : makeUsername(contactsMap && contactsMap[lastMessage.user.id], lastMessage.user, getFromContacts, true)))), !(typingOrRecording !== null && typingOrRecording !== void 0 && typingOrRecording.isTyping) && !(typingOrRecording !== null && typingOrRecording !== void 0 && typingOrRecording.isRecording) && (isDirectChannel ? !(typingOrRecording !== null && typingOrRecording !== void 0 && typingOrRecording.isTyping) && !(typingOrRecording !== null && typingOrRecording !== void 0 && typingOrRecording.isRecording) && (draftMessageText || lastMessage.user && lastMessage.state !== MESSAGE_STATUS.DELETE && (channel.lastReactedMessage && channel.newReactions && channel.newReactions[0] ? channel.newReactions[0].user && channel.newReactions[0].user.id === user.id : lastMessage.user.id === user.id)) : ((typingOrRecording === null || typingOrRecording === void 0 ? void 0 : typingOrRecording.isTyping) || (typingOrRecording === null || typingOrRecording === void 0 ? void 0 : typingOrRecording.isRecording)) && draftMessageText || lastMessage && lastMessage.state !== MESSAGE_STATUS.DELETE && lastMessage.type !== 'system') && (/*#__PURE__*/React__default.createElement(Points, {
     color: draftMessageText && warningColor || textPrimary
   }, ": ")), /*#__PURE__*/React__default.createElement(LastMessageText, {
     color: textSecondary,
-    withAttachments: !!(lastMessage && lastMessage.attachments && lastMessage.attachments.length && lastMessage.attachments[0].type !== attachmentTypes.link) && !isTypingOrRecording,
+    withAttachments: !!(lastMessage && lastMessage.attachments && lastMessage.attachments.length && lastMessage.attachments[0].type !== attachmentTypes.link) && (!(typingOrRecording !== null && typingOrRecording !== void 0 && typingOrRecording.isTyping) || !(typingOrRecording !== null && typingOrRecording !== void 0 && typingOrRecording.isRecording)),
     noBody: lastMessage && !lastMessage.body,
     deletedMessage: lastMessage && lastMessage.state === MESSAGE_STATUS.DELETE
   }, MessageText)))), /*#__PURE__*/React__default.createElement(ChannelStatus, {
@@ -20505,7 +21261,7 @@ var Channel = function Channel(_ref3) {
   }, lastMessage && lastMessage.createdAt && lastMessageDateFormat(lastMessage.createdAt))), /*#__PURE__*/React__default.createElement(UnreadInfo, {
     bottom: !(lastMessage || typingOrRecording.items.length > 0 || draftMessageText) ? '5px' : ''
   }, !!(channel.newMentionCount && channel.newMentionCount > 0) && (/*#__PURE__*/React__default.createElement(UnreadMentionIconWrapper, {
-    iconColor: channel !== null && channel !== void 0 && channel.muted ? iconInactive : accentColor,
+    iconColor: accentColor,
     rightMargin: !!(channel.newMessageCount || channel.unread)
   }, /*#__PURE__*/React__default.createElement(SvgUnreadMention, null))), !!(channel.newMessageCount || channel.unread) && (/*#__PURE__*/React__default.createElement(UnreadCount, {
     backgroundColor: accentColor,
@@ -21002,7 +21758,7 @@ var Container$4 = styled__default.div(_templateObject$8 || (_templateObject$8 =
 }, function (props) {
   return props.height ? props.height + "px" : '0px';
 }, function (props) {
-  return props.background + "40";
+  return props.background + "66";
 });
 
 var _templateObject$9, _templateObject2$8, _templateObject3$5, _templateObject4$5, _templateObject5$3, _templateObject6$2, _templateObject7$2, _templateObject8$2, _templateObject9$2, _templateObject0$2, _templateObject1$2;
@@ -22495,7 +23251,8 @@ var ChannelList = function ChannelList(_ref) {
     channelAvatarSize = _ref.channelAvatarSize,
     channelAvatarTextSize = _ref.channelAvatarTextSize,
     searchChannelInputFontSize = _ref.searchChannelInputFontSize,
-    searchedChannelsTitleFontSize = _ref.searchedChannelsTitleFontSize;
+    searchedChannelsTitleFontSize = _ref.searchedChannelsTitleFontSize,
+    searchChannelsPadding = _ref.searchChannelsPadding;
   var _useColor = useColors(),
     background = _useColor[THEME_COLORS.BACKGROUND],
     textPrimary = _useColor[THEME_COLORS.TEXT_PRIMARY],
@@ -22732,7 +23489,8 @@ var ChannelList = function ChannelList(_ref) {
   }, /*#__PURE__*/React__default.createElement(ChannelListHeader, {
     withCustomList: !!List,
     maxWidth: channelListRef.current && ((_channelListRef$curre2 = channelListRef.current) === null || _channelListRef$curre2 === void 0 ? void 0 : _channelListRef$curre2.clientWidth) || 0,
-    borderColor: borderColor
+    borderColor: borderColor,
+    padding: searchChannelsPadding
   }, Profile, showSearch && searchChannelsPosition === 'inline' ? (/*#__PURE__*/React__default.createElement(ChannelSearch, {
     inline: true,
     borderRadius: searchInputBorderRadius,
@@ -23055,8 +23813,10 @@ var NoData = styled__default.div(_templateObject8$4 || (_templateObject8$4 = _ta
   return props.color;
 });
 var LoadingWrapper = styled__default.div(_templateObject9$4 || (_templateObject9$4 = _taggedTemplateLiteralLoose(["\n  position: absolute;\n  left: calc(50% - 20px);\n  top: calc(50% - 20px);\n"])));
-var ChannelListHeader = styled__default.div(_templateObject0$3 || (_templateObject0$3 = _taggedTemplateLiteralLoose(["\n  display: flex;\n  align-items: center;\n  flex-direction: row;\n  justify-content: space-between;\n  max-width: ", ";\n  padding: 12px;\n  padding-left: 22px;\n  box-sizing: border-box;\n  padding-left: ", ";\n  border-right: ", ";\n"])), function (props) {
+var ChannelListHeader = styled__default.div(_templateObject0$3 || (_templateObject0$3 = _taggedTemplateLiteralLoose(["\n  display: flex;\n  align-items: center;\n  flex-direction: row;\n  justify-content: space-between;\n  max-width: ", ";\n  padding: ", ";\n  padding-left: 22px;\n  box-sizing: border-box;\n  padding-left: ", ";\n  border-right: ", ";\n"])), function (props) {
   return props.maxWidth ? props.maxWidth + "px" : 'inherit';
+}, function (props) {
+  return props.padding || '12px';
 }, function (props) {
   return props.withoutProfile && '52px';
 }, function (props) {
@@ -23446,7 +24206,7 @@ var Container$a = styled__default.div(_templateObject$j || (_templateObject$j =
 }, function (props) {
   return props.dateDividerTextColor;
 }, function (props) {
-  return props.dateDividerBackgroundColor + "40";
+  return props.dateDividerBackgroundColor + "66";
 }, function (props) {
   return props.dateDividerBorderRadius || '14px';
 }, function (props) {
@@ -24082,7 +24842,7 @@ var VolumeSlide = styled__default.input(_templateObject9$6 || (_templateObject9$
 var Progress = styled__default.input(_templateObject0$5 || (_templateObject0$5 = _taggedTemplateLiteralLoose(["\n  -webkit-appearance: none;\n  margin-right: 15px;\n  width: 100%;\n  height: 4px;\n  background: rgba(255, 255, 255, 0.6);\n  border-radius: 5px;\n  background-image: linear-gradient(#fff, #fff);\n  //background-size: 70% 100%;\n  background-repeat: no-repeat;\n  cursor: pointer;\n\n  &::-webkit-slider-thumb {\n    -webkit-appearance: none;\n    height: 16px;\n    width: 16px;\n    border-radius: 50%;\n    background: #fff;\n    cursor: pointer;\n    box-shadow: 0 0 2px 0 #555;\n    transition: all 0.3s ease-in-out;\n  }\n  &::-moz-range-thumb {\n    -webkit-appearance: none;\n    height: 16px;\n    width: 16px;\n    border-radius: 50%;\n    background: #fff;\n    cursor: pointer;\n    box-shadow: 0 0 2px 0 #555;\n    transition: all 0.3s ease-in-out;\n  }\n\n  &::-ms-thumb {\n    -webkit-appearance: none;\n    height: 16px;\n    width: 16px;\n    border-radius: 50%;\n    background: #fff;\n    cursor: pointer;\n    box-shadow: 0 0 2px 0 #555;\n    transition: all 0.3s ease-in-out;\n  }\n\n  &::-webkit-slider-thumb:hover {\n    background: #fff;\n  }\n  &::-moz-range-thumb:hover {\n    background: #fff;\n  }\n  &::-ms-thumb:hover {\n    background: #fff;\n  }\n\n  &::-webkit-slider-runnable-track {\n    -webkit-appearance: none;\n    box-shadow: none;\n    border: none;\n    background: transparent;\n    transition: all 0.3s ease-in-out;\n  }\n\n  &::-moz-range-track {\n    -webkit-appearance: none;\n    box-shadow: none;\n    border: none;\n    background: transparent;\n    transition: all 0.3s ease-in-out;\n  }\n  &::-ms-track {\n    -webkit-appearance: none;\n    box-shadow: none;\n    border: none;\n    background: transparent;\n    transition: all 0.3s ease-in-out;\n  }\n"])));
 var FullScreenWrapper = styled__default.div(_templateObject1$3 || (_templateObject1$3 = _taggedTemplateLiteralLoose(["\n  display: flex;\n  margin-left: 16px;\n  cursor: pointer;\n  @media (max-width: 768px) {\n    margin-left: 12px;\n    & > svg {\n      width: 18px;\n      height: 18px;\n    }\n  }\n  @media (max-width: 480px) {\n    margin-left: auto;\n    & > svg {\n      width: 16px;\n      height: 16px;\n    }\n  }\n"])));
 
-var _templateObject$l, _templateObject2$i, _templateObject3$e, _templateObject4$c, _templateObject5$a, _templateObject6$8, _templateObject7$7, _templateObject8$7, _templateObject9$7, _templateObject0$6;
+var _templateObject$l, _templateObject2$i, _templateObject3$e, _templateObject4$c, _templateObject5$a, _templateObject6$8, _templateObject7$7, _templateObject8$7, _templateObject9$7, _templateObject0$6, _templateObject1$4;
 function ForwardMessagePopup(_ref) {
   var title = _ref.title,
     buttonText = _ref.buttonText,
@@ -24332,7 +25092,9 @@ function ForwardMessagePopup(_ref) {
       backgroundColor: 'transparent',
       checkedBackgroundColor: accentColor
     }));
-  }))))) : channels.map(function (channel) {
+  }))), !searchedChannels.chats_groups.length && !searchedChannels.channels.length && (/*#__PURE__*/React__default.createElement(NoResults, {
+    color: textSecondary
+  }, "No channels found")))) : channels.map(function (channel) {
     var _channel$metadata3;
     var isDirectChannel = channel.type === DEFAULT_CHANNEL_TYPE.DIRECT;
     var isSelfChannel = isDirectChannel && ((_channel$metadata3 = channel.metadata) === null || _channel$metadata3 === void 0 ? void 0 : _channel$metadata3.s);
@@ -24416,6 +25178,9 @@ var SelectedChannelName = styled__default.span(_templateObject9$7 || (_templateO
   return props.color;
 });
 var StyledSubtractSvg$1 = styled__default(SvgCross)(_templateObject0$6 || (_templateObject0$6 = _taggedTemplateLiteralLoose(["\n  cursor: pointer;\n  margin-left: 4px;\n  transform: translate(2px, 0);\n"])));
+var NoResults = styled__default.div(_templateObject1$4 || (_templateObject1$4 = _taggedTemplateLiteralLoose(["\n  font-size: 15px;\n  line-height: 16px;\n  font-weight: 500;\n  text-align: center;\n  margin-top: 20px;\n  color: ", ";\n"])), function (props) {
+  return props.color;
+});
 
 var _templateObject$m, _templateObject2$j;
 var CustomRadio = function CustomRadio(_ref) {
@@ -24589,7 +25354,7 @@ var DeleteOptionItem = styled__default.div(_templateObject2$k || (_templateObjec
   return props.color;
 });
 
-var _templateObject$o, _templateObject2$l, _templateObject3$f, _templateObject4$d, _templateObject5$b, _templateObject6$9, _templateObject7$8, _templateObject8$8, _templateObject9$8, _templateObject0$7, _templateObject1$4, _templateObject10$2, _templateObject11$2, _templateObject12$2, _templateObject13$2;
+var _templateObject$o, _templateObject2$l, _templateObject3$f, _templateObject4$d, _templateObject5$b, _templateObject6$9, _templateObject7$8, _templateObject8$8, _templateObject9$8, _templateObject0$7, _templateObject1$5, _templateObject10$2, _templateObject11$2, _templateObject12$2, _templateObject13$2;
 var SliderPopup = function SliderPopup(_ref) {
   var channel = _ref.channel,
     setIsSliderOpen = _ref.setIsSliderOpen,
@@ -24976,7 +25741,7 @@ var SliderPopup = function SliderPopup(_ref) {
     text: '',
     styles: {
       background: {
-        fill: overlayBackground2 + "40"
+        fill: overlayBackground2 + "66"
       },
       path: {
         stroke: textOnPrimary,
@@ -25130,7 +25895,7 @@ var FileSize = styled__default.span(_templateObject9$8 || (_templateObject9$8 =
 var UserName = styled__default.h4(_templateObject0$7 || (_templateObject0$7 = _taggedTemplateLiteralLoose(["\n  margin: 0;\n  color: ", ";\n  font-weight: 500;\n  font-size: 15px;\n  line-height: 18px;\n  letter-spacing: -0.2px;\n"])), function (props) {
   return props.color;
 });
-var ActionsWrapper = styled__default.div(_templateObject1$4 || (_templateObject1$4 = _taggedTemplateLiteralLoose(["\n  display: flex;\n"])));
+var ActionsWrapper = styled__default.div(_templateObject1$5 || (_templateObject1$5 = _taggedTemplateLiteralLoose(["\n  display: flex;\n"])));
 var IconWrapper = styled__default.span(_templateObject10$2 || (_templateObject10$2 = _taggedTemplateLiteralLoose(["\n  display: flex;\n  cursor: pointer;\n  color: ", ";\n  margin: ", ";\n\n  & > svg {\n    width: 28px;\n    height: 28px;\n  }\n\n  ", "\n"])), function (props) {
   return props.color;
 }, function (props) {
@@ -25231,7 +25996,7 @@ var Container$c = styled__default.div(_templateObject$p || (_templateObject$p =
 }, function (props) {
   return props.textColor;
 }, function (props) {
-  return props.backgroundColor + "40";
+  return props.backgroundColor + "66";
 }, function (props) {
   return props.border;
 }, function (props) {
@@ -26198,7 +26963,9 @@ var VideoPreview = /*#__PURE__*/React.memo(function VideoPreview(_ref) {
         setLoading(false);
         var minutes = Math.floor(video.duration / 60);
         var _seconds = Math.floor(video.duration % 60);
-        setVideoCurrentTime(minutes + ":" + (_seconds < 10 ? "0" + _seconds : _seconds));
+        if (!videoCurrentTime) {
+          setVideoCurrentTime(minutes + ":" + (_seconds < 10 ? "0" + _seconds : _seconds));
+        }
         if (setVideoIsReadyToSend) {
           setVideoIsReadyToSend(file.tid);
         }
@@ -26279,7 +27046,7 @@ var VideoTime = styled__default.div(_templateObject2$o || (_templateObject2$o =
 }, function (props) {
   return props.isRepliedMessage ? '0 3px' : '4px 6px';
 }, function (props) {
-  return props.messageTimeBackgroundColor + "40";
+  return props.messageTimeBackgroundColor + "66";
 }, function (props) {
   return props.color;
 }, function (props) {
@@ -28475,7 +29242,7 @@ var Timer$1 = styled__default.div(_templateObject6$c || (_templateObject6$c = _t
   return props.color;
 });
 
-var _templateObject$u, _templateObject2$q, _templateObject3$k, _templateObject4$h, _templateObject5$f, _templateObject6$d, _templateObject7$b, _templateObject8$a, _templateObject9$a, _templateObject0$9, _templateObject1$5, _templateObject10$3, _templateObject11$3;
+var _templateObject$u, _templateObject2$q, _templateObject3$k, _templateObject4$h, _templateObject5$f, _templateObject6$d, _templateObject7$b, _templateObject8$a, _templateObject9$a, _templateObject0$9, _templateObject1$6, _templateObject10$3, _templateObject11$3;
 var Attachment = function Attachment(_ref) {
   var attachment = _ref.attachment,
     _ref$isPreview = _ref.isPreview,
@@ -28588,7 +29355,15 @@ var Attachment = function Attachment(_ref) {
     if (downloadIsCancelled) {
       setDownloadIsCancelled(false);
       if (customDownloader) {
-        customDownloader(attachment.url, false, function () {}, messageType).then(function (url) {
+        customDownloader(attachment.url, false, function (progress) {
+          var loadedRes = progress.loaded && progress.loaded / progress.total;
+          var uploadPercent = loadedRes && loadedRes * 100;
+          setSizeProgress({
+            loaded: progress.loaded || 0,
+            total: progress.total || 0
+          });
+          setProgress(uploadPercent);
+        }, messageType).then(function (url) {
           downloadImage(url);
         });
       } else {
@@ -28716,23 +29491,35 @@ var Attachment = function Attachment(_ref) {
     }
   }, [attachmentUrl]);
   React.useEffect(function () {
-    if (connectionStatus === CONNECTION_STATUS.CONNECTED && attachment.id && !(attachment.type === attachmentTypes.file || attachment.type === attachmentTypes.link)) {
+    if (!attachment.attachmentUrl && connectionStatus === CONNECTION_STATUS.CONNECTED && attachment.id && !(attachment.type === attachmentTypes.file || attachment.type === attachmentTypes.link)) {
       getAttachmentUrlFromCache(attachment.url).then(function (cachedUrl) {
         try {
-          if (attachment.type === 'image' && !isPreview) {
+          if (attachment.type === attachmentTypes.image && !isPreview) {
             if (cachedUrl) {
               setAttachmentUrl(cachedUrl);
+              dispatch(setUpdateMessageAttachmentAC(attachment.url, attachment.messageId, {
+                attachmentUrl: cachedUrl
+              }));
               setIsCached(true);
             } else {
               setIsCached(false);
               setDownloadingFile(true);
               if (customDownloader) {
-                customDownloader(attachment.url, false, function () {}, messageType).then(function (url) {
+                customDownloader(attachment.url, false, function (progress) {
+                  var loadedRes = progress.loaded && progress.loaded / progress.total;
+                  var uploadPercent = loadedRes && loadedRes * 100;
+                  setSizeProgress({
+                    loaded: progress.loaded || 0,
+                    total: progress.total || 0
+                  });
+                  setProgress(uploadPercent);
+                }, messageType).then(function (url) {
                   try {
                     downloadImage(url);
                     return Promise.resolve(fetch(url)).then(function (response) {
                       setAttachmentToCache(attachment.url, response);
                       setIsCached(true);
+                      setDownloadingFile(false);
                     });
                   } catch (e) {
                     return Promise.reject(e);
@@ -28771,7 +29558,15 @@ var Attachment = function Attachment(_ref) {
         log.info('error on get attachment url from cache. .. ', e);
         if (customDownloader) {
           setDownloadingFile(true);
-          customDownloader(attachment.url, false, function () {}, messageType).then(function (url) {
+          customDownloader(attachment.url, true, function (progress) {
+            var loadedRes = progress.loaded && progress.loaded / progress.total;
+            var uploadPercent = loadedRes && loadedRes * 100;
+            setSizeProgress({
+              loaded: progress.loaded || 0,
+              total: progress.total || 0
+            });
+            setProgress(uploadPercent);
+          }, messageType).then(function (url) {
             try {
               return Promise.resolve(fetch(url)).then(function (response) {
                 setAttachmentToCache(attachment.url, response);
@@ -28838,7 +29633,7 @@ var Attachment = function Attachment(_ref) {
       }
     }
   }, [attachmentsUploadProgress]);
-  return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, attachment.type === 'image' ? (/*#__PURE__*/React__default.createElement(AttachmentImgCont, {
+  return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, attachment.type === attachmentTypes.image ? (/*#__PURE__*/React__default.createElement(AttachmentImgCont, {
     draggable: false,
     onClick: function onClick() {
       return handleMediaItemClick && !isInUploadingState && !downloadingFile && handleMediaItemClick(attachment);
@@ -28876,7 +29671,7 @@ var Attachment = function Attachment(_ref) {
     imageMinWidth: imageMinWidth,
     withPrefix: withPrefix,
     borderColor: borderColor
-  }, /*#__PURE__*/React__default.createElement(UploadPercent, {
+  }, !isPreview && (isInUploadingState || downloadingFile) && sizeProgress && sizeProgress.loaded < sizeProgress.total && (/*#__PURE__*/React__default.createElement(UploadPercent, {
     isRepliedMessage: isRepliedMessage,
     isDetailsView: isDetailsView,
     backgroundColor: overlayBackground2
@@ -28893,7 +29688,7 @@ var Attachment = function Attachment(_ref) {
     text: '',
     styles: {
       background: {
-        fill: overlayBackground2 + "40"
+        fill: overlayBackground2 + "66"
       },
       path: {
         stroke: textOnPrimary,
@@ -28906,13 +29701,13 @@ var Attachment = function Attachment(_ref) {
     }
   })), sizeProgress && (/*#__PURE__*/React__default.createElement(SizeProgress, {
     color: textOnPrimary
-  }, bytesToSize(sizeProgress.loaded, 1), " / ", bytesToSize(sizeProgress.total, 1)))))))) : null, isPreview && (/*#__PURE__*/React__default.createElement(RemoveChosenFile, {
+  }, bytesToSize(sizeProgress.loaded, 1), " / ", bytesToSize(sizeProgress.total, 1))))))))) : null, isPreview && (/*#__PURE__*/React__default.createElement(RemoveChosenFile, {
     backgroundColor: background,
     color: iconInactive,
     onClick: function onClick() {
       return handleDeleteSelectedAttachment(attachment.tid);
     }
-  })))) : attachment.type === 'video' ? (/*#__PURE__*/React__default.createElement(React__default.Fragment, null, !isPreview ? (/*#__PURE__*/React__default.createElement(VideoCont, {
+  })))) : attachment.type === attachmentTypes.video ? (/*#__PURE__*/React__default.createElement(React__default.Fragment, null, !isPreview ? (/*#__PURE__*/React__default.createElement(VideoCont, {
     onClick: function onClick() {
       return handleMediaItemClick && !downloadingFile && !isInUploadingState && (attachmentCompilationState[attachment.tid] ? attachmentCompilationState[attachment.tid] !== UPLOAD_STATE.FAIL || attachmentCompilationState[attachment.tid] !== UPLOAD_STATE.UPLOADING : true) && handleMediaItemClick(attachment);
     },
@@ -28943,7 +29738,7 @@ var Attachment = function Attachment(_ref) {
     text: '',
     styles: {
       background: {
-        fill: overlayBackground2 + "40"
+        fill: overlayBackground2 + "66"
       },
       path: {
         stroke: textOnPrimary,
@@ -29008,7 +29803,7 @@ var Attachment = function Attachment(_ref) {
   React__default.createElement(AttachmentIconCont, {
     backgroundColor: accentColor,
     className: 'icon-warpper'
-  }, previewFileType && previewFileType === 'video' ? (/*#__PURE__*/React__default.createElement(VideoPreview, {
+  }, previewFileType && previewFileType === attachmentTypes.video ? (/*#__PURE__*/React__default.createElement(VideoPreview, {
     file: attachment,
     backgroundColor: backgroundColor && backgroundColor !== 'inherit' ? backgroundColor : overlayBackground2,
     width: '40px',
@@ -29050,7 +29845,7 @@ var Attachment = function Attachment(_ref) {
     text: '',
     styles: {
       background: {
-        fill: overlayBackground2 + "40"
+        fill: overlayBackground2 + "66"
       },
       path: {
         stroke: textOnPrimary,
@@ -29142,7 +29937,7 @@ var AttachmentSize = styled__default.span(_templateObject0$9 || (_templateObject
 }, function (props) {
   return props.errorColor;
 });
-var AttachmentFileInfo = styled__default.div(_templateObject1$5 || (_templateObject1$5 = _taggedTemplateLiteralLoose(["\n  margin-left: 12px;\n  ", "\n"])), function (props) {
+var AttachmentFileInfo = styled__default.div(_templateObject1$6 || (_templateObject1$6 = _taggedTemplateLiteralLoose(["\n  margin-left: 12px;\n  ", "\n"])), function (props) {
   return props.isPreview && "line-height: 14px;\n      max-width: calc(100% - 44px);\n  ";
 });
 var AttachmentImg$1 = styled__default.img(_templateObject10$3 || (_templateObject10$3 = _taggedTemplateLiteralLoose(["\n  position: ", ";\n  border-radius: ", ";\n  padding: ", ";\n  box-sizing: border-box;\n  max-width: 100%;\n  max-height: ", ";\n  width: ", ";\n  height: ", ";\n  min-height: ", ";\n  min-width: ", ";\n  object-fit: cover;\n  visibility: ", ";\n  z-index: 2;\n"])), function (props) {
@@ -30222,7 +31017,7 @@ var MessageStatusAndTime = function MessageStatusAndTime(_ref) {
   }))));
 };
 var MessageStatusAndTime$1 = /*#__PURE__*/React__default.memo(MessageStatusAndTime, function (prevProps, nextProps) {
-  return prevProps.message.state === nextProps.message.state && prevProps.message.deliveryStatus === nextProps.message.deliveryStatus && prevProps.message.createdAt === nextProps.message.createdAt && prevProps.showMessageTimeAndStatusOnlyOnHover === nextProps.showMessageTimeAndStatusOnlyOnHover && prevProps.messageStatusSize === nextProps.messageStatusSize && prevProps.messageStatusColor === nextProps.messageStatusColor && prevProps.messageReadStatusColor === nextProps.messageReadStatusColor && prevProps.messageStateFontSize === nextProps.messageStateFontSize && prevProps.messageStateColor === nextProps.messageStateColor && prevProps.messageTimeFontSize === nextProps.messageTimeFontSize && prevProps.messageStatusAndTimeLineHeight === nextProps.messageStatusAndTimeLineHeight && prevProps.messageTimeColor === nextProps.messageTimeColor && prevProps.messageTimeVisible === nextProps.messageTimeVisible && prevProps.messageStatusVisible === nextProps.messageStatusVisible && prevProps.ownMessageOnRightSide === nextProps.ownMessageOnRightSide && prevProps.bottomOfMessage === nextProps.bottomOfMessage && prevProps.marginBottom === nextProps.marginBottom && prevProps.messageTimeColorOnAttachment === nextProps.messageTimeColorOnAttachment;
+  return prevProps.message.state === nextProps.message.state && prevProps.message.deliveryStatus === nextProps.message.deliveryStatus && prevProps.message.createdAt === nextProps.message.createdAt && prevProps.showMessageTimeAndStatusOnlyOnHover === nextProps.showMessageTimeAndStatusOnlyOnHover && prevProps.messageStatusSize === nextProps.messageStatusSize && prevProps.messageStatusColor === nextProps.messageStatusColor && prevProps.messageReadStatusColor === nextProps.messageReadStatusColor && prevProps.messageStateFontSize === nextProps.messageStateFontSize && prevProps.messageStateColor === nextProps.messageStateColor && prevProps.messageTimeFontSize === nextProps.messageTimeFontSize && prevProps.messageStatusAndTimeLineHeight === nextProps.messageStatusAndTimeLineHeight && prevProps.messageTimeColor === nextProps.messageTimeColor && prevProps.messageTimeVisible === nextProps.messageTimeVisible && prevProps.messageStatusVisible === nextProps.messageStatusVisible && prevProps.ownMessageOnRightSide === nextProps.ownMessageOnRightSide && prevProps.bottomOfMessage === nextProps.bottomOfMessage && prevProps.marginBottom === nextProps.marginBottom && prevProps.messageTimeColorOnAttachment === nextProps.messageTimeColorOnAttachment && prevProps.withAttachment === nextProps.withAttachment;
 });
 var MessageStatus = styled__default.span(_templateObject$z || (_templateObject$z = _taggedTemplateLiteralLoose(["\n  display: inline-flex;\n  align-items: center;\n  margin-left: 4px;\n  text-align: right;\n  height: ", ";\n\n  & > svg {\n    height: 16px;\n    width: 16px;\n  }\n"])), function (props) {
   return props.height || '14px';
@@ -30241,7 +31036,7 @@ var MessageStatusAndTimeContainer = styled__default.span(_templateObject3$o || (
 }, function (props) {
   return props.withAttachment && '4px 6px';
 }, function (props) {
-  return props.withAttachment && !props.fileAttachment && props.messageTimeBackgroundColor + "40";
+  return props.withAttachment && !props.fileAttachment && props.messageTimeBackgroundColor + "66";
 }, function (props) {
   return props.lineHeight || '14px';
 }, function (props) {
@@ -30285,9 +31080,9 @@ var OGMetadata = function OGMetadata(_ref) {
     setMetadata = _useState[1];
   var attachment = React.useMemo(function () {
     return attachments.find(function (attachment) {
-      return attachment.type === 'link';
+      return attachment.type === attachmentTypes.link;
     });
-  }, [attachments === null || attachments === void 0 ? void 0 : attachments.length]);
+  }, [attachments]);
   var ogMetadataQueryBuilder = React.useCallback(function (url) {
     try {
       var client = getClient();
@@ -30297,7 +31092,7 @@ var OGMetadata = function OGMetadata(_ref) {
             var queryBuilder = new client.MessageLinkOGQueryBuilder(url);
             return Promise.resolve(queryBuilder.build()).then(function (query) {
               return Promise.resolve(query.loadOGData()).then(function (metadata) {
-                return Promise.resolve(storeMetadata(url.replace('https://', ''), metadata)).then(function () {
+                return Promise.resolve(storeMetadata(url.replace('https://', '').replace('http://', ''), metadata)).then(function () {
                   setMetadata(metadata);
                 });
               });
@@ -30316,10 +31111,10 @@ var OGMetadata = function OGMetadata(_ref) {
     }
   }, []);
   React.useEffect(function () {
-    if (attachment !== null && attachment !== void 0 && attachment.id && !metadata) {
+    if (attachment !== null && attachment !== void 0 && attachment.id && attachment !== null && attachment !== void 0 && attachment.url) {
       var url = attachment === null || attachment === void 0 ? void 0 : attachment.url;
       if (url) {
-        getMetadata(url.replace('https://', '')).then(function (cachedMetadata) {
+        getMetadata(url.replace('https://', '').replace('http://', '')).then(function (cachedMetadata) {
           try {
             if (cachedMetadata) {
               setMetadata(cachedMetadata);
@@ -30335,7 +31130,7 @@ var OGMetadata = function OGMetadata(_ref) {
         });
       }
     }
-  }, [attachment === null || attachment === void 0 ? void 0 : attachment.url, metadata]);
+  }, [attachment === null || attachment === void 0 ? void 0 : attachment.url]);
   var ogUrl = React.useMemo(function () {
     var url = attachment === null || attachment === void 0 ? void 0 : attachment.url;
     var urlObj = validateUrl(url);
@@ -30346,25 +31141,33 @@ var OGMetadata = function OGMetadata(_ref) {
   }, [attachment === null || attachment === void 0 ? void 0 : attachment.url]);
   var showOGMetadata = React.useMemo(function () {
     var _metadata$og, _metadata$og2, _metadata$og2$image, _metadata$og2$image$, _metadata$og3;
-    return state === 'deleted' || (metadata === null || metadata === void 0 ? void 0 : (_metadata$og = metadata.og) === null || _metadata$og === void 0 ? void 0 : _metadata$og.title) === '' || (metadata === null || metadata === void 0 ? void 0 : (_metadata$og2 = metadata.og) === null || _metadata$og2 === void 0 ? void 0 : (_metadata$og2$image = _metadata$og2.image) === null || _metadata$og2$image === void 0 ? void 0 : (_metadata$og2$image$ = _metadata$og2$image[0]) === null || _metadata$og2$image$ === void 0 ? void 0 : _metadata$og2$image$.url) === '' || (metadata === null || metadata === void 0 ? void 0 : (_metadata$og3 = metadata.og) === null || _metadata$og3 === void 0 ? void 0 : _metadata$og3.description) === '' || !metadata;
+    return state !== 'deleted' && (metadata === null || metadata === void 0 ? void 0 : (_metadata$og = metadata.og) === null || _metadata$og === void 0 ? void 0 : _metadata$og.title) && (metadata === null || metadata === void 0 ? void 0 : (_metadata$og2 = metadata.og) === null || _metadata$og2 === void 0 ? void 0 : (_metadata$og2$image = _metadata$og2.image) === null || _metadata$og2$image === void 0 ? void 0 : (_metadata$og2$image$ = _metadata$og2$image[0]) === null || _metadata$og2$image$ === void 0 ? void 0 : _metadata$og2$image$.url) && (metadata === null || metadata === void 0 ? void 0 : (_metadata$og3 = metadata.og) === null || _metadata$og3 === void 0 ? void 0 : _metadata$og3.description) && metadata;
   }, [state, metadata]);
-  return /*#__PURE__*/React__default.createElement(OGMetadataContainer, null, /*#__PURE__*/React__default.createElement("div", {
+  return /*#__PURE__*/React__default.createElement(OGMetadataContainer, {
+    showOGMetadata: !!showOGMetadata
+  }, /*#__PURE__*/React__default.createElement("div", {
     onClick: function onClick() {
       window.open(attachment === null || attachment === void 0 ? void 0 : attachment.url, '_blank');
     }
   }, /*#__PURE__*/React__default.createElement(ImageContainer, {
-    showOGMetadata: showOGMetadata
+    showOGMetadata: !!showOGMetadata
   }, metadata !== null && metadata !== void 0 && (_metadata$og4 = metadata.og) !== null && _metadata$og4 !== void 0 && (_metadata$og4$image = _metadata$og4.image) !== null && _metadata$og4$image !== void 0 && (_metadata$og4$image$ = _metadata$og4$image[0]) !== null && _metadata$og4$image$ !== void 0 && _metadata$og4$image$.url ? /*#__PURE__*/React__default.createElement(Img, {
     src: metadata === null || metadata === void 0 ? void 0 : (_metadata$og5 = metadata.og) === null || _metadata$og5 === void 0 ? void 0 : (_metadata$og5$image = _metadata$og5.image) === null || _metadata$og5$image === void 0 ? void 0 : (_metadata$og5$image$ = _metadata$og5$image[0]) === null || _metadata$og5$image$ === void 0 ? void 0 : _metadata$og5$image$.url,
     alt: 'OG metadata image'
-  }) : null), showOGMetadata ? null : (/*#__PURE__*/React__default.createElement(OGText, null, /*#__PURE__*/React__default.createElement(Url, null, ogUrl), metadata !== null && metadata !== void 0 && (_metadata$og6 = metadata.og) !== null && _metadata$og6 !== void 0 && _metadata$og6.title ? (/*#__PURE__*/React__default.createElement(Title, null, metadata !== null && metadata !== void 0 && (_metadata$og7 = metadata.og) !== null && _metadata$og7 !== void 0 && (_metadata$og7$favicon = _metadata$og7.favicon) !== null && _metadata$og7$favicon !== void 0 && _metadata$og7$favicon.url ? /*#__PURE__*/React__default.createElement(Favicon, {
+  }) : null), showOGMetadata ? (/*#__PURE__*/React__default.createElement(OGText, null, /*#__PURE__*/React__default.createElement(Url, null, ogUrl), metadata !== null && metadata !== void 0 && (_metadata$og6 = metadata.og) !== null && _metadata$og6 !== void 0 && _metadata$og6.title ? (/*#__PURE__*/React__default.createElement(Title, null, metadata !== null && metadata !== void 0 && (_metadata$og7 = metadata.og) !== null && _metadata$og7 !== void 0 && (_metadata$og7$favicon = _metadata$og7.favicon) !== null && _metadata$og7$favicon !== void 0 && _metadata$og7$favicon.url ? /*#__PURE__*/React__default.createElement(Favicon, {
     src: metadata === null || metadata === void 0 ? void 0 : (_metadata$og8 = metadata.og) === null || _metadata$og8 === void 0 ? void 0 : (_metadata$og8$favicon = _metadata$og8.favicon) === null || _metadata$og8$favicon === void 0 ? void 0 : _metadata$og8$favicon.url
-  }) : null, /*#__PURE__*/React__default.createElement("span", null, metadata === null || metadata === void 0 ? void 0 : (_metadata$og9 = metadata.og) === null || _metadata$og9 === void 0 ? void 0 : _metadata$og9.title))) : null, metadata !== null && metadata !== void 0 && (_metadata$og0 = metadata.og) !== null && _metadata$og0 !== void 0 && _metadata$og0.description ? /*#__PURE__*/React__default.createElement(Desc, null, metadata === null || metadata === void 0 ? void 0 : (_metadata$og1 = metadata.og) === null || _metadata$og1 === void 0 ? void 0 : _metadata$og1.description) : null))));
+  }) : null, /*#__PURE__*/React__default.createElement("span", null, metadata === null || metadata === void 0 ? void 0 : (_metadata$og9 = metadata.og) === null || _metadata$og9 === void 0 ? void 0 : _metadata$og9.title))) : null, metadata !== null && metadata !== void 0 && (_metadata$og0 = metadata.og) !== null && _metadata$og0 !== void 0 && _metadata$og0.description ? /*#__PURE__*/React__default.createElement(Desc, null, metadata === null || metadata === void 0 ? void 0 : (_metadata$og1 = metadata.og) === null || _metadata$og1 === void 0 ? void 0 : _metadata$og1.description) : null)) : null));
 };
-var OGMetadataContainer = styled__default.div(_templateObject$A || (_templateObject$A = _taggedTemplateLiteralLoose(["\n  min-width: inherit;\n  max-width: inherit;\n  display: grid;\n  grid-template-columns: 1fr;\n  background-color: rgba(0, 0, 0, 0.034);\n  border-radius: 6px;\n  margin-bottom: 0.4rem;\n  margin: 0 auto;\n  margin-bottom: 0.8rem;\n  &:hover {\n    background-color: rgba(0, 0, 0, 0.1);\n    cursor: pointer;\n  }\n"])));
-var ImageContainer = styled__default.div(_templateObject2$v || (_templateObject2$v = _taggedTemplateLiteralLoose(["\n  max-width: 100%;\n  max-height: 200px;\n  width: 100%;\n  height: 200px;\n  margin: 0 auto;\n  padding: 0.3rem;\n  height: ", ";\n  transition: height 0.2s ease;\n"])), function (_ref2) {
+var OGMetadataContainer = styled__default.div(_templateObject$A || (_templateObject$A = _taggedTemplateLiteralLoose(["\n  min-width: inherit;\n  max-width: inherit;\n  display: grid;\n  grid-template-columns: 1fr;\n  background-color: rgba(0, 0, 0, 0.034);\n  border-radius: 6px;\n  margin-bottom: 0.4rem;\n  margin: 0 auto;\n  margin-bottom: ", ";\n  &:hover {\n    background-color: rgba(0, 0, 0, 0.1);\n    cursor: pointer;\n  }\n"])), function (_ref2) {
   var showOGMetadata = _ref2.showOGMetadata;
-  return !showOGMetadata ? '200px' : '0';
+  return showOGMetadata ? '0.8rem' : '0';
+});
+var ImageContainer = styled__default.div(_templateObject2$v || (_templateObject2$v = _taggedTemplateLiteralLoose(["\n  max-width: 100%;\n  max-height: 200px;\n  width: 100%;\n  margin: 0 auto;\n  padding: ", ";\n  height: ", ";\n  transition: height 0.2s ease;\n"])), function (_ref3) {
+  var showOGMetadata = _ref3.showOGMetadata;
+  return showOGMetadata ? '0.3rem' : '0';
+}, function (_ref4) {
+  var showOGMetadata = _ref4.showOGMetadata;
+  return showOGMetadata ? '200px' : '0';
 });
 var OGText = styled__default.div(_templateObject3$p || (_templateObject3$p = _taggedTemplateLiteralLoose(["\n  width: 80%;\n  padding: 0.5rem;\n  margin: 0;\n"])));
 var Url = styled__default.p(_templateObject4$l || (_templateObject4$l = _taggedTemplateLiteralLoose(["\n  font-weight: normal;\n  font-size: 13px;\n  padding: 0;\n  margin: 0 0 12px 0;\n  color: gray;\n"])));
@@ -30887,7 +31690,7 @@ var FrequentlyEmojisContainer = styled__default.div(_templateObject5$i || (_temp
   return props.rtlDirection && '0';
 });
 
-var _templateObject$C, _templateObject2$x, _templateObject3$r, _templateObject4$n, _templateObject5$j, _templateObject6$g, _templateObject7$e, _templateObject8$d, _templateObject9$b, _templateObject0$a, _templateObject1$6, _templateObject10$4, _templateObject11$4, _templateObject12$3;
+var _templateObject$C, _templateObject2$x, _templateObject3$r, _templateObject4$n, _templateObject5$j, _templateObject6$g, _templateObject7$e, _templateObject8$d, _templateObject9$b, _templateObject0$a, _templateObject1$7, _templateObject10$4, _templateObject11$4, _templateObject12$3;
 var Message$1 = function Message(_ref) {
   var message = _ref.message,
     channel = _ref.channel,
@@ -31216,7 +32019,6 @@ var Message$1 = function Message(_ref) {
     if (isVisible && message.incoming && !(message.userMarkers && message.userMarkers.length && message.userMarkers.find(function (marker) {
       return marker.name === MESSAGE_DELIVERY_STATUS.READ;
     })) && channel.newMessageCount && channel.newMessageCount > 0 && connectionStatus === CONNECTION_STATUS.CONNECTED) {
-      log.info('send displayed marker for message ... ', message);
       dispatch(markMessagesAsReadAC(channel.id, [message.id]));
     }
   };
@@ -31264,8 +32066,9 @@ var Message$1 = function Message(_ref) {
       if (!channel.isLinkedChannel) {
         setMessageToVisibleMessagesMap(message);
       }
-      if (scrollToNewMessage.scrollToBottom) {
+      if (scrollToNewMessage.scrollToBottom && (message.id === channel.lastMessage.id || !message.id)) {
         dispatch(scrollToNewMessageAC(false, false, false));
+        dispatch(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
       }
     } else {
       if (!channel.isLinkedChannel) {
@@ -31664,7 +32467,7 @@ var ReactionsContainer = styled__default.div(_templateObject9$b || (_templateObj
 var MessageReactionsCont = styled__default.div(_templateObject0$a || (_templateObject0$a = _taggedTemplateLiteralLoose(["\n  position: relative;\n  display: inline-flex;\n  max-width: 300px;\n  direction: ", ";\n  cursor: pointer;\n"])), function (props) {
   return props.rtlDirection && 'ltr';
 });
-var MessageStatus$1 = styled__default.span(_templateObject1$6 || (_templateObject1$6 = _taggedTemplateLiteralLoose(["\n  display: inline-flex;\n  align-items: center;\n  margin-left: 4px;\n  text-align: right;\n  height: ", ";\n  & > svg {\n    height: 16px;\n    width: 16px;\n  }\n"])), function (props) {
+var MessageStatus$1 = styled__default.span(_templateObject1$7 || (_templateObject1$7 = _taggedTemplateLiteralLoose(["\n  display: inline-flex;\n  align-items: center;\n  margin-left: 4px;\n  text-align: right;\n  height: ", ";\n  & > svg {\n    height: 16px;\n    width: 16px;\n  }\n"])), function (props) {
   return props.height || '14px';
 });
 var HiddenMessageTime$1 = styled__default.span(_templateObject10$4 || (_templateObject10$4 = _taggedTemplateLiteralLoose(["\n  display: ", ";\n  font-weight: 400;\n  font-size: ", ";\n  color: ", ";\n"])), function (props) {
@@ -31709,13 +32512,14 @@ var HiddenMessageProperty;
   HiddenMessageProperty["hideAfterSendMessage"] = "hideAfterSendMessage";
 })(HiddenMessageProperty || (HiddenMessageProperty = {}));
 
-var _templateObject$D, _templateObject2$y, _templateObject3$s, _templateObject4$o, _templateObject5$k, _templateObject6$h, _templateObject7$f, _templateObject8$e, _templateObject9$c, _templateObject0$b, _templateObject1$7;
+var _templateObject$D, _templateObject2$y, _templateObject3$s, _templateObject4$o, _templateObject5$k, _templateObject6$h, _templateObject7$f, _templateObject8$e, _templateObject9$c, _templateObject0$b, _templateObject1$8;
 var loadFromServer = false;
 var loadDirection = '';
 var nextDisable = false;
 var prevDisable = false;
 var scrollToBottom = false;
 var shouldLoadMessages;
+var loading = false;
 var messagesIndexMap = {};
 var CreateMessageDateDivider = function CreateMessageDateDivider(_ref) {
   var lastIndex = _ref.lastIndex,
@@ -32025,7 +32829,7 @@ var MessageList = function MessageList(_ref2) {
       } else {
         if (messagesIndexMap[lastVisibleMessageId] < 15 || forceLoadPrevMessages) {
           if (connectionStatus === CONNECTION_STATUS.CONNECTED && !scrollToNewMessage.scrollToBottom && hasPrevMessages) {
-            if (messagesLoading === LOADING_STATE.LOADING || prevDisable) {
+            if (loading || messagesLoading === LOADING_STATE.LOADING || prevDisable) {
               shouldLoadMessages = 'prev';
             } else {
               if (shouldLoadMessages === 'prev') {
@@ -32042,7 +32846,7 @@ var MessageList = function MessageList(_ref2) {
         }
         if (messagesIndexMap[lastVisibleMessageId] >= messages.length - 15 || target.scrollTop === 0) {
           if (connectionStatus === CONNECTION_STATUS.CONNECTED && !scrollToNewMessage.scrollToBottom && (hasNextMessages || getHasNextCached())) {
-            if (messagesLoading === LOADING_STATE.LOADING || nextDisable) {
+            if (loading || messagesLoading === LOADING_STATE.LOADING || nextDisable) {
               shouldLoadMessages = 'next';
             } else {
               if (shouldLoadMessages === 'next') {
@@ -32062,7 +32866,7 @@ var MessageList = function MessageList(_ref2) {
     } catch (e) {
       return Promise.reject(e);
     }
-  }, [channel === null || channel === void 0 ? void 0 : (_channel$lastMessage = channel.lastMessage) === null || _channel$lastMessage === void 0 ? void 0 : _channel$lastMessage.id, messages, scrollToMentionedMessage, scrollToNewMessage, messagesLoading, hasPrevMessages, hasNextMessages, messagesIndexMap, lastVisibleMessageId, connectionStatus, shouldLoadMessages, loadDirection, getHasPrevCached, getHasNextCached, scrollToReply]);
+  }, [channel === null || channel === void 0 ? void 0 : (_channel$lastMessage = channel.lastMessage) === null || _channel$lastMessage === void 0 ? void 0 : _channel$lastMessage.id, messages, scrollToMentionedMessage, scrollToNewMessage, messagesLoading, hasPrevMessages, hasNextMessages, messagesIndexMap, lastVisibleMessageId, connectionStatus, shouldLoadMessages, loadDirection, getHasPrevCached, getHasNextCached, scrollToReply, loading, prevDisable, nextDisable]);
   var handleScrollToRepliedMessage = function handleScrollToRepliedMessage(messageId) {
     try {
       prevDisable = true;
@@ -32102,8 +32906,10 @@ var MessageList = function MessageList(_ref2) {
     var hasNextCached = getHasNextCached();
     if (messagesLoading === LOADING_STATE.LOADED && connectionStatus === CONNECTION_STATUS.CONNECTED) {
       if (direction === MESSAGE_LOAD_DIRECTION.PREV && firstMessageId && (hasPrevMessages || hasPrevCached)) {
+        loading = true;
         dispatch(loadMoreMessagesAC(channel.id, limit, direction, firstMessageId, hasPrevMessages));
       } else if (direction === MESSAGE_LOAD_DIRECTION.NEXT && lastMessageId && (hasNextMessages || hasNextCached)) {
+        loading = true;
         dispatch(loadMoreMessagesAC(channel.id, limit, direction, lastMessageId, hasNextMessages));
       }
     }
@@ -32223,7 +33029,7 @@ var MessageList = function MessageList(_ref2) {
   }, [messages, channel === null || channel === void 0 ? void 0 : (_channel$lastMessage3 = channel.lastMessage) === null || _channel$lastMessage3 === void 0 ? void 0 : _channel$lastMessage3.id, scrollRef === null || scrollRef === void 0 ? void 0 : (_scrollRef$current = scrollRef.current) === null || _scrollRef$current === void 0 ? void 0 : _scrollRef$current.scrollTop, showScrollToNewMessageButton]);
   React.useEffect(function () {
     if (scrollToRepliedMessage) {
-      dispatch(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
+      loading = false;
       scrollRef.current.style.scrollBehavior = 'inherit';
       var repliedMessage = document.getElementById(scrollToRepliedMessage);
       if (repliedMessage) {
@@ -32297,7 +33103,7 @@ var MessageList = function MessageList(_ref2) {
         clearVisibleMessagesMap();
       }
       if (channel) {
-        dispatch(getMessagesAC(channel, true, undefined, undefined, true));
+        dispatch(getMessagesAC(channel, undefined, undefined, undefined, true));
       }
       if (channel.id) {
         if (channel.newMessageCount && channel.newMessageCount > 0) {
@@ -32339,7 +33145,7 @@ var MessageList = function MessageList(_ref2) {
         setShouldPreserveScroll(true);
       }
     }
-    if (messagesLoading) {
+    if (loading) {
       if (loadDirection !== 'next') {
         var lastVisibleMessage = document.getElementById(lastVisibleMessageId);
         if (lastVisibleMessage) {
@@ -32349,7 +33155,7 @@ var MessageList = function MessageList(_ref2) {
         }
         if (loadFromServer) {
           setTimeout(function () {
-            dispatch(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
+            loading = false;
             loadFromServer = false;
             nextDisable = false;
             if (shouldLoadMessages === 'prev' && messagesIndexMap[lastVisibleMessageId] < 15) {
@@ -32360,7 +33166,7 @@ var MessageList = function MessageList(_ref2) {
             }
           }, 50);
         } else {
-          dispatch(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
+          loading = false;
           if (shouldLoadMessages === 'prev') {
             handleLoadMoreMessages(MESSAGE_LOAD_DIRECTION.PREV, LOAD_MAX_MESSAGE_COUNT);
             shouldLoadMessages = '';
@@ -32377,7 +33183,7 @@ var MessageList = function MessageList(_ref2) {
           scrollRef.current.scrollTop = _lastVisibleMessage.offsetTop - scrollRef.current.offsetHeight + _lastVisibleMessage.offsetHeight;
           scrollRef.current.style.scrollBehavior = 'smooth';
         }
-        dispatch(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
+        loading = false;
         prevDisable = false;
         if (shouldLoadMessages === 'prev') {
           handleLoadMoreMessages(MESSAGE_LOAD_DIRECTION.PREV, LOAD_MAX_MESSAGE_COUNT);
@@ -32409,7 +33215,7 @@ var MessageList = function MessageList(_ref2) {
   React.useEffect(function () {
     log.info('connection status is changed.. .... ', connectionStatus, 'channel  ... ', channel);
     if (connectionStatus === CONNECTION_STATUS.CONNECTED) {
-      dispatch(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
+      loading = false;
       prevDisable = false;
       nextDisable = false;
       clearMessagesMap();
@@ -32716,7 +33522,7 @@ var MessageTopDate = styled__default.div(_templateObject4$o || (_templateObject4
 }, function (props) {
   return props.dateDividerTextColor;
 }, function (props) {
-  return props.dateDividerBackgroundColor + "40";
+  return props.dateDividerBackgroundColor + "66";
 }, function (props) {
   return props.dateDividerBorder;
 }, function (props) {
@@ -32756,7 +33562,7 @@ var NoMessagesContainer = styled__default.div(_templateObject9$c || (_templateOb
 var NoMessagesTitle = styled__default.h4(_templateObject0$b || (_templateObject0$b = _taggedTemplateLiteralLoose(["\n  margin: 12px 0 8px;\n  font-family: Inter, sans-serif;\n  text-align: center;\n  font-size: 20px;\n  font-style: normal;\n  font-weight: 500;\n  line-height: 24px;\n  color: ", ";\n"])), function (props) {
   return props.color;
 });
-var NoMessagesText = styled__default.p(_templateObject1$7 || (_templateObject1$7 = _taggedTemplateLiteralLoose(["\n  margin: 0;\n  text-align: center;\n  font-feature-settings:\n    'clig' off,\n    'liga' off;\n  font-family: Inter, sans-serif;\n  font-size: 15px;\n  font-style: normal;\n  font-weight: 400;\n  line-height: 20px;\n  color: ", ";\n"])), function (props) {
+var NoMessagesText = styled__default.p(_templateObject1$8 || (_templateObject1$8 = _taggedTemplateLiteralLoose(["\n  margin: 0;\n  text-align: center;\n  font-feature-settings:\n    'clig' off,\n    'liga' off;\n  font-family: Inter, sans-serif;\n  font-size: 15px;\n  font-style: normal;\n  font-weight: 400;\n  line-height: 20px;\n  color: ", ";\n"])), function (props) {
   return props.color;
 });
 
@@ -34760,19 +35566,19 @@ var AudioRecord = function AudioRecord(_ref) {
   }, [currentRecordedFile]);
   var dispatch = reactRedux.useDispatch();
   var handleStartRecording = function handleStartRecording() {
-    dispatch(sendRecordingAC(true));
+    dispatch(sendRecordingAC(true, currentChannelId));
     if (sendingInterval) {
       clearInterval(sendingInterval);
       setSendingInterval(null);
       return;
     }
     var interval = setInterval(function () {
-      dispatch(sendRecordingAC(true));
+      dispatch(sendRecordingAC(true, currentChannelId));
     }, 1000);
     setSendingInterval(interval);
   };
   var handleStopRecording = function handleStopRecording() {
-    dispatch(sendRecordingAC(false));
+    dispatch(sendRecordingAC(false, currentChannelId));
     if (sendingInterval) {
       clearInterval(sendingInterval);
       setSendingInterval(null);
@@ -34926,10 +35732,9 @@ var AudioRecord = function AudioRecord(_ref) {
       return Promise.resolve(_catch(function () {
         var _wavesurfer$current3;
         function _temp3(_result3) {
+          var _wavesurfer$current$i, _wavesurfer$current$i2;
           if (_exit) return _result3;
-          if (draft) {
-            return;
-          }
+          setCurrentTime(((_wavesurfer$current$i = wavesurfer.current[id]) === null || _wavesurfer$current$i === void 0 ? void 0 : (_wavesurfer$current$i2 = _wavesurfer$current$i.decodedData) === null || _wavesurfer$current$i2 === void 0 ? void 0 : _wavesurfer$current$i2.duration) || 0);
           wavesurfer.current[id].on('ready', function () {
             setRecordingIsReadyToPlay(true);
             var audioDuration = wavesurfer.current[id].getDuration();
@@ -35041,7 +35846,6 @@ var AudioRecord = function AudioRecord(_ref) {
     recorder.stop().getMp3().then(function (_ref4) {
       var buffer = _ref4[0],
         blob = _ref4[1];
-      setCurrentTime(0);
       var file = new File(buffer, 'record.mp3', {
         type: blob.type,
         lastModified: Date.now()
@@ -35107,15 +35911,12 @@ var AudioRecord = function AudioRecord(_ref) {
     if ((_wavesurfer$current5 = wavesurfer.current) !== null && _wavesurfer$current5 !== void 0 && _wavesurfer$current5[cId || currentChannelId]) {
       if (!wavesurfer.current[cId || currentChannelId].isPlaying()) {
         setPlayAudio(true);
-        handleStartRecording();
         intervalRef.current[cId || currentChannelId] = setInterval(function () {
           var currentTime = wavesurfer.current[cId || currentChannelId].getCurrentTime();
           if (currentTime >= 0) {
             setCurrentTime(currentTime);
           }
         }, 10);
-      } else {
-        handleStopRecording();
       }
       wavesurfer.current[cId || currentChannelId].playPause();
     }
@@ -35226,11 +36027,12 @@ var AudioRecord = function AudioRecord(_ref) {
       setShowRecording(false);
       setStartRecording(false);
       setPlayAudio(false);
-      setCurrentTime(0);
       var audioRecording = getAudioRecordingFromMap(channelId);
       setRecordedFile(audioRecording || null);
       setRecordingIsReadyToPlay(!!audioRecording);
     }
+    setCurrentTime(0);
+    handleStopRecording();
     setCurrentChannelId(channelId);
   }, [channelId]);
   return /*#__PURE__*/React__default.createElement(Container$j, {
@@ -35345,7 +36147,7 @@ var RecordingAnimation = function RecordingAnimation(_ref2) {
   }));
 };
 
-var _templateObject$J, _templateObject2$E, _templateObject3$x, _templateObject4$s, _templateObject5$o, _templateObject6$k, _templateObject7$i, _templateObject8$g, _templateObject9$d, _templateObject0$c, _templateObject1$8, _templateObject10$5, _templateObject11$5, _templateObject12$4, _templateObject13$3, _templateObject14$2, _templateObject15$2, _templateObject16$2, _templateObject17$2, _templateObject18$2, _templateObject19$2, _templateObject20$2, _templateObject21$1, _templateObject22$1, _templateObject23$1, _templateObject24$1, _templateObject25$1, _templateObject26$1, _templateObject27$1, _templateObject28$1, _templateObject29$1, _templateObject30$1, _templateObject31$1, _templateObject32$1, _templateObject33$1, _templateObject34$1;
+var _templateObject$J, _templateObject2$E, _templateObject3$x, _templateObject4$s, _templateObject5$o, _templateObject6$k, _templateObject7$i, _templateObject8$g, _templateObject9$d, _templateObject0$c, _templateObject1$9, _templateObject10$5, _templateObject11$5, _templateObject12$4, _templateObject13$3, _templateObject14$2, _templateObject15$2, _templateObject16$2, _templateObject17$2, _templateObject18$2, _templateObject19$2, _templateObject20$2, _templateObject21$1, _templateObject22$1, _templateObject23$1, _templateObject24$1, _templateObject25$1, _templateObject26$1, _templateObject27$1, _templateObject28$1, _templateObject29$1, _templateObject30$1, _templateObject31$1, _templateObject32$1, _templateObject33$1, _templateObject34$1;
 function AutoFocusPlugin(_ref) {
   var messageForReply = _ref.messageForReply;
   var _useLexicalComposerCo = LexicalComposerContext.useLexicalComposerContext(),
@@ -35775,6 +36577,18 @@ var SendMessageInput = function SendMessageInput(_ref3) {
   var handleEditMessage = function handleEditMessage() {
     var messageTexToSend = editMessageText.trim();
     if (messageTexToSend) {
+      var linkAttachment;
+      if (messageTexToSend) {
+        var linkify = new LinkifyIt();
+        var match = linkify.match(messageTexToSend);
+        if (match) {
+          linkAttachment = {
+            type: attachmentTypes.link,
+            data: match[0].url,
+            upload: false
+          };
+        }
+      }
       var mentionedMembersPositions = [];
       var mentionMembersToSend = [];
       if (mentionedMembers && mentionedMembers.length) {
@@ -35794,7 +36608,9 @@ var SendMessageInput = function SendMessageInput(_ref3) {
           });
         }
       }
-      var messageToSend = _extends({}, messageToEdit, {
+      var messageToSend = _extends({}, messageToEdit, linkAttachment ? {
+        attachments: [linkAttachment]
+      } : {}, {
         metadata: mentionedMembersPositions,
         bodyAttributes: messageBodyAttributes,
         mentionedUsers: mentionMembersToSend,
@@ -36254,7 +37070,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
             }
             var dataFromDb;
             var _temp11 = _catch(function () {
-              return Promise.resolve(_getDataFromDB(DB_NAMES.FILES_STORAGE, DB_STORE_NAMES.ATTACHMENTS, checksumHash, 'checksum')).then(function (_getDataFromDB) {
+              return Promise.resolve(getDataFromDB(DB_NAMES.FILES_STORAGE, DB_STORE_NAMES.ATTACHMENTS, checksumHash, 'checksum')).then(function (_getDataFromDB) {
                 dataFromDb = _getDataFromDB;
               });
             }, function (e) {
@@ -36461,14 +37277,16 @@ var SendMessageInput = function SendMessageInput(_ref3) {
           text: messageText,
           mentionedMembers: draftMessage.mentionedMembers,
           messageForReply: messageForReply,
-          editorState: realEditorState
+          editorState: realEditorState,
+          bodyAttributes: messageBodyAttributes
         });
       } else {
         setDraftMessageToMap(activeChannel.id, {
           text: messageText,
           mentionedMembers: mentionedMembers,
           messageForReply: messageForReply,
-          editorState: realEditorState
+          editorState: realEditorState,
+          bodyAttributes: messageBodyAttributes
         });
       }
       if (!listenerIsAdded) {
@@ -36489,16 +37307,18 @@ var SendMessageInput = function SendMessageInput(_ref3) {
       setDraftMessageToMap(activeChannel.id, {
         text: messageText,
         mentionedMembers: mentionedMembers,
-        messageForReply: messageForReply
+        messageForReply: messageForReply,
+        bodyAttributes: messageBodyAttributes
       });
     }
   }, [mentionedMembers]);
   React.useEffect(function () {
     if (connectionStatus === CONNECTION_STATUS.CONNECTED) {
+      var pendingMessagesMap = getPendingMessagesMap();
+      var pendingMessagesMapCopy = JSON.parse(JSON.stringify(pendingMessagesMap));
       setTimeout(function () {
-        var pendingMessagesMap = getPendingMessagesMap();
-        Object.keys(pendingMessagesMap).forEach(function (key) {
-          pendingMessagesMap[key].forEach(function (msg) {
+        Object.keys(pendingMessagesMapCopy).forEach(function (key) {
+          pendingMessagesMapCopy[key].forEach(function (msg) {
             dispatch(resendMessageAC(msg, key, connectionStatus));
           });
         });
@@ -36543,7 +37363,8 @@ var SendMessageInput = function SendMessageInput(_ref3) {
       setDraftMessageToMap(activeChannel.id, {
         text: messageText,
         mentionedMembers: mentionedMembers,
-        messageForReply: messageForReply
+        messageForReply: messageForReply,
+        bodyAttributes: messageBodyAttributes
       });
     }
     if (messageForReply && messageToEdit) {
@@ -36594,16 +37415,21 @@ var SendMessageInput = function SendMessageInput(_ref3) {
       }
     };
   }, []);
-  var filteredTypingOrRecordingIndicator = React.useMemo(function () {
-    return typingOrRecordingIndicator ? Object.values(typingOrRecordingIndicator).filter(function (item) {
+  var typingOrRecording = React.useMemo(function () {
+    var dataValues = typingOrRecordingIndicator ? Object.values(typingOrRecordingIndicator) : [];
+    var filteredItems = dataValues.filter(function (item) {
       return item.typingState || item.recordingState;
-    }) : [];
-  }, [typingOrRecordingIndicator]);
-  var isTyping = React.useMemo(function () {
-    return !!filteredTypingOrRecordingIndicator.find(function (item) {
-      return item.typingState;
     });
-  }, [filteredTypingOrRecordingIndicator]);
+    return {
+      items: filteredItems,
+      isTyping: !!filteredItems.find(function (item) {
+        return item.typingState;
+      }),
+      isRecording: !!filteredItems.find(function (item) {
+        return item.recordingState;
+      })
+    };
+  }, [typingOrRecordingIndicator]);
   var formatTypingIndicatorText = function formatTypingIndicatorText(users, maxShownUsers) {
     if (maxShownUsers === void 0) {
       maxShownUsers = 3;
@@ -36612,7 +37438,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     if (users.length === 1) {
       var _user = users[0];
       var userName = makeUsername(getFromContacts && _user.from && contactsMap[_user.from.id], _user.from, getFromContacts);
-      return "" + userName + (isTyping ? activeChannel.type === DEFAULT_CHANNEL_TYPE.DIRECT ? ' is typing' : '' : activeChannel.type === DEFAULT_CHANNEL_TYPE.DIRECT ? ' is recording' : '');
+      return "" + userName + (typingOrRecording !== null && typingOrRecording !== void 0 && typingOrRecording.isTyping ? activeChannel.type === DEFAULT_CHANNEL_TYPE.DIRECT ? ' is typing' : '' : activeChannel.type === DEFAULT_CHANNEL_TYPE.DIRECT ? ' is recording' : '');
     }
     if (users.length <= maxShownUsers) {
       var userNames = users.map(function (user) {
@@ -36682,8 +37508,8 @@ var SendMessageInput = function SendMessageInput(_ref3) {
   }, "Join")) : (activeChannel.type === DEFAULT_CHANNEL_TYPE.BROADCAST || activeChannel.type === DEFAULT_CHANNEL_TYPE.PUBLIC ? !(activeChannel.userRole === 'admin' || activeChannel.userRole === 'owner') : activeChannel.type !== DEFAULT_CHANNEL_TYPE.DIRECT && !checkActionPermission('sendMessage')) ? (/*#__PURE__*/React__default.createElement(ReadOnlyCont, {
     color: textPrimary,
     iconColor: accentColor
-  }, /*#__PURE__*/React__default.createElement(SvgEye, null), " Read only")) : (/*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(TypingIndicator$1, null, filteredTypingOrRecordingIndicator.length > 0 && (CustomTypingIndicator ? (/*#__PURE__*/React__default.createElement(CustomTypingIndicator, {
-    from: filteredTypingOrRecordingIndicator.map(function (item) {
+  }, /*#__PURE__*/React__default.createElement(SvgEye, null), " Read only")) : (/*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(TypingIndicator$1, null, (typingOrRecording === null || typingOrRecording === void 0 ? void 0 : typingOrRecording.items.length) > 0 && (CustomTypingIndicator ? (/*#__PURE__*/React__default.createElement(CustomTypingIndicator, {
+    from: typingOrRecording === null || typingOrRecording === void 0 ? void 0 : typingOrRecording.items.map(function (item) {
       return {
         id: item.from.id,
         name: item.from.name,
@@ -36693,7 +37519,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     })
   })) : (/*#__PURE__*/React__default.createElement(TypingIndicatorCont, null, /*#__PURE__*/React__default.createElement(TypingFrom, {
     color: textSecondary
-  }, formatTypingIndicatorText(filteredTypingOrRecordingIndicator, 3)), isTyping ? (/*#__PURE__*/React__default.createElement(TypingAnimation, {
+  }, formatTypingIndicatorText(typingOrRecording === null || typingOrRecording === void 0 ? void 0 : typingOrRecording.items, 3)), typingOrRecording !== null && typingOrRecording !== void 0 && typingOrRecording.isTyping ? (/*#__PURE__*/React__default.createElement(TypingAnimation, {
     borderColor: iconInactive
   }, /*#__PURE__*/React__default.createElement(DotOne, null), /*#__PURE__*/React__default.createElement(DotTwo, null), /*#__PURE__*/React__default.createElement(DotThree, null))) : (/*#__PURE__*/React__default.createElement(RecordingAnimation, {
     borderColor: iconInactive
@@ -36964,7 +37790,7 @@ var AddAttachmentIcon = styled__default.span(_templateObject0$c || (_templateObj
 }, function (props) {
   return props.hoverColor;
 });
-var SendMessageInputContainer = styled__default.div(_templateObject1$8 || (_templateObject1$8 = _taggedTemplateLiteralLoose(["\n  display: flex;\n  align-items: flex-end;\n  justify-content: space-between;\n  position: relative;\n  min-height: ", ";\n  box-sizing: border-box;\n  border-radius: ", ";\n\n  & .dropdown-trigger.open {\n    color: #ccc;\n\n    & ", " {\n      & > svg {\n        color: ", ";\n      }\n    ;\n    }\n  }\n}\n"])), function (props) {
+var SendMessageInputContainer = styled__default.div(_templateObject1$9 || (_templateObject1$9 = _taggedTemplateLiteralLoose(["\n  display: flex;\n  align-items: flex-end;\n  justify-content: space-between;\n  position: relative;\n  min-height: ", ";\n  box-sizing: border-box;\n  border-radius: ", ";\n\n  & .dropdown-trigger.open {\n    color: #ccc;\n\n    & ", " {\n      & > svg {\n        color: ", ";\n      }\n    ;\n    }\n  }\n}\n"])), function (props) {
   return props.minHeight || '36px';
 }, function (props) {
   return props.messageForReply ? '0 0 4px 4px' : '4px';
@@ -37260,7 +38086,7 @@ function SvgUnpin(props) {
   })));
 }
 
-var _templateObject$K, _templateObject2$F, _templateObject3$y, _templateObject4$t, _templateObject5$p, _templateObject6$l, _templateObject7$j, _templateObject8$h, _templateObject9$e, _templateObject0$d, _templateObject1$9, _templateObject10$6, _templateObject11$6, _templateObject12$5, _templateObject13$4, _templateObject14$3, _templateObject15$3, _templateObject16$3;
+var _templateObject$K, _templateObject2$F, _templateObject3$y, _templateObject4$t, _templateObject5$p, _templateObject6$l, _templateObject7$j, _templateObject8$h, _templateObject9$e, _templateObject0$d, _templateObject1$a, _templateObject10$6, _templateObject11$6, _templateObject12$5, _templateObject13$4, _templateObject14$3, _templateObject15$3, _templateObject16$3;
 var Actions = function Actions(_ref) {
   var _channel$metadata;
   var setActionsHeight = _ref.setActionsHeight,
@@ -37739,7 +38565,7 @@ var DefaultStarIcon = styled__default(SvgStar)(_templateObject7$j || (_templateO
 var DefaultUnpinIcon = styled__default(SvgUnpin)(_templateObject8$h || (_templateObject8$h = _taggedTemplateLiteralLoose([""])));
 var DefaultPinIcon = styled__default(SvgPin)(_templateObject9$e || (_templateObject9$e = _taggedTemplateLiteralLoose([""])));
 var DefaultMarkAsRead = styled__default(SvgMarkAsRead)(_templateObject0$d || (_templateObject0$d = _taggedTemplateLiteralLoose([""])));
-var DefaultMarkAsUnRead = styled__default(SvgMarkAsUnRead)(_templateObject1$9 || (_templateObject1$9 = _taggedTemplateLiteralLoose([""])));
+var DefaultMarkAsUnRead = styled__default(SvgMarkAsUnRead)(_templateObject1$a || (_templateObject1$a = _taggedTemplateLiteralLoose([""])));
 var DefaultBlockIcon = styled__default(SvgBlockChannel)(_templateObject10$6 || (_templateObject10$6 = _taggedTemplateLiteralLoose([""])));
 var DefaultReportIcon = styled__default(SvgReport)(_templateObject11$6 || (_templateObject11$6 = _taggedTemplateLiteralLoose([""])));
 var DefaultClearIcon = styled__default(SvgClear)(_templateObject12$5 || (_templateObject12$5 = _taggedTemplateLiteralLoose([""])));
@@ -38463,7 +39289,7 @@ var Files = function Files(_ref) {
       text: '',
       styles: {
         background: {
-          fill: overlayBackground2 + "40"
+          fill: overlayBackground2 + "66"
         },
         path: {
           stroke: accentColor,
@@ -39285,7 +40111,7 @@ var EditChannel = function EditChannel(_ref) {
   })));
 };
 
-var _templateObject$V, _templateObject2$O, _templateObject3$F, _templateObject4$z, _templateObject5$u, _templateObject6$p, _templateObject7$n, _templateObject8$l, _templateObject9$g, _templateObject0$e, _templateObject1$a, _templateObject10$7;
+var _templateObject$V, _templateObject2$O, _templateObject3$F, _templateObject4$z, _templateObject5$u, _templateObject6$p, _templateObject7$n, _templateObject8$l, _templateObject9$g, _templateObject0$e, _templateObject1$b, _templateObject10$7;
 var Details = function Details(_ref) {
   var _activeChannel$metada;
   var detailsTitleText = _ref.detailsTitleText,
@@ -39401,7 +40227,8 @@ var Details = function Details(_ref) {
     tabItemsLineHeight = _ref.tabItemsLineHeight,
     tabItemsMinWidth = _ref.tabItemsMinWidth,
     backgroundColor = _ref.backgroundColor,
-    bordersColor = _ref.bordersColor;
+    bordersColor = _ref.bordersColor,
+    showPhoneNumber = _ref.showPhoneNumber;
   var _useColor = useColors(),
     accentColor = _useColor[THEME_COLORS.ACCENT],
     textPrimary = _useColor[THEME_COLORS.TEXT_PRIMARY],
@@ -39555,7 +40382,7 @@ var Details = function Details(_ref) {
     color: textSecondary,
     fontSize: channelMembersFontSize,
     lineHeight: channelMembersLineHeight
-  }, hideUserPresence && directChannelUser && hideUserPresence(directChannelUser) ? '' : directChannelUser && directChannelUser.presence && (directChannelUser.presence.state === USER_PRESENCE_STATUS.ONLINE ? 'Online' : directChannelUser.presence.lastActiveAt && userLastActiveDateFormat(directChannelUser.presence.lastActiveAt)))) : (/*#__PURE__*/React__default.createElement(SubTitle, {
+  }, showPhoneNumber ? "+" + directChannelUser.id : hideUserPresence && directChannelUser && hideUserPresence(directChannelUser) ? '' : directChannelUser && directChannelUser.presence && (directChannelUser.presence.state === USER_PRESENCE_STATUS.ONLINE ? 'Online' : directChannelUser.presence.lastActiveAt && userLastActiveDateFormat(directChannelUser.presence.lastActiveAt)))) : (/*#__PURE__*/React__default.createElement(SubTitle, {
     color: textSecondary,
     fontSize: channelMembersFontSize,
     lineHeight: channelMembersLineHeight
@@ -39717,7 +40544,7 @@ var ChannelName$1 = styled__default(SectionHeader)(_templateObject0$e || (_templ
 }, function (props) {
   return props.uppercase && 'uppercase';
 });
-var ChannelNameWrapper = styled__default.div(_templateObject1$a || (_templateObject1$a = _taggedTemplateLiteralLoose(["\n  display: flex;\n  justify-content: center;\n"])));
+var ChannelNameWrapper = styled__default.div(_templateObject1$b || (_templateObject1$b = _taggedTemplateLiteralLoose(["\n  display: flex;\n  justify-content: center;\n"])));
 var EditButton = styled__default.span(_templateObject10$7 || (_templateObject10$7 = _taggedTemplateLiteralLoose(["\n  margin-left: 6px;\n  cursor: pointer;\n  color: #b2b6be;\n"])));
 
 var _templateObject$W;
@@ -39831,7 +40658,8 @@ var ChannelDetailsContainer = function ChannelDetailsContainer(_ref) {
     tabItemsFontSize = _ref.tabItemsFontSize,
     tabItemsLineHeight = _ref.tabItemsLineHeight,
     tabItemsMinWidth = _ref.tabItemsMinWidth,
-    bordersColor = _ref.bordersColor;
+    bordersColor = _ref.bordersColor,
+    showPhoneNumber = _ref.showPhoneNumber;
   var channelDetailsIsOpen = reactRedux.useSelector(channelInfoIsOpenSelector, reactRedux.shallowEqual);
   React.useEffect(function () {
     setShowChannelDetails(true);
@@ -39944,7 +40772,8 @@ var ChannelDetailsContainer = function ChannelDetailsContainer(_ref) {
     addMemberIcon: addMemberIcon,
     tabItemsFontSize: tabItemsFontSize,
     tabItemsLineHeight: tabItemsLineHeight,
-    tabItemsMinWidth: tabItemsMinWidth
+    tabItemsMinWidth: tabItemsMinWidth,
+    showPhoneNumber: showPhoneNumber
   })));
 };
 var DetailsWrapper = styled__default.div(_templateObject$W || (_templateObject$W = _taggedTemplateLiteralLoose([""])));
@@ -39999,26 +40828,31 @@ var MessagesScrollToBottomButton = function MessagesScrollToBottomButton(_ref) {
   var showScrollToNewMessageButton = reactRedux.useSelector(showScrollToNewMessageButtonSelector);
   var messages = reactRedux.useSelector(activeChannelMessagesSelector) || [];
   var handleScrollToBottom = function handleScrollToBottom() {
-    dispatch(markMessagesAsReadAC(channel.id, [channel.lastMessage.id]));
-    handleScrollToRepliedMessage(channel.lastMessage.id);
+    var user = getClient().user;
+    if (channel.lastMessage.user.id !== user.id) {
+      dispatch(markMessagesAsReadAC(channel.id, [channel.lastMessage.id]));
+    }
+    handleScrollToLastMessage(channel.lastMessage.id);
   };
-  var handleScrollToRepliedMessage = function handleScrollToRepliedMessage(messageId) {
+  var handleScrollToLastMessage = function handleScrollToLastMessage(messageId) {
     try {
+      dispatch(scrollToNewMessageAC(true, false, false));
       if (messages.findIndex(function (msg) {
         return msg.id === messageId;
       }) >= 10) {
+        dispatch(setMessagesLoadingStateAC(LOADING_STATE.LOADING));
         var repliedMessage = document.getElementById(messageId);
         if (repliedMessage) {
           var scrollRef = document.getElementById('scrollableDiv');
           if (scrollRef) {
             scrollRef.scrollTo({
-              top: 0,
+              top: 1000,
               behavior: 'smooth'
             });
           }
         }
       } else {
-        dispatch(getMessagesAC(channel, true, messageId));
+        dispatch(getMessagesAC(channel, true, messageId, undefined, undefined, false));
       }
       return Promise.resolve();
     } catch (e) {