stream-chat 6.2.0 → 6.5.0

package/dist/index.es.js

@@ -103,6 +103,13 @@ var ChannelState = /*#__PURE__*/function () {
    * When false, any new message (received by websocket event - message.new) will not
    * be pushed on to message list.
    */
+
+  /**
+   * Disjoint lists of messages
+   * Users can jump in the message list (with searching) and this can result in disjoint lists of messages
+   * The state manages these lists and merges them when lists overlap
+   * The messages array contains the currently active set
+   */
   function ChannelState(channel) {
     var _this = this,
         _channel$state;
@@ -117,8 +124,6 @@ var ChannelState = /*#__PURE__*/function () {
 
     _defineProperty(this, "read", void 0);
 
-    _defineProperty(this, "messages", void 0);
-
     _defineProperty(this, "pinnedMessages", void 0);
 
     _defineProperty(this, "threads", void 0);
@@ -137,6 +142,8 @@ var ChannelState = /*#__PURE__*/function () {
 
     _defineProperty(this, "isUpToDate", void 0);
 
+    _defineProperty(this, "messageSets", []);
+
     _defineProperty(this, "setIsUpToDate", function (isUpToDate) {
       _this.isUpToDate = isUpToDate;
     });
@@ -166,7 +173,9 @@ var ChannelState = /*#__PURE__*/function () {
         }
       };
 
-      _updateUserMessages(_this.messages, user);
+      _this.messageSets.forEach(function (set) {
+        return _updateUserMessages(set.messages, user);
+      });
 
       for (var parentId in _this.threads) {
         _updateUserMessages(_this.threads[parentId], user);
@@ -220,7 +229,9 @@ var ChannelState = /*#__PURE__*/function () {
         }
       };
 
-      _deleteUserMessages(_this.messages, user, hardDelete);
+      _this.messageSets.forEach(function (set) {
+        return _deleteUserMessages(set.messages, user, hardDelete);
+      });
 
       for (var parentId in _this.threads) {
         _deleteUserMessages(_this.threads[parentId], user, hardDelete);
@@ -233,7 +244,7 @@ var ChannelState = /*#__PURE__*/function () {
     this.watcher_count = 0;
     this.typing = {};
     this.read = {};
-    this.messages = [];
+    this.initMessages();
     this.pinnedMessages = [];
     this.threads = {}; // a list of users to hide messages from
 
@@ -252,22 +263,58 @@ var ChannelState = /*#__PURE__*/function () {
     this.isUpToDate = true;
     this.last_message_at = (channel === null || channel === void 0 ? void 0 : (_channel$state = channel.state) === null || _channel$state === void 0 ? void 0 : _channel$state.last_message_at) != null ? new Date(channel.state.last_message_at) : null;
   }
-  /**
-   * addMessageSorted - Add a message to the state
-   *
-   * @param {MessageResponse<StreamChatGenerics>} newMessage A new message
-   * @param {boolean} timestampChanged Whether updating a message with changed created_at value.
-   * @param {boolean} addIfDoesNotExist Add message if it is not in the list, used to prevent out of order updated messages from being added.
-   *
-   */
-
 
   _createClass(ChannelState, [{
+    key: "messages",
+    get: function get() {
+      var _this$messageSets$fin;
+
+      return ((_this$messageSets$fin = this.messageSets.find(function (s) {
+        return s.isCurrent;
+      })) === null || _this$messageSets$fin === void 0 ? void 0 : _this$messageSets$fin.messages) || [];
+    },
+    set: function set(messages) {
+      var index = this.messageSets.findIndex(function (s) {
+        return s.isCurrent;
+      });
+      this.messageSets[index].messages = messages;
+    }
+    /**
+     * The list of latest messages
+     * The messages array not always contains the latest messages (for example if a user searched for an earlier message, that is in a different message set)
+     */
+
+  }, {
+    key: "latestMessages",
+    get: function get() {
+      var _this$messageSets$fin2;
+
+      return ((_this$messageSets$fin2 = this.messageSets.find(function (s) {
+        return s.isLatest;
+      })) === null || _this$messageSets$fin2 === void 0 ? void 0 : _this$messageSets$fin2.messages) || [];
+    },
+    set: function set(messages) {
+      var index = this.messageSets.findIndex(function (s) {
+        return s.isLatest;
+      });
+      this.messageSets[index].messages = messages;
+    }
+    /**
+     * addMessageSorted - Add a message to the state
+     *
+     * @param {MessageResponse<StreamChatGenerics>} newMessage A new message
+     * @param {boolean} timestampChanged Whether updating a message with changed created_at value.
+     * @param {boolean} addIfDoesNotExist Add message if it is not in the list, used to prevent out of order updated messages from being added.
+     * @param {MessageSetType} messageSetToAddToIfDoesNotExist Which message set to add to if message is not in the list (only used if addIfDoesNotExist is true)
+     */
+
+  }, {
     key: "addMessageSorted",
     value: function addMessageSorted(newMessage) {
       var timestampChanged = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       var addIfDoesNotExist = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
-      return this.addMessagesSorted([newMessage], timestampChanged, false, addIfDoesNotExist);
+      var messageSetToAddToIfDoesNotExist = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'latest';
+      return this.addMessagesSorted([newMessage], timestampChanged, false, addIfDoesNotExist, messageSetToAddToIfDoesNotExist);
     }
     /**
      * formatMessage - Takes the message object. Parses the dates, sets __html
@@ -299,6 +346,7 @@ var ChannelState = /*#__PURE__*/function () {
      * @param {boolean} timestampChanged Whether updating messages with changed created_at value.
      * @param {boolean} initializing Whether channel is being initialized.
      * @param {boolean} addIfDoesNotExist Add message if it is not in the list, used to prevent out of order updated messages from being added.
+     * @param {MessageSetType} messageSetToAddToIfDoesNotExist Which message set to add to if messages are not in the list (only used if addIfDoesNotExist is true)
      *
      */
 
@@ -308,48 +356,63 @@ var ChannelState = /*#__PURE__*/function () {
       var timestampChanged = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       var initializing = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
       var addIfDoesNotExist = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
+      var messageSetToAddToIfDoesNotExist = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 'current';
 
-      for (var i = 0; i < newMessages.length; i += 1) {
-        var _this$_channel;
+      var _this$findTargetMessa = this.findTargetMessageSet(newMessages, addIfDoesNotExist, messageSetToAddToIfDoesNotExist),
+          messagesToAdd = _this$findTargetMessa.messagesToAdd,
+          targetMessageSetIndex = _this$findTargetMessa.targetMessageSetIndex;
 
-        var isFromShadowBannedUser = newMessages[i].shadowed;
+      for (var i = 0; i < messagesToAdd.length; i += 1) {
+        var isFromShadowBannedUser = messagesToAdd[i].shadowed;
 
         if (isFromShadowBannedUser) {
           continue;
-        }
+        } // If message is already formatted we can skip the tasks below
+        // This will be true for messages that are already present at the state -> this happens when we perform merging of message sets
+        // This will be also true for message previews used by some SDKs
 
-        var message = this.formatMessage(newMessages[i]);
 
-        if (message.user && (_this$_channel = this._channel) !== null && _this$_channel !== void 0 && _this$_channel.cid) {
-          /**
-           * Store the reference to user for this channel, so that when we have to
-           * handle updates to user, we can use the reference map, to determine which
-           * channels need to be updated with updated user object.
-           */
-          this._channel.getClient().state.updateUserReference(message.user, this._channel.cid);
-        }
+        var isMessageFormatted = messagesToAdd[i].created_at instanceof Date;
+        var message = void 0;
 
-        if (initializing && message.id && this.threads[message.id]) {
-          // If we are initializing the state of channel (e.g., in case of connection recovery),
-          // then in that case we remove thread related to this message from threads object.
-          // This way we can ensure that we don't have any stale data in thread object
-          // and consumer can refetch the replies.
-          delete this.threads[message.id];
-        }
+        if (isMessageFormatted) {
+          message = messagesToAdd[i];
+        } else {
+          var _this$_channel;
 
-        if (!this.last_message_at) {
-          this.last_message_at = new Date(message.created_at.getTime());
-        }
+          message = this.formatMessage(messagesToAdd[i]);
 
-        if (message.created_at.getTime() > this.last_message_at.getTime()) {
-          this.last_message_at = new Date(message.created_at.getTime());
+          if (message.user && (_this$_channel = this._channel) !== null && _this$_channel !== void 0 && _this$_channel.cid) {
+            /**
+             * Store the reference to user for this channel, so that when we have to
+             * handle updates to user, we can use the reference map, to determine which
+             * channels need to be updated with updated user object.
+             */
+            this._channel.getClient().state.updateUserReference(message.user, this._channel.cid);
+          }
+
+          if (initializing && message.id && this.threads[message.id]) {
+            // If we are initializing the state of channel (e.g., in case of connection recovery),
+            // then in that case we remove thread related to this message from threads object.
+            // This way we can ensure that we don't have any stale data in thread object
+            // and consumer can refetch the replies.
+            delete this.threads[message.id];
+          }
+
+          if (!this.last_message_at) {
+            this.last_message_at = new Date(message.created_at.getTime());
+          }
+
+          if (message.created_at.getTime() > this.last_message_at.getTime()) {
+            this.last_message_at = new Date(message.created_at.getTime());
+          }
         } // update or append the messages...
 
 
-        var parentID = message.parent_id; // add to the main message list
+        var parentID = message.parent_id; // add to the given message set
 
-        if (!parentID || message.show_in_channel) {
-          this.messages = this._addToMessageList(this.messages, message, timestampChanged, 'created_at', addIfDoesNotExist);
+        if ((!parentID || message.show_in_channel) && targetMessageSetIndex !== -1) {
+          this.messageSets[targetMessageSetIndex].messages = this._addToMessageList(this.messageSets[targetMessageSetIndex].messages, message, timestampChanged, 'created_at', addIfDoesNotExist);
         }
         /**
          * Add message to thread if applicable and the message
@@ -473,6 +536,8 @@ var ChannelState = /*#__PURE__*/function () {
   }, {
     key: "removeQuotedMessageReferences",
     value: function removeQuotedMessageReferences(message) {
+      var _this4 = this;
+
       var parseMessage = function parseMessage(m) {
         var _m$pinned_at, _m$updated_at;
 
@@ -483,16 +548,19 @@ var ChannelState = /*#__PURE__*/function () {
         });
       };
 
-      var updatedMessages = this.messages.filter(function (msg) {
-        return msg.quoted_message_id === message.id;
-      }).map(parseMessage).map(function (msg) {
-        return _objectSpread$7(_objectSpread$7({}, msg), {}, {
-          quoted_message: _objectSpread$7(_objectSpread$7({}, message), {}, {
-            attachments: []
-          })
+      this.messageSets.forEach(function (set) {
+        var updatedMessages = set.messages.filter(function (msg) {
+          return msg.quoted_message_id === message.id;
+        }).map(parseMessage).map(function (msg) {
+          return _objectSpread$7(_objectSpread$7({}, msg), {}, {
+            quoted_message: _objectSpread$7(_objectSpread$7({}, message), {}, {
+              attachments: []
+            })
+          });
         });
+
+        _this4.addMessagesSorted(updatedMessages, true);
       });
-      this.addMessagesSorted(updatedMessages, true);
     }
     /**
      * Updates all instances of given message in channel state
@@ -520,12 +588,16 @@ var ChannelState = /*#__PURE__*/function () {
       }
 
       if (!show_in_channel && !parent_id || show_in_channel) {
-        var _msgIndex = this.messages.findIndex(function (msg) {
-          return msg.id === message.id;
-        });
+        var messageSetIndex = this.findMessageSetIndex(message);
+
+        if (messageSetIndex !== -1) {
+          var _msgIndex = this.messageSets[messageSetIndex].messages.findIndex(function (msg) {
+            return msg.id === message.id;
+          });
 
-        if (_msgIndex !== -1) {
-          this.messages[_msgIndex] = updateFunc(this.messages[_msgIndex]);
+          if (_msgIndex !== -1) {
+            this.messageSets[messageSetIndex].messages[_msgIndex] = updateFunc(this.messageSets[messageSetIndex].messages[_msgIndex]);
+          }
         }
       }
 
@@ -644,12 +716,16 @@ var ChannelState = /*#__PURE__*/function () {
         this.threads[messageToRemove.parent_id] = threadMessages;
         isRemoved = removed;
       } else {
-        var _this$removeMessageFr3 = this.removeMessageFromArray(this.messages, messageToRemove),
-            _removed = _this$removeMessageFr3.removed,
-            messages = _this$removeMessageFr3.result;
+        var messageSetIndex = this.findMessageSetIndex(messageToRemove);
 
-        this.messages = messages;
-        isRemoved = _removed;
+        if (messageSetIndex !== -1) {
+          var _this$removeMessageFr3 = this.removeMessageFromArray(this.messageSets[messageSetIndex].messages, messageToRemove),
+              _removed = _this$removeMessageFr3.removed,
+              messages = _this$removeMessageFr3.result;
+
+          this.messageSets[messageSetIndex].messages = messages;
+          isRemoved = _removed;
+        }
       }
 
       return isRemoved;
@@ -662,10 +738,10 @@ var ChannelState = /*#__PURE__*/function () {
      *
      */
     function filterErrorMessages() {
-      var filteredMessages = this.messages.filter(function (message) {
+      var filteredMessages = this.latestMessages.filter(function (message) {
         return message.type !== 'error';
       });
-      this.messages = filteredMessages;
+      this.latestMessages = filteredMessages;
     }
     /**
      * clean - Remove stale data such as users that stayed in typing state for more than 5 seconds
@@ -699,9 +775,250 @@ var ChannelState = /*#__PURE__*/function () {
   }, {
     key: "clearMessages",
     value: function clearMessages() {
-      this.messages = [];
+      this.initMessages();
       this.pinnedMessages = [];
     }
+  }, {
+    key: "initMessages",
+    value: function initMessages() {
+      this.messageSets = [{
+        messages: [],
+        isLatest: true,
+        isCurrent: true
+      }];
+    }
+    /**
+     * loadMessageIntoState - Loads a given message (and messages around it) into the state
+     *
+     * @param {string} messageId The id of the message, or 'latest' to indicate switching to the latest messages
+     * @param {string} parentMessageId The id of the parent message, if we want load a thread reply
+     */
+
+  }, {
+    key: "loadMessageIntoState",
+    value: function () {
+      var _loadMessageIntoState = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(messageId, parentMessageId) {
+        var _this$threads$parentM;
+
+        var messageSetIndex, switchedToMessageSet, loadedMessageThread, messageIdToFind;
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                switchedToMessageSet = false;
+                loadedMessageThread = false;
+                messageIdToFind = parentMessageId || messageId;
+
+                if (!(messageId === 'latest')) {
+                  _context.next = 9;
+                  break;
+                }
+
+                if (!(this.messages === this.latestMessages)) {
+                  _context.next = 6;
+                  break;
+                }
+
+                return _context.abrupt("return");
+
+              case 6:
+                messageSetIndex = this.messageSets.findIndex(function (s) {
+                  return s.isLatest;
+                });
+                _context.next = 10;
+                break;
+
+              case 9:
+                messageSetIndex = this.findMessageSetIndex({
+                  id: messageIdToFind
+                });
+
+              case 10:
+                if (messageSetIndex !== -1) {
+                  this.switchToMessageSet(messageSetIndex);
+                  switchedToMessageSet = true;
+                }
+
+                loadedMessageThread = !parentMessageId || !!((_this$threads$parentM = this.threads[parentMessageId]) !== null && _this$threads$parentM !== void 0 && _this$threads$parentM.find(function (m) {
+                  return m.id === messageId;
+                }));
+
+                if (!(switchedToMessageSet && loadedMessageThread)) {
+                  _context.next = 14;
+                  break;
+                }
+
+                return _context.abrupt("return");
+
+              case 14:
+                if (switchedToMessageSet) {
+                  _context.next = 17;
+                  break;
+                }
+
+                _context.next = 17;
+                return this._channel.query({
+                  messages: {
+                    id_around: messageIdToFind,
+                    limit: 25
+                  }
+                }, 'new');
+
+              case 17:
+                if (!(!loadedMessageThread && parentMessageId)) {
+                  _context.next = 20;
+                  break;
+                }
+
+                _context.next = 20;
+                return this._channel.getReplies(parentMessageId, {
+                  id_around: messageId,
+                  limit: 25
+                });
+
+              case 20:
+                messageSetIndex = this.findMessageSetIndex({
+                  id: messageIdToFind
+                });
+
+                if (messageSetIndex !== -1) {
+                  this.switchToMessageSet(messageSetIndex);
+                }
+
+              case 22:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
+
+      function loadMessageIntoState(_x, _x2) {
+        return _loadMessageIntoState.apply(this, arguments);
+      }
+
+      return loadMessageIntoState;
+    }()
+  }, {
+    key: "switchToMessageSet",
+    value: function switchToMessageSet(index) {
+      var currentMessages = this.messageSets.find(function (s) {
+        return s.isCurrent;
+      });
+
+      if (!currentMessages) {
+        return;
+      }
+
+      currentMessages.isCurrent = false;
+      this.messageSets[index].isCurrent = true;
+    }
+  }, {
+    key: "areMessageSetsOverlap",
+    value: function areMessageSetsOverlap(messages1, messages2) {
+      return messages1.some(function (m1) {
+        return messages2.find(function (m2) {
+          return m1.id === m2.id;
+        });
+      });
+    }
+  }, {
+    key: "findMessageSetIndex",
+    value: function findMessageSetIndex(message) {
+      return this.messageSets.findIndex(function (set) {
+        return !!set.messages.find(function (m) {
+          return m.id === message.id;
+        });
+      });
+    }
+  }, {
+    key: "findTargetMessageSet",
+    value: function findTargetMessageSet(newMessages) {
+      var _this5 = this;
+
+      var addIfDoesNotExist = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+      var messageSetToAddToIfDoesNotExist = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'current';
+      var messagesToAdd = newMessages;
+      var targetMessageSetIndex;
+
+      if (addIfDoesNotExist) {
+        var overlappingMessageSetIndices = this.messageSets.map(function (_, i) {
+          return i;
+        }).filter(function (i) {
+          return _this5.areMessageSetsOverlap(_this5.messageSets[i].messages, newMessages);
+        });
+
+        switch (messageSetToAddToIfDoesNotExist) {
+          case 'new':
+            if (overlappingMessageSetIndices.length > 0) {
+              targetMessageSetIndex = overlappingMessageSetIndices[0]; // No new message set is created if newMessages only contains thread replies
+            } else if (newMessages.some(function (m) {
+              return !m.parent_id;
+            })) {
+              this.messageSets.push({
+                messages: [],
+                isCurrent: false,
+                isLatest: false
+              });
+              targetMessageSetIndex = this.messageSets.length - 1;
+            }
+
+            break;
+
+          case 'current':
+            targetMessageSetIndex = this.messageSets.findIndex(function (s) {
+              return s.isCurrent;
+            });
+            break;
+
+          case 'latest':
+            targetMessageSetIndex = this.messageSets.findIndex(function (s) {
+              return s.isLatest;
+            });
+            break;
+
+          default:
+            targetMessageSetIndex = -1;
+        } // when merging the target set will be the first one from the overlapping message sets
+
+
+        var mergeTargetMessageSetIndex = overlappingMessageSetIndices.splice(0, 1)[0];
+
+        var mergeSourceMessageSetIndices = _toConsumableArray(overlappingMessageSetIndices);
+
+        if (mergeTargetMessageSetIndex !== undefined && mergeTargetMessageSetIndex !== targetMessageSetIndex) {
+          mergeSourceMessageSetIndices.push(targetMessageSetIndex);
+        } // merge message sets
+
+
+        if (mergeSourceMessageSetIndices.length > 0) {
+          var target = this.messageSets[mergeTargetMessageSetIndex];
+          var sources = this.messageSets.filter(function (_, i) {
+            return mergeSourceMessageSetIndices.indexOf(i) !== -1;
+          });
+          sources.forEach(function (messageSet) {
+            target.isLatest = target.isLatest || messageSet.isLatest;
+            target.isCurrent = target.isCurrent || messageSet.isCurrent;
+            messagesToAdd = [].concat(_toConsumableArray(messagesToAdd), _toConsumableArray(messageSet.messages));
+          });
+          sources.forEach(function (s) {
+            return _this5.messageSets.splice(_this5.messageSets.indexOf(s), 1);
+          });
+          var overlappingMessageSetIndex = this.messageSets.findIndex(function (s) {
+            return _this5.areMessageSetsOverlap(s.messages, newMessages);
+          });
+          targetMessageSetIndex = overlappingMessageSetIndex;
+        }
+      } else {
+        // assumes that all new messages belong to the same set
+        targetMessageSetIndex = this.findMessageSetIndex(newMessages[0]);
+      }
+
+      return {
+        targetMessageSetIndex: targetMessageSetIndex,
+        messagesToAdd: messagesToAdd
+      };
+    }
   }]);
 
   return ChannelState;
@@ -1064,7 +1381,7 @@ var Channel = /*#__PURE__*/function () {
                 presence: false
               };
               _context.next = 3;
-              return _this.query(options);
+              return _this.query(options, 'latest');
 
             case 3:
               return _context.abrupt("return", _context.sent);
@@ -2362,14 +2679,14 @@ var Channel = /*#__PURE__*/function () {
     value: function lastMessage() {
       // get last 5 messages, sort, return the latest
       // get a slice of the last 5
-      var min = this.state.messages.length - 5;
+      var min = this.state.latestMessages.length - 5;
 
       if (min < 0) {
         min = 0;
       }
 
-      var max = this.state.messages.length + 1;
-      var messageSlice = this.state.messages.slice(min, max); // sort by pk desc
+      var max = this.state.latestMessages.length + 1;
+      var messageSlice = this.state.latestMessages.slice(min, max); // sort by pk desc
 
       messageSlice.sort(function (a, b) {
         return b.created_at.getTime() - a.created_at.getTime();
@@ -2478,7 +2795,7 @@ var Channel = /*#__PURE__*/function () {
 
                 combined = _objectSpread$5(_objectSpread$5({}, defaultOptions), options);
                 _context27.next = 7;
-                return this.query(combined);
+                return this.query(combined, 'latest');
 
               case 7:
                 state = _context27.sent;
@@ -2552,7 +2869,7 @@ var Channel = /*#__PURE__*/function () {
      * getReplies - List the message replies for a parent message
      *
      * @param {string} parent_id The message parent id, ie the top of the thread
-     * @param {PaginationOptions & { user?: UserResponse<StreamChatGenerics>; user_id?: string }} options Pagination params, ie {limit:10, id_lte: 10}
+     * @param {MessagePaginationOptions & { user?: UserResponse<StreamChatGenerics>; user_id?: string }} options Pagination params, ie {limit:10, id_lte: 10}
      *
      * @return {Promise<GetRepliesAPIResponse<StreamChatGenerics>>} A response with a list of messages
      */
@@ -2713,8 +3030,8 @@ var Channel = /*#__PURE__*/function () {
       if (!lastRead) return this.state.unreadCount;
       var count = 0;
 
-      for (var i = 0; i < this.state.messages.length; i += 1) {
-        var message = this.state.messages[i];
+      for (var i = 0; i < this.state.latestMessages.length; i += 1) {
+        var message = this.state.latestMessages[i];
 
         if (message.created_at > lastRead && this._countMessageAsUnread(message)) {
           count++;
@@ -2724,7 +3041,7 @@ var Channel = /*#__PURE__*/function () {
       return count;
     }
     /**
-     * countUnread - Count the number of unread messages mentioning the current user
+     * countUnreadMentions - Count the number of unread messages mentioning the current user
      *
      * @return {number} Unread mentions count
      */
@@ -2736,10 +3053,10 @@ var Channel = /*#__PURE__*/function () {
       var userID = this.getClient().userID;
       var count = 0;
 
-      for (var i = 0; i < this.state.messages.length; i += 1) {
+      for (var i = 0; i < this.state.latestMessages.length; i += 1) {
         var _message$mentioned_us;
 
-        var message = this.state.messages[i];
+        var message = this.state.latestMessages[i];
 
         if (this._countMessageAsUnread(message) && (!lastRead || message.created_at > lastRead) && (_message$mentioned_us = message.mentioned_users) !== null && _message$mentioned_us !== void 0 && _message$mentioned_us.some(function (user) {
           return user.id === userID;
@@ -2763,33 +3080,40 @@ var Channel = /*#__PURE__*/function () {
      * query - Query the API, get messages, members or other channel fields
      *
      * @param {ChannelQueryOptions<StreamChatGenerics>} options The query options
+     * @param {MessageSetType} messageSetToAddToIfDoesNotExist It's possible to load disjunct sets of a channel's messages into state, use `current` to load the initial channel state or if you want to extend the currently displayed messages, use `latest` if you want to load/extend the latest messages, `new` is used for loading a specific message and it's surroundings
      *
      * @return {Promise<ChannelAPIResponse<StreamChatGenerics>>} Returns a query response
      */
     function () {
       var _query = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee31(options) {
-        var queryURL, state, membersStr, tempChannelCid;
+        var messageSetToAddToIfDoesNotExist,
+            queryURL,
+            state,
+            membersStr,
+            tempChannelCid,
+            _args31 = arguments;
         return _regeneratorRuntime.wrap(function _callee31$(_context31) {
           while (1) {
             switch (_context31.prev = _context31.next) {
               case 0:
-                _context31.next = 2;
+                messageSetToAddToIfDoesNotExist = _args31.length > 1 && _args31[1] !== undefined ? _args31[1] : 'current';
+                _context31.next = 3;
                 return this.getClient().wsPromise;
 
-              case 2:
+              case 3:
                 queryURL = "".concat(this.getClient().baseURL, "/channels/").concat(this.type);
 
                 if (this.id) {
                   queryURL += "/".concat(this.id);
                 }
 
-                _context31.next = 6;
+                _context31.next = 7;
                 return this.getClient().post(queryURL + '/query', _objectSpread$5({
                   data: this._data,
                   state: true
                 }, options));
 
-              case 6:
+              case 7:
                 state = _context31.sent;
 
                 // update the channel id if it was missing
@@ -2818,11 +3142,11 @@ var Channel = /*#__PURE__*/function () {
                 this.getClient()._addChannelConfig(state); // add any messages to our channel state
 
 
-                this._initializeState(state);
+                this._initializeState(state, messageSetToAddToIfDoesNotExist);
 
                 return _context31.abrupt("return", state);
 
-              case 11:
+              case 12:
               case "end":
                 return _context31.stop();
             }
@@ -3372,6 +3696,8 @@ var Channel = /*#__PURE__*/function () {
   }, {
     key: "_initializeState",
     value: function _initializeState(state) {
+      var messageSetToAddToIfDoesNotExist = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'latest';
+
       var _this$getClient2 = this.getClient(),
           clientState = _this$getClient2.state,
           user = _this$getClient2.user,
@@ -3401,10 +3727,10 @@ var Channel = /*#__PURE__*/function () {
       var messages = state.messages || [];
 
       if (!this.state.messages) {
-        this.state.messages = [];
+        this.state.initMessages();
       }
 
-      this.state.addMessagesSorted(messages, false, true);
+      this.state.addMessagesSorted(messages, false, true, true, messageSetToAddToIfDoesNotExist);
 
       if (!this.state.pinnedMessages) {
         this.state.pinnedMessages = [];
@@ -4826,7 +5152,7 @@ function TokenManager(secret) {
   _defineProperty(this, "loadToken", function () {
     // eslint-disable-next-line no-async-promise-executor
     _this.loadTokenPromise = new Promise( /*#__PURE__*/function () {
-      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(resolve) {
+      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(resolve, reject) {
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
@@ -4840,26 +5166,36 @@ function TokenManager(secret) {
 
               case 2:
                 if (!(_this.tokenProvider && typeof _this.tokenProvider !== 'string')) {
-                  _context2.next = 7;
+                  _context2.next = 13;
                   break;
                 }
 
-                _context2.next = 5;
+                _context2.prev = 3;
+                _context2.next = 6;
                 return _this.tokenProvider();
 
-              case 5:
+              case 6:
                 _this.token = _context2.sent;
+                _context2.next = 12;
+                break;
+
+              case 9:
+                _context2.prev = 9;
+                _context2.t0 = _context2["catch"](3);
+                return _context2.abrupt("return", reject(new Error("Call to tokenProvider failed with message: ".concat(_context2.t0))));
+
+              case 12:
                 resolve(_this.token);
 
-              case 7:
+              case 13:
               case "end":
                 return _context2.stop();
             }
           }
-        }, _callee2);
+        }, _callee2, null, [[3, 9]]);
       }));
 
-      return function (_x3) {
+      return function (_x3, _x4) {
         return _ref2.apply(this, arguments);
       };
     }());
@@ -6369,30 +6705,31 @@ var StreamChat = /*#__PURE__*/function () {
     key: "updateAppSettings",
     value:
     /**
-    * updateAppSettings - updates application settings
-    *
-    * @param {AppSettings} options App settings.
-    * 		IE: {
-     			"apn_config": {
-    			"auth_type": "token",
-    			"auth_key": fs.readFileSync(
-    				'./apn-push-auth-key.p8',
-    				'utf-8',
-    			),
-    			"key_id": "keyid",
-    			"team_id": "teamid", //either ALL these 3
-    			"notification_template": "notification handlebars template",
-    			"bundle_id": "com.apple.your.app",
-    			"development": true
-    		},
-    		"firebase_config": {
-    			"server_key": "server key from fcm",
-    			"notification_template": "notification handlebars template"
-    			"data_template": "data handlebars template"
-    		},
-    		"webhook_url": "https://acme.com/my/awesome/webhook/"
-    	}
-    */
+     * updateAppSettings - updates application settings
+     *
+     * @param {AppSettings} options App settings.
+     * IE: {
+        'apn_config': {
+          'auth_type': 'token',
+          'auth_key": fs.readFileSync(
+            './apn-push-auth-key.p8',
+            'utf-8',
+          ),
+          'key_id': 'keyid',
+          'team_id': 'teamid',
+          'notification_template": 'notification handlebars template',
+          'bundle_id': 'com.apple.your.app',
+          'development': true
+    	},
+        'firebase_config': {
+          'server_key': 'server key from fcm',
+          'notification_template': 'notification handlebars template',
+          'data_template': 'data handlebars template',
+          'apn_template': 'apn notification handlebars template under v2'
+        },
+        'webhook_url': 'https://acme.com/my/awesome/webhook/'
+      }
+     */
     function () {
       var _updateAppSettings = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(options) {
         var _options$apn_config;
@@ -6583,17 +6920,19 @@ var StreamChat = /*#__PURE__*/function () {
       return getAppSettings;
     }()
     /**
-    * testPushSettings - Tests the push settings for a user with a random chat message and the configured push templates
-    *
-    * @param {string} userID User ID. If user has no devices, it will error
-    * @param {TestPushDataInput} [data] Overrides for push templates/message used
-    * 		IE: {
-    		  messageID: 'id-of-message',//will error if message does not exist
-    		  apnTemplate: '{}', //if app doesn't have apn configured it will error
-    		  firebaseTemplate: '{}', //if app doesn't have firebase configured it will error
-    		  firebaseDataTemplate: '{}', //if app doesn't have firebase configured it will error
-    		  skipDevices: true, // skip config/device checks and sending to real devices
-    	}
+     * testPushSettings - Tests the push settings for a user with a random chat message and the configured push templates
+     *
+     * @param {string} userID User ID. If user has no devices, it will error
+     * @param {TestPushDataInput} [data] Overrides for push templates/message used
+     *  IE: {
+          messageID: 'id-of-message', // will error if message does not exist
+          apnTemplate: '{}', // if app doesn't have apn configured it will error
+          firebaseTemplate: '{}', // if app doesn't have firebase configured it will error
+          firebaseDataTemplate: '{}', // if app doesn't have firebase configured it will error
+          skipDevices: true, // skip config/device checks and sending to real devices
+          pushProviderName: 'staging' // one of your configured push providers
+          pushProviderType: 'apn' // one of supported provider types
+        }
     */
 
   }, {
@@ -6608,7 +6947,7 @@ var StreamChat = /*#__PURE__*/function () {
               case 0:
                 data = _args12.length > 1 && _args12[1] !== undefined ? _args12[1] : {};
                 _context12.next = 3;
-                return this.post(this.baseURL + '/check_push', _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
+                return this.post(this.baseURL + '/check_push', _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
                   user_id: userID
                 }, data.messageID ? {
                   message_id: data.messageID
@@ -6620,6 +6959,10 @@ var StreamChat = /*#__PURE__*/function () {
                   firebase_data_template: data.firebaseDataTemplate
                 } : {}), data.skipDevices ? {
                   skip_devices: true
+                } : {}), data.pushProviderName ? {
+                  push_provider_name: data.pushProviderName
+                } : {}), data.pushProviderType ? {
+                  push_provider_type: data.pushProviderType
                 } : {}));
 
               case 3:
@@ -6643,11 +6986,11 @@ var StreamChat = /*#__PURE__*/function () {
      * testSQSSettings - Tests that the given or configured SQS configuration is valid
      *
      * @param {TestSQSDataInput} [data] Overrides SQS settings for testing if needed
-     * 		IE: {
-    		  sqs_key: 'auth_key',
-    		  sqs_secret: 'auth_secret',
-    		  sqs_url: 'url_to_queue',
-    	}
+     *  IE: {
+          sqs_key: 'auth_key',
+          sqs_secret: 'auth_secret',
+          sqs_url: 'url_to_queue',
+        }
      */
 
   }, {
@@ -7002,7 +7345,7 @@ var StreamChat = /*#__PURE__*/function () {
         this.mutedUsers = event.me.mutes;
       }
 
-      if (event.type === 'notification.mark_read') {
+      if (event.type === 'notification.mark_read' && event.unread_channels === 0) {
         var activeChannelKeys = Object.keys(this.activeChannels);
         activeChannelKeys.forEach(function (activeChannelKey) {
           return _this3.activeChannels[activeChannelKey].state.unreadCount = 0;
@@ -7444,11 +7787,11 @@ var StreamChat = /*#__PURE__*/function () {
                     c.initialized = true;
 
                     if (skipInitialization === undefined) {
-                      c._initializeState(_channelState);
+                      c._initializeState(_channelState, 'latest');
                     } else if (!skipInitialization.includes(_channelState.channel.id)) {
                       c.state.clearMessages();
 
-                      c._initializeState(_channelState);
+                      c._initializeState(_channelState, 'latest');
                     }
 
                     channels.push(c);
@@ -7585,23 +7928,26 @@ var StreamChat = /*#__PURE__*/function () {
      * @param {string} id the device id
      * @param {PushProvider} push_provider the push provider
      * @param {string} [userID] the user id (defaults to current user)
+     * @param {string} [push_provider_name] user provided push provider name for multi bundle support
      *
      */
 
   }, {
     key: "addDevice",
     value: function () {
-      var _addDevice = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee21(id, push_provider, userID) {
+      var _addDevice = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee21(id, push_provider, userID, push_provider_name) {
         return _regeneratorRuntime.wrap(function _callee21$(_context21) {
           while (1) {
             switch (_context21.prev = _context21.next) {
               case 0:
                 _context21.next = 2;
-                return this.post(this.baseURL + '/devices', _objectSpread({
+                return this.post(this.baseURL + '/devices', _objectSpread(_objectSpread({
                   id: id,
                   push_provider: push_provider
                 }, userID != null ? {
                   user_id: userID
+                } : {}), push_provider_name != null ? {
+                  push_provider_name: push_provider_name
                 } : {}));
 
               case 2:
@@ -7615,7 +7961,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee21, this);
       }));
 
-      function addDevice(_x20, _x21, _x22) {
+      function addDevice(_x20, _x21, _x22, _x23) {
         return _addDevice.apply(this, arguments);
       }
 
@@ -7653,7 +7999,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee22, this);
       }));
 
-      function getDevices(_x23) {
+      function getDevices(_x24) {
         return _getDevices.apply(this, arguments);
       }
 
@@ -7693,7 +8039,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee23, this);
       }));
 
-      function removeDevice(_x24, _x25) {
+      function removeDevice(_x25, _x26) {
         return _removeDevice.apply(this, arguments);
       }
 
@@ -7734,7 +8080,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee24, this);
       }));
 
-      function getRateLimits(_x26) {
+      function getRateLimits(_x27) {
         return _getRateLimits.apply(this, arguments);
       }
 
@@ -7835,7 +8181,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee25, this);
       }));
 
-      function partialUpdateUser(_x27) {
+      function partialUpdateUser(_x28) {
         return _partialUpdateUser.apply(this, arguments);
       }
 
@@ -7921,7 +8267,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee26, this, [[2, 13, 16, 19]]);
       }));
 
-      function upsertUsers(_x28) {
+      function upsertUsers(_x29) {
         return _upsertUsers.apply(this, arguments);
       }
 
@@ -8034,7 +8380,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee27, this, [[1, 11, 14, 17]]);
       }));
 
-      function partialUpdateUsers(_x29) {
+      function partialUpdateUsers(_x30) {
         return _partialUpdateUsers.apply(this, arguments);
       }
 
@@ -8062,7 +8408,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee28, this);
       }));
 
-      function deleteUser(_x30, _x31) {
+      function deleteUser(_x31, _x32) {
         return _deleteUser.apply(this, arguments);
       }
 
@@ -8090,7 +8436,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee29, this);
       }));
 
-      function reactivateUser(_x32, _x33) {
+      function reactivateUser(_x33, _x34) {
         return _reactivateUser.apply(this, arguments);
       }
 
@@ -8118,7 +8464,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee30, this);
       }));
 
-      function deactivateUser(_x34, _x35) {
+      function deactivateUser(_x35, _x36) {
         return _deactivateUser.apply(this, arguments);
       }
 
@@ -8146,7 +8492,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee31, this);
       }));
 
-      function exportUser(_x36, _x37) {
+      function exportUser(_x37, _x38) {
         return _exportUser.apply(this, arguments);
       }
 
@@ -8183,7 +8529,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee32, this);
       }));
 
-      function banUser(_x38, _x39) {
+      function banUser(_x39, _x40) {
         return _banUser.apply(this, arguments);
       }
 
@@ -8220,7 +8566,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee33, this);
       }));
 
-      function unbanUser(_x40, _x41) {
+      function unbanUser(_x41, _x42) {
         return _unbanUser.apply(this, arguments);
       }
 
@@ -8257,7 +8603,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee34, this);
       }));
 
-      function shadowBan(_x42, _x43) {
+      function shadowBan(_x43, _x44) {
         return _shadowBan.apply(this, arguments);
       }
 
@@ -8294,7 +8640,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee35, this);
       }));
 
-      function removeShadowBan(_x44, _x45) {
+      function removeShadowBan(_x45, _x46) {
         return _removeShadowBan.apply(this, arguments);
       }
 
@@ -8337,7 +8683,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee36, this);
       }));
 
-      function muteUser(_x46, _x47) {
+      function muteUser(_x47, _x48) {
         return _muteUser.apply(this, arguments);
       }
 
@@ -8376,7 +8722,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee37, this);
       }));
 
-      function unmuteUser(_x48, _x49) {
+      function unmuteUser(_x49, _x50) {
         return _unmuteUser.apply(this, arguments);
       }
 
@@ -8435,7 +8781,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee38, this);
       }));
 
-      function flagMessage(_x50) {
+      function flagMessage(_x51) {
         return _flagMessage.apply(this, arguments);
       }
 
@@ -8475,7 +8821,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee39, this);
       }));
 
-      function flagUser(_x51) {
+      function flagUser(_x52) {
         return _flagUser.apply(this, arguments);
       }
 
@@ -8515,7 +8861,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee40, this);
       }));
 
-      function unflagMessage(_x52) {
+      function unflagMessage(_x53) {
         return _unflagMessage.apply(this, arguments);
       }
 
@@ -8555,7 +8901,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee41, this);
       }));
 
