merge devel

2021-08-16 16:06:32 -07:00
parent 982b40d6e8 c34ba46563
commit fb3de109e0
7 changed files with 73 additions and 40 deletions
@@ -3072,7 +3072,9 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone

          if (topic && topic.isSubscribed() && topic.msgHasMoreMessages()) {
            newState.fetchingMessages = true;
-            topic.getMessagesPage(_config_js__WEBPACK_IMPORTED_MODULE_14__.MESSAGES_PAGE).catch(err => {
+            topic.getMessagesPage(_config_js__WEBPACK_IMPORTED_MODULE_14__.MESSAGES_PAGE).then(() => this.setState({
+              fetchingMessages: false
+            })).catch(err => {
              this.setState({
                fetchingMessages: false
              });