diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.ts
index 015955a..d497a26 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.ts
@@ -71,7 +71,7 @@ export class PdAllocationComponent implements OnInit {
   getPDOfficerList(pdID:string){
     
     let user_type 
-    if(this.data.lender_role_id == '25') {
+    if(this.data.lender_role_id == '25' || this.data.lender_role_id == '30') {
           user_type = "RCM"
     }
     else if(this.data.lender_role_id == '27') {
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
index 64e6b55..0c8c19e 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
@@ -232,21 +232,14 @@
                                   </div>
                                   <ng-template #prompt>
                                     <span *ngIf="master.lender_short_name == 'MWISE'">
-                                    <span><button *ngIf="roleAccessDetails.allocate && addresses.assigned_pd && master.pd_type_name && addresses.addtional_pd_data[0].pd_status ==  pdStatusCheck.ALLOCATED || currentPDStatus!=pdStatusCheck.CANCELLED && (userRoleID == '28' && (currentVendorStatus !=pdStatusCheck.COMPLETED || currentVendorStatus !=pdStatusCheck.QC_COMPLETED)) || (userRoleID == '29' && currentVendorStatus !=pdStatusCheck.QC_COMPLETED)" mat-raised-button mat-button-md  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Reject .. " matTooltipPosition="above" (click)="rejectPD()"><mat-icon>settings_backup_restore</mat-icon></button></span>
-                                    <span *ngIf="currentPDStatus == pdStatusCheck.BOUNCED ">
-                                          <button *ngIf="roleAccessDetails.allocate && addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && (currentPDStatus == pdStatusCheck.ALLOCATED_TO_FIA ||currentPDStatus == pdStatusCheck.TRIGGERED||currentPDStatus == pdStatusCheck.ALLOCATED|| (currentPDStatus == pdStatusCheck.ALLOCATED && userId == master.fk_pd_allocated_to)|| (currentPDStatus == pdStatusCheck.BOUNCED && userId == master.fk_pd_allocated_to) || currentPDStatus==pdStatusCheck.CANCELLED)  " mat-raised-button mat-button-md  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Allocate" matTooltipPosition="above" (click)="selfAllocation(addresses.fk_state)"><mat-icon>verified_user</mat-icon></button></span>
+                                    <span><button *ngIf="roleAccessDetails.allocate && addresses.assigned_pd && master.pd_type_name && addresses.addtional_pd_data[0].pd_status ==  pdStatusCheck.ALLOCATED || currentPDStatus!=pdStatusCheck.CANCELLED && ((currentVendorStatus !=pdStatusCheck.COMPLETED || currentVendorStatus !=pdStatusCheck.QC_COMPLETED))" mat-raised-button mat-button-md  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Reject" matTooltipPosition="above" (click)="rejectPD()"><mat-icon>settings_backup_restore</mat-icon></button></span>
                                     <span *ngIf="currentVendorStatus != 'QC COMPLETED'">
                                           <button *ngIf="roleAccessDetails.allocate && addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && (currentPDStatus == pdStatusCheck.ALLOCATED_TO_FIA||currentVendorStatus == pdStatusCheck.INPROGRESS ||currentVendorStatus == pdStatusCheck.ALLOCATED|| (currentVendorStatus == pdStatusCheck.ALLOCATED && userId == master.fk_pd_allocated_to)|| (currentVendorStatus == pdStatusCheck.BOUNCED && userId == master.fk_pd_allocated_to) || currentPDStatus!=pdStatusCheck.CANCELLED)  " mat-raised-button mat-button-md  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Allocate" matTooltipPosition="above" (click)="selfAllocation(addresses.fk_state)"><mat-icon>verified_user</mat-icon></button></span>
-                                    <span><button *ngIf="roleAccessDetails.allocate && addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && (currentPDStatus == pdStatusCheck.TRIGGERED || currentPDStatus==pdStatusCheck.CANCELLED || (currentPDStatus == pdStatusCheck.ALLOCATED && master.pd_allocated_to_role_id == '27'))  " mat-raised-button mat-button-md  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Allocate to Self" matTooltipPosition="above" (click)="selfAllocation(addresses.fk_state)"><mat-icon>verified_user</mat-icon></button></span>
-                                    <span><button *ngIf="roleAccessDetails.allocate && addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && (currentPDStatus == pdStatusCheck.TRIGGERED || currentPDStatus == pdStatusCheck.ALLOCATED) || ( master.pd_allocated_to_role_id == '26')  " mat-raised-button mat-button-md  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Allocate to Vendor" matTooltipPosition="above" (click)="Allocationtovendor(addresses.fk_state)"><mat-icon>assignment_ind</mat-icon></button></span>
-                                    <span *ngIf="(userId == master.fk_pd_allocated_to)">
-                                          <button *ngIf="addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && (currentPDStatus == pdStatusCheck.ALLOCATED || currentPDStatus == pdStatusCheck.INPROGRESS)" mat-raised-button mat-button-md  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Send back to CPA" matTooltipPosition="above" (click)="allocateToCpa()"><mat-icon>swap_vert</mat-icon></button></span>
-                                    <span *ngIf="(userId == master.fk_pd_allocated_to)">
-                                          <button *ngIf="roleAccessDetails.discussions && addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && addresses.addtional_pd_data[0].pd_status!=pdStatusCheck.DRAFT && currentPDStatus!=pdStatusCheck.BOUNCED && currentPDStatus!=pdStatusCheck.CANCELLED && (LenderRoleID == '27' || LenderRoleID == '28'||currentPDStatus!=pdStatusCheck.TRIGGERED)||LenderRoleID == '29'" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Discussion" matTooltipPosition="above" (click)="getPDStart(addresses,addresses.addtional_pd_data[0].pd_status)"><mat-icon>question_answer</mat-icon></button></span>
-                                    <span *ngIf="(userId == master.fk_pd_allocated_to && currentVendorStatus!='QC COMPLETED')">
-                                          <button *ngIf="roleAccessDetails.discussions && addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && addresses.addtional_pd_data[0].vendor_status!=pdStatusCheck.DRAFT && currentVendorStatus!=pdStatusCheck.BOUNCED && currentVendorStatus!='QC COMPLETED'&& (LenderRoleID == '27' || LenderRoleID == '28'||currentVendorStatus!=pdStatusCheck.TRIGGERED)|| currentPDStatus!=pdStatusCheck.CANCELLED || LenderRoleID == '29'" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Discussion" matTooltipPosition="above" (click)="getPDStart(addresses,addresses.addtional_pd_data[0].vendor_status)"><mat-icon>question_answer</mat-icon></button></span>
-                                    <span *ngIf="((currentPDStatus!=pdStatusCheck.CANCELLED) && (currentVendorStatus != pdStatusCheck.CANCELLED))">
-                                          <button  mat-raised-button mat-button-md  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Cancel PD" matTooltipPosition="above" (click)="cancelPD(addresses)"><mat-icon>cancel_presentation</mat-icon></button></span>
+                                    <!-- <span><button *ngIf="roleAccessDetails.allocate && addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && (currentPDStatus == pdStatusCheck.TRIGGERED || currentPDStatus==pdStatusCheck.CANCELLED || currentPDStatus == pdStatusCheck.ALLOCATED)  " mat-raised-button mat-button-md  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Allocate to Self" matTooltipPosition="above" (click)="selfAllocation(addresses.fk_state)"><mat-icon>verified_user</mat-icon></button></span> -->
+                                    <span><button *ngIf="roleAccessDetails.allocate && addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && (currentPDStatus == pdStatusCheck.TRIGGERED || currentPDStatus == pdStatusCheck.ALLOCATED)" mat-raised-button mat-button-md  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Allocate to Vendor" matTooltipPosition="above" (click)="Allocationtovendor(addresses.fk_state)"><mat-icon>assignment_ind</mat-icon></button></span>
+                                    <span><button *ngIf="addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && (currentPDStatus == pdStatusCheck.ALLOCATED || currentPDStatus == pdStatusCheck.INPROGRESS)" mat-raised-button mat-button-md  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Send back to CPA" matTooltipPosition="above" (click)="allocateToCpa()"><mat-icon>swap_vert</mat-icon></button></span>
+                                    <span><button *ngIf="roleAccessDetails.discussions && addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && addresses.addtional_pd_data[0].pd_status && addresses.addtional_pd_data[0].pd_status!=pdStatusCheck.DRAFT && currentPDStatus!=pdStatusCheck.BOUNCED && currentPDStatus!=pdStatusCheck.CANCELLED && (currentPDStatus!=pdStatusCheck.TRIGGERED)" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Discussion" matTooltipPosition="above" (click)="getPDStart(addresses,addresses.addtional_pd_data[0].pd_status)"><mat-icon>question_answer</mat-icon></button></span>
+                                    <span><button *ngIf="roleAccessDetails.discussions && addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && addresses.addtional_pd_data[0].vendor_status && currentVendorStatus!=pdStatusCheck.QC_COMPLETED && currentPDStatus!=pdStatusCheck.CANCELLED" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Discussion" matTooltipPosition="above" (click)="getPDStart(addresses,addresses.addtional_pd_data[0].vendor_status)"><mat-icon>question_answer</mat-icon></button></span>
                                     </span>
                                   </ng-template>
                                 </div>  
@@ -268,6 +261,7 @@
                                 </div> 
                               <div fxFlex="60" align="right" style="color: #e00201" *ngIf="master.scheduled_on">
                                 {{master.scheduled_on}}
+                                <span *ngIf="LenderRoleID == '30'"><button *ngIf="((currentPDStatus!=pdStatusCheck.CANCELLED) && (currentVendorStatus != pdStatusCheck.CANCELLED))" mat-raised-button mat-button-md  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Cancel PD" matTooltipPosition="above" (click)="cancelPD(addresses)"><mat-icon>cancel_presentation</mat-icon></button></span>
                               </div>
                               </div>
                               </div> 
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts
index 7953fda..3321c23 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts
@@ -140,7 +140,7 @@ export class ViewPdComponent implements OnInit, OnDestroy {
     this.enableStartPD = false;
     this.roleAccessDetails=this._pd.getRoleAccessDetails();
    
-    console.log(this.roleAccessDetails);
+    console.log("this.roleAccessDetails",this.roleAccessDetails);
    
   }
 
diff --git a/ng6-seed/src/environments/environment.stage.ts b/ng6-seed/src/environments/environment.stage.ts
index 8c21da0..d5a4d4d 100644
--- a/ng6-seed/src/environments/environment.stage.ts
+++ b/ng6-seed/src/environments/environment.stage.ts
@@ -8,8 +8,7 @@ export const environment = {
     
     environmentName: 'Development Environment',//Localhost Environment.
   
-    // apiEndpoint: 'https://demo.pdgenie.com/sparqtest/api/',
-    apiEndpoint: 'http://localhost/AWSEC2/sparqapi/api',
+    apiEndpoint: 'https://apitest.pdgenie.com/sparqtest/api/',
   
     authorization: 'sparqvenba2018',