-      function unflagUser(_x53) {
+      function unflagUser(_x54) {
         return _unflagUser.apply(this, arguments);
       }
 
@@ -8701,7 +9047,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee44, this);
       }));
 
-      function _reviewFlagReport(_x54, _x55) {
+      function _reviewFlagReport(_x55, _x56) {
         return _reviewFlagReport2.apply(this, arguments);
       }
 
@@ -8747,7 +9093,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee45, this);
       }));
 
-      function _unblockMessage(_x56) {
+      function _unblockMessage(_x57) {
         return _unblockMessage2.apply(this, arguments);
       }
 
@@ -8886,7 +9232,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee47, this);
       }));
 
-      function translateMessage(_x57, _x58) {
+      function translateMessage(_x58, _x59) {
         return _translateMessage.apply(this, arguments);
       }
 
@@ -9048,7 +9394,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee48, this);
       }));
 
-      function updateMessage(_x59, _x60, _x61) {
+      function updateMessage(_x60, _x61, _x62) {
         return _updateMessage.apply(this, arguments);
       }
 
@@ -9109,7 +9455,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee49, this);
       }));
 
-      function partialUpdateMessage(_x62, _x63, _x64, _x65) {
+      function partialUpdateMessage(_x63, _x64, _x65, _x66) {
         return _partialUpdateMessage.apply(this, arguments);
       }
 
@@ -9146,7 +9492,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee50, this);
       }));
 
