merge devel

src/views/messages-view.jsx

@@ -376,10 +376,12 @@ class MessagesView extends React.Component {
           const topic = this.props.tinode.getTopic(this.state.topic);
           if (topic && topic.isSubscribed() && topic.msgHasMoreMessages()) {
             newState.fetchingMessages = true;
-            topic.getMessagesPage(MESSAGES_PAGE).catch((err) => {
-              this.setState({fetchingMessages: false});
-              this.props.onError(err.message, 'err');
-            });
+            topic.getMessagesPage(MESSAGES_PAGE)
+              .then(() => this.setState({fetchingMessages: false}))
+              .catch((err) => {
+                this.setState({fetchingMessages: false});
+                this.props.onError(err.message, 'err');
+              });
           }
         }
         return newState;

umd/index.dev.js

@@ -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
               });