stream-chat-react-native-core 7.1.2-beta.4 → 7.1.2

package/lib/commonjs/components/Channel/Channel.js

@@ -1,10 +1,8 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.reactionData = exports.Channel = void 0;
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
@@ -134,7 +132,7 @@ var _excluded = ["user"],
 var _this = this,
   _jsxFileName = "/home/runner/work/stream-chat-react-native/stream-chat-react-native/package/src/components/Channel/Channel.tsx";
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 var styles = _reactNative.StyleSheet.create({
   selectChannel: {
     fontWeight: 'bold',
@@ -479,39 +477,39 @@ var ChannelWithContext = function ChannelWithContext(props) {
     selectChannel = _useTheme$theme.channel.selectChannel,
     black = _useTheme$theme.colors.black;
   var _useState = (0, _react.useState)(false),
-    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     deleted = _useState2[0],
     setDeleted = _useState2[1];
   var _useState3 = (0, _react.useState)(undefined),
-    _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
     editing = _useState4[0],
     setEditing = _useState4[1];
   var _useState5 = (0, _react.useState)(false),
-    _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
+    _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
     error = _useState6[0],
     setError = _useState6[1];
   var _useState7 = (0, _react.useState)(),
-    _useState8 = (0, _slicedToArray2["default"])(_useState7, 2),
+    _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
     lastRead = _useState8[0],
     setLastRead = _useState8[1];
   var _useState9 = (0, _react.useState)(undefined),
-    _useState10 = (0, _slicedToArray2["default"])(_useState9, 2),
+    _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
     quotedMessage = _useState10[0],
     setQuotedMessage = _useState10[1];
   var _useState11 = (0, _react.useState)(threadProps || null),
-    _useState12 = (0, _slicedToArray2["default"])(_useState11, 2),
+    _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
     thread = _useState12[0],
     setThread = _useState12[1];
   var _useState13 = (0, _react.useState)(true),
-    _useState14 = (0, _slicedToArray2["default"])(_useState13, 2),
+    _useState14 = (0, _slicedToArray2.default)(_useState13, 2),
     threadHasMore = _useState14[0],
     setThreadHasMore = _useState14[1];
   var _useState15 = (0, _react.useState)(false),
-    _useState16 = (0, _slicedToArray2["default"])(_useState15, 2),
+    _useState16 = (0, _slicedToArray2.default)(_useState15, 2),
     threadLoadingMore = _useState16[0],
     setThreadLoadingMore = _useState16[1];
   var _useState17 = (0, _react.useState)(undefined),
-    _useState18 = (0, _slicedToArray2["default"])(_useState17, 2),
+    _useState18 = (0, _slicedToArray2.default)(_useState17, 2),
     channelUnreadState = _useState18[0],
     setChannelUnreadState = _useState18[1];
   var syncingChannelRef = (0, _react.useRef)(false);
@@ -543,21 +541,21 @@ var ChannelWithContext = function ChannelWithContext(props) {
     loadMoreRecent = _useMessageListPagina.loadMoreRecent,
     channelMessagesState = _useMessageListPagina.state;
   var setReadThrottled = (0, _react.useMemo)(function () {
-    return (0, _throttle["default"])(function () {
+    return (0, _throttle.default)(function () {
       if (channel) {
         setRead(channel);
       }
     }, stateUpdateThrottleInterval, throttleOptions);
   }, [channel, stateUpdateThrottleInterval, setRead]);
   var copyMessagesStateFromChannelThrottled = (0, _react.useMemo)(function () {
-    return (0, _throttle["default"])(function () {
+    return (0, _throttle.default)(function () {
       if (channel) {
         copyMessagesStateFromChannel(channel);
       }
     }, newMessageStateUpdateThrottleInterval, throttleOptions);
   }, [channel, newMessageStateUpdateThrottleInterval, copyMessagesStateFromChannel]);
   var copyChannelState = (0, _react.useMemo)(function () {
-    return (0, _throttle["default"])(function () {
+    return (0, _throttle.default)(function () {
       if (channel) {
         copyStateFromChannel(channel);
         copyMessagesStateFromChannel(channel);
@@ -610,7 +608,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
           if (((_event$user2 = event.user) == null ? void 0 : _event$user2.id) !== client.userID || !optimisticallyUpdatedNewMessages.has(_messageId)) {
             copyMessagesStateFromChannelThrottled();
           }
-          optimisticallyUpdatedNewMessages["delete"](_messageId);
+          optimisticallyUpdatedNewMessages.delete(_messageId);
           return;
         }
         if (event.type === 'message.read' || event.type === 'notification.mark_read') {
@@ -624,87 +622,55 @@ var ChannelWithContext = function ChannelWithContext(props) {
   (0, _react.useEffect)(function () {
     var listener;
     var initChannel = function () {
-      var _ref = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee() {
+      var _ref = (0, _asyncToGenerator2.default)(function* () {
         var _client$user;
-        var unreadCount, errored, _channel$state$read$c, user, ownReadState, _channel$state$read$c2, _user, _ownReadState;
-        return _regenerator["default"].wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              setLastRead(new Date());
-              unreadCount = channel.countUnread();
-              if (!(!channel || !shouldSyncChannel)) {
-                _context.next = 4;
-                break;
-              }
-              return _context.abrupt("return");
-            case 4:
-              errored = false;
-              if (!(!channel.initialized || !channel.state.isUpToDate)) {
-                _context.next = 16;
-                break;
-              }
-              _context.prev = 6;
-              _context.next = 9;
-              return channel == null ? void 0 : channel.watch();
-            case 9:
-              _context.next = 16;
-              break;
-            case 11:
-              _context.prev = 11;
-              _context.t0 = _context["catch"](6);
-              console.warn('Channel watch request failed with error:', _context.t0);
-              setError(true);
-              errored = true;
-            case 16:
-              if (!errored) {
-                initStateFromChannel(channel);
-                loadInitialMessagesStateFromChannel(channel, channel.state.messagePagination.hasPrev);
-              }
-              if ((_client$user = client.user) != null && _client$user.id && channel.state.read[client.user.id]) {
-                _channel$state$read$c = channel.state.read[client.user.id], user = _channel$state$read$c.user, ownReadState = (0, _objectWithoutProperties2["default"])(_channel$state$read$c, _excluded);
-                setChannelUnreadState(ownReadState);
-              }
-              if (!messageId) {
-                _context.next = 23;
-                break;
-              }
-              _context.next = 21;
-              return loadChannelAroundMessage({
-                messageId: messageId,
-                setTargetedMessage: setTargetedMessage
-              });
-            case 21:
-              _context.next = 27;
-              break;
-            case 23:
-              if (!(initialScrollToFirstUnreadMessage && client.user && unreadCount > scrollToFirstUnreadThreshold)) {
-                _context.next = 27;
-                break;
-              }
-              _channel$state$read$c2 = channel.state.read[client.user.id], _user = _channel$state$read$c2.user, _ownReadState = (0, _objectWithoutProperties2["default"])(_channel$state$read$c2, _excluded2);
-              _context.next = 27;
-              return loadChannelAtFirstUnreadMessage({
-                channelUnreadState: _ownReadState,
-                setChannelUnreadState: setChannelUnreadState,
-                setTargetedMessage: setTargetedMessage
-              });
-            case 27:
-              if (!(unreadCount > 0 && markReadOnMount)) {
-                _context.next = 30;
-                break;
-              }
-              _context.next = 30;
-              return markRead({
-                updateChannelUnreadState: false
-              });
-            case 30:
-              listener = channel.on(handleEvent);
-            case 31:
-            case "end":
-              return _context.stop();
+        setLastRead(new Date());
+        var unreadCount = channel.countUnread();
+        if (!channel || !shouldSyncChannel) {
+          return;
+        }
+        var errored = false;
+        if (!channel.initialized || !channel.state.isUpToDate) {
+          try {
+            yield channel == null ? void 0 : channel.watch();
+          } catch (err) {
+            console.warn('Channel watch request failed with error:', err);
+            setError(true);
+            errored = true;
           }
-        }, _callee, null, [[6, 11]]);
-      }));
+        }
+        if (!errored) {
+          initStateFromChannel(channel);
+          loadInitialMessagesStateFromChannel(channel, channel.state.messagePagination.hasPrev);
+        }
+        if ((_client$user = client.user) != null && _client$user.id && channel.state.read[client.user.id]) {
+          var _channel$state$read$c = channel.state.read[client.user.id],
+            user = _channel$state$read$c.user,
+            ownReadState = (0, _objectWithoutProperties2.default)(_channel$state$read$c, _excluded);
+          setChannelUnreadState(ownReadState);
+        }
+        if (messageId) {
+          yield loadChannelAroundMessage({
+            messageId: messageId,
+            setTargetedMessage: setTargetedMessage
+          });
+        } else if (initialScrollToFirstUnreadMessage && client.user && unreadCount > scrollToFirstUnreadThreshold) {
+          var _channel$state$read$c2 = channel.state.read[client.user.id],
+            _user = _channel$state$read$c2.user,
+            _ownReadState = (0, _objectWithoutProperties2.default)(_channel$state$read$c2, _excluded2);
+          yield loadChannelAtFirstUnreadMessage({
+            channelUnreadState: _ownReadState,
+            setChannelUnreadState: setChannelUnreadState,
+            setTargetedMessage: setTargetedMessage
+          });
+        }
+        if (unreadCount > 0 && markReadOnMount) {
+          yield markRead({
+            updateChannelUnreadState: false
+          });
+        }
+        listener = channel.on(handleEvent);
+      });
       return function initChannel() {
         return _ref.apply(this, arguments);
       };
@@ -749,191 +715,123 @@ var ChannelWithContext = function ChannelWithContext(props) {
     }
   }, [thread == null ? void 0 : thread.id, channelId]);
   (0, _useAppStateListener.useAppStateListener)(undefined, handleAppBackground);
-  var markReadInternal = (0, _throttle["default"])(function () {
-    var _ref2 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee2(options) {
-      var _ref3, _ref3$updateChannelUn, updateChannelUnreadState, response;
-      return _regenerator["default"].wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
-          case 0:
-            _ref3 = options != null ? options : {}, _ref3$updateChannelUn = _ref3.updateChannelUnreadState, updateChannelUnreadState = _ref3$updateChannelUn === void 0 ? true : _ref3$updateChannelUn;
-            if (!(!channel || channel != null && channel.disconnected || !(clientChannelConfig != null && clientChannelConfig.read_events))) {
-              _context2.next = 3;
-              break;
-            }
-            return _context2.abrupt("return");
-          case 3:
-            if (!doMarkReadRequest) {
-              _context2.next = 7;
-              break;
-            }
-            doMarkReadRequest(channel, updateChannelUnreadState ? setChannelUnreadState : undefined);
-            _context2.next = 17;
-            break;
-          case 7:
-            _context2.prev = 7;
-            _context2.next = 10;
-            return channel.markRead();
-          case 10:
-            response = _context2.sent;
-            if (updateChannelUnreadState && response && lastRead) {
-              setChannelUnreadState({
-                last_read: lastRead,
-                last_read_message_id: response == null ? void 0 : response.event.last_read_message_id,
-                unread_messages: 0
-              });
-              setLastRead(new Date());
-            }
-            _context2.next = 17;
-            break;
-          case 14:
-            _context2.prev = 14;
-            _context2.t0 = _context2["catch"](7);
-            console.log('Error marking channel as read:', _context2.t0);
-          case 17:
-          case "end":
-            return _context2.stop();
+  var markReadInternal = (0, _throttle.default)(function () {
+    var _ref2 = (0, _asyncToGenerator2.default)(function* (options) {
+      var _ref3 = options != null ? options : {},
+        _ref3$updateChannelUn = _ref3.updateChannelUnreadState,
+        updateChannelUnreadState = _ref3$updateChannelUn === void 0 ? true : _ref3$updateChannelUn;
+      if (!channel || channel != null && channel.disconnected || !(clientChannelConfig != null && clientChannelConfig.read_events)) {
+        return;
+      }
+      if (doMarkReadRequest) {
+        doMarkReadRequest(channel, updateChannelUnreadState ? setChannelUnreadState : undefined);
+      } else {
+        try {
+          var response = yield channel.markRead();
+          if (updateChannelUnreadState && response && lastRead) {
+            setChannelUnreadState({
+              last_read: lastRead,
+              last_read_message_id: response == null ? void 0 : response.event.last_read_message_id,
+              unread_messages: 0
+            });
+            setLastRead(new Date());
+          }
+        } catch (err) {
+          console.log('Error marking channel as read:', err);
         }
-      }, _callee2, null, [[7, 14]]);
-    }));
+      }
+    });
     return function (_x) {
       return _ref2.apply(this, arguments);
     };
   }(), defaultThrottleInterval, throttleOptions);
   var markRead = (0, _hooks.useStableCallback)(markReadInternal);
-  var reloadThread = (0, _hooks.useStableCallback)((0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee3() {
-    var parentID, limit, queryResponse, updatedHasMore, updatedThreadMessages, _yield$channel$getMes, messages, _messages, threadMessage, formattedMessage;
-    return _regenerator["default"].wrap(function _callee3$(_context3) {
-      while (1) switch (_context3.prev = _context3.next) {
-        case 0:
-          if (!(!channel || !(thread != null && thread.id))) {
-            _context3.next = 2;
-            break;
-          }
-          return _context3.abrupt("return");
-        case 2:
-          setThreadLoadingMore(true);
-          _context3.prev = 3;
-          parentID = thread.id;
-          limit = 50;
-          channel.state.threads[parentID] = [];
-          _context3.next = 9;
-          return channel.getReplies(parentID, {
-            limit: limit
-          });
-        case 9:
-          queryResponse = _context3.sent;
-          updatedHasMore = queryResponse.messages.length === limit;
-          updatedThreadMessages = channel.state.threads[parentID] || [];
-          loadMoreThreadFinished(updatedHasMore, updatedThreadMessages);
-          _context3.next = 15;
-          return channel.getMessagesById([parentID]);
-        case 15:
-          _yield$channel$getMes = _context3.sent;
-          messages = _yield$channel$getMes.messages;
-          _messages = (0, _slicedToArray2["default"])(messages, 1), threadMessage = _messages[0];
-          if (threadMessage && !threadInstance) {
-            formattedMessage = channel.state.formatMessage(threadMessage);
-            setThread(formattedMessage);
-          }
-          _context3.next = 27;
-          break;
-        case 21:
-          _context3.prev = 21;
-          _context3.t0 = _context3["catch"](3);
-          console.warn('Thread loading request failed with error', _context3.t0);
-          if (_context3.t0 instanceof Error) {
-            setError(_context3.t0);
-          } else {
-            setError(true);
-          }
-          setThreadLoadingMore(false);
-          throw _context3.t0;
-        case 27:
-        case "end":
-          return _context3.stop();
+  var reloadThread = (0, _hooks.useStableCallback)((0, _asyncToGenerator2.default)(function* () {
+    if (!channel || !(thread != null && thread.id)) {
+      return;
+    }
+    setThreadLoadingMore(true);
+    try {
+      var parentID = thread.id;
+      var limit = 50;
+      channel.state.threads[parentID] = [];
+      var queryResponse = yield channel.getReplies(parentID, {
+        limit: limit
+      });
+      var updatedHasMore = queryResponse.messages.length === limit;
+      var updatedThreadMessages = channel.state.threads[parentID] || [];
+      loadMoreThreadFinished(updatedHasMore, updatedThreadMessages);
+      var _yield$channel$getMes = yield channel.getMessagesById([parentID]),
+        messages = _yield$channel$getMes.messages;
+      var _messages = (0, _slicedToArray2.default)(messages, 1),
+        threadMessage = _messages[0];
+      if (threadMessage && !threadInstance) {
+        var formattedMessage = channel.state.formatMessage(threadMessage);
+        setThread(formattedMessage);
       }
-    }, _callee3, null, [[3, 21]]);
-  })));
-  var resyncChannel = (0, _hooks.useStableCallback)((0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee4() {
-    var parseMessage, _channelMessagesState, failedMessages, failedThreadMessages;
-    return _regenerator["default"].wrap(function _callee4$(_context4) {
-      while (1) switch (_context4.prev = _context4.next) {
-        case 0:
-          if (!(!channel || syncingChannelRef.current)) {
-            _context4.next = 2;
-            break;
-          }
-          return _context4.abrupt("return");
-        case 2:
-          syncingChannelRef.current = true;
-          setError(false);
-          parseMessage = function parseMessage(message) {
-            var _message$pinned_at, _message$updated_at;
-            return Object.assign({}, message, {
-              created_at: message.created_at.toString(),
-              pinned_at: (_message$pinned_at = message.pinned_at) == null ? void 0 : _message$pinned_at.toString(),
-              updated_at: (_message$updated_at = message.updated_at) == null ? void 0 : _message$updated_at.toString()
-            });
-          };
-          _context4.prev = 5;
-          if (!(channelMessagesState != null && channelMessagesState.messages)) {
-            _context4.next = 9;
-            break;
-          }
-          _context4.next = 9;
-          return channel == null ? void 0 : channel.watch({
-            messages: {
-              limit: channelMessagesState.messages.length + 30
-            }
-          });
-        case 9:
-          if (thread) {
-            _context4.next = 18;
-            break;
-          }
-          copyChannelState();
-          failedMessages = (_channelMessagesState = channelMessagesState.messages) == null ? void 0 : _channelMessagesState.filter(function (message) {
-            return message.status === _utils.MessageStatusTypes.FAILED;
-          }).map(parseMessage);
-          if (failedMessages != null && failedMessages.length) {
-            channel.state.addMessagesSorted(failedMessages);
-          }
-          _context4.next = 15;
-          return markRead();
-        case 15:
-          channel.state.setIsUpToDate(true);
-          _context4.next = 22;
-          break;
-        case 18:
-          _context4.next = 20;
-          return reloadThread();
-        case 20:
-          failedThreadMessages = thread ? threadMessages.filter(function (message) {
-            return message.status === _utils.MessageStatusTypes.FAILED;
-          }).map(parseMessage) : [];
-          if (failedThreadMessages.length) {
-            channel.state.addMessagesSorted(failedThreadMessages);
-            setThreadMessages((0, _toConsumableArray2["default"])(channel.state.threads[thread.id]));
-          }
-        case 22:
-          _context4.next = 27;
-          break;
-        case 24:
-          _context4.prev = 24;
-          _context4.t0 = _context4["catch"](5);
-          if (_context4.t0 instanceof Error) {
-            setError(_context4.t0);
-          } else {
-            setError(true);
+    } catch (err) {
+      console.warn('Thread loading request failed with error', err);
+      if (err instanceof Error) {
+        setError(err);
+      } else {
+        setError(true);
+      }
+      setThreadLoadingMore(false);
+      throw err;
+    }
+  }));
+  var resyncChannel = (0, _hooks.useStableCallback)((0, _asyncToGenerator2.default)(function* () {
+    if (!channel || syncingChannelRef.current) {
+      return;
+    }
+    syncingChannelRef.current = true;
+    setError(false);
+    var parseMessage = function parseMessage(message) {
+      var _message$pinned_at, _message$updated_at;
+      return Object.assign({}, message, {
+        created_at: message.created_at.toString(),
+        pinned_at: (_message$pinned_at = message.pinned_at) == null ? void 0 : _message$pinned_at.toString(),
+        updated_at: (_message$updated_at = message.updated_at) == null ? void 0 : _message$updated_at.toString()
+      });
+    };
+    try {
+      if (channelMessagesState != null && channelMessagesState.messages) {
+        yield channel == null ? void 0 : channel.watch({
+          messages: {
+            limit: channelMessagesState.messages.length + 30
           }
-        case 27:
-          syncingChannelRef.current = false;
-        case 28:
-        case "end":
-          return _context4.stop();
+        });
+      }
+      if (!thread) {
+        var _channelMessagesState;
+        copyChannelState();
+        var failedMessages = (_channelMessagesState = channelMessagesState.messages) == null ? void 0 : _channelMessagesState.filter(function (message) {
+          return message.status === _utils.MessageStatusTypes.FAILED;
+        }).map(parseMessage);
+        if (failedMessages != null && failedMessages.length) {
+          channel.state.addMessagesSorted(failedMessages);
+        }
+        yield markRead();
+        channel.state.setIsUpToDate(true);
+      } else {
+        yield reloadThread();
+        var failedThreadMessages = thread ? threadMessages.filter(function (message) {
+          return message.status === _utils.MessageStatusTypes.FAILED;
+        }).map(parseMessage) : [];
+        if (failedThreadMessages.length) {
+          channel.state.addMessagesSorted(failedThreadMessages);
+          setThreadMessages((0, _toConsumableArray2.default)(channel.state.threads[thread.id]));
+        }
+      }
+    } catch (err) {
+      if (err instanceof Error) {
+        setError(err);
+      } else {
+        setError(true);
       }
-    }, _callee4, null, [[5, 24]]);
-  })));
+    }
+    syncingChannelRef.current = false;
+  }));
   var resyncChannelRef = (0, _react.useRef)(resyncChannel);
   resyncChannelRef.current = resyncChannel;
   (0, _react.useEffect)(function () {
@@ -968,87 +866,47 @@ var ChannelWithContext = function ChannelWithContext(props) {
     }
   };
   var clientChannelConfig = getChannelConfigSafely();
-  var reloadChannel = (0, _hooks.useStableCallback)((0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee5() {
-    return _regenerator["default"].wrap(function _callee5$(_context5) {
-      while (1) switch (_context5.prev = _context5.next) {
-        case 0:
-          _context5.prev = 0;
-          _context5.next = 3;
-          return loadLatestMessages();
-        case 3:
-          _context5.next = 8;
-          break;
-        case 5:
-          _context5.prev = 5;
-          _context5.t0 = _context5["catch"](0);
-          console.warn('Reloading channel failed with error:', _context5.t0);
-        case 8:
-        case "end":
-          return _context5.stop();
-      }
-    }, _callee5, null, [[0, 5]]);
-  })));
+  var reloadChannel = (0, _hooks.useStableCallback)((0, _asyncToGenerator2.default)(function* () {
+    try {
+      yield loadLatestMessages();
+    } catch (err) {
+      console.warn('Reloading channel failed with error:', err);
+    }
+  }));
   var loadChannelAroundMessage = (0, _hooks.useStableCallback)(function () {
-    var _ref8 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee6(_ref7) {
-      var messageIdToLoadAround;
-      return _regenerator["default"].wrap(function _callee6$(_context6) {
-        while (1) switch (_context6.prev = _context6.next) {
-          case 0:
-            messageIdToLoadAround = _ref7.messageId;
-            if (messageIdToLoadAround) {
-              _context6.next = 3;
-              break;
-            }
-            return _context6.abrupt("return");
-          case 3:
-            _context6.prev = 3;
-            if (!thread) {
-              _context6.next = 20;
-              break;
-            }
-            setThreadLoadingMore(true);
-            _context6.prev = 6;
-            _context6.next = 9;
-            return channel.state.loadMessageIntoState(messageIdToLoadAround, thread.id);
-          case 9:
+    var _ref8 = (0, _asyncToGenerator2.default)(function* (_ref7) {
+      var messageIdToLoadAround = _ref7.messageId;
+      if (!messageIdToLoadAround) {
+        return;
+      }
+      try {
+        if (thread) {
+          setThreadLoadingMore(true);
+          try {
+            yield channel.state.loadMessageIntoState(messageIdToLoadAround, thread.id);
             setThreadLoadingMore(false);
             setThreadMessages(channel.state.threads[thread.id]);
             if (setTargetedMessage) {
               setTargetedMessage(messageIdToLoadAround);
             }
-            _context6.next = 18;
-            break;
-          case 14:
-            _context6.prev = 14;
-            _context6.t0 = _context6["catch"](6);
-            if (_context6.t0 instanceof Error) {
-              setError(_context6.t0);
+          } catch (err) {
+            if (err instanceof Error) {
+              setError(err);
             } else {
               setError(true);
             }
             setThreadLoadingMore(false);
-          case 18:
-            _context6.next = 22;
-            break;
-          case 20:
-            _context6.next = 22;
-            return loadChannelAroundMessageFn({
-              messageId: messageIdToLoadAround,
-              setTargetedMessage: setTargetedMessage
-            });
-          case 22:
-            _context6.next = 27;
-            break;
-          case 24:
-            _context6.prev = 24;
-            _context6.t1 = _context6["catch"](3);
-            console.warn('Loading channel around message failed with error:', _context6.t1);
-          case 27:
-          case "end":
-            return _context6.stop();
+          }
+        } else {
+          yield loadChannelAroundMessageFn({
+            messageId: messageIdToLoadAround,
+            setTargetedMessage: setTargetedMessage
+          });
         }
-      }, _callee6, null, [[3, 24], [6, 14]]);
-    }));
+      } catch (err) {
+        console.warn('Loading channel around message failed with error:', err);
+      }
+    });
     return function (_x2) {
       return _ref8.apply(this, arguments);
     };
@@ -1087,18 +945,18 @@ var ChannelWithContext = function ChannelWithContext(props) {
       parent_id = _ref9.parent_id,
       poll_id = _ref9.poll_id,
       text = _ref9.text,
-      extraFields = (0, _objectWithoutProperties2["default"])(_ref9, _excluded3);
+      extraFields = (0, _objectWithoutProperties2.default)(_ref9, _excluded3);
     var _client$user2 = client.user,
       channel_mutes = _client$user2.channel_mutes,
       devices = _client$user2.devices,
       mutes = _client$user2.mutes,
-      messageUser = (0, _objectWithoutProperties2["default"])(_client$user2, _excluded4);
+      messageUser = (0, _objectWithoutProperties2.default)(_client$user2, _excluded4);
     var preview = Object.assign({
       __html: text,
       attachments: attachments,
       created_at: new Date(),
       html: text,
-      id: "".concat(client.userID, "-").concat((0, _utils.generateRandomId)()),
+      id: `${client.userID}-${(0, _utils.generateRandomId)()}`,
       mentioned_users: (mentioned_users == null ? void 0 : mentioned_users.map(function (userId) {
         return {
           id: userId
@@ -1124,325 +982,186 @@ var ChannelWithContext = function ChannelWithContext(props) {
     return preview;
   });
   var uploadPendingAttachments = (0, _hooks.useStableCallback)(function () {
-    var _ref10 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee7(message) {
+    var _ref10 = (0, _asyncToGenerator2.default)(function* (message) {
       var _updatedMessage$attac;
-      var updatedMessage, i, _updatedMessage$attac2, attachment, image, file, _image$name, filename, controller, compressedUri, contentType, uploadResponse, _controller, response;
-      return _regenerator["default"].wrap(function _callee7$(_context7) {
-        while (1) switch (_context7.prev = _context7.next) {
-          case 0:
-            updatedMessage = Object.assign({}, message);
-            if (!((_updatedMessage$attac = updatedMessage.attachments) != null && _updatedMessage$attac.length)) {
-              _context7.next = 50;
-              break;
-            }
-            i = 0;
-          case 3:
-            if (!(i < ((_updatedMessage$attac2 = updatedMessage.attachments) == null ? void 0 : _updatedMessage$attac2.length))) {
-              _context7.next = 50;
-              break;
-            }
-            attachment = updatedMessage.attachments[i];
-            image = attachment.originalImage;
-            file = attachment.originalFile;
-            if (!(attachment.type === _types.FileTypes.Image && image != null && image.uri && attachment.image_url && (0, _utils.isLocalUrl)(attachment.image_url))) {
-              _context7.next = 29;
-              break;
-            }
-            filename = (_image$name = image.name) != null ? _image$name : (0, _utils.getFileNameFromPath)(image.uri);
-            controller = uploadAbortControllerRef.current.get(filename);
+      var updatedMessage = Object.assign({}, message);
+      if ((_updatedMessage$attac = updatedMessage.attachments) != null && _updatedMessage$attac.length) {
+        for (var i = 0; i < ((_updatedMessage$attac2 = updatedMessage.attachments) == null ? void 0 : _updatedMessage$attac2.length); i++) {
+          var _updatedMessage$attac2;
+          var attachment = updatedMessage.attachments[i];
+          var image = attachment.originalImage;
+          var file = attachment.originalFile;
+          if (attachment.type === _types.FileTypes.Image && image != null && image.uri && attachment.image_url && (0, _utils.isLocalUrl)(attachment.image_url)) {
+            var _image$name;
+            var filename = (_image$name = image.name) != null ? _image$name : (0, _utils.getFileNameFromPath)(image.uri);
+            var controller = uploadAbortControllerRef.current.get(filename);
             if (controller) {
               controller.abort();
-              uploadAbortControllerRef.current["delete"](filename);
-            }
-            _context7.next = 13;
-            return (0, _compressImage.compressedImageURI)(image, compressImageQuality);
-          case 13:
-            compressedUri = _context7.sent;
-            contentType = (0, _mimeTypes.lookup)(filename) || 'multipart/form-data';
-            if (!doImageUploadRequest) {
-              _context7.next = 21;
-              break;
+              uploadAbortControllerRef.current.delete(filename);
             }
-            _context7.next = 18;
-            return doImageUploadRequest(image, channel);
-          case 18:
-            _context7.t0 = _context7.sent;
-            _context7.next = 24;
-            break;
-          case 21:
-            _context7.next = 23;
-            return channel.sendImage(compressedUri, filename, contentType);
-          case 23:
-            _context7.t0 = _context7.sent;
-          case 24:
-            uploadResponse = _context7.t0;
+            var compressedUri = yield (0, _compressImage.compressedImageURI)(image, compressImageQuality);
+            var contentType = (0, _mimeTypes.lookup)(filename) || 'multipart/form-data';
+            var uploadResponse = doImageUploadRequest ? yield doImageUploadRequest(image, channel) : yield channel.sendImage(compressedUri, filename, contentType);
             attachment.image_url = uploadResponse.file;
             delete attachment.originalFile;
-            _context7.next = 29;
-            return dbApi.updateMessage({
+            yield dbApi.updateMessage({
               message: Object.assign({}, updatedMessage, {
                 cid: channel.cid
               })
             });
-          case 29:
-            if (!((attachment.type === _types.FileTypes.File || attachment.type === _types.FileTypes.Audio || attachment.type === _types.FileTypes.VoiceRecording || attachment.type === _types.FileTypes.Video) && attachment.asset_url && (0, _utils.isLocalUrl)(attachment.asset_url) && file != null && file.uri)) {
-              _context7.next = 47;
-              break;
-            }
-            _controller = uploadAbortControllerRef.current.get(file.name);
+          }
+          if ((attachment.type === _types.FileTypes.File || attachment.type === _types.FileTypes.Audio || attachment.type === _types.FileTypes.VoiceRecording || attachment.type === _types.FileTypes.Video) && attachment.asset_url && (0, _utils.isLocalUrl)(attachment.asset_url) && file != null && file.uri) {
+            var _controller = uploadAbortControllerRef.current.get(file.name);
             if (_controller) {
               _controller.abort();
-              uploadAbortControllerRef.current["delete"](file.name);
-            }
-            if (!doDocUploadRequest) {
-              _context7.next = 38;
-              break;
+              uploadAbortControllerRef.current.delete(file.name);
             }
-            _context7.next = 35;
-            return doDocUploadRequest(file, channel);
-          case 35:
-            _context7.t1 = _context7.sent;
-            _context7.next = 41;
-            break;
-          case 38:
-            _context7.next = 40;
-            return channel.sendFile(file.uri, file.name, file.type);
-          case 40:
-            _context7.t1 = _context7.sent;
-          case 41:
-            response = _context7.t1;
+            var response = doDocUploadRequest ? yield doDocUploadRequest(file, channel) : yield channel.sendFile(file.uri, file.name, file.type);
             attachment.asset_url = response.file;
             if (response.thumb_url) {
               attachment.thumb_url = response.thumb_url;
             }
             delete attachment.originalFile;
-            _context7.next = 47;
-            return dbApi.updateMessage({
+            yield dbApi.updateMessage({
               message: Object.assign({}, updatedMessage, {
                 cid: channel.cid
               })
             });
-          case 47:
-            i++;
-            _context7.next = 3;
-            break;
-          case 50:
-            return _context7.abrupt("return", updatedMessage);
-          case 51:
-          case "end":
-            return _context7.stop();
+          }
         }
-      }, _callee7);
-    }));
+      }
+      return updatedMessage;
+    });
     return function (_x3) {
       return _ref10.apply(this, arguments);
     };
   }());
   var sendMessageRequest = (0, _hooks.useStableCallback)(function () {
-    var _ref11 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee9(message, retrying) {
-      var failedMessageUpdated, handleFailedMessage, _messageResponse, updatedMessage, extraFields, attachments, id, mentioned_users, parent_id, text, mentionedUserIds, messageData, messageResponse, newMessageResponse;
-      return _regenerator["default"].wrap(function _callee9$(_context9) {
-        while (1) switch (_context9.prev = _context9.next) {
-          case 0:
-            failedMessageUpdated = false;
-            handleFailedMessage = function () {
-              var _ref12 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee8() {
-                var updatedMessage;
-                return _regenerator["default"].wrap(function _callee8$(_context8) {
-                  while (1) switch (_context8.prev = _context8.next) {
-                    case 0:
-                      if (failedMessageUpdated) {
-                        _context8.next = 9;
-                        break;
-                      }
-                      updatedMessage = Object.assign({}, message, {
-                        cid: channel.cid,
-                        status: _utils.MessageStatusTypes.FAILED
-                      });
-                      updateMessage(updatedMessage);
-                      threadInstance == null || threadInstance.upsertReplyLocally == null || threadInstance.upsertReplyLocally({
-                        message: updatedMessage
-                      });
-                      optimisticallyUpdatedNewMessages["delete"](message.id);
-                      if (!enableOfflineSupport) {
-                        _context8.next = 8;
-                        break;
-                      }
-                      _context8.next = 8;
-                      return dbApi.updateMessage({
-                        message: updatedMessage
-                      });
-                    case 8:
-                      failedMessageUpdated = true;
-                    case 9:
-                    case "end":
-                      return _context8.stop();
-                  }
-                }, _callee8);
-              }));
-              return function handleFailedMessage() {
-                return _ref12.apply(this, arguments);
-              };
-            }();
-            _context9.prev = 2;
-            if (isOnline) {
-              _context9.next = 6;
-              break;
-            }
-            _context9.next = 6;
-            return handleFailedMessage();
-          case 6:
-            _context9.next = 8;
-            return uploadPendingAttachments(message);
-          case 8:
-            updatedMessage = _context9.sent;
-            extraFields = (0, _omit["default"])(updatedMessage, ['__html', 'attachments', 'created_at', 'deleted_at', 'html', 'id', 'latest_reactions', 'mentioned_users', 'own_reactions', 'parent_id', 'quoted_message', 'reaction_counts', 'reaction_groups', 'reactions', 'status', 'text', 'type', 'updated_at', 'user']);
-            attachments = updatedMessage.attachments, id = updatedMessage.id, mentioned_users = updatedMessage.mentioned_users, parent_id = updatedMessage.parent_id, text = updatedMessage.text;
-            if (channel.id) {
-              _context9.next = 13;
-              break;
-            }
-            return _context9.abrupt("return");
-          case 13:
-            mentionedUserIds = (mentioned_users == null ? void 0 : mentioned_users.map(function (user) {
-              return user.id;
-            })) || [];
-            messageData = Object.assign({
-              attachments: attachments,
-              id: id,
-              mentioned_users: mentionedUserIds,
-              parent_id: parent_id,
-              text: (0, _patchMessageTextCommand.patchMessageTextCommand)(text != null ? text : '', mentionedUserIds)
-            }, extraFields);
-            messageResponse = {};
-            if (!doSendMessageRequest) {
-              _context9.next = 22;
-              break;
-            }
-            _context9.next = 19;
-            return doSendMessageRequest((channel == null ? void 0 : channel.cid) || '', messageData);
-          case 19:
-            messageResponse = _context9.sent;
-            _context9.next = 26;
-            break;
-          case 22:
-            if (!channel) {
-              _context9.next = 26;
-              break;
-            }
-            _context9.next = 25;
-            return channel.sendMessage(messageData);
-          case 25:
-            messageResponse = _context9.sent;
-          case 26:
-            if (!((_messageResponse = messageResponse) != null && _messageResponse.message)) {
-              _context9.next = 32;
-              break;
-            }
-            newMessageResponse = Object.assign({}, messageResponse.message, {
-              status: _utils.MessageStatusTypes.RECEIVED
+    var _ref11 = (0, _asyncToGenerator2.default)(function* (message, retrying) {
+      var failedMessageUpdated = false;
+      var handleFailedMessage = function () {
+        var _ref12 = (0, _asyncToGenerator2.default)(function* () {
+          if (!failedMessageUpdated) {
+            var updatedMessage = Object.assign({}, message, {
+              cid: channel.cid,
+              status: _utils.MessageStatusTypes.FAILED
+            });
+            updateMessage(updatedMessage);
+            threadInstance == null || threadInstance.upsertReplyLocally == null || threadInstance.upsertReplyLocally({
+              message: updatedMessage
             });
-            if (!enableOfflineSupport) {
-              _context9.next = 31;
-              break;
+            optimisticallyUpdatedNewMessages.delete(message.id);
+            if (enableOfflineSupport) {
+              yield dbApi.updateMessage({
+                message: updatedMessage
+              });
             }
-            _context9.next = 31;
-            return dbApi.updateMessage({
+            failedMessageUpdated = true;
+          }
+        });
+        return function handleFailedMessage() {
+          return _ref12.apply(this, arguments);
+        };
+      }();
+      try {
+        var _messageResponse;
+        if (!isOnline) {
+          yield handleFailedMessage();
+        }
+        var updatedMessage = yield uploadPendingAttachments(message);
+        var extraFields = (0, _omit.default)(updatedMessage, ['__html', 'attachments', 'created_at', 'deleted_at', 'html', 'id', 'latest_reactions', 'mentioned_users', 'own_reactions', 'parent_id', 'quoted_message', 'reaction_counts', 'reaction_groups', 'reactions', 'status', 'text', 'type', 'updated_at', 'user']);
+        var attachments = updatedMessage.attachments,
+          id = updatedMessage.id,
+          mentioned_users = updatedMessage.mentioned_users,
+          parent_id = updatedMessage.parent_id,
+          text = updatedMessage.text;
+        if (!channel.id) {
+          return;
+        }
+        var mentionedUserIds = (mentioned_users == null ? void 0 : mentioned_users.map(function (user) {
+          return user.id;
+        })) || [];
+        var messageData = Object.assign({
+          attachments: attachments,
+          id: id,
+          mentioned_users: mentionedUserIds,
+          parent_id: parent_id,
+          text: (0, _patchMessageTextCommand.patchMessageTextCommand)(text != null ? text : '', mentionedUserIds)
+        }, extraFields);
+        var messageResponse = {};
+        if (doSendMessageRequest) {
+          messageResponse = yield doSendMessageRequest((channel == null ? void 0 : channel.cid) || '', messageData);
+        } else if (channel) {
+          messageResponse = yield channel.sendMessage(messageData);
+        }
+        if ((_messageResponse = messageResponse) != null && _messageResponse.message) {
+          var newMessageResponse = Object.assign({}, messageResponse.message, {
+            status: _utils.MessageStatusTypes.RECEIVED
+          });
+          if (enableOfflineSupport) {
+            yield dbApi.updateMessage({
               message: Object.assign({}, newMessageResponse, {
                 cid: channel.cid
               })
             });
-          case 31:
-            if (retrying) {
-              replaceMessage(message, newMessageResponse);
-            } else {
-              updateMessage(newMessageResponse, {}, true);
-            }
-          case 32:
-            _context9.next = 39;
-            break;
-          case 34:
-            _context9.prev = 34;
-            _context9.t0 = _context9["catch"](2);
-            console.log(_context9.t0);
-            _context9.next = 39;
-            return handleFailedMessage();
-          case 39:
-          case "end":
-            return _context9.stop();
+          }
+          if (retrying) {
+            replaceMessage(message, newMessageResponse);
+          } else {
+            updateMessage(newMessageResponse, {}, true);
+          }
         }
-      }, _callee9, null, [[2, 34]]);
-    }));
+      } catch (err) {
+        console.log(err);
+        yield handleFailedMessage();
+      }
+    });
     return function (_x4, _x5) {
       return _ref11.apply(this, arguments);
     };
   }());
   var sendMessage = (0, _hooks.useStableCallback)(function () {
-    var _ref13 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee10(message) {
+    var _ref13 = (0, _asyncToGenerator2.default)(function* (message) {
       var _channel$state;
-      var messagePreview;
-      return _regenerator["default"].wrap(function _callee10$(_context10) {
-        while (1) switch (_context10.prev = _context10.next) {
-          case 0:
-            if (channel != null && (_channel$state = channel.state) != null && _channel$state.filterErrorMessages) {
-              channel.state.filterErrorMessages();
-            }
-            messagePreview = createMessagePreview(Object.assign({}, message, {
-              attachments: message.attachments || []
-            }));
-            updateMessage(messagePreview, {
-              commands: [],
-              messageInput: ''
-            });
-            threadInstance == null || threadInstance.upsertReplyLocally == null || threadInstance.upsertReplyLocally({
-              message: messagePreview
-            });
-            optimisticallyUpdatedNewMessages.add(messagePreview.id);
-            if (!enableOfflineSupport) {
-              _context10.next = 8;
-              break;
-            }
-            _context10.next = 8;
-            return dbApi.upsertMessages({
-              messages: [Object.assign({}, messagePreview, {
-                cid: channel.cid,
-                status: _utils.MessageStatusTypes.FAILED
-              })]
-            });
-          case 8:
-            _context10.next = 10;
-            return sendMessageRequest(messagePreview);
-          case 10:
-          case "end":
-            return _context10.stop();
-        }
-      }, _callee10);
-    }));
+      if (channel != null && (_channel$state = channel.state) != null && _channel$state.filterErrorMessages) {
+        channel.state.filterErrorMessages();
+      }
+      var messagePreview = createMessagePreview(Object.assign({}, message, {
+        attachments: message.attachments || []
+      }));
+      updateMessage(messagePreview, {
+        commands: [],
+        messageInput: ''
+      });
+      threadInstance == null || threadInstance.upsertReplyLocally == null || threadInstance.upsertReplyLocally({
+        message: messagePreview
+      });
+      optimisticallyUpdatedNewMessages.add(messagePreview.id);
+      if (enableOfflineSupport) {
+        yield dbApi.upsertMessages({
+          messages: [Object.assign({}, messagePreview, {
+            cid: channel.cid,
+            status: _utils.MessageStatusTypes.FAILED
+          })]
+        });
+      }
+      yield sendMessageRequest(messagePreview);
+    });
     return function (_x6) {
       return _ref13.apply(this, arguments);
     };
   }());
   var retrySendMessage = (0, _hooks.useStableCallback)(function () {
-    var _ref14 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee11(message) {
-      var statusPendingMessage, messageWithoutReservedFields;
-      return _regenerator["default"].wrap(function _callee11$(_context11) {
-        while (1) switch (_context11.prev = _context11.next) {
-          case 0:
-            statusPendingMessage = Object.assign({}, message, {
-              status: _utils.MessageStatusTypes.SENDING
-            });
-            messageWithoutReservedFields = (0, _removeReservedFields.removeReservedFields)(statusPendingMessage);
-            if (!(0, _utils.isBouncedMessage)(message)) {
-              updateMessage(messageWithoutReservedFields);
-            }
-            _context11.next = 5;
-            return sendMessageRequest(messageWithoutReservedFields, true);
-          case 5:
-          case "end":
-            return _context11.stop();
-        }
-      }, _callee11);
-    }));
+    var _ref14 = (0, _asyncToGenerator2.default)(function* (message) {
+      var statusPendingMessage = Object.assign({}, message, {
+        status: _utils.MessageStatusTypes.SENDING
+      });
+      var messageWithoutReservedFields = (0, _removeReservedFields.removeReservedFields)(statusPendingMessage);
+      if (!(0, _utils.isBouncedMessage)(message)) {
+        updateMessage(messageWithoutReservedFields);
+      }
+      yield sendMessageRequest(messageWithoutReservedFields, true);
+    });
     return function (_x7) {
       return _ref14.apply(this, arguments);
     };
@@ -1464,167 +1183,100 @@ var ChannelWithContext = function ChannelWithContext(props) {
     return setQuotedMessage(undefined);
   });
   var removeMessage = (0, _hooks.useStableCallback)(function () {
-    var _ref15 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee12(message) {
-      return _regenerator["default"].wrap(function _callee12$(_context12) {
-        while (1) switch (_context12.prev = _context12.next) {
-          case 0:
-            if (channel) {
-              channel.state.removeMessage(message);
-              copyMessagesStateFromChannel(channel);
-              if (thread) {
-                setThreadMessages(channel.state.threads[thread.id] || []);
-              }
-            }
-            if (!client.offlineDb) {
-              _context12.next = 4;
-              break;
-            }
-            _context12.next = 4;
-            return client.offlineDb.handleRemoveMessage({
-              messageId: message.id
-            });
-          case 4:
-          case "end":
-            return _context12.stop();
+    var _ref15 = (0, _asyncToGenerator2.default)(function* (message) {
+      if (channel) {
+        channel.state.removeMessage(message);
+        copyMessagesStateFromChannel(channel);
+        if (thread) {
+          setThreadMessages(channel.state.threads[thread.id] || []);
         }
-      }, _callee12);
-    }));
+      }
+      if (client.offlineDb) {
+        yield client.offlineDb.handleRemoveMessage({
+          messageId: message.id
+        });
+      }
+    });
     return function (_x8) {
       return _ref15.apply(this, arguments);
     };
   }());
   var sendReaction = (0, _hooks.useStableCallback)(function () {
-    var _ref16 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee13(type, messageId) {
-      var payload, sendReactionResponse;
-      return _regenerator["default"].wrap(function _callee13$(_context13) {
-        while (1) switch (_context13.prev = _context13.next) {
-          case 0:
-            if (!(!(channel != null && channel.id) || !client.user)) {
-              _context13.next = 2;
-              break;
-            }
-            throw new Error('Channel has not been initialized');
-          case 2:
-            payload = [messageId, {
-              type: type
-            }, {
-              enforce_unique: enforceUniqueReaction
-            }];
-            if (!enableOfflineSupport) {
-              _context13.next = 7;
-              break;
-            }
-            _context13.next = 6;
-            return (0, _addReactionToLocalState.addReactionToLocalState)({
-              channel: channel,
-              enforceUniqueReaction: enforceUniqueReaction,
-              messageId: messageId,
-              reactionType: type,
-              user: client.user
-            });
-          case 6:
-            copyMessagesStateFromChannel(channel);
-          case 7:
-            _context13.next = 9;
-            return channel.sendReaction.apply(channel, payload);
-          case 9:
-            sendReactionResponse = _context13.sent;
-            if (sendReactionResponse != null && sendReactionResponse.message) {
-              threadInstance == null || threadInstance.upsertReplyLocally == null || threadInstance.upsertReplyLocally({
-                message: sendReactionResponse.message
-              });
-            }
-          case 11:
-          case "end":
-            return _context13.stop();
-        }
-      }, _callee13);
-    }));
+    var _ref16 = (0, _asyncToGenerator2.default)(function* (type, messageId) {
+      if (!(channel != null && channel.id) || !client.user) {
+        throw new Error('Channel has not been initialized');
+      }
+      var payload = [messageId, {
+        type: type
+      }, {
+        enforce_unique: enforceUniqueReaction
+      }];
+      if (enableOfflineSupport) {
+        yield (0, _addReactionToLocalState.addReactionToLocalState)({
+          channel: channel,
+          enforceUniqueReaction: enforceUniqueReaction,
+          messageId: messageId,
+          reactionType: type,
+          user: client.user
+        });
+        copyMessagesStateFromChannel(channel);
+      }
+      var sendReactionResponse = yield channel.sendReaction.apply(channel, payload);
+      if (sendReactionResponse != null && sendReactionResponse.message) {
+        threadInstance == null || threadInstance.upsertReplyLocally == null || threadInstance.upsertReplyLocally({
+          message: sendReactionResponse.message
+        });
+      }
+    });
     return function (_x9, _x10) {
       return _ref16.apply(this, arguments);
     };
   }());
   var deleteMessage = (0, _hooks.useStableCallback)(function () {
-    var _ref17 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee14(message) {
-      var hardDelete,
-        updatedMessage,
-        data,
-        _args14 = arguments;
-      return _regenerator["default"].wrap(function _callee14$(_context14) {
-        while (1) switch (_context14.prev = _context14.next) {
-          case 0:
-            hardDelete = _args14.length > 1 && _args14[1] !== undefined ? _args14[1] : false;
-            if (channel.id) {
-              _context14.next = 3;
-              break;
-            }
-            throw new Error('Channel has not been initialized yet');
-          case 3:
-            if (!(message.status === _utils.MessageStatusTypes.FAILED)) {
-              _context14.next = 7;
-              break;
-            }
-            _context14.next = 6;
-            return removeMessage(message);
-          case 6:
-            return _context14.abrupt("return");
-          case 7:
-            updatedMessage = Object.assign({}, message, {
-              cid: channel.cid,
-              deleted_at: new Date(),
-              type: 'deleted'
-            });
-            updateMessage(updatedMessage);
-            threadInstance == null || threadInstance.upsertReplyLocally({
-              message: updatedMessage
-            });
-            _context14.next = 12;
-            return client.deleteMessage(message.id, hardDelete);
-          case 12:
-            data = _context14.sent;
-            if (data != null && data.message) {
-              updateMessage(Object.assign({}, data.message));
-            }
-          case 14:
-          case "end":
-            return _context14.stop();
-        }
-      }, _callee14);
-    }));
+    var _ref17 = (0, _asyncToGenerator2.default)(function* (message) {
+      var hardDelete = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+      if (!channel.id) {
+        throw new Error('Channel has not been initialized yet');
+      }
+      if (message.status === _utils.MessageStatusTypes.FAILED) {
+        yield removeMessage(message);
+        return;
+      }
+      var updatedMessage = Object.assign({}, message, {
+        cid: channel.cid,
+        deleted_at: new Date(),
+        type: 'deleted'
+      });
+      updateMessage(updatedMessage);
+      threadInstance == null || threadInstance.upsertReplyLocally({
+        message: updatedMessage
+      });
+      var data = yield client.deleteMessage(message.id, hardDelete);
+      if (data != null && data.message) {
+        updateMessage(Object.assign({}, data.message));
+      }
+    });
     return function (_x11) {
       return _ref17.apply(this, arguments);
     };
   }());
   var deleteReaction = (0, _hooks.useStableCallback)(function () {
-    var _ref18 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee15(type, messageId) {
-      var payload;
-      return _regenerator["default"].wrap(function _callee15$(_context15) {
-        while (1) switch (_context15.prev = _context15.next) {
-          case 0:
-            if (!(!(channel != null && channel.id) || !client.user)) {
-              _context15.next = 2;
-              break;
-            }
-            throw new Error('Channel has not been initialized');
-          case 2:
-            payload = [messageId, type];
-            if (enableOfflineSupport) {
-              channel.state.removeReaction({
-                created_at: '',
-                message_id: messageId,
-                type: type,
-                updated_at: ''
-              });
-              copyMessagesStateFromChannel(channel);
-            }
-            _context15.next = 6;
-            return channel.deleteReaction.apply(channel, payload);
-          case 6:
-          case "end":
-            return _context15.stop();
-        }
-      }, _callee15);
-    }));
+    var _ref18 = (0, _asyncToGenerator2.default)(function* (type, messageId) {
+      if (!(channel != null && channel.id) || !client.user) {
+        throw new Error('Channel has not been initialized');
+      }
+      var payload = [messageId, type];
+      if (enableOfflineSupport) {
+        channel.state.removeReaction({
+          created_at: '',
+          message_id: messageId,
+          type: type,
+          updated_at: ''
+        });
+        copyMessagesStateFromChannel(channel);
+      }
+      yield channel.deleteReaction.apply(channel, payload);
+    });
     return function (_x12, _x13) {
       return _ref18.apply(this, arguments);
     };
@@ -1641,62 +1293,42 @@ var ChannelWithContext = function ChannelWithContext(props) {
     setThread(null);
     setThreadMessages([]);
   }, [setThread, setThreadMessages]);
-  var loadMoreThreadFinished = (0, _react.useRef)((0, _debounce["default"])(function (newThreadHasMore, updatedThreadMessages) {
+  var loadMoreThreadFinished = (0, _react.useRef)((0, _debounce.default)(function (newThreadHasMore, updatedThreadMessages) {
     setThreadHasMore(newThreadHasMore);
     setThreadLoadingMore(false);
     setThreadMessages(updatedThreadMessages);
   }, defaultDebounceInterval, debounceOptions)).current;
-  var loadMoreThread = (0, _hooks.useStableCallback)((0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee16() {
-    var _threadMessages$, parentID, oldestMessageID, limit, queryResponse, updatedHasMore, updatedThreadMessages;
-    return _regenerator["default"].wrap(function _callee16$(_context16) {
-      while (1) switch (_context16.prev = _context16.next) {
-        case 0:
-          if (!(threadLoadingMore || !(thread != null && thread.id))) {
-            _context16.next = 2;
-            break;
-          }
-          return _context16.abrupt("return");
-        case 2:
-          setThreadLoadingMore(true);
-          _context16.prev = 3;
-          if (!channel) {
-            _context16.next = 15;
-            break;
-          }
-          parentID = thread.id;
-          channel.state.threads[parentID] = threadMessages;
-          oldestMessageID = threadMessages == null || (_threadMessages$ = threadMessages[0]) == null ? void 0 : _threadMessages$.id;
-          limit = 50;
-          _context16.next = 11;
-          return channel.getReplies(parentID, {
-            id_lt: oldestMessageID,
-            limit: limit
-          });
-        case 11:
-          queryResponse = _context16.sent;
-          updatedHasMore = queryResponse.messages.length === limit;
-          updatedThreadMessages = channel.state.threads[parentID] || [];
-          loadMoreThreadFinished(updatedHasMore, updatedThreadMessages);
-        case 15:
-          _context16.next = 23;
-          break;
-        case 17:
-          _context16.prev = 17;
-          _context16.t0 = _context16["catch"](3);
-          console.warn('Message pagination request failed with error', _context16.t0);
-          if (_context16.t0 instanceof Error) {
-            setError(_context16.t0);
-          } else {
-            setError(true);
-          }
-          setThreadLoadingMore(false);
-          throw _context16.t0;
-        case 23:
-        case "end":
-          return _context16.stop();
+  var loadMoreThread = (0, _hooks.useStableCallback)((0, _asyncToGenerator2.default)(function* () {
+    if (threadLoadingMore || !(thread != null && thread.id)) {
+      return;
+    }
+    setThreadLoadingMore(true);
+    try {
+      if (channel) {
+        var _threadMessages$;
+        var parentID = thread.id;
+        channel.state.threads[parentID] = threadMessages;
+        var oldestMessageID = threadMessages == null || (_threadMessages$ = threadMessages[0]) == null ? void 0 : _threadMessages$.id;
+        var limit = 50;
+        var queryResponse = yield channel.getReplies(parentID, {
+          id_lt: oldestMessageID,
+          limit: limit
+        });
+        var updatedHasMore = queryResponse.messages.length === limit;
+        var updatedThreadMessages = channel.state.threads[parentID] || [];
+        loadMoreThreadFinished(updatedHasMore, updatedThreadMessages);
+      }
+    } catch (err) {
+      console.warn('Message pagination request failed with error', err);
+      if (err instanceof Error) {
+        setError(err);
+      } else {
+        setError(true);
       }
-    }, _callee16, null, [[3, 17]]);
-  })));
+      setThreadLoadingMore(false);
+      throw err;
+    }
+  }));
   var ownCapabilitiesContext = (0, _useCreateOwnCapabilitiesContext.useCreateOwnCapabilitiesContext)({
     channel: channel,
     overrideCapabilities: overrideOwnCapabilities