-      function deleteMessage(_x66, _x67) {
+      function deleteMessage(_x67, _x68) {
         return _deleteMessage.apply(this, arguments);
       }
 
@@ -9174,7 +9520,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee51, this);
       }));
 
-      function getMessage(_x68) {
+      function getMessage(_x69) {
         return _getMessage.apply(this, arguments);
       }
 
@@ -9183,7 +9529,7 @@ var StreamChat = /*#__PURE__*/function () {
   }, {
     key: "getUserAgent",
     value: function getUserAgent() {
-      return this.userAgent || "stream-chat-javascript-client-".concat(this.node ? 'node' : 'browser', "-", "6.2.0");
+      return this.userAgent || "stream-chat-javascript-client-".concat(this.node ? 'node' : 'browser', "-", "6.5.0");
     }
   }, {
     key: "setUserAgent",
@@ -9399,7 +9745,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee52, this);
       }));
 
-      function sendUserCustomEvent(_x69, _x70) {
+      function sendUserCustomEvent(_x70, _x71) {
         return _sendUserCustomEvent.apply(this, arguments);
       }
 
@@ -9492,7 +9838,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee53, this);
       }));
 
-      function createSegment(_x71) {
+      function createSegment(_x72) {
         return _createSegment.apply(this, arguments);
       }
 
@@ -9532,7 +9878,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee54, this);
       }));
 
