diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index f00981d68..925be1fda 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -3,7 +3,7 @@
-
+
@@ -23,7 +23,7 @@
-
diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts
index 8ab068fa2..5ff32424b 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.ts
+++ b/src/app/pages/chat/group-messages/group-messages.page.ts
@@ -113,6 +113,7 @@ export class GroupMessagesPage implements OnInit, AfterViewChecked {
});
}
}
+
loadGroupMessages(room:any){
this.showLoader = true;
//If group is private call getGroupMembers
@@ -266,9 +267,12 @@ export class GroupMessagesPage implements OnInit, AfterViewChecked {
if(this.route.url != "/home/chat"){
console.log("Timer message stop")
} else {
- await new Promise(resolve => setTimeout(resolve, 1000));
- await this.serverLongPull();
- console.log('Timer message running')
+ //Check if modal is opened
+ if(document.querySelector('.groupChatOpened')){
+ await new Promise(resolve => setTimeout(resolve, 1000));
+ await this.serverLongPull();
+ console.log('Timer message running')
+ }
}
} else {
diff --git a/src/app/pages/chat/messages/contacts/contacts.page.html b/src/app/pages/chat/messages/contacts/contacts.page.html
index fe94a14f1..7ae952e46 100644
--- a/src/app/pages/chat/messages/contacts/contacts.page.html
+++ b/src/app/pages/chat/messages/contacts/contacts.page.html
@@ -15,7 +15,7 @@
-
+
@@ -27,9 +27,9 @@
-
+
-
+
{{header}}
@@ -39,10 +39,10 @@
-
+
-
+
-
-
+
+
diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts
index c8d5f497c..b06d3543b 100644
--- a/src/app/pages/chat/messages/messages.page.ts
+++ b/src/app/pages/chat/messages/messages.page.ts
@@ -187,9 +187,12 @@ export class MessagesPage implements OnInit, AfterViewChecked {
if(this.route.url != "/home/chat"){
console.log("Timer message stop")
} else {
- await new Promise(resolve => setTimeout(resolve, 1000));
- await this.serverLongPull();
- console.log('Timer message running')
+ //Check if modal is opened
+ if(document.querySelector('.messagesChatOpened')){
+ await new Promise(resolve => setTimeout(resolve, 1000));
+ await this.serverLongPull();
+ console.log('Timer message running')
+ }
}
} else {
diff --git a/src/app/pages/chat/new-group/contacts/contacts.page.html b/src/app/pages/chat/new-group/contacts/contacts.page.html
index 588926fb4..509f4999f 100644
--- a/src/app/pages/chat/new-group/contacts/contacts.page.html
+++ b/src/app/pages/chat/new-group/contacts/contacts.page.html
@@ -16,7 +16,7 @@
-
+
@@ -28,7 +28,7 @@
-
+
-
+
{{header}}
@@ -46,10 +46,10 @@
{{user.first}} {{user.last}}
-
+
-
-
+
+
diff --git a/src/app/services/chat.service.ts b/src/app/services/chat.service.ts
index 189a37314..0107c2930 100644
--- a/src/app/services/chat.service.ts
+++ b/src/app/services/chat.service.ts
@@ -128,6 +128,18 @@ export class ChatService {
}
return this.http.get(environment.apiChatUrl+'im.members', opts);
}
+
+ getMemberInfo(userId:string){
+ let params = new HttpParams();
+ params = params.set("userId", userId);
+
+ let opts = {
+ headers: this.headers,
+ params: params
+ }
+ return this.http.get(environment.apiChatUrl+'users.info', opts);
+ }
+
removeChatRoom(body:any){
let opts = {
headers: this.headers,
@@ -247,9 +259,9 @@ export class ChatService {
console.log('Subcrive')
let params = new HttpParams();
params = params.set("roomId", roomId);
- let opts = {
- headers: this.headers,
- params: params
+ let opts = {
+ headers: this.headers,
+ params: params
}
this.http.get(environment.apiChatUrl+'im.messages', opts).subscribe(async res => {
@@ -275,8 +287,8 @@ export class ChatService {
}
})
-
-
+
+
}
}
diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html
index 4cc223766..12efc9f18 100644
--- a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html
+++ b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html
@@ -20,7 +20,7 @@
-
+
@@ -31,7 +31,7 @@
-
+
Contactos selecção:
@@ -48,7 +48,7 @@
-
+
{{header}}
@@ -58,8 +58,8 @@
{{user.name}}
-
+
-
-
+
+
diff --git a/src/app/shared/chat/messages/contacts/contacts.page.html b/src/app/shared/chat/messages/contacts/contacts.page.html
index 6c44e43f2..e263f96f7 100644
--- a/src/app/shared/chat/messages/contacts/contacts.page.html
+++ b/src/app/shared/chat/messages/contacts/contacts.page.html
@@ -13,13 +13,13 @@
-
+
-
+
@@ -27,9 +27,9 @@
-
+
-
+
{{header}}
@@ -39,10 +39,10 @@
-
+
-
+
-
-
+
+
diff --git a/src/app/shared/chat/new-group/contacts/contacts.page.html b/src/app/shared/chat/new-group/contacts/contacts.page.html
index 441bdddae..291e6ef37 100644
--- a/src/app/shared/chat/new-group/contacts/contacts.page.html
+++ b/src/app/shared/chat/new-group/contacts/contacts.page.html
@@ -16,7 +16,7 @@
-
+
@@ -28,7 +28,7 @@
-
+
-
+
{{header}}
@@ -46,10 +46,10 @@
{{user.first}} {{user.last}}
-
+
-
-
+
+