diff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/pages/chat/group-messages/group-messages.page.html
index 41770d707..d0ee28435 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.html
+++ b/src/app/pages/chat/group-messages/group-messages.page.html
@@ -35,9 +35,9 @@
-
+
- {{countDownDate(room.customFields.countDownDate, room._id)}}
+ {{roomCountDownDate}}
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 85d112784..48d497e74 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.ts
+++ b/src/app/pages/chat/group-messages/group-messages.page.ts
@@ -56,6 +56,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
longPressActive = false;
showMessageOptions = false;
selectedMsgId:string;
+ roomCountDownDate:any;
@ViewChild('scrollMe') private myScrollContainer: ElementRef;
@@ -182,6 +183,9 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
this.chatService.getRoomInfo(this.roomId).subscribe(room=>{
this.room = room['room'];
this.roomName = this.room.name.split('-').join(' ');
+ if(this.room.customFields.countDownDate){
+ this.roomCountDownDate = this.timeService.countDownDate(this.room.customFields.countDownDate, this.room._id);
+ }
this.getGroupContacts(this.room);
this.loadGroupMessages(this.room);
this.showLoader = false;
diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html
index 156dde216..428237204 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -23,9 +23,9 @@
-
+
- {{countDownDate(room.customFields.countDownDate, room._id)}}
+ {{roomCountDownDate}}
diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts
index 3a6238074..979c97bdf 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.ts
+++ b/src/app/shared/chat/group-messages/group-messages.page.ts
@@ -56,6 +56,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
currentPosition: any;
startPosition: number;
scrollToBottomBtn = false;
+ roomCountDownDate:any;
@Input() roomId:string;
@Output() closeAllDesktopComponents:EventEmitter = new EventEmitter();
@@ -251,6 +252,9 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
if(this.room.name){
this.roomName = this.room.name.split('-').join(' ');
}
+ if(this.room.customFields.countDownDate){
+ this.roomCountDownDate = this.timeService.countDownDate(this.room.customFields.countDownDate, this.room._id);
+ }
this.getGroupContacts(this.room);
//this.loadGroupMessages(this.room);
this.showLoader = false;