-      function getSegment(_x72) {
+      function getSegment(_x73) {
         return _getSegment.apply(this, arguments);
       }
 
@@ -9571,7 +9917,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee55, this);
       }));
 
-      function listSegments(_x73) {
+      function listSegments(_x74) {
         return _listSegments.apply(this, arguments);
       }
 
@@ -9614,7 +9960,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee56, this);
       }));
 
-      function updateSegment(_x74, _x75) {
+      function updateSegment(_x75, _x76) {
         return _updateSegment.apply(this, arguments);
       }
 
@@ -9646,7 +9992,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee57, this);
       }));
 
-      function deleteSegment(_x76) {
+      function deleteSegment(_x77) {
         return _deleteSegment.apply(this, arguments);
       }
 
@@ -9688,7 +10034,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee58, this);
       }));
 
-      function createCampaign(_x77) {
+      function createCampaign(_x78) {
         return _createCampaign.apply(this, arguments);
       }
 
@@ -9728,7 +10074,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee59, this);
       }));
 
-      function getCampaign(_x78) {
+      function getCampaign(_x79) {
         return _getCampaign.apply(this, arguments);
       }
 
@@ -9767,7 +10113,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee60, this);
       }));
 
-      function listCampaigns(_x79) {
+      function listCampaigns(_x80) {
         return _listCampaigns.apply(this, arguments);
       }
 
@@ -9810,7 +10156,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee61, this);
       }));
 
