diff --git a/src/addon/messages/pages/conversation-info/conversation-info.html b/src/addon/messages/pages/conversation-info/conversation-info.html index 0aaee5df7..69b3dddb3 100644 --- a/src/addon/messages/pages/conversation-info/conversation-info.html +++ b/src/addon/messages/pages/conversation-info/conversation-info.html @@ -37,6 +37,6 @@ - + diff --git a/src/addon/messages/pages/conversation-info/conversation-info.ts b/src/addon/messages/pages/conversation-info/conversation-info.ts index c35856e4a..cd2d3dd5f 100644 --- a/src/addon/messages/pages/conversation-info/conversation-info.ts +++ b/src/addon/messages/pages/conversation-info/conversation-info.ts @@ -31,6 +31,7 @@ export class AddonMessagesConversationInfoPage implements OnInit { conversation: any; members = []; canLoadMore = false; + loadMoreError = false; protected conversationId: number; @@ -72,6 +73,8 @@ export class AddonMessagesConversationInfoPage implements OnInit { * @return {Promise} Promise resolved when done. */ protected fetchMembers(loadingMore?: boolean): Promise { + this.loadMoreError = false; + const limitFrom = loadingMore ? this.members.length : 0; return this.messagesProvider.getConversationMembers(this.conversationId, limitFrom).then((data) => { @@ -94,7 +97,7 @@ export class AddonMessagesConversationInfoPage implements OnInit { loadMoreMembers(infiniteComplete?: any): Promise { return this.fetchMembers(true).catch((error) => { this.domUtils.showErrorModalDefault(error, 'Error getting members.'); - this.canLoadMore = false; + this.loadMoreError = true; }).finally(() => { infiniteComplete && infiniteComplete(); }); diff --git a/src/addon/messages/pages/group-conversations/group-conversations.html b/src/addon/messages/pages/group-conversations/group-conversations.html index 130477f88..274ec53d5 100644 --- a/src/addon/messages/pages/group-conversations/group-conversations.html +++ b/src/addon/messages/pages/group-conversations/group-conversations.html @@ -59,7 +59,7 @@
- +

{{ 'addon.messages.nofavourites' | translate }}

@@ -75,7 +75,7 @@
- +

{{ 'addon.messages.nogroupmessages' | translate }}

@@ -90,7 +90,7 @@
- +

{{ 'addon.messages.nomessages' | translate }}

diff --git a/src/addon/messages/pages/group-conversations/group-conversations.ts b/src/addon/messages/pages/group-conversations/group-conversations.ts index 84a9c6e73..cffa4d295 100644 --- a/src/addon/messages/pages/group-conversations/group-conversations.ts +++ b/src/addon/messages/pages/group-conversations/group-conversations.ts @@ -253,6 +253,8 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy { * @return {Promise} Promise resolved when done. */ fetchDataForOption(option: any, loadingMore?: boolean): Promise { + option.loadMoreError = false; + const limitFrom = loadingMore ? option.conversations.length : 0; return this.messagesProvider.getConversations(option.type, option.favourites, limitFrom).then((data) => { @@ -353,7 +355,7 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy { loadMoreConversations(option: any, infiniteComplete?: any): Promise { return this.fetchDataForOption(option, true).catch((error) => { this.domUtils.showErrorModalDefault(error, 'addon.messages.errorwhileretrievingdiscussions', true); - option.canLoadMore = false; + option.loadMoreError = true; }).finally(() => { infiniteComplete && infiniteComplete(); });