diff --git a/ng6-seed/src/app/layouts/admin/admin-layout.component.ts b/ng6-seed/src/app/layouts/admin/admin-layout.component.ts
index 77b75f14e..29855d128 100755
--- a/ng6-seed/src/app/layouts/admin/admin-layout.component.ts
+++ b/ng6-seed/src/app/layouts/admin/admin-layout.component.ts
@@ -65,6 +65,7 @@ export class AdminLayoutComponent implements OnInit, OnDestroy {
   alertTAT: any;
   countTAT: number;
   incomingDialogOpened:boolean = false
+  dialogRef: any;
   constructor(private router: Router, public menuItems: MenuItems, public horizontalMenuItems : HorizontalMenuItems, public translate: TranslateService,public aws:AwsService,public users:UserService,private _dashboardService: DashboardService,private messagingService:MessagingService,private socket:Socket,private matDialog:MatDialog,
     private _notificationService:PushNotifyService) {
    
@@ -356,10 +357,17 @@ export class AdminLayoutComponent implements OnInit, OnDestroy {
   openIncomingDialog(offer?,curr_pd_info?) {
     offer.pd_id = curr_pd_info.pd_id
     if(this.incomingDialogOpened == true) {
-      return;
+      if(this.dialogRef) {
+        console.log("dialog",this.dialogRef)
+        this.dialogRef.close();
+      }
+      else {
+        return;
+      }
     }
+    let autoCloseDialog:any;
     this.incomingDialogOpened = true
-    const dialogRef = this.matDialog.open(IncomingCallComponent,{
+    this.dialogRef = this.matDialog.open(IncomingCallComponent,{
       // minWidth:'25%',
         // maxWidth:'30%',
         data:curr_pd_info,
@@ -367,13 +375,19 @@ export class AdminLayoutComponent implements OnInit, OnDestroy {
         backdropClass: 'incoming-call-background' ,
         panelClass:'incoming-call-background'
     })
-    dialogRef.afterClosed().subscribe(data=>{
+    autoCloseDialog = setTimeout(()=>{
+      this.dialogRef.close()
+    },15000)
+    this.dialogRef.afterClosed().subscribe(data=>{
       console.log(data)
+      if(autoCloseDialog != undefined && autoCloseDialog) {
+        clearTimeout(autoCloseDialog)
+        }
       if(data == 'decline'){
         this.incomingDialogOpened = false
         this.socket.emit('callStatus',{random_string:curr_pd_info.random_string,status:'declined',status_code:3})
       }
-      else {
+      else if(data == 'answered'){
         this.incomingDialogOpened = false
         this.openVideoChatDialog(offer)
       }
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html
index 9f3613c18..2a7082b55 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html
@@ -132,7 +132,7 @@
                 <mat-icon>sms</mat-icon>
             </button> -->
 
-                      <button style ="float: right" mat-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="viewPD(details.is_child == 0 ? details.pd_id : details.parent_pd_id,details.random_string)" matTooltip="View" 
+                      <button  mat-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="viewPD(details.is_child == 0 ? details.pd_id : details.parent_pd_id,details.random_string)" matTooltip="View" 
                       matTooltipPosition="above" color="primary"><mat-icon>visibility</mat-icon></button>
                       <button style="float: right" mat-button mat-icon-button class="mb-1 hover-icon" type="button" color="primary" (click)="copyPD(details)"
                       matTooltip="Copy PD" matTooltipPosition="above">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html
index db445fae7..b84123952 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html
@@ -126,7 +126,7 @@
                 matTooltip="Send Link Via SMS" matTooltipPosition="above">
                 <mat-icon>sms</mat-icon>
             </button> -->
-                      <button style="float: right" mat-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="viewPD(details.is_child == 0 ? details.pd_id : details.parent_pd_id,details.random_string)" matTooltip="View" matTooltipPosition="above" color="primary"><mat-icon>visibility</mat-icon></button>
+                      <button  mat-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="viewPD(details.is_child == 0 ? details.pd_id : details.parent_pd_id,details.random_string)" matTooltip="View" matTooltipPosition="above" color="primary"><mat-icon>visibility</mat-icon></button>
                       <button style="float: right" mat-button mat-icon-button class="mb-1 hover-icon" type="button" color="primary" (click)="copyPD(details)"
                       matTooltip="Copy PD" matTooltipPosition="above">
                       <mat-icon>file_copy</mat-icon>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html
index 041328727..2f8296a5d 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html
@@ -131,7 +131,7 @@
            <mat-icon>sms</mat-icon>
        </button> -->
 
-                <button style="float: right" mat-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="viewPD(details.is_child == 0 ? details.pd_id : details.parent_pd_id,details.random_string)" color="primary" matTooltip="View" matTooltipPosition="above"><mat-icon>visibility</mat-icon></button>
+                <button  mat-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="viewPD(details.is_child == 0 ? details.pd_id : details.parent_pd_id,details.random_string)" color="primary" matTooltip="View" matTooltipPosition="above"><mat-icon>visibility</mat-icon></button>
                 <button style="float: right" mat-button mat-icon-button class="mb-1 hover-icon" type="button" color="primary" (click)="copyPD(details)"
                 matTooltip="Copy PD" matTooltipPosition="above">
                 <mat-icon>file_copy</mat-icon>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html
index 5452d3954..a8d1db732 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html
@@ -131,7 +131,7 @@
                 <mat-icon>sms</mat-icon>
             </button> -->
 
-                      <button style="float: right" mat-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="viewPD(details.is_child == 0 ? details.pd_id : details.parent_pd_id,details.random_string)" color="primary" matTooltip="View" matTooltipPosition="above"><mat-icon>visibility</mat-icon></button>
+                      <button  mat-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="viewPD(details.is_child == 0 ? details.pd_id : details.parent_pd_id,details.random_string)" color="primary" matTooltip="View" matTooltipPosition="above"><mat-icon>visibility</mat-icon></button>
                       <button style="float: right" mat-button mat-icon-button class="mb-1 hover-icon" type="button" color="primary" (click)="copyPD(details)"
                       matTooltip="Copy PD" matTooltipPosition="above">
                       <mat-icon>file_copy</mat-icon>
diff --git a/ng6-seed/src/app/video-chat/video-chat.component.ts b/ng6-seed/src/app/video-chat/video-chat.component.ts
index 1c49a9f77..81cf14054 100755
--- a/ng6-seed/src/app/video-chat/video-chat.component.ts
+++ b/ng6-seed/src/app/video-chat/video-chat.component.ts
@@ -232,9 +232,6 @@ export class VideoChatComponent implements OnInit {
   //     //wait for 1 sec
   // }
   function connectPeer(answer) {
-    if(this.callDisconnectTimer) {
-      clearTimeout(this.callDisconnectTimer)
-    }
     console.log("$$$$$$$$$$$$$$44");
     console.log(answer);
     setTimeout(()=>{
@@ -260,7 +257,7 @@ export class VideoChatComponent implements OnInit {
     console.log('Failed to get stream', err);
     alert('Failed to get stream '+err);
     });
-    this.socket.on('callStatusMessage',this.updateTheMsg)
+    // this.socket.on('callStatusMessage',this.updateTheMsg)
   this.socket.fromEvent('callStatusMessage').subscribe(res=>{
     if(res) {
       this.updateTheMsg(res)
@@ -288,8 +285,8 @@ export class VideoChatComponent implements OnInit {
     // socket.on('Disconnect', RemovePeer)
   }
   updateTheMsg(msg_obj) {
-    console.log("CallstatusMsg",msg_obj)
-    if(msg_obj && (msg_obj.status_code == 2) || (msg_obj.status_code == 3) && msg_obj.random_string == this.chat_info.random_string){
+    console.log("CallstatusMsg",msg_obj,this.chat_info)
+    if(msg_obj && (msg_obj.status_code == 2) || (msg_obj.status_code == 3) && msg_obj.random_string == this.chat_info.random_string && !this.peerVideoEnable){
       console.log("entered");
       this.start_btn_enable = false
       this.displayMsg = msg_obj.msg
@@ -314,6 +311,9 @@ export class VideoChatComponent implements OnInit {
           this.peervideo.nativeElement.style.marginTop = '0px'
         }
         this.peerVideoEnable = enablePeerVideo
+        if(this.callDisconnectTimer != undefined && this.callDisconnectTimer) {
+          clearTimeout(this.callDisconnectTimer)
+        }
         this.socket.emit('callStatus',{random_string:this.chat_info.random_string,status:'connected',status_code:1})
         // this.camereSwitchBtn.nativeElement.disabled = true;
         console.log("peervideo check",this.peerVideoEnable,this.peervideo.nativeElement.videoWidth,this.peervideo.nativeElement.videoHeight);
@@ -483,12 +483,14 @@ sendVideoToServer(blob,is_auto_start) {
     this.peer.send('Hello world');
   }
   disconnect() {
-    console.log(this.peer)
+    console.log("onDisconnect",this.peer,this.peerVideoEnable)
     if(this.peer) {
+      if(this.peerVideoEnable) {
       this.stopRecording().then(res=>{
 
       })
-      if(this.callDisconnectTimer) {
+    }
+      if(this.callDisconnectTimer != undefined && this.callDisconnectTimer) {
         clearTimeout(this.callDisconnectTimer)
       }
     this.peer.destroy();