-      function updateCampaign(_x80, _x81) {
+      function updateCampaign(_x81, _x82) {
         return _updateCampaign.apply(this, arguments);
       }
 
@@ -9842,7 +10188,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee62, this);
       }));
 
-      function deleteCampaign(_x82) {
+      function deleteCampaign(_x83) {
         return _deleteCampaign.apply(this, arguments);
       }
 
@@ -9886,7 +10232,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee63, this);
       }));
 
-      function scheduleCampaign(_x83, _x84) {
+      function scheduleCampaign(_x84, _x85) {
         return _scheduleCampaign.apply(this, arguments);
       }
 
@@ -9926,7 +10272,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee64, this);
       }));
 
-      function stopCampaign(_x85) {
+      function stopCampaign(_x86) {
         return _stopCampaign.apply(this, arguments);
       }
 
@@ -9966,7 +10312,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee65, this);
       }));
 
-      function resumeCampaign(_x86) {
+      function resumeCampaign(_x87) {
         return _resumeCampaign.apply(this, arguments);
       }
 
@@ -10009,7 +10355,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee66, this);
       }));
 
-      function testCampaign(_x87, _x88) {
+      function testCampaign(_x88, _x89) {
         return _testCampaign.apply(this, arguments);
       }
 
@@ -10042,7 +10388,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee67, this);
       }));
 
-      function enrichURL(_x89) {
+      function enrichURL(_x90) {
         return _enrichURL.apply(this, arguments);
       }
 
@@ -10074,7 +10420,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee68, this);
       }));
 
-      function getTask(_x90) {
+      function getTask(_x91) {
         return _getTask.apply(this, arguments);
       }
 
@@ -10116,7 +10462,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee69, this);
       }));
 
-      function deleteChannels(_x91) {
+      function deleteChannels(_x92) {
         return _deleteChannels.apply(this, arguments);
       }
 
@@ -10179,7 +10525,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee70, this);
       }));
 
-      function deleteUsers(_x92, _x93) {
+      function deleteUsers(_x93, _x94) {
         return _deleteUsers.apply(this, arguments);
       }
 
@@ -10194,7 +10540,6 @@ var StreamChat = /*#__PURE__*/function () {
      *
      * @private
      * @param {string} filename filename of uploaded data
-     *
      * @return {APIResponse & CreateImportResponse} An ImportTask
      */
 
@@ -10222,7 +10567,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee71, this);
       }));
 
-      function _createImportURL(_x94) {
+      function _createImportURL(_x95) {
         return _createImportURL2.apply(this, arguments);
       }
 
@@ -10237,7 +10582,7 @@ var StreamChat = /*#__PURE__*/function () {
      *
      * @private
      * @param {string} path path of uploaded data
-     *
+     * @param {CreateImportOptions} options import options
      * @return {APIResponse & CreateImportResponse} An ImportTask
      */
 
@@ -10245,19 +10590,24 @@ var StreamChat = /*#__PURE__*/function () {
     key: "_createImport",
     value: function () {
       var _createImport2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee72(path) {
+        var options,
+            _args72 = arguments;
         return _regeneratorRuntime.wrap(function _callee72$(_context72) {
           while (1) {
             switch (_context72.prev = _context72.next) {
               case 0:
-                _context72.next = 2;
-                return this.post(this.baseURL + "/imports", {
+                options = _args72.length > 1 && _args72[1] !== undefined ? _args72[1] : {
+                  mode: 'upsert'
+                };
+                _context72.next = 3;
+                return this.post(this.baseURL + "/imports", _objectSpread({
                   path: path
-                });
+                }, options));
 
-              case 2:
+              case 3:
                 return _context72.abrupt("return", _context72.sent);
 
-              case 3:
+              case 4:
               case "end":
                 return _context72.stop();
             }
@@ -10265,7 +10615,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee72, this);
       }));
 
-      function _createImport(_x95) {
+      function _createImport(_x96) {
         return _createImport2.apply(this, arguments);
       }
 
@@ -10306,7 +10656,7 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee73, this);
       }));
 
-      function _getImport(_x96) {
+      function _getImport(_x97) {
         return _getImport2.apply(this, arguments);
       }
 
@@ -10347,12 +10697,128 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee74, this);
       }));
 
-      function _listImports(_x97) {
+      function _listImports(_x98) {
         return _listImports2.apply(this, arguments);
       }
 
       return _listImports;
     }()
+    /**
+     * upsertPushProvider - Create or Update a push provider
+     *
+     * Note: Works only for v2 push version is enabled on app settings.
+     *
+     * @param {PushProviderConfig} configuration of the provider you want to create or update
+     *
+     * @return {APIResponse & PushProviderUpsertResponse} A push provider
+     */
+
+  }, {
+    key: "upsertPushProvider",
+    value: function () {
+      var _upsertPushProvider = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee75(pushProvider) {
+        return _regeneratorRuntime.wrap(function _callee75$(_context75) {
+          while (1) {
+            switch (_context75.prev = _context75.next) {
+              case 0:
+                _context75.next = 2;
+                return this.post(this.baseURL + "/push_providers", {
+                  push_provider: pushProvider
+                });
+
+              case 2:
+                return _context75.abrupt("return", _context75.sent);
+
+              case 3:
+              case "end":
+                return _context75.stop();
+            }
+          }
+        }, _callee75, this);
+      }));
+
+      function upsertPushProvider(_x99) {
+        return _upsertPushProvider.apply(this, arguments);
+      }
+
+      return upsertPushProvider;
+    }()
+    /**
+     * deletePushProvider - Delete a push provider
+     *
+     * Note: Works only for v2 push version is enabled on app settings.
+     *
+     * @param {PushProviderID} type and foreign id of the push provider to be deleted
+     *
+     * @return {APIResponse} An API response
+     */
+
+  }, {
+    key: "deletePushProvider",
+    value: function () {
+      var _deletePushProvider = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee76(_ref8) {
+        var type, name;
+        return _regeneratorRuntime.wrap(function _callee76$(_context76) {
+          while (1) {
+            switch (_context76.prev = _context76.next) {
+              case 0:
+                type = _ref8.type, name = _ref8.name;
+                _context76.next = 3;
+                return this.delete(this.baseURL + "/push_providers/".concat(type, "/").concat(name));
+
+              case 3:
+                return _context76.abrupt("return", _context76.sent);
+
+              case 4:
+              case "end":
+                return _context76.stop();
+            }
+          }
+        }, _callee76, this);
+      }));
+
+      function deletePushProvider(_x100) {
+        return _deletePushProvider.apply(this, arguments);
+      }
+
+      return deletePushProvider;
+    }()
+    /**
+     * listPushProviders - Get all push providers in the app
+     *
+     * Note: Works only for v2 push version is enabled on app settings.
+     *
+     * @return {APIResponse & PushProviderListResponse} A push provider
+     */
+
+  }, {
+    key: "listPushProviders",
+    value: function () {
+      var _listPushProviders = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee77() {
+        return _regeneratorRuntime.wrap(function _callee77$(_context77) {
+          while (1) {
+            switch (_context77.prev = _context77.next) {
+              case 0:
+                _context77.next = 2;
+                return this.get(this.baseURL + "/push_providers");
+
+              case 2:
+                return _context77.abrupt("return", _context77.sent);
+
+              case 3:
+              case "end":
+                return _context77.stop();
+            }
+          }
+        }, _callee77, this);
+      }));
+
+      function listPushProviders() {
+        return _listPushProviders.apply(this, arguments);
+      }
+
+      return listPushProviders;
+    }()
   }], [{
     key: "getInstance",
     value: function getInstance(key, secretOrOptions, options) {