diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7ed1de3607b3..de4c56092c0f 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # tiledesk-dashboard
 
+### 2.7.41-rc1
+- Adds the ability to add the webhook subscriptions "Request Abandoned" and "Request Fully Abandoned"
+
 ### 2.7.40
 - Minor improvements and bug fixing
 
@@ -15,6 +18,9 @@
 ### 2.7.37
 - Adds checks to validate Widget footer branding
 
+### 2.7.38-rc2
+- Fix chatbot import validation from json
+
 ### 2.7.36
 - Adds the ability to filter for abandoned conversations in the "Non-real-time conversations" page
 - Adds "Guard Role"
@@ -45,7 +51,11 @@
 ### 2.7.36-rc1
 - Adds role guard
 - Updates the libraries ua-parser-js, bootstrap and jquery
+<<<<<<< HEAD
 - Adds checks to validate user uploads (user profile, inport chatbot, widget settings, conversation detail)
+=======
+- Adds checks to validate user upload (user profile, inport chatbot, widget settings, conversation detail)
+>>>>>>> master-PRE
 
 ### 2.7.35
 - Refactors tables in Monitor page 
@@ -58,7 +68,24 @@
 ### 2.7.33
 - Adds, on the History page, the ability to filter by conversation duration
 
-### 2.7.32
+### 2.7.34-rc4
+- Refactors table in Monitor page 
+- Improves handling of alert windows display
+
+### 2.7.34-rc3
+- AI settings and KB preview bug fixing
+
+### 2.7.34-rc2
+- Minor improvements
+
+### 2.7.34-rc1
+- Adds the ability to select the indexing type for Knowledge Base URL contents
+- Adds to AI models used by knowledge bases the ability to add an advanced context and to visualize the contents sources
+
+### 2.7.33-rc1
+- Adds, on the History page, the ability to filter by conversation duration 
+
+### 2.7.32-rc1
 - Moves the menu item "Apps" from the sidebar to the setting sidebar
 
 ### 2.7.31
@@ -103,9 +130,15 @@
 - Adds the ability to select the launch block when a conversation is manually assigned to a chatbot
 - Improves the method to get the number of conversations in the monitor page
 
+### 2.7.19-rc1
+- Adds the ability to select the launch block when a conversation is manually assigned to a chatbot
+
 ### 2.7.18
 - Minor improvements and bug fixing
 
+### 2.7.18-rc1
+- Improves the method to get the number of conversations in the monitor page
+
 ### 2.7.17
 - Removes the ability to customize the quotas email template
 - Implements the icons for the SMS channel
@@ -154,6 +187,9 @@
 - Deploys in production
 - Adds the knowledge base walkthrough on the knowledge base page
 
+### 2.7.7-rc1
+- Adds the knowledge base walkthrough on the knowledge base page
+
 ### 2.7.6
 - Deploys in production
 - Adds a warning banner to the home page that displays when the user has used up one or more of his monthly resources
@@ -165,10 +201,21 @@
 ### 2.7.4
 - Added Time Slots in Operating Hours page
 
+### 2.7.4-rc1
+- Fix saving operation hours bug
+
 ### 2.7.3
 - Adds the ability, during onboarding, to create a chatbot that automatically answers questions based on the contents of the Knowledge Base
 - Improves the knowledge base page
 
+### 2.7.3-rc2
+- Adds the ability, during onboarding, to create a chatbot that automatically answers questions based on the contents of the Knowledge Base
+- Improves the knowledge base page 
+- Improves time slots UI
+
+### 2.7.3-rc1
+- Kb onboarding
+
 ### 2.7.2
 - Deploys in production
 - Adds GPT-4o mini language model
@@ -182,24 +229,61 @@
 - Adds the ability to edit the "Quota checkpoint notification" email template
 - Adds Twilio SMS channel integration  
 
+### 2.6.45-rc2
+- Improves time slots UI
+- Added translations for time slots
+
+### 2.6.45-rc1
+- Added time slots in Operating Hours
+
 ### 2.6.44
 - Deploys in production
 - Adds the option "Teammates can only see their own conversations" in the Project Settings > Advanced tab
 - Improvements and bug fixing
 
+### 2.6.44-rc4
+- Improvements and bug fixing
+
+### 2.6.44-rc3
+- Adds the option "Teammates can only see their own conversations" in the Project Settings > Advanced tab
+
+### 2.6.44-rc2
+- Fix vxml voice integration visibility
+
+### 2.6.44-rc1
+- Added vxml voice integration
+- Added twilio sms integration
+
 ### 2.6.43
 - Deploys in production
 - Improves the quota usage widget
 - Minor improvements
 
+### 2.6.43-rc2
+- Improves Knowledge Bases page
+
+### 2.6.43-rc1
+- Improves quotes widget
+- Added voice-vxml and sms-twilio channel in analytics
+
 ### 2.6.42
 - Deploys in production
 - Displays all the indexed chunks of a content on the "Manage your Knowledge Bases" page
 
+### 2.6.42-rc1
+- Displays all the indexed chunks of a content on the "Manage your Knowledge Bases" page
+
 ### 2.6.41
 - Deploys in production
 - Displays information about the Voice channel
 
+### 2.6.41-rc2
+- Adds the Voice Channel integration 
+
+### 2.6.41-rc1
+- Deploys in production
+- Displays information about the Voice channel
+
 ### 2.6.40
 - Deploys in production
 - Displays a dialog box that allows to update the plan when the knowledge bases limit is reached
diff --git a/package-lock.json b/package-lock.json
index 6af6718989f1..ded3421664a3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@tiledesk/tiledesk-dashboard",
-  "version": "2.7.40",
+  "version": "2.7.41-rc1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index f66980bcc656..08664b038580 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tiledesk/tiledesk-dashboard",
-  "version": "2.7.40",
+  "version": "2.7.41-rc1",
   "scripts": {
     "ng": "ng",
     "start": "ng serve --aot",
diff --git a/src/app/activities/activities.component.ts b/src/app/activities/activities.component.ts
index c20532e7b0d1..63ec94c0cdb1 100755
--- a/src/app/activities/activities.component.ts
+++ b/src/app/activities/activities.component.ts
@@ -18,6 +18,7 @@ import { ActivitiesService } from './activities-service/activities.service';
 import { FormGroup, FormControl } from '@angular/forms';
 import { goToCDSVersion } from 'app/utils/util';
 import { AppConfigService } from 'app/services/app-config.service';
+import { ProjectUser } from 'app/models/project-user';
 import { RoleService } from 'app/services/role.service';
 @Component({
   selector: 'appdashboard-activities',
@@ -392,12 +393,12 @@ export class ActivitiesComponent implements OnInit, OnDestroy {
                       activity['closed_by_label'] = storedTeammate['firstname'] + ' ' + storedTeammate['lastname']
                     } else {
                       this.usersService.getProjectUserByUserId(activity.actor.id)
-                        .subscribe((projectUser: any) => {
+                        .subscribe((projectUser: ProjectUser) => {
 
-                          if (projectUser && projectUser[0] && projectUser[0].id_user) {
-                            this.usersLocalDbService.saveMembersInStorage(projectUser[0].id_user._id, projectUser[0].id_user, 'activities');
+                          if (projectUser && projectUser.id_user) {
+                            this.usersLocalDbService.saveMembersInStorage(projectUser.id_user._id, projectUser.id_user, 'activities');
                             this.logger.log('ActivitiesComponent] GET projectUser by USER-ID projectUser id', projectUser);
-                            activity['closed_by_label'] = projectUser[0].id_user.firstname + ' ' + projectUser[0].id_user.lastname
+                            activity['closed_by_label'] = projectUser.id_user.firstname + ' ' + projectUser.id_user.lastname
                           } else {
 
                             activity['closed_by_label'] = activity.target.object.userFullname
diff --git a/src/app/app-store/app-store.component.ts b/src/app/app-store/app-store.component.ts
index 1ba9c04dfb0b..01814cf04da2 100644
--- a/src/app/app-store/app-store.component.ts
+++ b/src/app/app-store/app-store.component.ts
@@ -17,6 +17,7 @@ import { PricingBaseComponent } from 'app/pricing/pricing-base/pricing-base.comp
 import { FaqKbService } from 'app/services/faq-kb.service';
 import { ChatbotModalComponent } from 'app/bots/bots-list/chatbot-modal/chatbot-modal.component';
 import { MatDialog } from '@angular/material/dialog';
+import { ProjectUser } from 'app/models/project-user';
 const swal = require('sweetalert');
 const Swal = require('sweetalert2')
 @Component({
@@ -269,16 +270,12 @@ export class AppStoreComponent extends PricingBaseComponent implements OnInit, O
   }
 
   getProjectUserRole() {
-    this.usersService.project_user_role_bs
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((user_role) => {
-        this.logger.log('[APP-STORE] - GET PROJECT-USER ROLE ', user_role);
-        if (user_role) {
-          this.USER_ROLE = user_role;
-        }
-      });
+    this.usersService.projectUser_bs.pipe(takeUntil(this.unsubscribe$)).subscribe((projectUser: ProjectUser) => {
+      this.logger.log('[APP-STORE] - GET PROJECT-USER ROLE ', projectUser);
+      if (projectUser) {
+        this.USER_ROLE = projectUser.role;
+      }
+    });
   }
 
 
diff --git a/src/app/app.routing.ts b/src/app/app.routing.ts
index 3bd13889a25b..29869366eebf 100755
--- a/src/app/app.routing.ts
+++ b/src/app/app.routing.ts
@@ -8,7 +8,6 @@ import { Routes, RouterModule } from '@angular/router';
 import { UserProfileComponent } from './user-profile/user-profile.component';
 
 import { AuthGuard } from './core/auth.guard';
-import { AdminGuard } from './core/admin.guard';
 import { ProjectProfileGuard } from './core/project-profile.guard';
 import { PendingChangesGuard } from './core/pending-changes.guard';
 import { CoreModule } from './core/core.module';
@@ -1289,6 +1288,6 @@ const routes: Routes = [
     RouterModule.forRoot(routes)
   ],
   exports: [RouterModule],
-  providers: [AuthGuard, AdminGuard, ProjectProfileGuard, RoleGuard]
+  providers: [AuthGuard, ProjectProfileGuard, PendingChangesGuard]
 })
 export class AppRoutingModule { }
diff --git a/src/app/auth/autologin/autologin.component.ts b/src/app/auth/autologin/autologin.component.ts
index df34a2fc764b..1631ead2b45d 100755
--- a/src/app/auth/autologin/autologin.component.ts
+++ b/src/app/auth/autologin/autologin.component.ts
@@ -13,6 +13,7 @@ import { ProjectService } from '../../services/project.service';
 import { LoggerService } from '../../services/logger/logger.service';
 import { LocalDbService } from 'app/services/users-local-db.service';
 import { UsersService } from 'app/services/users.service';
+import { ProjectUser } from 'app/models/project-user';
 
 @Component({
   selector: 'appdashboard-autologin',
@@ -70,11 +71,12 @@ export class AutologinComponent implements OnInit {
   }
 
   getUserRole() {
-    this.usersService.project_user_role_bs
-      .subscribe((userRole) => {
-        this.logger.log('[AUTOLOGIN] - $UBSCRIPTION TO USER ROLE »»» ', userRole)
-        this.USER_ROLE = userRole;
-      })
+    this.usersService.projectUser_bs.subscribe((projectUser: ProjectUser) => {
+      this.logger.log('[AUTOLOGIN] - $UBSCRIPTION TO USER ROLE »»» ', projectUser)
+      if(projectUser){
+        this.USER_ROLE = projectUser.role;
+      }
+    })
   }
 
 
@@ -168,11 +170,11 @@ export class AutologinComponent implements OnInit {
       this.logger.log('[AUTOLOGIN] SSO - ssoLogin routeSegments ', routeSegments);
 
       const projectIDGetFromRoute = routeSegments[2]
-      
+
       this.logger.log('[AUTOLOGIN] SSO - ssoLogin projectIDGetFromRoute ', projectIDGetFromRoute);
-    
+
       this.getProject(projectIDGetFromRoute)
-    
+
 
       this.router.navigate([route]);
 
@@ -205,6 +207,7 @@ export class AutologinComponent implements OnInit {
       }
      
 
+
     }, () => {
       this.logger.log('[AUTOLOGIN] SSO - ssoLogin getCurrentAuthenticatedUser * COMPLETE *');
 
@@ -222,7 +225,7 @@ export class AutologinComponent implements OnInit {
     });
   }
 
- 
+
 
 
   getProject(projectIDGetFromRouteIsNumber) {
@@ -240,7 +243,7 @@ export class AutologinComponent implements OnInit {
     })
   }
 
- 
+
 
 
 
diff --git a/src/app/auth/signup/signup.component.ts b/src/app/auth/signup/signup.component.ts
index b2771acedc8d..e56a072b591c 100755
--- a/src/app/auth/signup/signup.component.ts
+++ b/src/app/auth/signup/signup.component.ts
@@ -20,6 +20,7 @@ declare const grecaptcha: any;
 import { WidgetSetUpBaseComponent } from 'app/widget_components/widget-set-up/widget-set-up-base/widget-set-up-base.component';
 import { WidgetService } from 'app/services/widget.service';
 import { UsersService } from 'app/services/users.service';
+import { ProjectUser } from 'app/models/project-user';
 
 type UserFields = 'email' | 'password' | 'firstName' | 'lastName' | 'terms';
 type FormErrors = { [u in UserFields]: string };
@@ -177,11 +178,12 @@ export class SignupComponent extends WidgetSetUpBaseComponent implements OnInit,
   }
 
   getUserRole() {
-    this.usersService.project_user_role_bs
-      .subscribe((userRole) => {
-        this.logger.log('[SIGN-UP] - $UBSCRIPTION TO USER ROLE »»» ', userRole)
-        this.USER_ROLE = userRole;
-      })
+    this.usersService.projectUser_bs.subscribe((projectUser: ProjectUser) => {
+      this.logger.log('[SIGN-UP] - $UBSCRIPTION TO USER ROLE »»» ', projectUser)
+      if(projectUser){
+        this.USER_ROLE = projectUser.role;
+      }
+    })
   }
 
   ngAfterViewInit() {
diff --git a/src/app/bots/bot-create/bot-create.component.ts b/src/app/bots/bot-create/bot-create.component.ts
index 3a040b86fac4..e5eaf1289f71 100755
--- a/src/app/bots/bot-create/bot-create.component.ts
+++ b/src/app/bots/bot-create/bot-create.component.ts
@@ -35,6 +35,7 @@ import { ProjectPlanService } from 'app/services/project-plan.service';
 import { UsersService } from 'app/services/users.service';
 import { MatDialog } from '@angular/material/dialog';
 import { ChatbotModalComponent } from '../bots-list/chatbot-modal/chatbot-modal.component';
+import { ProjectUser } from 'app/models/project-user';
 
 @Component({
   selector: 'bot-create',
@@ -188,15 +189,12 @@ export class BotCreateComponent extends PricingBaseComponent implements OnInit {
   }
 
   getUserRole() {
-    this.usersService.project_user_role_bs
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((userRole) => {
-
-        this.logger.log('[BOT-CREATE] - SUBSCRIPTION TO USER ROLE »»» ', userRole)
-        this.USER_ROLE = userRole;
-      })
+    this.usersService.projectUser_bs.pipe(takeUntil(this.unsubscribe$)).subscribe((projectUser: ProjectUser) => {
+      this.logger.log('[BOT-CREATE] - SUBSCRIPTION TO USER ROLE »»» ', projectUser)
+      if(projectUser){
+        this.USER_ROLE = projectUser.role;
+      }
+    })
   }
 
 
@@ -350,7 +348,7 @@ export class BotCreateComponent extends PricingBaseComponent implements OnInit {
     const jsonString = JSON.stringify(json)
     // Check for XSS patterns
     if (containsXSS(jsonString)) {
-      // console.log("Potential XSS attack detected!");
+      this.logger.log("Potential XSS attack detected!");
       this.notify.showToast(this.translationMap.get('UploadedFileMayContainsDangerousCode'), 4, 'report_problem')
       return;
     }
diff --git a/src/app/bots/bots-list/bots-list.component.ts b/src/app/bots/bots-list/bots-list.component.ts
index 8ee97149817e..c03cb82fe594 100755
--- a/src/app/bots/bots-list/bots-list.component.ts
+++ b/src/app/bots/bots-list/bots-list.component.ts
@@ -27,6 +27,7 @@ import { Clipboard } from '@angular/cdk/clipboard';
 import { MatSnackBar } from '@angular/material/snack-bar';
 import { MessagesStatsModalComponent } from 'app/components/modals/messages-stats-modal/messages-stats-modal.component';
 import { KnowledgeBaseService } from 'app/services/knowledge-base.service';
+import { ProjectUser } from 'app/models/project-user';
 
 const swal = require('sweetalert');
 const Swal = require('sweetalert2')
@@ -210,15 +211,12 @@ export class BotListComponent extends PricingBaseComponent implements OnInit, On
   // }
 
   getUserRole() {
-    this.usersService.project_user_role_bs
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((userRole) => {
-
-        this.logger.log('[BOTS-LIST] - SUBSCRIPTION TO USER ROLE »»» ', userRole)
-        this.USER_ROLE = userRole;
-      })
+    this.usersService.projectUser_bs.pipe(takeUntil(this.unsubscribe$)).subscribe((projectUser: ProjectUser) => {
+      this.logger.log('[BOTS-LIST] - SUBSCRIPTION TO USER ROLE »»» ', projectUser)
+      if(projectUser){
+        this.USER_ROLE = projectUser.role;
+      }
+    })
   }
 
   getNavigationBaseUrl() {
diff --git a/src/app/bots/bots-list/chatbot-alert/chatbot-alert.component.ts b/src/app/bots/bots-list/chatbot-alert/chatbot-alert.component.ts
index 12305b2e66aa..f43d4c9ba73f 100644
--- a/src/app/bots/bots-list/chatbot-alert/chatbot-alert.component.ts
+++ b/src/app/bots/bots-list/chatbot-alert/chatbot-alert.component.ts
@@ -13,6 +13,7 @@ import { AuthService } from 'app/core/auth.service';
 import { Project } from 'app/models/project-model';
 import { takeUntil } from 'rxjs/operators'
 import { Subject } from 'rxjs';
+import { ProjectUser } from 'app/models/project-user';
 
 
 @Component({
@@ -82,9 +83,11 @@ export class ChatbotAlertComponent extends PricingBaseComponent implements OnIni
   }
 
   getProjectUserRole() {
-    this.usersService.project_user_role_bs.subscribe((user_role) => {
-      this.USER_ROLE = user_role
-      this.logger.log('[CHATBOT-ALERT] - GET PROJECT USER ROLE - USER_ROLE : ', this.USER_ROLE)
+    this.usersService.projectUser_bs.subscribe((projectUser: ProjectUser) => {
+      if(projectUser){
+        this.USER_ROLE = projectUser.role
+        this.logger.log('[CHATBOT-ALERT] - GET PROJECT USER ROLE - USER_ROLE : ', this.USER_ROLE)
+      }
     })
   }
 
diff --git a/src/app/bots/faq/faq.component.html b/src/app/bots/faq/faq.component.html
index 2982ae55f435..005d5482ceea 100755
--- a/src/app/bots/faq/faq.component.html
+++ b/src/app/bots/faq/faq.component.html
@@ -138,6 +138,7 @@ <h3 class="card_title__underlined">
             <!-- ------------------------------------------------------------------------------------------- -->
             <!-- Bot type (for external & native) -->
             <!-- ------------------------------------------------------------------------------------------- -->
+            
             <section *ngIf="botType !== 'dialogflow'">
 
               <!-- ------------------------------------------------------------------------------------------- -->
diff --git a/src/app/bots/native-bot-sidebar/native-bot-sidebar.component.ts b/src/app/bots/native-bot-sidebar/native-bot-sidebar.component.ts
index b119f07b9f83..7af421846f4e 100755
--- a/src/app/bots/native-bot-sidebar/native-bot-sidebar.component.ts
+++ b/src/app/bots/native-bot-sidebar/native-bot-sidebar.component.ts
@@ -10,6 +10,7 @@ import { UsersService } from 'app/services/users.service'
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 import { FaqKbService } from 'app/services/faq-kb.service'
+import { ProjectUser } from 'app/models/project-user'
 @Component({
   selector: 'appdashboard-native-bot-sidebar',
   templateUrl: './native-bot-sidebar.component.html',
@@ -124,14 +125,12 @@ export class NativeBotSidebarComponent implements OnInit, OnChanges {
   }
 
   getUserRole() {
-    this.usersService.project_user_role_bs
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((userRole) => {
+    this.usersService.projectUser_bs.pipe(takeUntil(this.unsubscribe$)).subscribe((projectUser: ProjectUser) => {
+      if(projectUser){
         //  console.log('[SETTINGS-SIDEBAR]] - SUBSCRIPTION TO USER ROLE »»» ', userRole)
-        this.USER_ROLE = userRole;
-      })
+        this.USER_ROLE = projectUser.role;
+      }
+    })
   }
 
 
diff --git a/src/app/bots/templates/community-template-dtls/community-template-dtls.component.ts b/src/app/bots/templates/community-template-dtls/community-template-dtls.component.ts
index 8380cfef7568..b1066c79897b 100644
--- a/src/app/bots/templates/community-template-dtls/community-template-dtls.component.ts
+++ b/src/app/bots/templates/community-template-dtls/community-template-dtls.component.ts
@@ -16,6 +16,7 @@ import { ChatbotModalComponent } from 'app/bots/bots-list/chatbot-modal/chatbot-
 import { MatDialog } from '@angular/material/dialog';
 import { NotifyService } from 'app/core/notify.service';
 import { TranslateService } from '@ngx-translate/core';
+import { ProjectUser } from 'app/models/project-user';
 
 @Component({
   selector: 'appdashboard-community-template-dtls',
@@ -104,11 +105,12 @@ export class CommunityTemplateDtlsComponent extends PricingBaseComponent impleme
   }
 
   getUserRole() {
-    this.usersService.project_user_role_bs
-      .subscribe((userRole) => {
-        this.logger.log('[COMMUNITY-TEMPLATE-DTLS] - SUBSCRIPTION TO USER ROLE »»» ', userRole)
-        this.USER_ROLE = userRole;
-      })
+    this.usersService.projectUser_bs.subscribe((projectUser: ProjectUser) => {
+      if(projectUser){
+        this.logger.log('[COMMUNITY-TEMPLATE-DTLS] - SUBSCRIPTION TO USER ROLE »»» ', projectUser)
+        this.USER_ROLE = projectUser.role;
+      }
+    })
   }
 
   getProfileImageStorage() {
diff --git a/src/app/bots/templates/template-detail/template-detail.component.ts b/src/app/bots/templates/template-detail/template-detail.component.ts
index 3b712cc70808..1d7339cd3bd9 100644
--- a/src/app/bots/templates/template-detail/template-detail.component.ts
+++ b/src/app/bots/templates/template-detail/template-detail.component.ts
@@ -20,6 +20,7 @@ import { ProjectPlanService } from 'app/services/project-plan.service';
 import { NotifyService } from 'app/core/notify.service';
 import { PricingBaseComponent } from 'app/pricing/pricing-base/pricing-base.component';
 import { TranslateService } from '@ngx-translate/core';
+import { ProjectUser } from 'app/models/project-user';
 @Component({
   selector: 'appdashboard-template-detail',
   templateUrl: './template-detail.component.html',
@@ -230,13 +231,12 @@ export class TemplateDetailComponent extends PricingBaseComponent implements OnI
 
 
   getProjectUserRole() {
-    this.usersService.project_user_role_bs
-      .subscribe((user_role) => {
-        if (user_role) {
-          this.USER_ROLE = user_role
-          // this.logger.log('[TEMPLATE DETAIL] user_role ', user_role);
-        }
-      });
+    this.usersService.projectUser_bs.subscribe((projectUser: ProjectUser) => {
+      if (projectUser) {
+        this.USER_ROLE = projectUser.role
+        // this.logger.log('[TEMPLATE DETAIL] user_role ', user_role);
+      }
+    });
   }
 
   getTestSiteUrl() {
diff --git a/src/app/bots/templates/templates.component.ts b/src/app/bots/templates/templates.component.ts
index 27f97cfce1b5..afffa4ddf601 100644
--- a/src/app/bots/templates/templates.component.ts
+++ b/src/app/bots/templates/templates.component.ts
@@ -15,6 +15,7 @@ import { NotifyService } from 'app/core/notify.service';
 import { PricingBaseComponent } from 'app/pricing/pricing-base/pricing-base.component';
 import { TranslateService } from '@ngx-translate/core';
 import { KnowledgeBaseService } from 'app/services/knowledge-base.service';
+import { ProjectUser } from 'app/models/project-user';
 
 
 
@@ -154,14 +155,12 @@ export class TemplatesComponent extends PricingBaseComponent implements OnInit {
   }
 
   getUserRole() {
-    this.usersService.project_user_role_bs
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((userRole) => {
-        this.logger.log('[BOTS-TEMPLATES] - SUBSCRIPTION TO USER ROLE »»» ', userRole)
-        this.USER_ROLE = userRole;
-      })
+    this.usersService.projectUser_bs.pipe(takeUntil(this.unsubscribe$)).subscribe((projectUser: ProjectUser) => {
+      if(projectUser){
+        this.logger.log('[BOTS-TEMPLATES] - SUBSCRIPTION TO USER ROLE »»» ', projectUser)
+        this.USER_ROLE = projectUser.role;
+      }
+    })
   }
 
   getProfileImageStorage() {
diff --git a/src/app/bots/tilebot-sidebar/tilebot-sidebar.component.ts b/src/app/bots/tilebot-sidebar/tilebot-sidebar.component.ts
index 46ba394015fd..a182770035dd 100755
--- a/src/app/bots/tilebot-sidebar/tilebot-sidebar.component.ts
+++ b/src/app/bots/tilebot-sidebar/tilebot-sidebar.component.ts
@@ -10,6 +10,7 @@ import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 import { FaqKbService } from 'app/services/faq-kb.service'
 import { DomSanitizer } from '@angular/platform-browser';
+import { ProjectUser } from 'app/models/project-user';
 
 @Component({
   selector: 'appdashboard-tilebot-sidebar',
@@ -118,14 +119,12 @@ export class TilebotSidebarComponent implements OnInit , OnChanges{
   }
 
   getUserRole() {
-    this.usersService.project_user_role_bs
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((userRole) => {
+    this.usersService.projectUser_bs.pipe(takeUntil(this.unsubscribe$)).subscribe((projectUser: ProjectUser) => {
+      if(projectUser){
         //  console.log('[SETTINGS-SIDEBAR]] - SUBSCRIPTION TO USER ROLE »»» ', userRole)
-        this.USER_ROLE = userRole;
-      })
+        this.USER_ROLE = projectUser.role;
+      }
+    })
   }
 
   @HostListener('window:resize', ['$event'])
diff --git a/src/app/chatbot-design-studio/cds-sidebar/cds-sidebar.component.ts b/src/app/chatbot-design-studio/cds-sidebar/cds-sidebar.component.ts
index d485de2af870..00f7cb5f7400 100644
--- a/src/app/chatbot-design-studio/cds-sidebar/cds-sidebar.component.ts
+++ b/src/app/chatbot-design-studio/cds-sidebar/cds-sidebar.component.ts
@@ -5,6 +5,7 @@ import { LoggerService } from 'app/services/logger/logger.service';
 import { UsersService } from 'app/services/users.service';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
+import { ProjectUser } from 'app/models/project-user';
 
 @Component({
   selector: 'cds-sidebar',
@@ -35,10 +36,12 @@ export class CdsSidebarComponent implements OnInit {
 
 
   getUserRole() {
-    this.usersService.project_user_role_bs.pipe( takeUntil(this.unsubscribe$)).subscribe((userRole) => {
+    this.usersService.projectUser_bs.pipe(takeUntil(this.unsubscribe$)).subscribe((projectUser: ProjectUser) => {
+      if(projectUser){
         //  console.log('[CDS-SIDEBAR] - SUBSCRIPTION TO USER ROLE »»» ', userRole)
-        this.USER_ROLE = userRole;
-      })
+        this.USER_ROLE = projectUser.role;
+      }
+    })
   }
 
   listenSidebarIsOpened() {
diff --git a/src/app/components/components.module.ts b/src/app/components/components.module.ts
index 14c7b2e62428..e95ccba2deb2 100755
--- a/src/app/components/components.module.ts
+++ b/src/app/components/components.module.ts
@@ -7,8 +7,7 @@ import { NavbarComponent } from './navbar/navbar.component';
 import { SidebarComponent } from './sidebar/sidebar.component';
 import { TranslateModule } from '@ngx-translate/core';
 import { SmallSidebarComponent } from './small-sidebar/small-sidebar.component';
-import { NavbarForPanelComponent } from './navbar-for-panel/navbar-for-panel.component';
-import { NavbarForPanelService } from './navbar-for-panel/navbar-for-panel.service';
+
 import { MatTooltipModule } from '@angular/material/tooltip';
 import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { MatSlideToggleModule } from '@angular/material/slide-toggle';
@@ -42,7 +41,6 @@ import { LoadingSpinnerComponent } from 'app/ui/loading-spinner/loading-spinner.
     NavbarComponent,
     SidebarComponent,
     SmallSidebarComponent,
-    NavbarForPanelComponent,
     SidebarUserDetailsComponent,
   ],
   exports: [
@@ -51,11 +49,9 @@ import { LoadingSpinnerComponent } from 'app/ui/loading-spinner/loading-spinner.
     SidebarComponent,
     SidebarUserDetailsComponent,
     SmallSidebarComponent,
-    NavbarForPanelComponent,
     TranslateModule
   ],
   providers: [
-    NavbarForPanelService
 
   ]
 })
diff --git a/src/app/components/modals/messages-stats-modal/messages-stats-modal.component.ts b/src/app/components/modals/messages-stats-modal/messages-stats-modal.component.ts
index 74c76287171f..dd11748c25e0 100644
--- a/src/app/components/modals/messages-stats-modal/messages-stats-modal.component.ts
+++ b/src/app/components/modals/messages-stats-modal/messages-stats-modal.component.ts
@@ -11,6 +11,7 @@ import { takeUntil } from 'rxjs/operators'
 import { Router } from '@angular/router';
 import { AuthService } from 'app/core/auth.service';
 import { AnalyticsService } from 'app/services/analytics.service';
+import { ProjectUser } from 'app/models/project-user';
 
 @Component({
   selector: 'appdashboard-messages-stats-modal',
@@ -89,13 +90,11 @@ export class MessagesStatsModalComponent implements OnInit {
   }
 
   getUserRole() {
-    this.usersService.project_user_role_bs
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((userRole) => {
-        this.USER_ROLE = userRole;
-      })
+    this.usersService.projectUser_bs.pipe(takeUntil(this.unsubscribe$)).subscribe((projectUser: ProjectUser) => {
+      if(projectUser){
+        this.USER_ROLE = projectUser.role;
+      }
+    })
   }
 
   getCurrentProject() {
diff --git a/src/app/components/navbar-for-panel/navbar-for-panel.component.html b/src/app/components/navbar-for-panel/navbar-for-panel.component.html
deleted file mode 100755
index 97ab1755a3a7..000000000000
--- a/src/app/components/navbar-for-panel/navbar-for-panel.component.html
+++ /dev/null
@@ -1,97 +0,0 @@
-<div class="panel-left-sidebar-toolbar-a">
-  <div class="panel-left-sidebar-toolbar-b">
-    <div class="panel-left-sidebar-toolbar-c">
-
-      <div class="panel-left-sidebar-logged-in-user">
-        <div class="panel-left-sidebar-avatar-wrapper">
-
-          <img class="panel-left-sidebar-avatar"
-            *ngIf="userProfileImageExist === true || userImageHasBeenUploaded === true"
-            alt="{{user.firstname}} {{user.lastname}}" [src]="getUserProfileImage()">
-          <img class="panel-left-sidebar-avatar"
-            *ngIf="userProfileImageExist !== true && userImageHasBeenUploaded !== true"
-            src="assets/img/no_image_user.png" />
-
-          <div (click)="changeAvailabilityState(IS_AVAILABLE = !IS_AVAILABLE)" *ngIf="!IS_PROJECTS_X_PANEL_ROUTE"
-            class="panel-left-sidebar-logged-in-user-status"
-            [ngClass]="{'logged-in-user-status-online' : IS_AVAILABLE === true, 'logged-in-user-status-offline' : IS_AVAILABLE === false}">
-          </div>
-
-          <div *ngIf="IS_BUSY === true" class="user-is-busy">
-            <span class="material-icons"
-              style="font-size: 16px; color: #fedd00; position: absolute;top: 7px;  background: #1e2129; border-radius: 50%;">
-              access_time
-            </span>
-
-          </div>
-        </div>
-
-        <div class="panel-left-sidebar-logged-in-user-name-and-email">
-          <div class="panel-left-sidebar-logged-in-user-name"> {{ user.firstname }} {{ user.lastname }} </div>
-          <div class="panel-left-sidebar-logged-in-user-email"> {{ user.email }} </div>
-        </div>
-      </div>
-    </div>
-
-    <div class="panel-left-sidebar-actions">
-      <div class="dropdown">
-        <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-          <span class="material-icons dark-style-icon" style="">
-            arrow_drop_down
-          </span>
-        </a>
-        <!-- (click)="$event.stopPropagation()" -->
-        <ul class="dropdown-menu dark-style-dropdown-menu" style=" left: -125px;" >
-          <li (click)="selectAppearance('true')">
-            <a>
-              <span class="material-icons dark-style-icon icon-in-dropdown"  [ngClass]="{'dark-style-icon-selected' : dkmode === 'true'}">
-                bedtime
-              </span>
-              Dark mode
-            </a>
-          </li>
-
-          <li (click)="selectAppearance('false')">
-            <a>
-              <span class="material-icons dark-style-icon icon-in-dropdown" [ngClass]="{'dark-style-icon-selected' : dkmode === 'false'}">
-                wb_sunny
-              </span>
-              Light mode
-            </a>
-          </li>
-        </ul>
-      </div>
-    </div>
-
-  </div>
-</div>
-
-
-
-<!-- <div style="display: none; background-color: #1e2129 !important;
-color: #fff !important; position: relative;
-  display: flex;
-  align-items: center;
-  justify-content: flex-start;
-  width: 100%;
-  height: 80px;
-  min-height: 80px;
-  max-height: 80px;">
-
-  <div style="  position: absolute;
-  /* top: 92px; */
-  /* top: 80px; */
-  border-radius: 50%;
-  padding: 8px;
-  /* -webkit-transform: translateX(-50%); */
-  /* transform: translateX(-50%); */
-  /* left: 50%; */
-  ">
-    <img class="avatar" *ngIf="userProfileImageExist === true || userImageHasBeenUploaded === true"
-      [src]="getUserProfileImage()" />
-
-    <img class="avatar" *ngIf="userProfileImageExist !== true && userImageHasBeenUploaded !== true"
-      src="assets/img/no_image_user.png" />
-
-  </div>
-</div> -->
\ No newline at end of file
diff --git a/src/app/components/navbar-for-panel/navbar-for-panel.component.scss b/src/app/components/navbar-for-panel/navbar-for-panel.component.scss
deleted file mode 100755
index ff7df6675b79..000000000000
--- a/src/app/components/navbar-for-panel/navbar-for-panel.component.scss
+++ /dev/null
@@ -1,133 +0,0 @@
-.panel-left-sidebar-toolbar-a {
-    flex-direction: row;
-    box-sizing: border-box;
-    display: flex;
-    background-color: #1e2129 !important;
-}
-
-.panel-left-sidebar-toolbar-b {
-    flex: 1 1 0%;
-    box-sizing: border-box;
-    flex-direction: row;
-    display: flex;
-    place-content: center space-between;
-    align-items: center;
-}
-
-.panel-left-sidebar-toolbar-d {
-    flex-direction: row;
-    box-sizing: border-box;
-    display: flex;
-    place-content: center flex-start;
-    align-items: center;
-}
-
-.panel-left-sidebar-logged-in-user {
-    flex-direction: row;
-    box-sizing: border-box;
-    display: flex;
-    place-content: center flex-start;
-    align-items: center;
-}
-
-.panel-left-sidebar-avatar-wrapper {
-    position: relative;
-}
-
-.panel-left-sidebar-avatar {
-    width: 42px;
-    min-width: 42px;
-    height: 42px;
-    line-height: 42px;
-    margin: 0 8px 0 0;
-    border-radius: 50%;
-    font-size: 17px;
-    font-weight: 600;
-    text-align: center;
-    // margin-right: 16px;
-    // margin-left: 4px;
-    margin-right: 9px;
-    margin-left: 9px;
-    margin-top: 6px;
-    margin-bottom: 6px;
-}
-
-.panel-left-sidebar-logged-in-user-status {
-    position: absolute;
-    // width: 14px;
-    // height: 14px;
-    // bottom: 8px;
-    // left: 43px;
-    width: 12px;
-    height: 12px;
-    bottom: 8px;
-    left: 35px;
-    border: 1px solid #2d323e;
-    border-radius: 50%;
-}
-
-.logged-in-user-status-online {
-    background-color: #4caf50;
-}
-
-.logged-in-user-status-offline {
-    background-color: #f44336;
-}
-
-.panel-left-sidebar-logged-in-user-name {
-    color: #fff;
-}
-
-.panel-left-sidebar-logged-in-user-email {
-    color: rgba(255, 255, 255, 0.5);
-    font-size: 12px;
-}
-// .dark-style-icon{
-//     color: #dbddde;
-//     background-color: rgba(255, 255, 255, 0.1);
-//     border-radius: 50%;
-//     padding: 6px;
-//     margin-right: 6px;
-//     height: 36px;
-//     width: 36px;
-// }
-
-.dark-style-dropdown-menu {
-    background: #1e212a;
-}
-
-.dark-style-dropdown-menu > li > a {
-    color: #e4e6eb;
-}
-
-.dark-style-dropdown-menu li a:hover,
-.dark-style-dropdown-menu li a:focus,
-.dark-style-dropdown-menu li a:active {
-    background-color: unset;
-    // color: #FFFFFF;
-}
-
-.dark-style-icon {
-    color: #dbddde;
-    background-color: rgba(255, 255, 255, 0.1);
-    border-radius: 50%;
-    padding: 6px;
-    margin-right: 6px;
-    height: 36px;
-    width: 36px;
-}
-
-.dark-style-icon:hover {
-    background-color: rgba(45, 136, 255, 0.2);
-    color: #3491ff;
-}
-
-.dark-style-icon-selected {
-    background-color: rgba(45, 136, 255, 0.2);
-    color: #3491ff;
-}
-
-.icon-in-dropdown {
-    margin-left: -10px;
-    margin-right: 16px;
-}
diff --git a/src/app/components/navbar-for-panel/navbar-for-panel.component.spec.ts b/src/app/components/navbar-for-panel/navbar-for-panel.component.spec.ts
deleted file mode 100755
index 00cc6a37613d..000000000000
--- a/src/app/components/navbar-for-panel/navbar-for-panel.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { NavbarForPanelComponent } from './navbar-for-panel.component';
-
-describe('NavbarForPanelComponent', () => {
-  let component: NavbarForPanelComponent;
-  let fixture: ComponentFixture<NavbarForPanelComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ NavbarForPanelComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(NavbarForPanelComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/components/navbar-for-panel/navbar-for-panel.component.ts b/src/app/components/navbar-for-panel/navbar-for-panel.component.ts
deleted file mode 100755
index 916fc057d944..000000000000
--- a/src/app/components/navbar-for-panel/navbar-for-panel.component.ts
+++ /dev/null
@@ -1,328 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { AuthService } from '../../core/auth.service';
-import { UsersService } from '../../services/users.service';
-import { AppConfigService } from '../../services/app-config.service';
-import { takeUntil } from 'rxjs/operators';
-import { Subject } from 'rxjs';
-import { Router, NavigationEnd, NavigationStart } from '@angular/router';
-import { LocalDbService } from '../../services/users-local-db.service';
-import { NavbarForPanelService } from './navbar-for-panel.service';
-import { WsRequestsService } from './../../services/websocket/ws-requests.service';
-import { LoggerService } from './../../services/logger/logger.service';
-@Component({
-  selector: 'appdashboard-navbar-for-panel',
-  templateUrl: './navbar-for-panel.component.html',
-  styleUrls: ['./navbar-for-panel.component.scss']
-})
-export class NavbarForPanelComponent implements OnInit {
-  user: any;
-  currentUserId: string;
-  IS_AVAILABLE: boolean;
-  IS_BUSY: boolean;
-  USER_ROLE: string;
-  projectId: string;
-
-  userProfileImageExist: boolean;
-  userImageHasBeenUploaded: boolean;
-  userProfileImageurl: string;
-  storageBucket: string;
-  timeStamp: any;
-  PROJECT_USER_ID: string;
-  IS_PROJECTS_X_PANEL_ROUTE: boolean;
-  dkmode: string;
-  private unsubscribe$: Subject<any> = new Subject<any>();
-
-  constructor(
-    private auth: AuthService,
-    private usersService: UsersService,
-    public appConfigService: AppConfigService,
-    private router: Router,
-    public usersLocalDbService: LocalDbService,
-    public navbarForPanelService: NavbarForPanelService,
-    public wsRequestsService: WsRequestsService,
-    private logger: LoggerService
-
-  ) {
-    this.getCurrentRoute();
-  }
-
-  ngOnInit() {
-
-    this.getLoggedUser();
-    this.getCurrentProject();
-    this.getStorageBucket();
-    this.checkUserImageExist();
-    // this.getUserAvailability();
-    // this.getUserUserIsBusy();
-
-    this.setInitialDisplayPreferences();
-  }
-
-
-
-
-  getCurrentRoute() {
-    this.router.events
-      .subscribe((e) => {
-        if (e instanceof NavigationEnd) {
-          this.logger.log('NAVBAR-X-PANEL - ROUTE params e ', e);
-          this.logger.log('NAVBAR-X-PANEL - ROUTE params e.url ', e.url);
-
-          const current_url = e.url;
-          if (current_url === '/projects-for-panel') {
-
-            // GENERA BUG: QUANDO DAL DETTAGLI PROGETTO (LISTA DELLE UNSERVED) SI TORNA ALLA LISTA DEI PROGETTI IL PROGETTO 
-            // PER CUI SI è SELEZIONATO IL DETTAGLIO NON VISULAIZZA LO STATO DI DISPONIBILITA'
-            // this.usersService.unsubscriptionToWsCurrentUser(this.PROJECT_USER_ID)
-
-
-            this.IS_AVAILABLE = null;
-            this.IS_PROJECTS_X_PANEL_ROUTE = true;
-            this.logger.log('NAVBAR-X-PANEL ROUTE is', e.url, ' - IS AVAILABLE ', this.IS_AVAILABLE);
-          } else {
-            this.IS_PROJECTS_X_PANEL_ROUTE = false;
-          }
-        }
-      })
-  }
-
-  getStorageBucket() {
-    const firebase_conf = this.appConfigService.getConfig().firebase;
-    this.storageBucket = firebase_conf['storageBucket'];
-    this.logger.log('STORAGE-BUCKET NAVBAR-X-PANEL ', this.storageBucket)
-  }
-
-
-  getLoggedUser() {
-    this.auth.user_bs.subscribe((user) => {
-      this.logger.log('NAVBAR-X-PANEL - LOGGED USER ', user)
-      // tslint:disable-next-line:no-debugger
-      // debugger
-      this.user = user;
-
-      if (user) {
-        this.currentUserId = user._id;
-        this.logger.log('NAVBAR-X-PANEL - CURRENT USER ID ', this.currentUserId);
-
-        if (this.currentUserId) {
-          // this.getProjectUserByCurrentUserIdAndProjectId()
-        }
-      }
-    });
-  }
-
-  getCurrentProject() {
-    this.auth.project_bs.subscribe((project) => {
-
-      if (project) {
-        this.projectId = project._id
-        this.logger.log('NAVBAR-X-PANEL - GET CURRENT PROJECT - PROJECT ID  ', this.projectId)
-
-        this.getProjectUser();
-      }
-    });
-  }
-
-
-  getProjectUser() {
-    this.logger.log('NAVBAR-X-PANEL  CALL GET-PROJECT-USER')
-    this.usersService.getProjectUserByUserId(this.currentUserId).subscribe((projectUser: any) => {
-      this.logger.log('NAVBAR-X-PANEL GET BY USER-ID - PROJECT-ID ', this.projectId);
-      this.logger.log('NAVBAR-X-PANEL GET BY USER-ID - CURRENT-USER-ID ', this.user._id);
-      this.logger.log('NAVBAR-X-PANEL GET BY USER-ID - PROJECT USER ', projectUser);
-      this.logger.log('NAVBAR-X-PANEL GET BY USER-ID - PROJECT USER LENGTH', projectUser.length);
-      if ((projectUser) && (projectUser.length !== 0)) {
-
-
-        this.logger.log('NAVBAR-X-PANEL PROJECT-USER ID ', projectUser[0]._id)
-        this.logger.log('NAVBAR-X-PANEL USER IS AVAILABLE ', projectUser[0].user_available)
-        this.logger.log('NAVBAR-X-PANEL USER IS BUSY (from db)', projectUser[0].isBusy)
-        // this.user_is_available_bs = projectUser.user_available;
-
-        this.PROJECT_USER_ID = projectUser[0]._id;
-
-        this.subsTo_WsCurrentUser(projectUser[0]._id)
-
-        if (projectUser[0].user_available !== undefined) {
-          this.usersService.user_availability(projectUser[0]._id, projectUser[0].user_available, projectUser[0].isBusy, projectUser[0] )
-        }
-
-        // ADDED 21 AGO
-        if (projectUser[0].role !== undefined) {
-          this.logger.log('NAVBAR-X-PANEL GET PROJECT USER ROLE FOR THE PROJECT ', this.projectId, ' »» ', projectUser[0].role);
-
-          // ASSIGN THE projectUser[0].role VALUE TO USER_ROLE
-          this.USER_ROLE = projectUser[0].role;
-
-          // SEND THE ROLE TO USER SERVICE THAT PUBLISH
-          this.usersService.user_role(projectUser[0].role);
-
-        }
-      } else {
-        // this could be the case in which the current user was deleted as a member of the current project
-        this.logger.log('NAVBAR-X-PANEL PROJECT-USER UNDEFINED ')
-      }
-
-    }, (error) => {
-      this.logger.error('NAVBAR-X-PANEL PROJECT-USER GET BY PROJECT-ID & CURRENT-USER-ID  ', error);
-    }, () => {
-      this.logger.log('NAVBAR-X-PANEL PROJECT-USER GET BY PROJECT ID & CURRENT-USER-ID  * COMPLETE *');
-    });
-  }
-
-
-  subsTo_WsCurrentUser(currentuserprjctuserid) {
-    this.logger.log('NAVBAR-X-PANEL - SUBSCRIBE TO WS CURRENT-USER AVAILABILITY  prjct user id of current user ', currentuserprjctuserid);
-    // this.usersService.subscriptionToWsCurrentUser(currentuserprjctuserid);
-    this.wsRequestsService.subscriptionToWsCurrentUser(currentuserprjctuserid);
-    this.getWsCurrentUserAvailability$();
-    this.getWsCurrentUserIsBusy$();
-  }
-
-  getWsCurrentUserAvailability$() {
-    // this.usersService.currentUserWsAvailability$
-    this.wsRequestsService.currentUserWsAvailability$
-
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((currentuser_availability) => {
-        // this.logger.log('NAVBAR-X-PANEL - IS AVAILABLE (from SUBSCR) ', currentuser_availability);
-        if (currentuser_availability !== null) {
-          this.IS_AVAILABLE = currentuser_availability;
-        }
-      }, error => {
-        this.logger.error('NAVBAR-X-PANEL - GET WS CURRENT-USER AVAILABILITY * error * ', error)
-      }, () => {
-        this.logger.log('NAVBAR-X-PANEL - GET WS CURRENT-USER AVAILABILITY *** complete *** ')
-      });
-  }
-
-  getWsCurrentUserIsBusy$() {
-    // this.usersService.currentUserWsIsBusy$
-    this.wsRequestsService.currentUserWsIsBusy$
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((currentuser_isbusy) => {
-        // this.logger.log('NAVBAR-X-PANEL - GET WS CURRENT-USER - currentuser_isbusy? ', currentuser_isbusy);
-        if (currentuser_isbusy !== null) {
-          this.IS_BUSY = currentuser_isbusy;
-          // this.logger.log('NAVBAR-X-PANEL - GET WS CURRENT-USER (from ws)- this.IS_BUSY? ', this.IS_BUSY);
-        }
-      }, error => {
-        this.logger.error('NAVBAR-X-PANEL - GET WS CURRENT-USER IS BUSY * error * ', error)
-      }, () => {
-        this.logger.log('NAVBAR-X-PANEL - GET WS CURRENT-USER IS BUSY *** complete *** ')
-      });
-  }
-
-
-  getUserAvailability() {
-    this.usersService.user_is_available_bs.subscribe((user_available) => {
-      this.IS_AVAILABLE = user_available;
-      this.logger.log('NAVBAR-X-PANEL - USER IS AVAILABLE ', this.IS_AVAILABLE);
-    });
-  }
-
-  getUserUserIsBusy() {
-    this.usersService.user_is_busy$.subscribe((user_isbusy) => {
-      this.IS_BUSY = user_isbusy;
-      // THE VALUE OF IS_BUSY IS THEN UPDATED WITH THE VALUE RETURNED FROM THE WEBSOCKET getWsCurrentUserIsBusy$()
-      // WHEN, FOR EXAMPLE IN PROJECT-SETTINGS > ADVANCED THE NUM OF MAX CHAT IS 3 AND THE 
-      this.logger.log('!!! SIDEBAR - USER IS BUSY (from db)', this.IS_BUSY);
-    });
-  }
-
-
-
-  checkUserImageExist() {
-    this.usersService.userProfileImageExist.subscribe((image_exist) => {
-      this.logger.log('NAVBAR-X-PANEL - USER PROFILE EXIST ? ', image_exist);
-      this.userProfileImageExist = image_exist;
-      if (this.storageBucket && this.userProfileImageExist === true) {
-        this.logger.log('NAVBAR-X-PANEL - USER PROFILE EXIST - BUILD userProfileImageurl');
-        this.setImageProfileUrl(this.storageBucket)
-      }
-    });
-  }
-
-
-
-  setImageProfileUrl(storageBucket) {
-    this.userProfileImageurl = 'https://firebasestorage.googleapis.com/v0/b/' + storageBucket + '/o/profiles%2F' + this.currentUserId + '%2Fphoto.jpg?alt=media';
-    this.timeStamp = (new Date()).getTime();
-  }
-
-  getUserProfileImage() {
-    if (this.timeStamp) {
-      return this.userProfileImageurl + '&' + this.timeStamp;
-    }
-    return this.userProfileImageurl
-  }
-
-
-  changeAvailabilityState(IS_AVAILABLE, profilestatus) {
-    this.logger.log('SB - CHANGE STATUS - USER IS AVAILABLE ? ', IS_AVAILABLE);
-    // this.logger.log('SB - CHANGE STATUS - PROJECT USER ID: ', this.projectUser_id);
-
-
-    // this.usersService.updateProjectUser(this.projectUser_id, IS_AVAILABLE).subscribe((projectUser: any) => {
-    // DONE - WORKS NK-TO-TEST - da implementare quando viene implementato il servizio - serve per cambiare lo stato di disponibilità dell'utente corrente
-    // anche in USER & GROUP bisogna cambiare per la riga dell'utente corrente   
-    this.usersService.updateCurrentUserAvailability(this.projectId, IS_AVAILABLE, profilestatus).subscribe((projectUser: any) => { // non 
-
-      this.logger.log('PROJECT-USER UPDATED ', projectUser)
-
-      // NOTIFY TO THE USER SERVICE WHEN THE AVAILABLE / UNAVAILABLE BUTTON IS CLICKED
-      // this.usersService.availability_btn_clicked(true)
-
-    }, (error) => {
-      this.logger.error('PROJECT-USER UPDATED ERR  ', error);
-      // =========== NOTIFY ERROR ===========
-      // this.notify.showNotification('An error occurred while updating status', 4, 'report_problem');
-      // this.notify.showWidgetStyleUpdateNotification(this.changeAvailabilityErrorNoticationMsg, 4, 'report_problem');
-
-    }, () => {
-      this.logger.log('PROJECT-USER UPDATED  * COMPLETE *');
-
-      // =========== NOTIFY SUCCESS===========
-      // this.notify.showNotification('status successfully updated', 2, 'done');
-      // this.notify.showWidgetStyleUpdateNotification(this.changeAvailabilitySuccessNoticationMsg, 2, 'done');
-
-
-      // this.getUserAvailability()
-      this.getProjectUser();
-    });
-  }
-
-
-  setInitialDisplayPreferences() {
-    this.dkmode = this.usersLocalDbService.getStoredAppearanceDisplayPreferences();
-    this.logger.log('NAVBAR-X-PANEL -  dkmode  ', this.dkmode);
-
-    if (this.dkmode === null) {
-      this.dkmode = 'true'
-      this.usersLocalDbService.storeAppearanceDisplayPreferences(this.dkmode)
-    }
-  }
-
-
-  selectAppearance(dkm) {
-    this.logger.log('NAVBAR-X-PANEL -  dkm  ', dkm);
-    // if (this.dkmode === 'true') {
-      this.dkmode = dkm;
-      this.navbarForPanelService.publishDisplayPreferences(dkm);
-      this.usersLocalDbService.storeAppearanceDisplayPreferences(dkm);
-      this.logger.log('NAVBAR-X-PANEL -  dkmode  ', this.dkmode);
-    // }
-
-    // if (this.dkmode === 'false') {
-    //   this.dkmode = 'true';
-    //   this.navbarForPanelService.publishDisplayPreferences(this.dkmode);
-    //   this.usersLocalDbService.storeAppearanceDisplayPreferences(this.dkmode);
-    // }
-
-  }
-
-}
diff --git a/src/app/components/navbar-for-panel/navbar-for-panel.service.ts b/src/app/components/navbar-for-panel/navbar-for-panel.service.ts
deleted file mode 100755
index c3cc531543ce..000000000000
--- a/src/app/components/navbar-for-panel/navbar-for-panel.service.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Injectable } from '@angular/core';
-import { BehaviorSubject } from 'rxjs';
-import { LoggerService } from '../../services/logger/logger.service';
-
-@Injectable()
-
-export class NavbarForPanelService {
-
-  public darkmode$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(null);
-
-  constructor(
-    private logger: LoggerService
-    ) { }
-
-
-  publishDisplayPreferences(dkm) {
-
-    this.logger.log('[NAVBAR-X-PANEL] publishDisplayPreferences dkm ', dkm)
-
-  }
-}
diff --git a/src/app/components/navbar/navbar.component.html b/src/app/components/navbar/navbar.component.html
index b549fb2ef56f..207768105dc7 100755
--- a/src/app/components/navbar/navbar.component.html
+++ b/src/app/components/navbar/navbar.component.html
@@ -80,26 +80,11 @@
 
                   <div class="quote-container">
 
-                    <div class="quota-wpr">
-
-                      <div class="quota-header-section">
-                        <p class="quote-title">Conversations</p>
-                        <div class="quote-count">{{requests_count | number:'1.0-0'}} / {{requests_limit |
-                          number:'1.0-0'}}</div>
-                      </div>
-
-                      <div class="convs-count-container">
-                        <div class="convs-count-wpr">
-                          <div class="convs-count-label">Opened </div>
-                          <div class="convs-count-value" (click)="goToHistoryOpenedConvs()"> {{openedConversations}}
-                          </div>
-                        </div>
-                        <div class="convs-count-wpr">
-                          <div class="convs-count-label">Closed </div>
-                          <div class="convs-count-value" (click)="goToHistoryClosedConvs()"> {{closedConversations}}
-                          </div>
-                        </div>
-                      </div>
+                    <div>
+                      <p class="quote-title">{{'Requests' | translate}}</p>
+                      <div class="quote-count">{{requests_count}} / {{requests_limit}}</div> 
+                      <p class="quote-title">Conversations</p>
+                      <div class="quote-count">{{requests_count | number:'1.0-0'}} / {{requests_limit | number:'1.0-0'}}</div>
                     </div>
 
 
diff --git a/src/app/components/navbar/navbar.component.ts b/src/app/components/navbar/navbar.component.ts
index 3640b0312aed..33d920d7b836 100755
--- a/src/app/components/navbar/navbar.component.ts
+++ b/src/app/components/navbar/navbar.component.ts
@@ -41,6 +41,7 @@ import { ProgressSpinnerMode } from '@angular/material/progress-spinner';
 import { QuotesService } from 'app/services/quotes.service';
 import { PricingBaseComponent } from 'app/pricing/pricing-base/pricing-base.component';
 import { APP_SUMO_PLAN_NAME, PLAN_NAME, URL_understanding_default_roles } from 'app/utils/util';
+import { ProjectUser } from 'app/models/project-user';
 
 const swal = require('sweetalert');
 const Swal = require('sweetalert2')
@@ -240,7 +241,6 @@ export class NavbarComponent extends PricingBaseComponent implements OnInit, Aft
 
   ngOnInit() {
     this.getCurrentProject();
-    this.getProjectUserRole();
     this.getProfileImageStorage();
 
     // -------------------------------------------
@@ -261,7 +261,7 @@ export class NavbarComponent extends PricingBaseComponent implements OnInit, Aft
     // this.getUnservedRequestLenght_bs();
 
 
-    this.getProjectUserId();
+    this.getProjectUser();
 
     this.getActiveRoute();
     this.hidePendingEmailNotification();
@@ -275,7 +275,6 @@ export class NavbarComponent extends PricingBaseComponent implements OnInit, Aft
     this.getFromLocalStorageHasOpenedTheChat();
     this.getFromNotifyServiceHasOpenedChat();
 
-    this.getUserAvailability();
     this.hasChangedAvailabilityStatusInSidebar();
     this.hasChangedAvailabilityStatusInUsersComp();
     // this.subscribeToLogoutPressedinSidebarNavMobile();
@@ -355,7 +354,6 @@ export class NavbarComponent extends PricingBaseComponent implements OnInit, Aft
   getProjectQuotes() {
     this.quotesService.getProjectQuotes(this.projectId).then((response) => {
       this.logger.log("[NAVBAR] getProjectQuotes response: ", response);
-      this.logger.log("getProjectQuotes: ", response);
       this.project_limits = response;
     }).catch((err) => {
       this.logger.error("[NAVBAR] getProjectQuotes error: ", err);
@@ -646,29 +644,6 @@ export class NavbarComponent extends PricingBaseComponent implements OnInit, Aft
     // this.logger.log('[NAVBAR] AppConfigService getAppConfig (NAVBAR) CHAT_BASE_URL', this.CHAT_BASE_URL);
   }
 
-  getProjectUserRole() {
-    // const user___role =  this.usersService.project_user_role_bs.value;
-    // this.logger.log('[NAVBAR] % »»» WebSocketJs WF +++++ ws-requests--- navbar - USER ROLE 1 ', user___role);
-
-    this.usersService.project_user_role_bs
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((user_role) => {
-        this.logger.log('[NAVBAR] - USER ROLE from $ubscription', user_role);
-        if (user_role) {
-          this.USER_ROLE = user_role
-          if (user_role === 'agent') {
-            this.ROLE_IS_AGENT = true;
-
-          } else {
-            this.ROLE_IS_AGENT = false;
-          }
-        }
-      });
-  }
-
-
   getProfileImageStorage() {
     if (this.appConfigService.getConfig().uploadEngine === 'firebase') {
       const firebase_conf = this.appConfigService.getConfig().firebase;
@@ -774,13 +749,6 @@ export class NavbarComponent extends PricingBaseComponent implements OnInit, Aft
     this.logger.log('[NAVBAR] ===== BRS LANG ', this.browserLang)
   }
 
-  getUserAvailability() {
-    this.usersService.user_is_available_bs.subscribe((user_available) => {
-      this.IS_AVAILABLE = user_available;
-      this.logger.log('[NAVBAR]- USER IS AVAILABLE ', this.IS_AVAILABLE);
-    });
-  }
-
   hasChangedAvailabilityStatusInSidebar() {
     this.usersService.has_changed_availability_in_sidebar.subscribe((has_changed_availability) => {
       this.logger.log('[NAVBAR] SUBSCRIBES TO HAS CHANGED AVAILABILITY FROM THE SIDEBAR', has_changed_availability)
@@ -1887,10 +1855,21 @@ export class NavbarComponent extends PricingBaseComponent implements OnInit, Aft
     return 'Dashboard';
   }
 
-  getProjectUserId() {
-    this.usersService.project_user_id_bs.subscribe((projectUser_id) => {
-      this.logger.log('[NAVBAR] - PROJECT-USER-ID ', projectUser_id);
-      this.projectUser_id = projectUser_id;
+  getProjectUser() {
+    this.usersService.projectUser_bs.subscribe((projectUser: ProjectUser) => {
+      this.logger.log('[NAVBAR] - PROJECT-USER-ID ', projectUser);
+      if(projectUser){
+        this.projectUser_id = projectUser._id;
+        this.IS_AVAILABLE = projectUser.user_available;
+
+        this.USER_ROLE = projectUser.role
+        if (this.USER_ROLE === 'agent') {
+          this.ROLE_IS_AGENT = true;
+
+        } else {
+          this.ROLE_IS_AGENT = false;
+        }
+      }
     });
   }
 
diff --git a/src/app/components/settings-sidebar/settings-sidebar.component.ts b/src/app/components/settings-sidebar/settings-sidebar.component.ts
index 00612f9cc6e7..137a6436d2d6 100755
--- a/src/app/components/settings-sidebar/settings-sidebar.component.ts
+++ b/src/app/components/settings-sidebar/settings-sidebar.component.ts
@@ -9,6 +9,7 @@ import { UsersService } from 'app/services/users.service'
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 import { KnowledgeBaseService } from 'app/services/knowledge-base.service'
+import { ProjectUser } from 'app/models/project-user'
 @Component({
   selector: 'appdashboard-settings-sidebar',
   templateUrl: './settings-sidebar.component.html',
@@ -119,14 +120,12 @@ export class SettingsSidebarComponent implements OnInit {
   }
 
   getUserRole() {
-    this.usersService.project_user_role_bs
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((userRole) => {
+    this.usersService.projectUser_bs.pipe(takeUntil(this.unsubscribe$)).subscribe((projectUser: ProjectUser) => {
+      if(projectUser){
         //  this.logger.log('[SETTINGS-SIDEBAR]] - SUBSCRIPTION TO USER ROLE »»» ', userRole)
-        this.USER_ROLE = userRole;
-      })
+        this.USER_ROLE = projectUser.role;
+      }
+    })
   }
 
   listenSidebarIsOpened() {
diff --git a/src/app/components/shared/contact-info/contact-info.component.ts b/src/app/components/shared/contact-info/contact-info.component.ts
index e663c788a9e0..e49758420703 100644
--- a/src/app/components/shared/contact-info/contact-info.component.ts
+++ b/src/app/components/shared/contact-info/contact-info.component.ts
@@ -14,6 +14,7 @@ import { browserRefresh } from 'app/app.component';
 import { LoggerService } from '../../../services/logger/logger.service';
 import { TagsService } from 'app/services/tags.service';
 import { UsersService } from 'app/services/users.service';
+import { ProjectUser } from 'app/models/project-user';
 @Component({
   selector: 'appdashboard-contact-info',
   templateUrl: './contact-info.component.html',
@@ -102,15 +103,13 @@ export class ContactInfoComponent implements OnInit, OnChanges, OnDestroy, After
   // @ Subscribe to project user role
   // -------------------------------------------------------------
   getProjectUserRole() {
-    this.usersService.project_user_role_bs
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((userRole) => {
-        this.logger.log('[WS-REQUESTS-MSGS] - GET CURRENT PTOJECT-USER ROLE - userRole ', userRole)
+    this.usersService.projectUser_bs.pipe(takeUntil(this.unsubscribe$)).subscribe((projectUser: ProjectUser) => {
+      if(projectUser){
+        this.logger.log('[WS-REQUESTS-MSGS] - GET CURRENT PTOJECT-USER ROLE - userRole ', projectUser)
         // used to display / hide 'WIDGET' and 'ANALITCS' in home.component.html
-        this.CURRENT_USER_ROLE = userRole;
-      })
+        this.CURRENT_USER_ROLE = projectUser.role;
+      }
+    })
   }
 
   detectBrowserRefresh() {
diff --git a/src/app/components/sidebar-user-details/sidebar-user-details.component.ts b/src/app/components/sidebar-user-details/sidebar-user-details.component.ts
index d1be692f78aa..86ec67498f67 100755
--- a/src/app/components/sidebar-user-details/sidebar-user-details.component.ts
+++ b/src/app/components/sidebar-user-details/sidebar-user-details.component.ts
@@ -21,6 +21,7 @@ import { MatDialog, MatDialogRef } from '@angular/material/dialog';
 import { UserModalComponent } from 'app/users/user-modal/user-modal.component';
 import { BrandService } from 'app/services/brand.service';
 import { Project } from 'app/models/project-model';
+import { ProjectUser } from 'app/models/project-user';
 // import { slideInOutAnimation } from '../../../_animations/index';
 @Component({
   selector: 'appdashboard-sidebar-user-details',
@@ -319,16 +320,13 @@ export class SidebarUserDetailsComponent implements OnInit {
 
 
   getUserRole() {
-    this.usersService.project_user_role_bs
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((userRole) => {
-
+    this.usersService.projectUser_bs.pipe(takeUntil(this.unsubscribe$)).subscribe((projectUser: ProjectUser) => {
+      if(projectUser){
         // this.logger..log('[SIDEBAR-USER-DETAILS] - SUBSCRIPTION TO USER ROLE »»» ', userRole)
         // used to display / hide 'WIDGET' and 'ANALITCS' in home.component.html
-        this.USER_ROLE = userRole;
-      })
+        this.USER_ROLE = projectUser.role;
+      }
+    })
   }
 
 
@@ -390,6 +388,8 @@ export class SidebarUserDetailsComponent implements OnInit {
           this.teammateStatus = this.teammateStatus.slice(0)
           this.logger.log('[SIDEBAR-USER-DETAILS] - PROFILE_STATUS selected option', this.teammateStatus[0].name);
         }
+
+
       }
       //  this.teammateStatus = this.teammateStatus.slice(0)
     });
@@ -397,11 +397,13 @@ export class SidebarUserDetailsComponent implements OnInit {
   }
 
   getUserUserIsBusy() {
-    this.usersService.user_is_busy$.subscribe((user_isbusy) => {
-      this.IS_BUSY = user_isbusy;
+    this.usersService.projectUser_bs.subscribe((projectUser: ProjectUser) => {
       // THE VALUE OS  IS_BUSY IS THEN UPDATED WITH THE VALUE RETURNED FROM THE WEBSOCKET getWsCurrentUserIsBusy$()
       // WHEN, FOR EXAMPLE IN PROJECT-SETTINGS > ADVANCED THE NUM OF MAX CHAT IS 3 AND THE 
       // this.logger.log('[SIDEBAR-USER-DETAILS] - USER IS BUSY (from db)', this.IS_BUSY);
+      if(projectUser){
+        this.IS_BUSY = projectUser.isBusy;
+      }
     });
   }
 
@@ -409,36 +411,31 @@ export class SidebarUserDetailsComponent implements OnInit {
 
   getProjectUser() {
     this.logger.log('[SIDEBAR-USER-DETAILS]  !!! SIDEBAR CALL GET-PROJECT-USER')
-    this.usersService.getProjectUserByUserId(this.user._id).subscribe((projectUser: any) => {
+    this.usersService.getProjectUserByUserId(this.user._id).subscribe((projectUser: ProjectUser) => {
 
       this.logger.log('[SIDEBAR-USER-DETAILS] PROJECT-USER GET BY USER-ID - PROJECT-ID ', this.projectId);
       this.logger.log('[SIDEBAR-USER-DETAILS] PROJECT-USER GET BY USER-ID - CURRENT-USER-ID ', this.user._id);
-      // this.logger..log('[SIDEBAR-USER-DETAILS] PROJECT-USER GET BY USER-ID - PROJECT USER ', projectUser);
-      this.logger.log('[SIDEBAR-USER-DETAILS] PROJECT-USER GET BY USER-ID - PROJECT USER LENGTH', projectUser.length);
-      if ((projectUser) && (projectUser.length !== 0)) {
-        // this.logger.log('[SIDEBAR] PROJECT-USER ID ', projectUser[0]._id)
-        // this.logger.log('[SIDEBAR] USER IS AVAILABLE ', projectUser[0].user_available)
-        // this.logger.log('[SIDEBAR] USER IS BUSY (from db)', projectUser[0].isBusy)
+      console.log('[SIDEBAR-USER-DETAILS] PROJECT-USER GET BY USER-ID - PROJECT USER ', projectUser);
+      if (projectUser) {
+        // this.logger.log('[SIDEBAR] PROJECT-USER ID ', projectUser._id)
+        // this.logger.log('[SIDEBAR] USER IS AVAILABLE ', projectUser.user_available)
+        // this.logger.log('[SIDEBAR] USER IS BUSY (from db)', projectUser.isBusy)
         // this.user_is_available_bs = projectUser.user_available;
 
-        // NOTE_nk: comment this this.subsTo_WsCurrentUser(projectUser[0]._id)
-        this.subsTo_WsCurrentUser(projectUser[0]._id)
-
-        if (projectUser[0].user_available !== undefined) {
+        // NOTE_nk: comment this this.subsTo_WsCurrentUser(projectUser._id)
+        this.subsTo_WsCurrentUser(projectUser._id)
 
-          this.usersService.user_availability(projectUser[0]._id, projectUser[0].user_available, projectUser[0].isBusy, projectUser[0])
+        if (projectUser.user_available !== undefined) {
+          this.usersService.setProjectUser(projectUser)
 
         }
 
         // ADDED 21 AGO
-        if (projectUser[0].role !== undefined) {
-          this.logger.log('[SIDEBAR-USER-DETAILS] GET PROJECT USER ROLE FOR THE PROJECT ', this.projectId, ' »» ', projectUser[0].role);
+        if (projectUser.role !== undefined) {
+          this.logger.log('[SIDEBAR-USER-DETAILS] GET PROJECT USER ROLE FOR THE PROJECT ', this.projectId, ' »» ', projectUser.role);
 
           // ASSIGN THE projectUser[0].role VALUE TO USER_ROLE
-          this.USER_ROLE = projectUser[0].role;
-
-          // SEND THE ROLE TO USER SERVICE THAT PUBLISH
-          this.usersService.user_role(projectUser[0].role);
+          this.USER_ROLE = projectUser.role;
 
         }
       } else {
diff --git a/src/app/components/sidebar/sidebar.component.ts b/src/app/components/sidebar/sidebar.component.ts
index 1e65f4837e31..2c7e290f0a05 100755
--- a/src/app/components/sidebar/sidebar.component.ts
+++ b/src/app/components/sidebar/sidebar.component.ts
@@ -44,6 +44,7 @@ import { getSteps as defaultSteps, defaultStepOptions } from './sidebar.tour.con
 
 import Step from 'shepherd.js/src/types/step';
 import { environment } from 'environments/environment';
+import { ProjectUser } from 'app/models/project-user';
 
 declare const $: any;
 
@@ -313,8 +314,6 @@ export class SidebarComponent implements OnInit, AfterViewInit {
     this.translateChangeAvailabilitySuccessMsg();
     this.translateChangeAvailabilityErrorMsg();
     this.getProfileImageStorage();
-    this.getUserAvailability();
-    this.getUserUserIsBusy();
     this.getProjectUserId();
     this.hasChangedAvailabilityStatusInUsersComp();
     this.checkUserImageUploadIsComplete();
@@ -1358,17 +1357,19 @@ export class SidebarComponent implements OnInit, AfterViewInit {
 
 
   getProjectUserId() {
-    this.usersService.project_user_id_bs.subscribe((projectUser_id) => {
-      this.logger.log('[SIDEBAR] - PROJECT-USER-ID ', projectUser_id);
-
-      // if (this.projectUser_id) {
-      //     this.logger.log('[SIDEBAR] - PROJECT-USER-ID (THIS)  ', this.projectUser_id);
-      //     this.logger.log('[SIDEBAR] - PROJECT-USER-ID ', projectUser_id);
-
-      //     this.usersService.unsubscriptionToWsCurrentUser(projectUser_id)
-      // }
-      if (projectUser_id) {
-        this.projectUser_id = projectUser_id;
+    this.usersService.projectUser_bs.subscribe((projectUser: ProjectUser) => {
+      this.logger.log('[SIDEBAR] - PROJECT-USER-ID ', projectUser);
+      if (projectUser) {
+        this.projectUser_id = projectUser._id;
+        this.IS_AVAILABLE = projectUser.user_available;
+        this.IS_BUSY = projectUser.isBusy;
+
+        this.USER_ROLE = projectUser.role;
+        if (this.USER_ROLE) {
+          if (this.USER_ROLE === 'agent') {
+            this.SHOW_SETTINGS_SUBMENU = false;
+          }
+        }
       }
     });
   }
@@ -1380,22 +1381,6 @@ export class SidebarComponent implements OnInit, AfterViewInit {
      - the USER-SERVICE PUBLISH THE PROJECT-USER AVAILABILITY AND THE PROJECT-USER ID
      - the SIDEBAR (this component) SUBSCRIBES THESE VALUES
   */
-  getUserAvailability() {
-    this.usersService.user_is_available_bs.subscribe((user_available) => {
-      this.IS_AVAILABLE = user_available;
-      // this.logger.log('[SIDEBAR] - USER IS AVAILABLE ', this.IS_AVAILABLE);
-    });
-  }
-
-  getUserUserIsBusy() {
-    this.usersService.user_is_busy$.subscribe((user_isbusy) => {
-      this.IS_BUSY = user_isbusy;
-      // THE VALUE OS  IS_BUSY IS THEN UPDATED WITH THE VALUE RETURNED FROM THE WEBSOCKET getWsCurrentUserIsBusy$()
-      // WHEN, FOR EXAMPLE IN PROJECT-SETTINGS > ADVANCED THE NUM OF MAX CHAT IS 3 AND THE 
-      // this.logger.log('[SIDEBAR] - USER IS BUSY (from db)', this.IS_BUSY);
-    });
-  }
-
 
   // changeAvailabilityState(IS_AVAILABLE, profilestatus) {
   //     this.logger.log('[SIDEBAR] - CHANGE STATUS - USER IS AVAILABLE ? ', IS_AVAILABLE);
@@ -1450,34 +1435,28 @@ export class SidebarComponent implements OnInit, AfterViewInit {
   // *** NOTE: THE SAME CALLBACK IS RUNNED IN THE HOME.COMP ***
   getProjectUser() {
     //    this.logger.log('[SIDEBAR]  !!! SIDEBAR CALL GET-PROJECT-USER')
-    this.usersService.getProjectUserByUserId(this.currentUserId).subscribe((projectUser: any) => {
+    this.usersService.getProjectUserByUserId(this.currentUserId).subscribe((projectUser: ProjectUser) => {
       this.logger.log('[SIDEBAR] PROJECT-USER GET BY USER-ID  ', projectUser);
       this.logger.log('[SIDEBAR] PROJECT-USER GET BY USER-ID - PROJECT-ID ', this.projectId);
       this.logger.log('[SIDEBAR] PROJECT-USER GET BY USER-ID - CURRENT-USER-ID ', this.user._id);
       // this.logger.log('[SIDEBAR] PROJECT-USER GET BY USER-ID - PROJECT USER ', projectUser);
-      this.logger.log('[SIDEBAR] PROJECT-USER GET BY USER-ID - PROJECT USER LENGTH', projectUser.length);
-      if ((projectUser) && (projectUser.length !== 0)) {
-        // this.logger.log('[SIDEBAR] PROJECT-USER ID ', projectUser[0]._id)
-        // this.logger.log('[SIDEBAR] USER IS AVAILABLE ', projectUser[0].user_available)
-        // this.logger.log('[SIDEBAR] USER IS BUSY (from db)', projectUser[0].isBusy)
+      if (projectUser) {
+        // this.logger.log('[SIDEBAR] PROJECT-USER ID ', projectUser._id)
+        // this.logger.log('[SIDEBAR] USER IS AVAILABLE ', projectUser.user_available)
+        // this.logger.log('[SIDEBAR] USER IS BUSY (from db)', projectUser.isBusy)
         // this.user_is_available_bs = projectUser.user_available;
 
-        // NOTE_nk: comment this this.subsTo_WsCurrentUser(projectUser[0]._id)
-        this.subsTo_WsCurrentUser(projectUser[0]._id)
+        // NOTE_nk: comment this this.subsTo_WsCurrentUser(projectUser._id)
+        this.subsTo_WsCurrentUser(projectUser._id)
 
-        if (projectUser[0].user_available !== undefined) {
-          this.usersService.user_availability(projectUser[0]._id, projectUser[0].user_available, projectUser[0].isBusy, projectUser[0])
-        }
+        this.usersService.setProjectUser(projectUser)
 
         // ADDED 21 AGO
-        if (projectUser[0].role !== undefined) {
-          this.logger.log('[SIDEBAR] GET PROJECT USER ROLE FOR THE PROJECT ', this.projectId, ' »» ', projectUser[0].role);
-
-          // ASSIGN THE projectUser[0].role VALUE TO USER_ROLE
-          this.USER_ROLE = projectUser[0].role;
+        if (projectUser.role !== undefined) {
+          this.logger.log('[SIDEBAR] GET PROJECT USER ROLE FOR THE PROJECT ', this.projectId, ' »» ', projectUser.role);
 
-          // SEND THE ROLE TO USER SERVICE THAT PUBLISH
-          this.usersService.user_role(projectUser[0].role);
+          // ASSIGN THE projectUser.role VALUE TO USER_ROLE
+          this.USER_ROLE = projectUser.role;
 
         }
       } else {
@@ -1602,7 +1581,7 @@ export class SidebarComponent implements OnInit, AfterViewInit {
         });
 
 
-        this.getProjectUserRole();
+        this.getProjectUserId();
 
         this.getProjectUser();
         // this.getFaqKbByProjectId()
@@ -1648,21 +1627,6 @@ export class SidebarComponent implements OnInit, AfterViewInit {
     });
   }
 
-  getProjectUserRole() {
-    this.usersService.project_user_role_bs.subscribe((user_role) => {
-      this.USER_ROLE = user_role;
-      this.logger.log('[SIDEBAR] - 1. SUBSCRIBE PROJECT_USER_ROLE_BS ', this.USER_ROLE);
-      if (this.USER_ROLE) {
-        // this.logger.log('[SIDEBAR] - PROJECT USER ROLE get from $ subsription', this.USER_ROLE);
-        if (this.USER_ROLE === 'agent') {
-          this.SHOW_SETTINGS_SUBMENU = false;
-        }
-      }
-
-    });
-    // }
-  }
-
   round5(x) {
     // const percentageRounded = Math.ceil(x / 5) * 5;
     // this.logger.log('SIDEBAR project trial days left % rounded', percentageRounded);
diff --git a/src/app/components/widget-installations/magento-installation/magento-installation.component.html b/src/app/components/widget-installations/magento-installation/magento-installation.component.html
index 4c2be73b713d..85e4481ed3c1 100644
--- a/src/app/components/widget-installations/magento-installation/magento-installation.component.html
+++ b/src/app/components/widget-installations/magento-installation/magento-installation.component.html
@@ -1,76 +1,75 @@
 <div class="master card-widget-installation card--no-border">
     <div class="card-content">
+  
+      <div class="install-widget-instructions">
+        <div class="install-widget-steps">
+          <span class="install-widget-step-number-wrapper">
+            <span class="install-widget-step-number">
+              1
+            </span>
+          </span>
+          <span class="install-widget-step-text">
+            {{'WidgetInstallations.GenericStep1' | translate }}
+          </span>
+          <br>
+  
+          <appdashboard-code-installation></appdashboard-code-installation>
+  
+          <span class="install-widget-step-number-wrapper">
+            <span class="install-widget-step-number">
+              2
+            </span>
+          </span>
+          <span class="install-widget-step-text">
+            {{'WidgetInstallations.MagentoStep2' | translate }}
+          </span>
+          <br>
+  
+          <span class="install-widget-step-number-wrapper">
+            <span class="install-widget-step-number">
+              3
+            </span>
+          </span>
+          <span class="install-widget-step-text">
+            {{'WidgetInstallations.MagentoStep3' | translate }}
+          </span>
+          <br>
+  
+          <span class="install-widget-step-number-wrapper">
+            <span class="install-widget-step-number">
+              4
+            </span>
+          </span>
+          <span class="install-widget-step-text">
+            {{'WidgetInstallations.MagentoStep4' | translate }}
+          </span>
+          <br>
+  
+          <span class="install-widget-step-number-wrapper">
+            <span class="install-widget-step-number">
+              5
+            </span>
+          </span>
+          <span class="install-widget-step-text">
+            {{'WidgetInstallations.MagentoStep5' | translate }}
+          </span>
+        </div>
 
-        <div class="install-widget-instructions">
-            <div class="install-widget-steps">
-                <span class="install-widget-step-number-wrapper">
-                    <span class="install-widget-step-number">
-                        1
-                    </span>
-                </span>
-                <span class="install-widget-step-text">
-                    {{'WidgetInstallations.GenericStep1' | translate }}
-                </span>
-                <br>
-
-                <appdashboard-code-installation></appdashboard-code-installation>
-
-                <span class="install-widget-step-number-wrapper">
-                    <span class="install-widget-step-number">
-                        2
-                    </span>
-                </span>
-                <span class="install-widget-step-text">
-                    {{'WidgetInstallations.MagentoStep2' | translate }}
-                </span>
-                <br>
-
-                <span class="install-widget-step-number-wrapper">
-                    <span class="install-widget-step-number">
-                        3
-                    </span>
-                </span>
-                <span class="install-widget-step-text">
-                    {{'WidgetInstallations.MagentoStep3' | translate }}
-                </span>
-                <br>
-
-                <span class="install-widget-step-number-wrapper">
-                    <span class="install-widget-step-number">
-                        4
-                    </span>
-                </span>
-                <span class="install-widget-step-text">
-                    {{'WidgetInstallations.MagentoStep4' | translate }}
-                </span>
-                <br>
-
-                <span class="install-widget-step-number-wrapper">
-                    <span class="install-widget-step-number">
-                        5
-                    </span>
-                </span>
-                <span class="install-widget-step-text">
-                    {{'WidgetInstallations.MagentoStep5' | translate }}
-                </span>
-            </div>
-
-            <div *ngIf="hideHelpLink" class="code-help">
-                <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-                    <g fill="none" fill-rule="evenodd">
-                        <path d="M1 1h18v18H1z"></path>
-                        <path stroke="#3ea9f5" stroke-width="2"
-                            d="M10 1.5c4.692 0 8.5 3.808 8.5 8.5s-3.808 8.5-8.5 8.5A8.503 8.503 0 0 1 1.5 10c0-4.692 3.808-8.5 8.5-8.5z">
-                        </path>
-                        <path fill="#3ea9f5" fill-rule="nonzero"
-                            d="M10.75 13.75h-1.5v-4.5h1.5zM10.75 7.75h-1.5v-1.5h1.5z"></path>
-                    </g>
-                </svg>
-                <a href="{{URL_install_tiledesk_on_magento}}" target="_blank"> {{'SeeDetailsHere' | translate}}</a>
-            </div>
-
-
-
-        </div> <!-- /. install-with-code -->
+        <div *ngIf="hideHelpLink" class="code-help">
+            <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
+              <g fill="none" fill-rule="evenodd">
+                <path d="M1 1h18v18H1z"></path>
+                <path stroke="#3ea9f5" stroke-width="2"
+                  d="M10 1.5c4.692 0 8.5 3.808 8.5 8.5s-3.808 8.5-8.5 8.5A8.503 8.503 0 0 1 1.5 10c0-4.692 3.808-8.5 8.5-8.5z">
+                </path>
+                <path fill="#3ea9f5" fill-rule="nonzero" d="M10.75 13.75h-1.5v-4.5h1.5zM10.75 7.75h-1.5v-1.5h1.5z"></path>
+              </g>
+            </svg>
+            <a href="{{URL_install_tiledesk_on_magento}}" target="_blank"> {{'SeeDetailsHere' | translate}}</a>
+          </div>
+ 
+  
+  
+      </div> <!-- /. install-with-code -->
     </div> <!-- /. card content -->
 </div> <!-- /. card -->
\ No newline at end of file
diff --git a/src/app/components/widget-installations/prestashop-installation/prestashop-installation.component.html b/src/app/components/widget-installations/prestashop-installation/prestashop-installation.component.html
index 3825b6df3ad6..a6c850a51b14 100644
--- a/src/app/components/widget-installations/prestashop-installation/prestashop-installation.component.html
+++ b/src/app/components/widget-installations/prestashop-installation/prestashop-installation.component.html
@@ -1,107 +1,116 @@
-
 <div class="master card-widget-installation card--no-border">
   <div class="card-content">
 
     <div class="install-widget-instructions">
-    <div class="install-widget-steps">
-      <span class="install-widget-step-number-wrapper">
-        <span class="install-widget-step-number">
-          1
-        </span>
-      </span>
-      <span class="install-widget-step-text">
-        {{'WidgetInstallations.GenericStep1' | translate }}
-      </span>
-      <br>
+      <div class="install-widget-steps">
+        <span class="install-widget-step-number-wrapper">
+          <span class="install-widget-step-number">
+            1
+          </span>
+        </span>
+        <span class="install-widget-step-text">
+          {{'WidgetInstallations.GenericStep1' | translate }}
+        </span>
+        <br>
 
-      <appdashboard-code-installation></appdashboard-code-installation>
+        <appdashboard-code-installation></appdashboard-code-installation>
 
-      <span class="install-widget-step-number-wrapper">
-        <span class="install-widget-step-number">
-          2
-        </span>
-      </span>
-      <span class="install-widget-step-text">
-      {{'WidgetInstallations.PrestashopStep2' | translate }}
-      </span>
-      <br>
+        <span class="install-widget-step-number-wrapper">
+          <span class="install-widget-step-number">
+            2
+          </span>
+        </span>
+        <span class="install-widget-step-text">
+          {{'WidgetInstallations.PrestashopStep2' | translate }}
+        </span>
+        <br>
 
-      <span class="install-widget-step-number-wrapper">
-        <span class="install-widget-step-number">
-          3
-        </span>
-      </span>
-      <span class="install-widget-step-text">
-      {{'WidgetInstallations.PrestashopStep3' | translate }}
-      <a href="https://mypresta.eu/en/art/prestashop-16/disable-html-purifier.html" target="_blank">{{'LearnMore' | translate }}</a>
+        <span class="install-widget-step-number-wrapper">
+          <span class="install-widget-step-number">
+            3
+          </span>
+        </span>
+        <span class="install-widget-step-text">
+          {{'WidgetInstallations.PrestashopStep3' | translate }}
+          <a href="https://mypresta.eu/en/art/prestashop-16/disable-html-purifier.html" target="_blank">{{'LearnMore' |
+            translate }}</a>
 
-      </span>
-      <br>
+        </span>
+        <br>
 
-      <span class="install-widget-step-number-wrapper">
-        <span class="install-widget-step-number">
-          4
-        </span>
-      </span>
-      <span class="install-widget-step-text">
-      {{'WidgetInstallations.PrestashopStep4' | translate }}
-      </span>
-      <br>
+        <span class="install-widget-step-number-wrapper">
+          <span class="install-widget-step-number">
+            4
+          </span>
+        </span>
+        <span class="install-widget-step-text">
+          {{'WidgetInstallations.PrestashopStep4' | translate }}
+        </span>
+        <br>
 
-      <span class="install-widget-step-number-wrapper">
-        <span class="install-widget-step-number">
-          5
-        </span>
-      </span>
-      <span class="install-widget-step-text">
-      {{'WidgetInstallations.PrestashopStep5' | translate }}
-      <a href="https://mypresta.eu/modules/front-office-features/html-box.html" target="_blank"> {{'FromHere' | translate }}.</a>
-      </span>
-      <br>
+        <span class="install-widget-step-number-wrapper">
+          <span class="install-widget-step-number">
+            5
+          </span>
+        </span>
+        <span class="install-widget-step-text">
+          {{'WidgetInstallations.PrestashopStep5' | translate }}
+          <a href="https://mypresta.eu/modules/front-office-features/html-box.html" target="_blank"> {{'FromHere' |
+            translate }}.</a>
+        </span>
+        <br>
 
-      <span class="install-widget-step-number-wrapper">
-        <span class="install-widget-step-number">
-          6
-        </span>
-      </span>
-      <span class="install-widget-step-text">
-        {{'WidgetInstallations.PrestashopStep6' | translate }}
-      </span>
-      <br>
+        <span class="install-widget-step-number-wrapper">
+          <span class="install-widget-step-number">
+            6
+          </span>
+        </span>
+        <span class="install-widget-step-text">
+          {{'WidgetInstallations.PrestashopStep6' | translate }}
+        </span>
+        <br>
+
+        <span class="install-widget-step-number-wrapper">
+          <span class="install-widget-step-number">
+            7
+          </span>
+        </span>
+        <span class="install-widget-step-text">
+          {{'WidgetInstallations.PrestashopStep7' | translate }}
+        </span>
+        <br>
+
+
+      </div>
+
+      <!-- https://stackoverflow.com/questions/34820524/how-to-align-multi-line-text-after-icon -->
+      <div class="install-widget-steps">
+        <span class="install-widget-step-number-wrapper">
+          <span class="install-widget-step-number">
+            8
+          </span>
+        </span>
+        <span class="install-widget-step-text">
+          {{'OnceYouHaveCompletedYourChanges' | translate}}.
+          {{'YourWidgetShouldAppearInTheBottomRightCorner' | translate}}.
+        </span>
+        <br>
+      </div>
 
-      <span class="install-widget-step-number-wrapper">
-        <span class="install-widget-step-number">
-          7
-        </span>
-      </span>
-      <span class="install-widget-step-text">
-      {{'WidgetInstallations.PrestashopStep7' | translate }}
-      </span>
-      <br>
+      <div *ngIf="hideHelpLink" class="code-help">
+        <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
+          <g fill="none" fill-rule="evenodd">
+            <path d="M1 1h18v18H1z"></path>
+            <path stroke="#3ea9f5" stroke-width="2"
+              d="M10 1.5c4.692 0 8.5 3.808 8.5 8.5s-3.808 8.5-8.5 8.5A8.503 8.503 0 0 1 1.5 10c0-4.692 3.808-8.5 8.5-8.5z">
+            </path>
+            <path fill="#3ea9f5" fill-rule="nonzero" d="M10.75 13.75h-1.5v-4.5h1.5zM10.75 7.75h-1.5v-1.5h1.5z"></path>
+          </g>
+        </svg>
+        <a href="{{URL_install_tiledesk_on_prestashop}}" target="_blank"> {{'SeeDetailsHere' | translate}}</a>
+      </div>
 
-      
-    </div>
-  
-    <!-- https://stackoverflow.com/questions/34820524/how-to-align-multi-line-text-after-icon -->
-    <div class="install-widget-steps">
-      <span class="install-widget-step-number-wrapper">
-        <span class="install-widget-step-number">
-          8
-        </span>
-      </span>
-      <span class="install-widget-step-text">
-      {{'OnceYouHaveCompletedYourChanges' | translate}}.
-      {{'YourWidgetShouldAppearInTheBottomRightCorner' | translate}}.
-      </span>
-      <br>
-    </div>
 
-    <div *ngIf="hideHelpLink" class="code-help">
-      <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><g fill="none" fill-rule="evenodd"><path d="M1 1h18v18H1z"></path><path stroke="#3ea9f5" stroke-width="2" d="M10 1.5c4.692 0 8.5 3.808 8.5 8.5s-3.808 8.5-8.5 8.5A8.503 8.503 0 0 1 1.5 10c0-4.692 3.808-8.5 8.5-8.5z"></path><path fill="#3ea9f5" fill-rule="nonzero" d="M10.75 13.75h-1.5v-4.5h1.5zM10.75 7.75h-1.5v-1.5h1.5z"></path></g></svg>
-      <a href="{{URL_install_tiledesk_on_prestashop}}" target="_blank"> {{'SeeDetailsHere' | translate}}</a>
-    </div>
-  
-  
     </div> <!-- /. install-with-code -->
   </div> <!-- /. card content -->
-  </div> <!-- /. card -->
+</div> <!-- /. card -->
\ No newline at end of file
diff --git a/src/app/contacts/contacts.component.ts b/src/app/contacts/contacts.component.ts
index 7a0d43a6a928..a08df928cdab 100755
--- a/src/app/contacts/contacts.component.ts
+++ b/src/app/contacts/contacts.component.ts
@@ -13,6 +13,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { ProjectPlanService } from '../services/project-plan.service';
 import { Subscription } from 'rxjs';
 import { LoggerService } from '../services/logger/logger.service';
+import { ProjectUser } from 'app/models/project-user';
 declare const $: any;
 const swal = require('sweetalert');
 const Swal = require('sweetalert2')
@@ -405,27 +406,29 @@ export class ContactsComponent implements OnInit, OnDestroy, AfterViewInit {
   }
 
   getProjectUserRole() {
-    this.usersService.project_user_role_bs.subscribe((user_role) => {
-      const current_user_role = user_role;
-      this.USER_ROLE = user_role;
-      this.logger.log('[CONTACTS-COMP] - SUBSCRIBE PROJECT_USER_ROLE_BS ', current_user_role);
-      if (current_user_role) {
-        this.logger.log('[CONTACTS-COMP] - PROJECT USER ROLE ', current_user_role);
-        if (current_user_role === 'agent') {
-          this.IS_CURRENT_USER_AGENT = true;
-          this.logger.log('[CONTACTS-COMP] - PROJECT USER ROLE - IS CURRENT USER AGENT? ', this.IS_CURRENT_USER_AGENT);
-        } else {
-          this.IS_CURRENT_USER_AGENT = false;
-          this.logger.log('[CONTACTS-COMP] - PROJECT USER ROLE - IS CURRENT USER AGENT? ', this.IS_CURRENT_USER_AGENT);
-        }
+    this.usersService.projectUser_bs.subscribe((projectUser: ProjectUser) => {
+      if(projectUser){
+        const current_user_role = projectUser.role;
+        this.USER_ROLE = current_user_role;
+        this.logger.log('[CONTACTS-COMP] - SUBSCRIBE PROJECT_USER_ROLE_BS ', current_user_role);
+        if (current_user_role) {
+          this.logger.log('[CONTACTS-COMP] - PROJECT USER ROLE ', current_user_role);
+          if (current_user_role === 'agent') {
+            this.IS_CURRENT_USER_AGENT = true;
+            this.logger.log('[CONTACTS-COMP] - PROJECT USER ROLE - IS CURRENT USER AGENT? ', this.IS_CURRENT_USER_AGENT);
+          } else {
+            this.IS_CURRENT_USER_AGENT = false;
+            this.logger.log('[CONTACTS-COMP] - PROJECT USER ROLE - IS CURRENT USER AGENT? ', this.IS_CURRENT_USER_AGENT);
+          }
 
 
-        if (current_user_role === 'owner') {
-          this.IS_CURRENT_USER_OWNER = true;
-          this.logger.log('[CONTACTS-COMP] - PROJECT USER ROLE - IS CURRENT USER OWNER? ', this.IS_CURRENT_USER_OWNER);
-        } else {
-          this.IS_CURRENT_USER_OWNER = false;
-          this.logger.log('[CONTACTS-COMP] - PROJECT USER ROLE - IS CURRENT USER OWNER? ', this.IS_CURRENT_USER_OWNER);
+          if (current_user_role === 'owner') {
+            this.IS_CURRENT_USER_OWNER = true;
+            this.logger.log('[CONTACTS-COMP] - PROJECT USER ROLE - IS CURRENT USER OWNER? ', this.IS_CURRENT_USER_OWNER);
+          } else {
+            this.IS_CURRENT_USER_OWNER = false;
+            this.logger.log('[CONTACTS-COMP] - PROJECT USER ROLE - IS CURRENT USER OWNER? ', this.IS_CURRENT_USER_OWNER);
+          }
         }
       }
     });
diff --git a/src/app/core/admin.guard.ts b/src/app/core/admin.guard.ts
deleted file mode 100755
index 7c7d781fff24..000000000000
--- a/src/app/core/admin.guard.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Router } from '@angular/router';
-import { UsersService } from '../services/users.service';
-import { AuthService } from '../core/auth.service';
-import { LoggerService } from '../services/logger/logger.service';
-// implements CanActivate
-@Injectable()
-export class AdminGuard {
-
-  userRole: string;
-  projectId: string;
-  currentUserId: string
-
-  constructor(
-    private router: Router,
-    private usersService: UsersService,
-    private auth: AuthService,
-    private logger: LoggerService
-  ) {
-    // this.checkRole();
-    // this.getLoggedUser();
-    // this.getCurrentProject();
-
-  }
-
-  getLoggedUser() {
-    this.auth.user_bs.subscribe((user) => {
-
-      if (user) {
-        this.currentUserId = user._id;
-        this.logger.log('[ADMIN-GUARD] - Current USER ID ', this.currentUserId)
-
-      }
-    });
-  }
-
-  getCurrentProject() {
-    this.auth.project_bs.subscribe((project) => {
-
-      if (project) {
-        this.projectId = project._id
-        this.logger.log('[ADMIN-GUARD] - PRJCT ID from AUTH SERV SUBSC  ', this.projectId);
-      }
-
-    });
-  }
-
-  checkRole() {
-    this.usersService.project_user_role_bs.subscribe((user_role) => {
-      if (user_role) {
-
-        this.userRole = user_role;
-        // this.userRole = 'agent';
-        this.logger.log('[ADMIN-GUARD] - CHECK ROLE (FROM SUBSCRIPTION) »»» ', this.userRole);
-        // if (user_role === 'agent' || user_role === undefined) {
-        //   this.logger.log([ADMIN-GUARD] - CHECK ROLE (FROM SUBSCRIPTION) »»» ', user_role);
-
-        //   this.router.navigate(['unauthorized']);
-
-        // } else {
-        //   this.logger.log([ADMIN-GUARD] - CHECK ROLE (FROM SUBSCRIPTION) »»» ', user_role);
-        // }
-      }
-    });
-  }
-
-}
diff --git a/src/app/core/auth.guard.ts b/src/app/core/auth.guard.ts
index e1074943fc26..f6528922268a 100755
--- a/src/app/core/auth.guard.ts
+++ b/src/app/core/auth.guard.ts
@@ -16,6 +16,7 @@ import { LocalDbService } from 'app/services/users-local-db.service';
 import { MatSnackBar } from '@angular/material/snack-bar';
 import { AppConfigService } from 'app/services/app-config.service';
 import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { FaqKbService } from 'app/services/faq-kb.service';
 
 // import { RequestsMsgsComponent } from '../requests-msgs/requests-msgs.component';
 // import { HomeComponent } from '../home/home.component';
@@ -58,6 +59,7 @@ export class AuthGuard implements CanActivate {
     private usersService: UsersService,
     private logger: LoggerService,
     public localDbService: LocalDbService,
+    private faqKbService: FaqKbService,
     private _snackBar: MatSnackBar,
     public appConfigService: AppConfigService,
     private _httpClient: HttpClient,
@@ -205,7 +207,7 @@ export class AuthGuard implements CanActivate {
         this.usersService.getAllUsersOfCurrentProjectAndSaveInStorage();
 
         // GET AND SAVE ALL BOTS OF CURRENT PROJECT IN LOCAL STORAGE
-        this.usersService.getBotsByProjectIdAndSaveInStorage();
+        this.faqKbService.getBotsByProjectIdAndSaveInStorage();
 
       } else {
         this.logger.log('[AUTH-GUARD] - PROJECT OBJCT FILTERED FOR PROJECT ID !! NOT FOUND - GO TO UNAUTHORIZED PAGE ');
diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts
index fbbf4c9e6799..c2d876d6729a 100755
--- a/src/app/core/core.module.ts
+++ b/src/app/core/core.module.ts
@@ -1,7 +1,6 @@
 import { NgModule } from '@angular/core';
 
 import { AuthService } from './auth.service';
-import { AdminGuard } from './admin.guard';
 import { NotifyService } from './notify.service';
 import { SsoService } from './sso.service';
 
@@ -11,7 +10,6 @@ import { SsoService } from './sso.service';
   providers: [
     AuthService,
     NotifyService,
-    AdminGuard,
     SsoService
   ],
 })
diff --git a/src/app/create-project-wizard/activate-appsumo-product/activate-appsumo-product.component.ts b/src/app/create-project-wizard/activate-appsumo-product/activate-appsumo-product.component.ts
index e078bb547c1b..d96903cf4738 100644
--- a/src/app/create-project-wizard/activate-appsumo-product/activate-appsumo-product.component.ts
+++ b/src/app/create-project-wizard/activate-appsumo-product/activate-appsumo-product.component.ts
@@ -11,6 +11,7 @@ import { WidgetSetUpBaseComponent } from 'app/widget_components/widget-set-up/wi
 import { WidgetService } from 'app/services/widget.service';
 import { NotifyService } from 'app/core/notify.service';
 import { UsersService } from 'app/services/users.service';
+import { ProjectUser } from 'app/models/project-user';
 const swal = require('sweetalert');
 
 @Component({
@@ -92,11 +93,10 @@ export class ActivateAppsumoProductComponent extends WidgetSetUpBaseComponent im
   }
 
   getProjectUserRole() {
-    this.usersService.project_user_role_bs
-      .subscribe((user_role) => {
+    this.usersService.projectUser_bs.subscribe((projectUser: ProjectUser) => {
         // this.logger.log('[ACTIVATE-APPSUMO-PRODUCT] - USER ROLE ', user_role);
-        if (user_role) {
-          this.USER_ROLE = user_role
+        if (projectUser) {
+          this.USER_ROLE = projectUser.role
         }
       });
   }
diff --git a/src/app/create-project-wizard/get-start-chatbot-fork/get-start-chatbot-fork.component.ts b/src/app/create-project-wizard/get-start-chatbot-fork/get-start-chatbot-fork.component.ts
index 7c90b50c1566..65e08c3359b6 100644
--- a/src/app/create-project-wizard/get-start-chatbot-fork/get-start-chatbot-fork.component.ts
+++ b/src/app/create-project-wizard/get-start-chatbot-fork/get-start-chatbot-fork.component.ts
@@ -18,6 +18,7 @@ import { ChatbotModalComponent } from 'app/bots/bots-list/chatbot-modal/chatbot-
 import { MatDialog } from '@angular/material/dialog';
 import { TranslateService } from '@ngx-translate/core';
 import { CacheService } from 'app/services/cache.service';
+import { ProjectUser } from 'app/models/project-user';
 const swal = require('sweetalert');
 
 @Component({
@@ -112,12 +113,12 @@ export class GetStartChatbotForkComponent implements OnInit {
   }
 
   getUserRole() {
-    this.usersService.project_user_role_bs
-      .subscribe((userRole) => {
-
-        this.logger.log('[GET START CHATBOT FORK] - SUBSCRIPTION TO USER ROLE »»» ', userRole)
-        this.USER_ROLE = userRole;
-      })
+    this.usersService.projectUser_bs.subscribe((projectUser: ProjectUser) => {
+      if(projectUser){
+        this.logger.log('[GET START CHATBOT FORK] - SUBSCRIPTION TO USER ROLE »»» ', projectUser)
+        this.USER_ROLE = projectUser.role;
+      }
+    })
   }
 
   // getCurrentProject() {
diff --git a/src/app/create-project-wizard/install-template/install-template.component.ts b/src/app/create-project-wizard/install-template/install-template.component.ts
index 2e4ed7045e0d..d46908facbfe 100644
--- a/src/app/create-project-wizard/install-template/install-template.component.ts
+++ b/src/app/create-project-wizard/install-template/install-template.component.ts
@@ -22,6 +22,7 @@ import { ProjectPlanService } from 'app/services/project-plan.service';
 import { UsersService } from 'app/services/users.service';
 import { NotifyService } from 'app/core/notify.service';
 import { ChatbotModalComponent } from 'app/bots/bots-list/chatbot-modal/chatbot-modal.component';
+import { ProjectUser } from 'app/models/project-user';
 @Component({
   selector: 'appdashboard-install-template',
   templateUrl: './install-template.component.html',
@@ -136,12 +137,12 @@ export class InstallTemplateComponent extends PricingBaseComponent implements On
   }
 
   getUserRole() {
-    this.usersService.project_user_role_bs
-      .subscribe((userRole) => {
-
-        this.logger.log('[INSTALL-TEMPLATE] - SUBSCRIPTION TO USER ROLE »»» ', userRole)
-        this.USER_ROLE = userRole;
-      })
+    this.usersService.projectUser_bs.subscribe((projectUser: ProjectUser) => {
+      if(projectUser){
+        this.logger.log('[INSTALL-TEMPLATE] - SUBSCRIPTION TO USER ROLE »»» ', projectUser)
+        this.USER_ROLE = projectUser.role;
+      }
+    })
   }
 
   getParamsTemplatesAndProjects() {
diff --git a/src/app/department-edit-add/department-edit-add.component.ts b/src/app/department-edit-add/department-edit-add.component.ts
index 14d1f490824a..584889663398 100755
--- a/src/app/department-edit-add/department-edit-add.component.ts
+++ b/src/app/department-edit-add/department-edit-add.component.ts
@@ -22,6 +22,7 @@ import { takeUntil } from 'rxjs/operators'
 import { FaqKb } from 'app/models/faq_kb-model';
 import { ProjectPlanService } from 'app/services/project-plan.service';
 import { PricingBaseComponent } from 'app/pricing/pricing-base/pricing-base.component';
+import { ProjectUser } from 'app/models/project-user';
 import { RoleService } from 'app/services/role.service';
 declare const $: any;
 const swal = require('sweetalert');
@@ -426,16 +427,13 @@ export class DepartmentEditAddComponent extends PricingBaseComponent implements
 
 
   getUserRole() {
-    this.usersService.project_user_role_bs
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((userRole) => {
-
-        this.logger.log('[DEPT-EDIT-ADD] - SUBSCRIPTION TO USER ROLE »»» ', userRole)
+    this.usersService.projectUser_bs.pipe(takeUntil(this.unsubscribe$)).subscribe((projectUser: ProjectUser) => {
+      if(projectUser){
+        this.logger.log('[DEPT-EDIT-ADD] - SUBSCRIPTION TO USER ROLE »»» ', projectUser)
         // used to display / hide 'WIDGET' and 'ANALITCS' in home.component.html
-        this.USER_ROLE = userRole;
-      })
+        this.USER_ROLE = projectUser.role;
+      }
+    })
   }
 
   getBrowserVersion() {
@@ -1364,12 +1362,12 @@ export class DepartmentEditAddComponent extends PricingBaseComponent implements
 
   getProjectuserbyUseridAndGoToEditProjectuser(member_id: string) {
 
-    this.usersService.getProjectUserByUserId(member_id).subscribe((projectUser: any) => {
+    this.usersService.getProjectUserByUserId(member_id).subscribe((projectUser: ProjectUser) => {
       this.logger.log('[DEPT-EDIT-ADD] GET projectUser by USER-ID ', projectUser)
       if (projectUser) {
-        this.logger.log('[DEPT-EDIT-ADD] - GET projectUser by USER-ID > projectUser id', projectUser[0]._id);
+        this.logger.log('[DEPT-EDIT-ADD] - GET projectUser by USER-ID > projectUser id', projectUser._id);
 
-        this.router.navigate(['project/' + this.project._id + '/user/edit/' + projectUser[0]._id]);
+        this.router.navigate(['project/' + this.project._id + '/user/edit/' + projectUser._id]);
       }
     }, (error) => {
       this.logger.error('[DEPT-EDIT-ADD] GET projectUser by USER-ID - ERROR ', error);
diff --git a/src/app/home-components/home-analytics-indicator/home-analytics-indicator.component.ts b/src/app/home-components/home-analytics-indicator/home-analytics-indicator.component.ts
index b1f59774cd6c..6f8b89684633 100644
--- a/src/app/home-components/home-analytics-indicator/home-analytics-indicator.component.ts
+++ b/src/app/home-components/home-analytics-indicator/home-analytics-indicator.component.ts
@@ -9,6 +9,7 @@ import { ContactsService } from 'app/services/contacts.service';
 import { LoggerService } from 'app/services/logger/logger.service';
 import { AppConfigService } from 'app/services/app-config.service';
 import { AnalyticsService } from 'app/services/analytics.service';
+import { ProjectUser } from 'app/models/project-user';
 @Component({
   selector: 'appdashboard-home-analytics-indicator',
   templateUrl: './home-analytics-indicator.component.html',
@@ -97,13 +98,11 @@ export class HomeAnalyticsIndicatorComponent implements OnInit {
 
 
   getUserRole() {
-    this.usersService.project_user_role_bs
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((userRole) => {
-        this.USER_ROLE = userRole;
-      })
+    this.usersService.projectUser_bs.pipe(takeUntil(this.unsubscribe$)).subscribe((projectUser: ProjectUser) => {
+      if(projectUser){
+        this.USER_ROLE = projectUser.role;
+      }
+    })
   }
 
   getActiveContactsCount() {
diff --git a/src/app/home-components/home-cds/home-cds.component.ts b/src/app/home-components/home-cds/home-cds.component.ts
index 2cadab7ed522..da325177acf2 100644
--- a/src/app/home-components/home-cds/home-cds.component.ts
+++ b/src/app/home-components/home-cds/home-cds.component.ts
@@ -8,6 +8,7 @@ import { NotifyService } from 'app/core/notify.service';
 import { ModalChatbotNameComponent } from 'app/knowledge-bases/modals/modal-chatbot-name/modal-chatbot-name.component';
 import { ModalHookBotComponent } from 'app/knowledge-bases/modals/modal-hook-bot/modal-hook-bot.component';
 import { Chatbot } from 'app/models/faq_kb-model';
+import { ProjectUser } from 'app/models/project-user';
 import { PricingBaseComponent } from 'app/pricing/pricing-base/pricing-base.component';
 import { AppConfigService } from 'app/services/app-config.service';
 import { DepartmentService } from 'app/services/department.service';
@@ -225,14 +226,12 @@ export class HomeCdsComponent extends PricingBaseComponent implements OnInit, On
 
 
   getUserRole() {
-    this.usersService.project_user_role_bs
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((userRole) => {
-        this.logger.log('[HOME-CDS] - SUBSCRIPTION TO USER ROLE »»» ', userRole)
-        this.USER_ROLE = userRole;
-      })
+    this.usersService.projectUser_bs.pipe(takeUntil(this.unsubscribe$)).subscribe((projectUser: ProjectUser) => {
+      if(projectUser){
+        this.logger.log('[HOME-CDS] - SUBSCRIPTION TO USER ROLE »»» ', projectUser)
+        this.USER_ROLE = projectUser.role;
+      }
+    })
   }
 
 
diff --git a/src/app/home-components/home-convs-graph/home-convs-graph.component.ts b/src/app/home-components/home-convs-graph/home-convs-graph.component.ts
index 8aea66dff296..456b7fe936c0 100644
--- a/src/app/home-components/home-convs-graph/home-convs-graph.component.ts
+++ b/src/app/home-components/home-convs-graph/home-convs-graph.component.ts
@@ -12,6 +12,7 @@ import { ContactsService } from 'app/services/contacts.service';
 import { LoggerService } from 'app/services/logger/logger.service';
 import { AppConfigService } from 'app/services/app-config.service';
 import { AnalyticsService } from 'app/services/analytics.service';
+import { ProjectUser } from 'app/models/project-user';
 
 @Component({
   selector: 'appdashboard-home-convs-graph',
@@ -226,13 +227,11 @@ export class HomeConvsGraphComponent implements OnInit, OnChanges {
  
 
   getUserRole() {
-    this.usersService.project_user_role_bs
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((userRole) => {
-        this.USER_ROLE = userRole;
-      })
+    this.usersService.projectUser_bs.pipe(takeUntil(this.unsubscribe$)).subscribe((projectUser: ProjectUser) => {
+      if(projectUser){
+        this.USER_ROLE = projectUser.role;
+      }
+    })
   }
 
   getMonthsName() {
diff --git a/src/app/home-components/home-create-chatbot/home-create-chatbot.component.ts b/src/app/home-components/home-create-chatbot/home-create-chatbot.component.ts
index 8ea5b8f2eed8..45ec7484b382 100644
--- a/src/app/home-components/home-create-chatbot/home-create-chatbot.component.ts
+++ b/src/app/home-components/home-create-chatbot/home-create-chatbot.component.ts
@@ -21,6 +21,7 @@ import { NotifyService } from 'app/core/notify.service';
 import { PricingBaseComponent } from 'app/pricing/pricing-base/pricing-base.component';
 import { TranslateService } from '@ngx-translate/core';
 import { BrandService } from 'app/services/brand.service';
+import { ProjectUser } from 'app/models/project-user';
 
 @Component({
   selector: 'appdashboard-home-create-chatbot',
@@ -258,15 +259,12 @@ export class HomeCreateChatbotComponent extends PricingBaseComponent implements
 
 
   getUserRole() {
-    this.usersService.project_user_role_bs
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((userRole) => {
-
-        this.logger.log('[HOME-CREATE-CHATBOT] - SUBSCRIPTION TO USER ROLE »»» ', userRole)
-        this.USER_ROLE = userRole;
-      })
+    this.usersService.projectUser_bs.pipe(takeUntil(this.unsubscribe$)).subscribe((projectUser: ProjectUser) => {
+      if(projectUser){
+        this.logger.log('[HOME-CREATE-CHATBOT] - SUBSCRIPTION TO USER ROLE »»» ', projectUser)
+        this.USER_ROLE = projectUser.role;
+      }
+    })
   }
 
   getCurrentProjectAndPrjctBots() {
diff --git a/src/app/home-components/home-create-teammate/home-create-teammate.component.ts b/src/app/home-components/home-create-teammate/home-create-teammate.component.ts
index 7a7602480153..9149d7e1e6a1 100644
--- a/src/app/home-components/home-create-teammate/home-create-teammate.component.ts
+++ b/src/app/home-components/home-create-teammate/home-create-teammate.component.ts
@@ -16,6 +16,7 @@ import { HomeInviteTeammateErrorModalComponent } from './home-invite-teammate-er
 import { TranslateService } from '@ngx-translate/core';
 import { PricingBaseComponent } from 'app/pricing/pricing-base/pricing-base.component';
 import { BrandService } from 'app/services/brand.service';
+import { ProjectUser } from 'app/models/project-user';
 
 @Component({
   selector: 'appdashboard-home-create-teammate',
@@ -172,15 +173,12 @@ export class HomeCreateTeammateComponent extends PricingBaseComponent implements
 
 
   getUserRole() {
-    this.usersService.project_user_role_bs
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((userRole) => {
-
-        this.logger.log('[HOME-CREATE-TEAMMATE] - SUBSCRIPTION TO USER ROLE »»» ', userRole)
-        this.USER_ROLE = userRole;
-      })
+    this.usersService.projectUser_bs.pipe(takeUntil(this.unsubscribe$)).subscribe((projectUser: ProjectUser) => {
+      if(projectUser){
+        this.logger.log('[HOME-CREATE-TEAMMATE] - SUBSCRIPTION TO USER ROLE »»» ', projectUser)
+        this.USER_ROLE = projectUser.role;
+      }
+    })
   }
 
   getLoggedUser() {
@@ -586,12 +584,12 @@ export class HomeCreateTeammateComponent extends PricingBaseComponent implements
 
   getProjectuserbyUseridAndGoToEditProjectuser(member_id: string) {
     this.usersService.getProjectUserByUserId(member_id)
-      .subscribe((projectUser: any) => {
+      .subscribe((projectUser: ProjectUser) => {
         this.logger.log('[HOME-CREATE-TEAMMATE] - GET projectUser by USER-ID ', projectUser)
         if (projectUser) {
-          this.logger.log('[HOME-CREATE-TEAMMATE] - GET projectUser > projectUser id', projectUser[0]._id);
+          this.logger.log('[HOME-CREATE-TEAMMATE] - GET projectUser > projectUser id', projectUser._id);
 
-          this.router.navigate(['project/' + this.projectId + '/user/edit/' + projectUser[0]._id]);
+          this.router.navigate(['project/' + this.projectId + '/user/edit/' + projectUser._id]);
         }
       }, (error) => {
         this.logger.error('[HOME-CREATE-TEAMMATE] - GET projectUser by USER-ID - ERROR ', error);
diff --git a/src/app/home-components/home-kb/home-kb.component.ts b/src/app/home-components/home-kb/home-kb.component.ts
index e0172c69dee7..439679465ff8 100644
--- a/src/app/home-components/home-kb/home-kb.component.ts
+++ b/src/app/home-components/home-kb/home-kb.component.ts
@@ -22,6 +22,7 @@ import { FaqService } from 'app/services/faq.service';
 import { ModalHookBotComponent } from 'app/knowledge-bases/modals/modal-hook-bot/modal-hook-bot.component';
 import { DepartmentService } from 'app/services/department.service';
 import { ModalChatbotNameComponent } from 'app/knowledge-bases/modals/modal-chatbot-name/modal-chatbot-name.component';
+import { ProjectUser } from 'app/models/project-user';
 const Swal = require('sweetalert2')
 @Component({
   selector: 'appdashboard-home-kb',
@@ -100,14 +101,12 @@ export class HomeKbComponent extends PricingBaseComponent implements OnInit {
 
 
   getUserRole() {
-    this.usersService.project_user_role_bs
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((userRole) => {
-        this.logger.log('[HOME-KB] - SUBSCRIPTION TO USER ROLE »»» ', userRole)
-        this.USER_ROLE = userRole;
-      })
+    this.usersService.projectUser_bs.pipe(takeUntil(this.unsubscribe$)).subscribe((projectUser: ProjectUser) => {
+      if(projectUser){
+        this.logger.log('[HOME-KB] - SUBSCRIPTION TO USER ROLE »»» ', projectUser)
+        this.USER_ROLE = projectUser.role;
+      }
+    })
   }
 
   getCurrentProject() {
diff --git a/src/app/home-components/home-whatsapp-account/home-whatsapp-account.component.ts b/src/app/home-components/home-whatsapp-account/home-whatsapp-account.component.ts
index 94c91512ec81..61cabf0c26e1 100644
--- a/src/app/home-components/home-whatsapp-account/home-whatsapp-account.component.ts
+++ b/src/app/home-components/home-whatsapp-account/home-whatsapp-account.component.ts
@@ -13,6 +13,7 @@ import { Subscription } from 'rxjs';
 import { takeUntil } from 'rxjs/operators'
 import { Subject } from 'rxjs';
 import { ProjectService } from 'app/services/project.service';
+import { ProjectUser } from 'app/models/project-user';
 const swal = require('sweetalert');
 
 @Component({
@@ -133,16 +134,14 @@ export class HomeWhatsappAccountComponent implements OnInit, OnChanges {
   }
 
   getProjectUserRole() {
-    this.usersService.project_user_role_bs
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((user_role) => {
-        this.logger.log('[HOME-WA] - GET PROJECT-USER ROLE ', user_role);
-        if (user_role) {
-          this.USER_ROLE = user_role;
+    this.usersService.projectUser_bs.pipe(takeUntil(this.unsubscribe$)).subscribe((projectUser: ProjectUser) => {
+      if(projectUser){
+        this.logger.log('[HOME-WA] - GET PROJECT-USER ROLE ', projectUser);
+        if (projectUser.role) {
+          this.USER_ROLE = projectUser.role;
         }
-      });
+      }
+    });
   }
 
   translateLabels() {
diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts
index 3a9ded135823..af2dbeb3b185 100755
--- a/src/app/home/home.component.ts
+++ b/src/app/home/home.component.ts
@@ -41,6 +41,7 @@ import { AnalyticsService } from 'app/services/analytics.service';
 import { ThemePalette } from '@angular/material/core';
 import { ProgressSpinnerMode } from '@angular/material/progress-spinner';
 import { QuotesService } from 'app/services/quotes.service';
+import { ProjectUser } from 'app/models/project-user';
 
 const swal = require('sweetalert');
 const Swal = require('sweetalert2')
@@ -311,12 +312,12 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit {
     this.getProjectUser();
 
     // GET AND SAVE ALL BOTS OF CURRENT PROJECT IN LOCAL STORAGE
-    this.usersService.getBotsByProjectIdAndSaveInStorage();
+    this.faqKbService.getBotsByProjectIdAndSaveInStorage();
 
     // TEST FUNCTION : GET ALL AVAILABLE PROJECT USER
     // this.getAvailableProjectUsersByProjectId();
 
-    this.getUserRole();
+    // this.getUserRole();
     // this.getProjectPlan(); 
     // this.getVisitorCounter();
     this.getOSCODE();
@@ -3305,30 +3306,27 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit {
   // *** NOTE: THE SAME CALLBACK IS RUNNED IN THE SIDEBAR.COMP ***
   getProjectUser() {
     this.logger.log('[HOME] CALL GET-PROJECT-USER')
-    this.usersService.getProjectUserByUserId(this.user._id).subscribe((projectUser: any) => {
+    this.usersService.getProjectUserByUserId(this.user._id).subscribe((projectUser: ProjectUser) => {
       this.logger.log('[HOME] PROJECT-USER GET BY PROJECT-ID & CURRENT-USER-ID ', projectUser)
       if (projectUser) {
-        this.logger.log('[HOME] PROJECT-USER ID ', projectUser[0]._id)
-        this.logger.log('[HOME] USER IS AVAILABLE ', projectUser[0].user_available)
-        this.logger.log('[HOME] USER IS BUSY ', projectUser[0].isBusy)
+        this.logger.log('[HOME] PROJECT-USER ID ', projectUser._id)
+        this.logger.log('[HOME] USER IS AVAILABLE ', projectUser.user_available)
+        this.logger.log('[HOME] USER IS BUSY ', projectUser.isBusy)
         // this.user_is_available_bs = projectUser.user_available;
 
-        if (projectUser[0].user_available !== undefined) {
-          this.usersService.user_availability(projectUser[0]._id, projectUser[0].user_available, projectUser[0].isBusy, projectUser[0]);
+        if (projectUser.user_available !== undefined) {
+          this.usersService.setProjectUser(projectUser);
         }
-        if (projectUser[0].role !== undefined) {
-          this.logger.log('!!! »»» HOME GET THE USER ROLE FOR THE PROJECT »»', this.projectId, '»»» ', projectUser[0].role);
+        if (projectUser.role !== undefined) {
+          this.logger.log('!!! »»» HOME GET THE USER ROLE FOR THE PROJECT »»', this.projectId, '»»» ', projectUser.role);
 
           // SEND THE ROLE TO USER SERVICE THAT PUBLISH
-          this.usersService.user_role(projectUser[0].role);
+          this.USER_ROLE = projectUser.role;
 
           // save the user role in storage - then the value is get by auth.service:
           // the user with agent role can not access to the pages under the settings sub-menu
-          // this.auth.user_role(projectUser[0].role);
-          // this.usersLocalDbService.saveUserRoleInStorage(projectUser[0].role);
-
-          // used to display / hide 'WIDGET' and 'ANALITCS' in home.component.html
-          this.USER_ROLE = projectUser[0].role;
+          // this.auth.user_role(projectUser.role);
+          // this.usersLocalDbService.saveUserRoleInStorage(projectUser.role);
         }
 
       }
@@ -3410,18 +3408,18 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit {
   // CON getUserRole() AGGIORNO this.USER_ROLE QUANDO LA SIDEBAR, NEL MOMENTO
   // IN CUI ESGUE getProjectUser() PASSA LO USER ROLE ALLO USER SERVICE CHE LO PUBBLICA
   // NOTA: LA SIDEBAR AGGIORNA LO USER ROLE PRIMA DELLA HOME
-  getUserRole() {
-    this.usersService.project_user_role_bs
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((userRole) => {
+  // getUserRole() {
+  //   this.usersService.project_user_role_bs
+  //     .pipe(
+  //       takeUntil(this.unsubscribe$)
+  //     )
+  //     .subscribe((userRole) => {
 
-        this.logger.log('[HOME] - SUBSCRIPTION TO USER ROLE »»» ', userRole)
-        // used to display / hide 'WIDGET' and 'ANALITCS' in home.component.html
-        this.USER_ROLE = userRole;
-      })
-  }
+  //       this.logger.log('[HOME] - SUBSCRIPTION TO USER ROLE »»» ', userRole)
+  //       // used to display / hide 'WIDGET' and 'ANALITCS' in home.component.html
+  //       this.USER_ROLE = userRole;
+  //     })
+  // }
 
   // TEST FUNCTION : GET ALL AVAILABLE PROJECT USER
   getAvailableProjectUsersByProjectId() {
@@ -3566,12 +3564,12 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit {
   // SERVED_BY: add this if not exist -->
   getProjectuserbyUseridAndGoToEditProjectuser(member_id: string) {
     this.usersService.getProjectUserByUserId(member_id)
-      .subscribe((projectUser: any) => {
+      .subscribe((projectUser: ProjectUser) => {
         this.logger.log('[HOME] - GET projectUser by USER-ID ', projectUser)
         if (projectUser) {
-          this.logger.log('[HOME] - GET projectUser > projectUser id', projectUser[0]._id);
+          this.logger.log('[HOME] - GET projectUser > projectUser id', projectUser._id);
 
-          this.router.navigate(['project/' + this.projectId + '/user/edit/' + projectUser[0]._id]);
+          this.router.navigate(['project/' + this.projectId + '/user/edit/' + projectUser._id]);
         }
       }, (error) => {
         this.logger.error('[HOME] - GET projectUser by USER-ID - ERROR ', error);
diff --git a/src/app/hours/hours.component.ts b/src/app/hours/hours.component.ts
index 8aaf8cccf4fb..c851b84f085e 100755
--- a/src/app/hours/hours.component.ts
+++ b/src/app/hours/hours.component.ts
@@ -16,6 +16,7 @@ import { v4 as uuidv4 } from 'uuid';
 import { DAYS } from './utils';
 import { takeUntil } from 'rxjs/operators';
 import { Subject } from 'rxjs';
+import { ProjectUser } from 'app/models/project-user';
 import { RoleService } from 'app/services/role.service';
 const Swal = require('sweetalert2')
 
@@ -103,11 +104,12 @@ export class HoursComponent implements OnInit, OnDestroy {
   }
 
   getUserRole() {
-    this.usersService.project_user_role_bs
-      .subscribe((userRole) => {
-        this.logger.log('[HOURS] - $UBSCRIPTION TO USER ROLE »»» ', userRole)
-        this.USER_ROLE = userRole;
-      })
+    this.usersService.projectUser_bs.subscribe((projectUser: ProjectUser) => {
+      if(projectUser){
+        this.logger.log('[HOURS] - $UBSCRIPTION TO USER ROLE »»» ', projectUser)
+        this.USER_ROLE = projectUser.role;
+      }
+    })
   }
 
   getOSCODE() {
diff --git a/src/app/hours/old_hours.component.html b/src/app/hours/old_hours.component.html
deleted file mode 100755
index 7b484b77d2c9..000000000000
--- a/src/app/hours/old_hours.component.html
+++ /dev/null
@@ -1,591 +0,0 @@
-<!-- <div class="navbar-brand" style="z-index: -1;margin-top:10px; padding-left:30px">
-    <i class="material-icons" style="vertical-align: middle !important; cursor: pointer;" (click)="goBack()">keyboard_arrow_left</i>
-    {{ "Hours" | translate }}
-</div> -->
-<!-- <p style="z-index: 1050;position: relative;margin-top:6px; padding-left:30px" class="navbar-brand">
-  {{ 'Settings' | translate }}
-</p> -->
-
-<span class="navbar-brand navbar-brand-sidebar-settings"
-  [ngStyle]="{'margin-top':isChromeVerGreaterThan100 === true ? '-64px' : '6px' }"
-  [ngClass]="{'is_opened':IS_OPEN_SETTINGS_SIDEBAR, 'is_closed':!IS_OPEN_SETTINGS_SIDEBAR }">
-
-  <i class="material-icons">settings</i>
-
-  <span *ngIf="IS_OPEN_SETTINGS_SIDEBAR">{{ 'Settings' | translate }} </span>
-</span>
-<!-- <span class="navbar-brand navbar-brand-title">
-  {{ "Hours" | translate }}
-</span> -->
-
-
-
-<div class="main-content" style="padding-top:0px; padding-left: 5px;padding-right: 5px;">
- 
-  <div class="page-title--sidebar-settings"
-    [ngClass]="{'page-title--sidebar-settings_opened':IS_OPEN_SETTINGS_SIDEBAR, 'page-title--sidebar-settings_closed':!IS_OPEN_SETTINGS_SIDEBAR }">
-    {{ 'Hours' | translate }}
-  </div>
-  
-  <div class="container-fluid" style="padding-left: 5px;padding-right: 5px;">
-    <div class="content-wpr" style="display: flex;">
-
-      <appdashboard-settings-sidebar> </appdashboard-settings-sidebar>
-
-      <div class="teplate-content" style="flex: 1 1 auto; margin-left: 20px;">
-
-        <div class="row">
-          <div class="col-md-12">
-
-            <div class="card card card--no-border" style="padding-bottom: 25px;margin-top: 5px;">
-
-              <loading-spinner *ngIf="showSpinner"></loading-spinner>
-
-              <div class="card-content" *ngIf="!showSpinner" style="padding-top: 10px;">
-
-                <div class="selector-bar">
-
-                  <div class="slot-add-selector">
-                    <div class="slot-name">General</div>
-                  
-                    <!-- ----------- MAT-MENU ----------- -->
-                    <button mat-icon-button [matMenuTriggerFor]="slotList" aria-label="namespaceList">
-                      <mat-icon>unfold_more</mat-icon>
-                    </button>
-                  
-                    <mat-menu #slotList="matMenu">
-                      <!-- Add slot option -->
-                      <button style="padding: 0 10px" class="mat-menu-custom-btn" mat-menu-item (click)="presentModalNewSlot()">
-                        <mat-icon>add</mat-icon>
-                        <span>New Slot</span>
-                      </button>
-
-                      <!-- General Operating Hours option -->
-                      <button style="padding: 0 10px" class="mat-menu-custom-btn" mat-menu-item (click)="onSelectGeneralOperatingHours()">
-                        <!-- // to be translated -->
-                        <span>General</span>
-                      </button>
-                    
-                      <!-- (click)="onSelectNamespace(namespace)" -->
-                      <!-- <button [ngClass]="{'active--namespace': namespace.name === selectedNamespace.name}" mat-menu-item
-                        *ngFor="let slot of timeSlotsArray">
-                        <span>{{slot}}</span>
-                      </button> -->
-
-                      <!-- Slot list options -->
-                      <button mat-menu-item *ngFor="let slot of timeSlotsArray" (click)="onSelectSlot(slot)">
-                        <span>{{slot.name}}</span>
-                      </button>
-
-                    </mat-menu>
-                  </div>
-                  <!-- <mat-form-field>
-                    <mat-label>Choose an option</mat-label>
-                    <mat-select>
-                      <mat-option value="option1">Option 1</mat-option>
-                      <mat-option value="option2">Option 2</mat-option>
-                      <mat-option value="option3">Option 3</mat-option>
-                    </mat-select>
-                  </mat-form-field> -->
-
-                  <button class="btn btn-primary" style="float:right" (click)="updateProject()">
-                    {{ "Save" | translate }}
-                  </button>
-                </div>
-
-                <!-- <div class="row">
-                  <div class="col-md-12">
-                    <button class="btn btn-primary" style="float:right" (click)="updateProject()">
-                      {{ "Save" | translate }}
-                    </button>
-
-                  </div>
-                </div> -->
-
-                <div class="row">
-                  <div class="col-md-12">
-
-                    <div class="oaerror info" style="margin-bottom: 16px;">
-                      <!-- color: #566787; font-weight:500; font-size: 14px; -->
-                      <p
-                        style=" font-size: 16px; font-family: 'Poppins','Roboto', 'Arial', sans-serif; color: #394f5a;">
-                        {{ "HoursPage.ActivateTimetables" | translate }}
-                      </p>
-
-
-                      <!-- <label class="container" for="hoursActive"
-                    style="margin-left: 0px; margin-bottom: 6px; color:#7695a5; font-weight:300">
-                    {{ "HoursPage.OpeningHoursActivated" | translate }}
-                    <input type="checkbox" id="hoursActive" (change)="onChange($event)"
-                      [checked]="isActiveOperatingHours" />
-                    <span class="checkmark" style="margin-top: 2px;"></span>
-                  </label> -->
-
-                      <div class="checkbox">
-                        <label class="title-attribute">
-                          <input type="checkbox" class="form-check-input" id="exampleCheck1" (change)="onChange($event)"
-                            [checked]="isActiveOperatingHours">
-                          <span style="font-size: 14px; color: #7695a5;">
-                            {{ "HoursPage.OpeningHoursActivated" | translate }}
-                          </span>
-                        </label>
-                      </div>
-
-                      <!--
-                  <div class="onoffswitch">
-                    <input (change)="onChange($event)" 
-                    [checked]="isActiveOperatingHours" type="checkbox" name="onoffswitch" class="onoffswitch-checkbox" id="myonoffswitch">
-                    <label class="onoffswitch-label" for="myonoffswitch">
-                      <span class="onoffswitch-inner"></span>
-                      <span class="onoffswitch-switch"></span>
-                    </label>
-                  </div>
-
-                  <div class="info-div"> 
-                  <i class="material-icons" style="color: #5e9ded; vertical-align: middle;"> info </i> 
-                    <span style="color:#7695a5"> {{ "HoursPage.OpeningHoursActivated" | translate }} </span> 
-                  </div>
-                -->
-
-
-                    </div>
-                  </div>
-                </div>
-                <div class="row">
-                  <div class="col-md-12">
-
-                    <div class="oaerror info" [ngClass]="{'oaerror_info_disabled' : !isActiveOperatingHours}">
-                      <div class="row">
-
-                        <div class="col-sm-12">
-                          <p style=" font-size: 16px; font-family: 'Poppins', sans-serif !important; color: #394f5a;"
-                            [ngClass]="{'day_label_disabled' : !isActiveOperatingHours}">
-                            Time zone
-                          </p>
-                        </div>
-
-                        <!-- /* THE PROJECT TIME ZONE IS SETTED TO */ -->
-                        <div class="col-sm-6 custom_col">
-                          <p style="color: #7695a5; font-size: 14px; margin-bottom: 8px"
-                            [ngClass]="{'day_label_disabled' : !isActiveOperatingHours}">
-                            <!-- The project timezone is setted to: -->
-                            {{ "HoursPage.TheProject" | translate }} time zone {{ "HoursPage.IsSettedTo" | translate }}
-                          </p>
-                          <!-- // TOOLTIP -->
-                          <!-- <span class="tooltipx">time zone <span class="tooltiptext">{{ "HoursPage.CurrentTimezone" | translate }} (UTC {{ timezoneUTCOffsetForTooltip}}) {{timezoneNameForTooltip}}</span> </span>  -->
-
-                          <!-- // note: with ngModel is set the previously selected value on the select option dropdown -->
-                          <ng-select #selectElem class="custom" [(ngModel)]="current_prjct_timezone_name"
-                            (change)="setSelectedTimeZone()" style="margin-bottom: 6px;"
-                            [disabled]="!isActiveOperatingHours">
-                            <ng-option *ngFor="let tz of timezone_NamesAndUTC_list" [value]="tz.value"
-                              style="height: 16px !important" [disabled]="!isActiveOperatingHours">
-                              {{ tz.tz }}
-                            </ng-option>
-                          </ng-select>
-                        </div>
-
-                        <!-- /* YOU ARE CURRENTLY AT */ -->
-                        <div class="col-sm-6">
-                          <p style="color: #7695a5; font-size: 14px; margin-bottom: 6px"
-                            [ngClass]="{'day_label_disabled' : !isActiveOperatingHours}">
-                            {{ "HoursPage.YouAreCurrentlyAt" | translate }} <span style="font-weight:400;"> (UTC
-                              {{ timezoneUTCOffsetForTooltip}}) {{timezoneNameForTooltip}} </span>
-                          </p>
-                          <button class="btn btn-primary"
-                            [disabled]="timeZoneSelectedIsUnlikeCurrentTimezone === false || !isActiveOperatingHours"
-                            (click)="setProjectToYourTimezone()"
-                            style="padding-top: 9px; padding-bottom: 9px; padding-right: 15px; padding-left: 15px; margin-top: 2px;">
-                            <span class="tooltipx">{{ "HoursPage.SetProjectToYourTimeZone" | translate }}
-                              <span *ngIf="timeZoneSelectedIsUnlikeCurrentTimezone === false" class="tooltiptext">
-                                {{ "HoursPage.TheProjectIsAlreadySettedOnYourTZ" | translate }}
-                              </span>
-                            </span>
-                          </button>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-
-                <div class="row">
-                  <div class="col-md-12">
-                    <div class="card" [ngClass]="{'card_disabled' : !isActiveOperatingHours}">
-
-                      <div class="card-content table-responsive">
-                        <table class="table table-hover oh-table">
-                          <thead>
-                            <tr>
-                              <th>
-                                <span style="color: #394f5a; font-family:'Poppins','Roboto', 'Arial', sans-serif"
-                                  [ngClass]="{'day_label_disabled' : !isActiveOperatingHours}">
-                                  <!-- <strong> -->
-                                  {{ "HoursPage.Day" | translate }}
-                                  <!-- </strong> -->
-                                </span>
-                              </th>
-
-                              <th colspan="2">
-                                <span style="color: #394f5a; font-family:'Poppins','Roboto', 'Arial', sans-serif"
-                                  [ngClass]="{'day_label_disabled' : !isActiveOperatingHours}">
-                                  <strong>
-                                    {{ "HoursPage.Status" | translate }}
-                                  </strong>
-                                </span>
-                              </th>
-
-                              <!-- // FOR DEBUG -->
-                              <!-- <th>
-                            <span style="color: #566787">
-                              <strong>
-                                Hours
-                              </strong>
-                            </span>
-                          </th> -->
-
-                              <th style="padding-left: 25px;">
-                                <!--  color: #566787  -->
-                                <span style="color: #394f5a; font-family: 'Poppins','Roboto', 'Arial', sans-serif"
-                                  [ngClass]="{'day_label_disabled' : !isActiveOperatingHours}">
-                                  <strong>
-                                    {{ "HoursPage.Morning" | translate }}
-                                  </strong>
-                                </span>
-                              </th>
-
-                              <th></th>
-
-                              <th style="padding-left: 25px;">
-                                <span style="color: #394f5a; font-family: 'Poppins','Roboto', 'Arial', sans-serif"
-                                  [ngClass]="{'day_label_disabled' : !isActiveOperatingHours}">
-                                  <strong>
-                                    {{ "HoursPage.Afternoon" | translate }}
-                                  </strong>
-                                </span>
-                              </th>
-
-                            <tr>
-                          </thead>
-
-                          <tbody>
-                            <tr *ngFor="let d of days">
-
-                              <td>
-                                <span style="color: #7695a5; font-weight: 300"
-                                  [ngClass]="{'day_label_disabled' : !isActiveOperatingHours}">
-                                  {{ d.weekday | translate}}
-                                </span>
-                              </td>
-
-                              <td style="white-space: nowrap; width: 1%; padding-bottom: 6px;">
-                                <label class="switch" style="margin-bottom: 0px;">
-                                  <input type="checkbox"
-                                    (change)="onChangeOpenedClosedStatus($event, d?._id, d?.weekday)"
-                                    [checked]="d?.isOpen == true" [disabled]="!isActiveOperatingHours">
-                                  <!-- [ngClass]="{'open_close_switch_disabled' : !isActiveOperatingHours}" -->
-                                  <span class="slider round"
-                                    [ngClass]="{'open_close_switch_disabled' : !isActiveOperatingHours}"></span>
-                                </label>
-                              </td>
-
-                              <td>
-                                <span *ngIf="d.isOpen" class="opened_label"
-                                  [ngClass]="{'opened_closed_label_disabled' : !isActiveOperatingHours}">
-                                  <!-- APERTO -->
-                                  {{ "HoursPage.Opened" | translate }}
-                                </span>
-                                <span *ngIf="!d.isOpen" class="closed_label"
-                                  [ngClass]="{'opened_closed_label_disabled' : !isActiveOperatingHours}">
-                                  <!-- CHIUSO -->
-                                  {{ "HoursPage.Closed" | translate }}
-                                </span>
-                              </td>
-
-                              <!-- // FOR DEBUG -->
-                              <!-- <td>
-                            <tr *ngFor="let oh of d.operatingHours">
-                              <td> {{ oh.start }} </td>
-                              <td> {{ oh.end }}  </td>
-                            </tr>
-                          </td> -->
-
-                              <!-- ----------------------------------------------- -->
-                              <!-- AM HOUR -->
-                              <!-- ----------------------------------------------- -->
-                              <td style="padding-top: 6px; padding-bottom: 6px;">
-
-          
-                              <!-- ----------------------------------------------- -->
-                              <!-- AM START HOUR -->
-                              <!-- ----------------------------------------------- -->
-                                <!-- AM START HOUR - ONLY THE LABEL-BTN 'FROM' -->
-                                <button [disabled]="d.isOpen != true || !isActiveOperatingHours"
-                                  [ngClass]="{'disabled' : d.isOpen != true || !isActiveOperatingHours}" type="button"
-                                  rel="tooltip" title="edit hour" class="btn btn-primary btn-simple btn-xs"
-                                  (click)='openAmStart(d?._id)' style="padding-right: 4px; color: #7695a5">
-                                  <span class="edithours_btnlabel">
-                                    {{ "HoursPage.From" | translate }}
-                                  </span>
-                                
-                                </button>
-
-                                <!-- AM START HOUR - THE INPUT/VISUALIZATION FIELD -->
-                                <input [disabled]="d.isOpen != true || !isActiveOperatingHours"
-                                  (input)="onChangeAmStartFromArrow($event.target.value, d?._id)"
-                                  [ngClass]="{'disabled' : d.isOpen != true || !isActiveOperatingHours}" type="time"
-                                  value="{{ d.operatingHoursAmStart }}">
-
-                                <!-- AM START HOUR - ONLY THE ICON-BTN FOR 'FROM' -->
-                                <!-- <button [disabled]="d.isOpen != true || !isActiveOperatingHours"
-                                  [ngClass]="{'disabled' : d.isOpen != true || !isActiveOperatingHours}" type="button"
-                                  rel="tooltip" title="edit hour"
-                                  class="btn btn-primary btn-simple btn-xs custom_schedule_btn"
-                                  (click)='openAmStart(d?._id)' style="padding-right: 7px; padding-left: 1px;">
-                                  <i class="material-icons">schedule</i>
-                                </button> -->
-
-                                <br class="newline">
-
-                                <!-- =================================== AM END HOUR ========================================== -->
-                                <!-- AM END HOUR - ONLY THE LABEL-BTN 'TO' -->
-                                <button [disabled]="d.isOpen != true || !isActiveOperatingHours"
-                                  [ngClass]="{'disabled' : d.isOpen != true || !isActiveOperatingHours}" type="button"
-                                  rel="tooltip" title="edit hour" class="btn btn-primary btn-simple btn-xs"
-                                  (click)='openAmEnd(d?._id)' style="padding-right: 4px; color: #7695a5">
-                                  <span class="edithours_btnlabelTo" [ngClass]="{'it_custom' : browser_lang == 'it'}">
-                                    {{ "HoursPage.To" | translate }}
-                                  </span>
-                                </button>
-
-                                <!-- AM END HOUR - THE INPUT/VISUALIZATION FIELD -->
-                                <input [disabled]="d.isOpen != true || !isActiveOperatingHours"
-                                  (input)="onChangeAmEndFromArrow($event.target.value, d?._id)"
-                                  [ngClass]="{'disabled' : d.isOpen != true || !isActiveOperatingHours}" type="time"
-                                  value="{{ d.operatingHoursAmEnd }}">
-
-                                <!-- AM END HOUR - ONLY THE ICON-BTN FOR 'TO' -->
-                                <!-- <button [disabled]="d.isOpen != true || !isActiveOperatingHours"
-                                  [ngClass]="{'disabled' : d.isOpen != true || !isActiveOperatingHours}" type="button"
-                                  rel="tooltip" title="edit hour" class="btn btn-primary btn-simple btn-xs"
-                                  (click)='openAmEnd(d?._id)' style="padding-right: 7px; padding-left: 1px;">
-                                  <i class="material-icons">schedule</i>
-                                </button> -->
-
-                              </td>
-
-                              <!-- =================================== BTNS: CLOSE / OPEN THE TIMES OF THE SECOND INTERVAL =================================== -->
-                              <td style="white-space: nowrap; width: 1%;">
-                                <!-- placeholder button - is dispalyed when the day is closed and when operating hours are not active -->
-                                <button *ngIf="d?.isOpen === false || !isActiveOperatingHours" type="button"
-                                  rel="tooltip" title="remove second interval"
-                                  class="btn btn-default btn-simple btn-xs  btn-circle close_pm disabled"
-                                  style="padding-left: 1px;padding-top: 1px; padding-right: 4px">
-                                  <i class="material-icons"
-                                    style="font-size: 12px; font-weight: 600; padding-bottom: 3px">
-                                    clear
-                                  </i>
-                                </button>
-
-                                <button *ngIf="d?.isOpenPm === true && d?.isOpen === true && isActiveOperatingHours"
-                                  type="button" rel="tooltip" title="remove second interval"
-                                  class="btn btn-danger btn-simple btn-xs  btn-circle close_pm"
-                                  (click)="close_Pm(d?._id)"
-                                  style="padding-left: 1px;padding-top: 1px; padding-right: 4px">
-                                  <i class="material-icons"
-                                    style="font-size: 12px; font-weight: 600; padding-bottom: 3px">
-                                    clear
-                                  </i>
-                                </button>
-
-                                <button *ngIf="d?.isOpenPm === false && d?.isOpen === true && isActiveOperatingHours"
-                                  type="button" rel="tooltip" title="add second interval"
-                                  class="btn btn-success btn-simple btn-xs  btn-circle open_pm"
-                                  (click)="open_Pm(d?._id)"
-                                  style="padding-left: 1px;padding-top: 1px; padding-right: 4px">
-                                  <i class="material-icons"
-                                    style="font-size: 12px; font-weight: 600; padding-bottom: 2px; position: relative; top: -2px;">
-                                    add
-                                  </i>
-                                </button>
-                              </td>
-
-                              <!-- ===================================================================================================
-                          ========================================== PM HOUR ================================================
-                          =================================================================================================== -->
-                              <td style="padding-top: 6px; padding-bottom: 6px;">
-
-                                <!-- =================================== PM START HOUR ========================================== -->
-                                <!-- PM START HOUR - ONLY THE LABEL-BTN 'FROM' -->
-                                <button [disabled]="d.isOpen != true || d.isOpenPm == false || !isActiveOperatingHours"
-                                  type="button" rel="tooltip" title="edit hour"
-                                  class="btn btn-primary btn-simple btn-xs"
-                                  [ngClass]="{'disabled' : d.isOpen != true || d.isOpenPm == false || !isActiveOperatingHours}"
-                                  (click)='openPmStart(d?._id)' style="padding-right: 4px;color: #566787">
-                                  <span class="edithours_btnlabel">
-                                    {{ "HoursPage.From" | translate }}
-                                  </span>
-                                </button>
-
-                                <!-- PM START HOUR - THE INPUT/VISUALIZATION FIELD -->
-                                <input [disabled]="d.isOpen != true || d.isOpenPm == false || !isActiveOperatingHours"
-                                  (input)="onChangePmStartFromArrow($event.target.value, d?._id)"
-                                  [ngClass]="{'disabled' : d.isOpen != true || d.isOpenPm == false || !isActiveOperatingHours}"
-                                  type="time" value="{{ d.operatingHoursPmStart }}">
-
-                                <!-- PM START HOUR - ONLY THE ICON-BTN FOR 'FROM' -->
-                                <!-- <button [disabled]="d.isOpen != true || d.isOpenPm == false || !isActiveOperatingHours"
-                                  type="button" rel="tooltip" title="edit hour"
-                                  class="btn btn-primary btn-simple btn-xs"
-                                  [ngClass]="{'disabled' : d.isOpen != true || d.isOpenPm == false || !isActiveOperatingHours}"
-                                  (click)='openPmStart(d?._id)' style="padding-right: 7px; padding-left: 1px;">
-                                  <i class="material-icons">schedule</i>
-                                </button> -->
-
-                                <br class="newline">
-
-                                <!-- =================================== PM END HOUR ========================================== -->
-                                <!-- PM END HOUR - ONLY THE LABEL-BTN 'TO' -->
-                                <button [disabled]="d.isOpen != true || d.isOpenPm == false || !isActiveOperatingHours"
-                                  type="button" rel="tooltip" title="edit hour"
-                                  class="btn btn-primary btn-simple btn-xs"
-                                  [ngClass]="{'disabled' : d.isOpen != true || d.isOpenPm == false || !isActiveOperatingHours}"
-                                  (click)='openPmEnd(d?._id)' style="padding-right: 4px; color: #566787">
-                                  <span class="edithours_btnlabelTo" [ngClass]="{'it_custom' : browser_lang == 'it'}">
-                                    {{ "HoursPage.To" | translate }}
-                                  </span>
-                                </button>
-
-                                <!-- PM END HOUR - THE INPUT/VISUALIZATION FIELD -->
-                                <input [disabled]="d.isOpen != true || d.isOpenPm == false || !isActiveOperatingHours"
-                                  (input)="onChangePmEndFromArrow($event.target.value, d?._id)"
-                                  [ngClass]="{'disabled' : d.isOpen != true || d.isOpenPm == false || !isActiveOperatingHours}"
-                                  type="time" value="{{ d.operatingHoursPmEnd }}">
-
-                                <!-- PM END HOUR - ONLY THE ICON-BTN FOR 'TO' -->
-                                <!-- <button [disabled]="d.isOpen != true || d.isOpenPm == false || !isActiveOperatingHours"
-                                  type="button" rel="tooltip" title="edit hour"
-                                  class="btn btn-primary btn-simple btn-xs"
-                                  [ngClass]="{'disabled' : d.isOpen != true || d.isOpenPm == false || !isActiveOperatingHours}"
-                                  (click)='openPmEnd(d?._id)' style="padding-right: 7px;padding-left: 1px;">
-                                  <i class="material-icons">schedule</i>
-                                </button> -->
-
-                              </td>
-
-                            </tr>
-                          </tbody>
-                        </table>
-                      </div>
-
-                    </div>
-                  </div>
-                </div>
-
-                <div class="row">
-                  <div class="col-md-12">
-                    <button class="btn btn-primary" (click)="updateProject()">
-                      <!-- {{ "HoursPage.UpdateHours" | translate }} -->
-                      {{ "Save" | translate }}
-                    </button>
-
-                    <!-- // TEST THE OPERATORS  -->
-                    <!-- <button class="btn btn-success" (click)="testAvailableProjectUserConsideringProjectOperatingHours()">
-                  TEST AVAILABLE
-                </button> -->
-                  </div>
-                </div>
-
-                <!-- // TO TEST OPERATING HOURS BY INIECTING THE JSON IN THE INPUT FIELD -->
-                <!-- <label  class="col-sm-2" style="height: 36px; padding-top: 7px; padding-left: 16px; padding-right: 16px; text-align: right;">
-              + {{ "Hours" | translate }}
-            </label>
-            <div class="col-sm-10">
-              <input [(ngModel)]="operatingHours" class="" type="text" placeholder='{{ "Hours" | translate }}'>
-            </div> -->
-
-              </div>
-              <!-- // BUTTON TO TEST OPERATING HOURS BY INIECTING THE JSON IN THE INPUT FIELD -->
-              <!-- <div style="padding-left:25px" class="col-sm-10 col-sm-offset-2">
-            <button class="btn btn-success" (click)="updateProjectOperatingHours()">
-              {{ "HoursPage.UpdateHours" | translate }}
-            </button>   
-          </div> -->
-
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-
-<!-- ============ INFO MODAL: UPDATING OPERATING HOURS IN PROGRESS ============ -->
-<div class="modal" tabindex="-1" role="dialog" [ngStyle]="{'display': displayModalUpdatingOperatingHours}"
-  style="background-color: rgba(90,90,90,0.5);">
-  <div class="modal-dialog modal-sm" role="document">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" aria-label="Close" (click)="closeModalOperatingHours()">
-          <span aria-hidden="true">&times;</span>
-        </button>
-
-        <h4 class="modal-title">
-          {{ "HoursPage.UpdateHours" | translate }}
-          <!-- <code>{{id_toDelete}}</code> -->
-        </h4>
-      </div>
-
-      <div class="modal-body" style="padding-top:15px; padding-bottom:15px">
-        <span *ngIf="SHOW_CIRCULAR_SPINNER">
-          <div class="loader" style="top:25%;">
-            <svg class="circular" viewBox="25 25 50 50">
-              <circle class="path" cx="50" cy="50" r="15" fill="none" stroke-width="2" stroke-miterlimit="10" />
-            </svg>
-
-          </div>
-          <p style="margin-top: 60px; text-align: center; color: #566787; font-weight: 500">
-            {{ "HoursPage.Processing" | translate }}
-          </p>
-        </span>
-
-        <!-- IF THERE IS NO ERROR -->
-        <span *ngIf="!SHOW_CIRCULAR_SPINNER && !UPDATE_HOURS_ERROR ">
-          <div style="text-align: center">
-            <i class="material-icons" style="color:#70b665">done</i>
-            <p style="color:#70b665; font-weight: 500">
-              {{ "HoursPage.Completed" | translate }}
-            </p>
-          </div>
-          <p style="margin-top:10px; text-align: center; color: #566787; font-weight: 500">
-            {{ "HoursPage.OperatingHoursSuccessfullyUpdated" | translate }}
-          </p>
-        </span>
-
-        <!-- IF THERE IS AN ERROR -->
-        <span *ngIf="!SHOW_CIRCULAR_SPINNER && UPDATE_HOURS_ERROR">
-          <div style="text-align: center ">
-            <i class="material-icons" style="color:#ff5252">report_problem</i>
-            <p style="color:#ff5252; font-weight: 500">
-              <!-- {{ "HoursPage.Error" | translate }} -->
-              {{ "Error" | translate }}
-            </p>
-          </div>
-          <p style="margin-top:10px; text-align: center; color: #566787; font-weight: 500">
-            <span *ngIf="!TIMEZONE_NAME_IS_NULL">{{ "HoursPage.AnErrorHasOccurred" | translate }}</span> <span
-              *ngIf="TIMEZONE_NAME_IS_NULL">{{ "HoursPage.ErrorSelectTheProjectTimezone" | translate }}</span>
-          </p>
-        </span>
-      </div>
-
-      <div class="modal-footer" style="text-align: center;">
-        <button class="btn btn-primary" [disabled]="SHOW_CIRCULAR_SPINNER" (click)="closeModalOperatingHoursHandler()"
-          style="padding:12px 16px;">
-          {{ "HoursPage.Continue" | translate }}
-        </button>
-      </div>
-
-    </div>
-    <!-- /.modal-content -->
-  </div>
-  <!-- /.modal-dialog -->
-</div>
\ No newline at end of file
diff --git a/src/app/integrations/integrations.component.ts b/src/app/integrations/integrations.component.ts
index ad9469ef08c5..e019aaf7f007 100644
--- a/src/app/integrations/integrations.component.ts
+++ b/src/app/integrations/integrations.component.ts
@@ -14,6 +14,7 @@ import { ProjectPlanService } from 'app/services/project-plan.service';
 import { PLAN_NAME } from 'app/utils/util';
 import { AppStoreService } from 'app/services/app-store.service';
 import { environment } from 'environments/environment';
+import { ProjectUser } from 'app/models/project-user';
 
 
 const swal = require('sweetalert');
@@ -168,21 +169,17 @@ export class IntegrationsComponent implements OnInit, OnDestroy {
   }
 
   getProjectUserRole() {
-    this.usersService.project_user_role_bs
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((user_role) => {
-        if (user_role) {
-          this.USER_ROLE = user_role
-          if (user_role === 'agent') {
-            this.ROLE_IS_AGENT = true;
+    this.usersService.projectUser_bs.pipe(takeUntil(this.unsubscribe$)).subscribe((projectUser: ProjectUser) => {
+      if (projectUser) {
+        this.USER_ROLE = projectUser.role
+        if (this.USER_ROLE === 'agent') {
+          this.ROLE_IS_AGENT = true;
 
-          } else {
-            this.ROLE_IS_AGENT = false;
-          }
+        } else {
+          this.ROLE_IS_AGENT = false;
         }
-      });
+      }
+    });
   }
 
   /**
@@ -818,7 +815,6 @@ export class IntegrationsComponent implements OnInit, OnDestroy {
         if (index != -1) { this.INTEGRATIONS.splice(index, 1) };
       }
 
-
       let index = this.INTEGRATIONS.findIndex(i => i.category === INTEGRATIONS_CATEGORIES.CHANNEL);
       if (index === -1) {
         let idx = this.CATEGORIES.findIndex(c => c.type === INTEGRATIONS_CATEGORIES.CHANNEL);
diff --git a/src/app/knowledge-bases/knowledge-bases-alert/knowledge-bases-alert.component.ts b/src/app/knowledge-bases/knowledge-bases-alert/knowledge-bases-alert.component.ts
index fcec682ae73f..8f37d5047326 100644
--- a/src/app/knowledge-bases/knowledge-bases-alert/knowledge-bases-alert.component.ts
+++ b/src/app/knowledge-bases/knowledge-bases-alert/knowledge-bases-alert.component.ts
@@ -11,6 +11,7 @@ import { Project } from 'app/models/project-model';
 import { UsersService } from 'app/services/users.service';
 import { KnowledgeBaseService } from 'app/services/knowledge-base.service';
 import { TranslateService } from '@ngx-translate/core';
+import { ProjectUser } from 'app/models/project-user';
 
 @Component({
   selector: 'appdashboard-knowledge-bases-alert',
@@ -69,9 +70,11 @@ export class KnowledgeBasesAlertComponent extends PricingBaseComponent  implemen
   }
 
   getProjectUserRole() {
-    this.usersService.project_user_role_bs.subscribe((user_role) => {
-      this.USER_ROLE = user_role
-      this.logger.log('[KB-ALERT] - GET PROJECT USER ROLE - USER_ROLE : ', this.USER_ROLE)
+    this.usersService.projectUser_bs.subscribe((projectUser: ProjectUser) => {
+      if(projectUser){
+        this.USER_ROLE = projectUser.role
+        this.logger.log('[KB-ALERT] - GET PROJECT USER ROLE - USER_ROLE : ', this.USER_ROLE)
+      }
     })
   }
 
diff --git a/src/app/knowledge-bases/knowledge-bases.component.scss b/src/app/knowledge-bases/knowledge-bases.component.scss
index 39bb6962b524..9e9d8b5ea663 100644
--- a/src/app/knowledge-bases/knowledge-bases.component.scss
+++ b/src/app/knowledge-bases/knowledge-bases.component.scss
@@ -34,7 +34,7 @@
     }
 }
 
-.header-first-column{
+.header-first-column {
     display: flex;
     flex-direction: column;
 }
@@ -547,7 +547,7 @@ table {
     padding-top: 8px !important;
     padding-bottom: 8px !important;
     color: #fff !important;
-  }
+}
 
 .show-hide-button {
     cursor: pointer;
@@ -801,33 +801,33 @@ table {
     .cbPopover-cbname {
         font-weight: 600;
     }
-  }
+}
 
 
-  .overlay-backdrop {
-   background:  #191d2285;
-  }
+.overlay-backdrop {
+    background: #191d2285;
+}
 
   .kb-container-wpr {
     width: 100%;
   }
 
-  .widget-set-up-col {
+.widget-set-up-col {
     // background-color: rgb(241, 241, 241);
     margin-top: -15px;
     padding: 20px 20px 10px 36px;
     // margin-bottom: 24px;
     // margin-left: 32px;
-  }
-  
-  .widget-set-up-text {
+}
+
+.widget-set-up-text {
     font-size: 22px;
     font-weight: 600;
     margin-bottom: 6px;
     line-height: 32px;
-  }
-  
-  .widget-set-up-link-to-docs-wpr {
+}
+
+.widget-set-up-link-to-docs-wpr {
     font-size: 14px;
     font-weight: 400;
     margin-bottom: 6px;
@@ -835,17 +835,17 @@ table {
     background-color: rgb(241, 241, 241);
     padding: 15px;
     width: 100%;
-  }
-  
-  .widget-set-up-link-to-docs {
+}
+
+.widget-set-up-link-to-docs {
     margin-left: 8px;
     vertical-align: middle;
     color: #0f62ff;
     font-size: 14px;
     font-weight: 400;
     cursor: pointer;
-  }
-  
-  .widget-set-up-link-to-docs:hover {
+}
+
+.widget-set-up-link-to-docs:hover {
     text-decoration: underline;
-  }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/app/knowledge-bases/knowledge-bases.component.ts b/src/app/knowledge-bases/knowledge-bases.component.ts
index f23f7595c0bc..0b3850405cdd 100644
--- a/src/app/knowledge-bases/knowledge-bases.component.ts
+++ b/src/app/knowledge-bases/knowledge-bases.component.ts
@@ -43,6 +43,7 @@ import { getSteps as defaultSteps, defaultStepOptions } from './knowledge-bases.
 
 import Step from 'shepherd.js/src/types/step';
 import { ModalFaqsComponent } from './modals/modal-faqs/modal-faqs.component';
+import { ProjectUser } from 'app/models/project-user';
 // import {
 //   // provideHighlightOptions,
 //   Highlight,
@@ -1437,7 +1438,7 @@ export class KnowledgeBasesComponent extends PricingBaseComponent implements OnI
       width: '600px',
     });
     dialogRef.afterClosed().subscribe(body => {
-      this.logger.log('[Modal Add URLS AFTER CLOSED] Dialog body: ', body);
+      console.log('[Modal Add URLS AFTER CLOSED] Dialog body: ', body);
       if (body) {
         this.onAddMultiKb(body)
       }
@@ -1454,7 +1455,7 @@ export class KnowledgeBasesComponent extends PricingBaseComponent implements OnI
 
     });
     dialogRef.afterClosed().subscribe(body => {
-      this.logger.log('[Modal IMPORT SITEMAP AFTER CLOSED]  body: ', body);
+      console.log('[Modal IMPORT SITEMAP AFTER CLOSED]  body: ', body);
       if (body) {
         this.onAddMultiKb(body)
       }
@@ -1481,17 +1482,12 @@ export class KnowledgeBasesComponent extends PricingBaseComponent implements OnI
   }
 
   getProjectUserRole() {
-    this.usersService.project_user_role_bs
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((user_role) => {
-        this.logger.log('[PRJCT-EDIT-ADD] - USER ROLE ', user_role);
-        if (user_role) {
-          this.USER_ROLE = user_role
-
-        }
-      });
+    this.usersService.projectUser_bs.pipe(takeUntil(this.unsubscribe$)).subscribe((projectUser: ProjectUser) => {
+      this.logger.log('[PRJCT-EDIT-ADD] - USER ROLE ', projectUser);
+      if (projectUser) {
+        this.USER_ROLE = projectUser.role
+      }
+    });
   }
 
 
diff --git a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html
index 396f2f45f131..1c1c1996fea4 100644
--- a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html
+++ b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html
@@ -276,7 +276,7 @@
                     </td>
 
                     <td style="min-width:150px; width:150px; font-size: small;" (click)="onOpenBaseModalDetail(kb)">
-                        {{ kb.createdAt | amTimeAgo }}
+                        {{ kb.updatedAt | amTimeAgo }}
                     </td>
 
                     <!-- <td class="" style="max-width: 100%; display: grid;" (click)="onOpenBaseModalDetail(kb)">
diff --git a/src/app/models/project-user.ts b/src/app/models/project-user.ts
index 0da119226c69..6995e4399e83 100755
--- a/src/app/models/project-user.ts
+++ b/src/app/models/project-user.ts
@@ -4,6 +4,7 @@ export interface ProjectUser {
     createdAt?: any;
     id_project?: string;
     user_available?: boolean;
+    profileStatus?: string;
     role?: string;
     createdBy?: string;
     is_group_member?: boolean;
diff --git a/src/app/pricing/pricing.component.ts b/src/app/pricing/pricing.component.ts
index 0c0cbbb61c6a..316038fa9ec6 100755
--- a/src/app/pricing/pricing.component.ts
+++ b/src/app/pricing/pricing.component.ts
@@ -14,6 +14,7 @@ import { AppConfigService } from '../services/app-config.service';
 import { TranslateService } from '@ngx-translate/core';
 import {  additionalFeaturesPlanD, additionalFeaturesPlanE, additionalFeaturesPlanEE, featuresPlanA, featuresPlanB, featuresPlanC, featuresPlanD, featuresPlanE, featuresPlanEE, featuresPlanF, highlightedFeaturesPlanA, highlightedFeaturesPlanB, highlightedFeaturesPlanC, highlightedFeaturesPlanD, highlightedFeaturesPlanE, highlightedFeaturesPlanEE, highlightedFeaturesPlanF, PLAN_NAME } from 'app/utils/util';
 import { NotifyService } from 'app/core/notify.service';
+import { ProjectUser } from 'app/models/project-user';
 
 declare var Stripe: any;
 
@@ -243,19 +244,17 @@ export class PricingComponent implements OnInit, OnDestroy {
 
   getLoggedUser() {
     this.auth.user_bs.subscribe((user) => {
-
       this.user = user;
     })
   }
 
   getProjectUserRole() {
-    this.usersService.project_user_role_bs
-      .subscribe((user_role) => {
-        this.logger.log('[APP-STORE] - GET PROJECT-USER ROLE ', user_role);
-        if (user_role) {
-          this.USER_ROLE = user_role;
-        }
-      });
+    this.usersService.projectUser_bs.subscribe((projectUser: ProjectUser) => {
+      this.logger.log('[APP-STORE] - GET PROJECT-USER ROLE ', projectUser);
+      if (projectUser) {
+        this.USER_ROLE = projectUser.role;
+      }
+    });
   }
 
   getCurrentProject() {
diff --git a/src/app/project-edit-add/project-edit-add.component.ts b/src/app/project-edit-add/project-edit-add.component.ts
index 179588847a7b..b594d9cb15e8 100755
--- a/src/app/project-edit-add/project-edit-add.component.ts
+++ b/src/app/project-edit-add/project-edit-add.component.ts
@@ -28,6 +28,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { CreditCardValidators } from 'angular-cc-library';
 import { ContactsService } from '../services/contacts.service';
 import { CacheService } from 'app/services/cache.service';
+import { ProjectUser } from 'app/models/project-user';
 import { RoleService } from 'app/services/role.service';
 
 const swal = require('sweetalert');
@@ -428,17 +429,14 @@ export class ProjectEditAddComponent implements OnInit, OnDestroy {
   }
 
   getProjectUserRole() {
-    this.usersService.project_user_role_bs
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((user_role) => {
-        this.logger.log('[PRJCT-EDIT-ADD] - USER ROLE ', user_role);
-        if (user_role) {
-          this.USER_ROLE = user_role
-
+    this.usersService.projectUser_bs.pipe(takeUntil(this.unsubscribe$)).subscribe((projectUser: ProjectUser) => {
+      if(projectUser){
+        this.logger.log('[PRJCT-EDIT-ADD] - USER ROLE ', projectUser);
+        if(projectUser.role) {
+          this.USER_ROLE = projectUser.role
         }
-      });
+      }
+    });
   }
 
   translateStrings() {
@@ -1293,6 +1291,7 @@ export class ProjectEditAddComponent implements OnInit, OnDestroy {
   getProjectPlan() {
     this.subscription = this.prjctPlanService.projectPlan$.subscribe((projectProfileData: any) => {
       //  this.logger.log('[PRJCT-EDIT-ADD] - getProjectPlan project Profile Data', projectProfileData)
+      this.logger.log('[PRJCT-EDIT-ADD] - getProjectPlan project Profile Data', projectProfileData)
       if (projectProfileData) {
         this.prjct_name = projectProfileData.name;
         this.logger.log('[PRJCT-EDIT-ADD] - getProjectPlan prjct_name', this.prjct_name);
diff --git a/src/app/projects/projects.component.ts b/src/app/projects/projects.component.ts
index 3cd0af417ad6..af6b3e35a4f2 100755
--- a/src/app/projects/projects.component.ts
+++ b/src/app/projects/projects.component.ts
@@ -156,6 +156,7 @@ export class ProjectsComponent implements OnInit, AfterContentInit, OnDestroy {
     this.unsubscribe$.next();
     this.unsubscribe$.complete();
   }
+
   getRouteParams() {
     this.route.queryParams.subscribe((params) => {
       this.logger.log('[PROJECTS] - GET ROUTE-PARAMS & APPID - params: ', params)
diff --git a/src/app/services/faq-kb.service.ts b/src/app/services/faq-kb.service.ts
index dc2a080c9d08..620542c7d368 100755
--- a/src/app/services/faq-kb.service.ts
+++ b/src/app/services/faq-kb.service.ts
@@ -8,6 +8,7 @@ import { AppConfigService } from '../services/app-config.service';
 import { LoggerService } from '../services/logger/logger.service';
 import { BehaviorSubject } from 'rxjs';
 import { map } from 'rxjs/operators';
+import { BotLocalDbService } from './bot-local-db.service';
 @Injectable()
 export class FaqKbService {
 
@@ -26,6 +27,7 @@ export class FaqKbService {
   constructor(
     private auth: AuthService,
     public appConfigService: AppConfigService,
+    private botLocalDbService: BotLocalDbService,
     private _httpClient: HttpClient,
     private logger: LoggerService
   ) {
@@ -412,6 +414,28 @@ export class FaqKbService {
       .delete(url, httpOptions)
   }
 
+  // GET AND SAVE ALL BOTS OF CURRENT PROJECT IN LOCAL STORAGE
+  public getBotsByProjectIdAndSaveInStorage() {
+    this.getFaqKbByProjectId().subscribe((bots: any) => {
+      this.logger.log('[USER-SERV] - GET BOT BY PROJECT ID AND SAVE IN STORAGE - bots ', bots);
+      if (bots && bots !== null) {
+
+        bots.forEach(bot => {
+          this.logger.log('[USER-SERV] - GET BOT BY PROJECT ID AND SAVE IN STORAGE - BOT', bot);
+          this.logger.log('[USER-SERV] - GET BOT BY PROJECT ID AND SAVE IN STORAGE - BOT-ID', bot._id);
+          this.botLocalDbService.saveBotsInStorage(bot._id, bot);
+        });
+
+      }
+    }, (error) => {
+      this.logger.error('[USER-SERV] - GET BOT BY PROJECT ID AND SAVE IN STORAGE - ERROR ', error);
+    }, () => {
+      this.logger.log('[USER-SERV] - GET BOT BY PROJECT ID AND SAVE IN STORAGE * COMPLETE');
+
+    });
+
+  }
+
   /**
    * @param name 
    * @param urlfaqkb 
diff --git a/src/app/services/notification.service.ts b/src/app/services/notification.service.ts
index 8cc24ae0c99c..c66a1b4298b6 100755
--- a/src/app/services/notification.service.ts
+++ b/src/app/services/notification.service.ts
@@ -21,7 +21,7 @@ export class NotificationService {
     private logger: LoggerService
   ) {
     this.user = auth.user_bs.value;
-    this.project_user_id = usersService.project_user_id_bs.value;
+    this.project_user_id = usersService.projectUser_bs.value._id;
     this.checkIfUserExistAndGetToken();
 
   
diff --git a/src/app/services/quotes.service.ts b/src/app/services/quotes.service.ts
index c398bd34e4e7..62a68d8dc51d 100644
--- a/src/app/services/quotes.service.ts
+++ b/src/app/services/quotes.service.ts
@@ -145,6 +145,8 @@ export class QuotesService {
       }
 
       limits = PLANS_LIST[plan];
+      // console.log('[Q-S] limits ', limits) 
+      // console.log('[Q-S] PLANS_LIST[plan] ', PLANS_LIST[plan]) 
 
     } else {
       if (project.trialExpired === true) {
diff --git a/src/app/services/role.service.ts b/src/app/services/role.service.ts
index 7d4e2ca1eb66..ab6f5f78ff44 100644
--- a/src/app/services/role.service.ts
+++ b/src/app/services/role.service.ts
@@ -38,9 +38,9 @@ export class RoleService {
 
       const projectId = currentProject._id
 
-      const projectUserRole = this.usersService.project_user_role_bs.value
-      this.logger.log('[ROLE-SERV] checkRoleForCurrentProject projectUserRole ', projectUserRole)
-      this.logger.log('[ROLE-SERV] checkRoleForCurrentProject > projectId ', projectId)
+      const projectUserRole = this.usersService.projectUser_bs.value.role
+      console.log('[ROLE-SERV] checkRoleForCurrentProject projectUserRole ', projectUserRole)
+      console.log('[ROLE-SERV] checkRoleForCurrentProject > projectId ', projectId)
       if (projectUserRole) {
         if (projectUserRole === 'agent') {
           this.logger.log('[ROLE-SERV] - checkRoleForCurrentProject ', projectUserRole, ' RUN NAVIGATE TO unauthorized page')
diff --git a/src/app/services/users.service.ts b/src/app/services/users.service.ts
index e65bbf6e0a2f..18cd85497f26 100755
--- a/src/app/services/users.service.ts
+++ b/src/app/services/users.service.ts
@@ -1,7 +1,7 @@
+import { ProjectUser } from 'app/models/project-user';
 import { Injectable } from '@angular/core';
 import { User } from '../models/user-model';
 import { PendingInvitation } from '../models/pending-invitation-model';
-import { ProjectUser } from '../models/project-user';
 import { Observable , BehaviorSubject} from 'rxjs';
 import { AuthService } from '../core/auth.service';
 import { HttpClient, HttpHeaders } from '@angular/common/http';
@@ -14,6 +14,7 @@ import { AppConfigService } from '../services/app-config.service';
 import { WebSocketJs } from "../services/websocket/websocket-js";
 import { avatarPlaceholder, getColorBck } from '../utils/util';
 import { LoggerService } from '../services/logger/logger.service';
+import { map } from 'rxjs/operators';
 interface NewUser {
   displayName: string;
   email: string;
@@ -24,11 +25,7 @@ interface NewUser {
 export class UsersService {
 
   wsService: WebSocketJs;
-  public user_is_available_bs: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(true);
-  public projectUser_bs: BehaviorSubject<any> = new BehaviorSubject<any>('');
-  public user_is_busy$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
-  public project_user_id_bs: BehaviorSubject<string> = new BehaviorSubject<string>('');
-  public project_user_role_bs: BehaviorSubject<string> = new BehaviorSubject<string>('');
+  public projectUser_bs: BehaviorSubject<ProjectUser> = new BehaviorSubject<ProjectUser>(null);
   public has_changed_availability_in_sidebar: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(null);
   public has_changed_availability_in_users: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(null);
   public userProfileImageExist: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(null);
@@ -67,8 +64,6 @@ export class UsersService {
     private auth: AuthService,
     private usersLocalDbService: LocalDbService,
     private router: Router,
-    private faqKbService: FaqKbService,
-    private botLocalDbService: BotLocalDbService,
     public appConfigService: AppConfigService,
     public webSocketJs: WebSocketJs,
     private logger: LoggerService,
@@ -525,7 +520,7 @@ export class UsersService {
    * @param user_id 
    * @returns 
    */
-  public getProjectUserByUserId(user_id: string): Observable<ProjectUser[]> {
+  public getProjectUserByUserId(user_id: string): Observable<ProjectUser> {
 
     const url = this.PROJECT_USER_URL + 'users/' + user_id;
     this.logger.log('[USER-SERV] - GET PROJECT-USER BY USER-ID - URL', url);
@@ -540,7 +535,7 @@ export class UsersService {
   
 
     return this._httpClient
-      .get<ProjectUser[]>(url, httpOptions)
+      .get<ProjectUser>(url, httpOptions).pipe(map((res)=> res[0]));
   }
 
   public getProjectUserByUserIdPassingProjectId(user_id: string,project_id:  string): Observable<ProjectUser[]> {
@@ -587,47 +582,6 @@ export class UsersService {
   }
 
 
-  // ------------------------------------------------------------------------------------------------
-  // TODO: TO REPLACE "getProjectUser()" USED BY THE SIDEBAR AND HOME COMPONENTS - CURRENTLY NOT USED
-  // -------------------------------------------------------------------------------------------------
-  getProjectUserAvailabilityAndRole() {
-    this.getProjectUserByUserId(this.currentUserId).subscribe((projectUser: any) => {
-      // this.logger.log('!! USER SERVICE - PROJECT-USER GET BY PROJECT-ID ', this.project_id);
-      this.logger.log('[USER-SERV] - PROJECT-USER GET BY CURRENT-USER-ID - CURRENT USE ID ', this.currentUserId);
-      this.logger.log('[USER-SERV] - PROJECT-USER GET BY CURRENT-USER-ID - PROJECT-USER ', projectUser);
-      this.logger.log('[USER-SERV] - PROJECT-USER GET BY CURRENT-USER-ID - PROJECT-USER LENGTH', projectUser.length);
-      if ((projectUser) && (projectUser.length !== 0)) {
-        this.logger.log('[USER-SERV] - PROJECT-USER GET BY CURRENT-USER-ID - PROJECT-USER ID ', projectUser[0]._id)
-        this.logger.log('[USER-SERV] - PROJECT-USER GET BY CURRENT-USER-ID - USER IS AVAILABLE ', projectUser[0].user_available)
-        // this.user_is_available_bs = projectUser.user_available;
-
-        if (projectUser[0].user_available !== undefined) {
-          this.user_availability(projectUser[0]._id, projectUser[0].user_available, projectUser[0].isBusy, projectUser[0])
-        }
-
-        // ADDED 21 AGO
-        if (projectUser[0].role !== undefined) {
-          this.logger.log('[USER-SERV] - PROJECT-USER GET BY CURRENT-USER-ID - CURRENT USER ROLE ', projectUser[0].role);
-          this.user_role(projectUser[0].role);
-
-          // save the user role in storage - then the value is get by auth.service:
-          // the user with agent role can not access to the pages under the settings sub-menu
-          // this.auth.user_role(projectUser[0].role);
-
-          this.usersLocalDbService.saveUserRoleInStorage(projectUser[0].role);
-        }
-      } else {
-        // this could be the case in which the current user was deleted as a member of the current project
-        this.logger.log('[USER-SERV] -  PROJECT-USER GET BY CURRENT-USER-ID - PROJECT-USER UNDEFINED ')
-      }
-
-    }, (error) => {
-      this.logger.error('[USER-SERV] - PROJECT-USER GET BY CURRENT-USER-ID - ERROR  ', error);
-    }, () => {
-      this.logger.log('[USER-SERV] - PROJECT-USER GET BY CURRENT-USER-ID * COMPLETE *');
-    });
-  }
-
 
   // -------------------------------------------------------------------------
   // GET ALL PROJECT PROJECT-USERS AND SAVE IN STORAGE USERS AND PROJECT-USERS
@@ -705,29 +659,6 @@ export class UsersService {
     }
   }
 
-  // GET AND SAVE ALL BOTS OF CURRENT PROJECT IN LOCAL STORAGE
-  getBotsByProjectIdAndSaveInStorage() {
-    this.faqKbService.getFaqKbByProjectId().subscribe((bots: any) => {
-      this.logger.log('[USER-SERV] - GET BOT BY PROJECT ID AND SAVE IN STORAGE - bots ', bots);
-      if (bots && bots !== null) {
-
-        bots.forEach(bot => {
-          this.logger.log('[USER-SERV] - GET BOT BY PROJECT ID AND SAVE IN STORAGE - BOT', bot);
-          this.logger.log('[USER-SERV] - GET BOT BY PROJECT ID AND SAVE IN STORAGE - BOT-ID', bot._id);
-          this.botLocalDbService.saveBotsInStorage(bot._id, bot);
-        });
-
-      }
-    }, (error) => {
-      this.logger.error('[USER-SERV] - GET BOT BY PROJECT ID AND SAVE IN STORAGE - ERROR ', error);
-    }, () => {
-      this.logger.log('[USER-SERV] - GET BOT BY PROJECT ID AND SAVE IN STORAGE * COMPLETE');
-
-    });
-
-  }
-
-
   // -----------------------------------------------------------------------------------------------------
   // PUBLISH: Project User ID, Availability; Busy - PUBLISH projectUser_id, user_available, isBusy
   // -----------------------------------------------------------------------------------------------------
@@ -740,15 +671,9 @@ export class UsersService {
    * @param user_available 
    * @param user_isbusy 
    */
-  public user_availability(projectUser_id: string, user_available: boolean, user_isbusy: boolean, projctuser:any) {
-    this.logger.log('[USER-SERV] - PUBLISH PROJECT-USER-ID ', projectUser_id);
-    this.logger.log('[USER-SERV] - PUBLISH USER AVAILABLE ', user_available);
-    this.logger.log('[USER-SERV] - PUBLISH USER IS BUSY ', user_isbusy);
-
-    this.project_user_id_bs.next(projectUser_id);
-    this.user_is_available_bs.next(user_available);
-    this.user_is_busy$.next(user_isbusy);
-    this.projectUser_bs.next(projctuser);
+  public setProjectUser(projctUser:ProjectUser) {
+    this.logger.log('[USER-SERV] - PUBLISH PROJECT_USER ', projctUser);
+    this.projectUser_bs.next(projctUser);
   }
 
 
@@ -861,47 +786,6 @@ export class UsersService {
   }
 
 
-  /**
-   * PUBLISH PROJECT-USER ROLE AND CHECK THE ROLE (FOR THE CURRENT PROJECT) SAVED IN THE STORAGE
-   * NOTE: THE projectUser_role IS PASSED FROM HOME - SIDEBAR - NAVBAR-FOR-PANEL
-   * NOTE: IF THE USER ROLE STORED NOT MATCHES THE USER ROLE PUBLISHED IS RESET IN STORAGE THE PROJECT OBJCT
-   * @param projectUser_role 
-   */
-  public user_role(projectUser_role: string) {
-    this.logger.log('[USER-SERV] PUBLISH THE USER-ROLE  >>', projectUser_role, '<< FOR THE PROJECT ID ', this.project_id);
-
-    // PUBLISH THE USER ROLE
-    this.project_user_role_bs.next(projectUser_role);
-
-    // COMPARE THE STORED ROLE WITH THE USER ROLE PUBLISHED
-    // const storedProjectJson = localStorage.getItem(this.project_id);
-    // if (storedProjectJson) {
-    //   const projectObject = JSON.parse(storedProjectJson);
-    //   const storedUserRole = projectObject['role'];
-    //   const storedProjectName = projectObject['name'];
-    //   const storedProjectId = projectObject['_id'];
-    //   const storedProjectOH = projectObject['operatingHours'];
-    //   this.logger.log('[USER-SERV] USER ROLE FROM STORAGE >>', storedUserRole, '<<');
-    //   this.logger.log('[USER-SERV] PROJECT NAME FROM STORAGE ', storedProjectName);
-    //   this.logger.log('[USER-SERV] PROJECT ID FROM STORAGE ', storedProjectId);
-
-      // if (storedUserRole !== projectUser_role) {
-      // this.logger.log('[USER-SERV] - USER ROLE STORED !!! NOT MATCHES USER ROLE PUBLISHED - RESET PROJECT IN STORAGE ');
-
-      //   // const projectForStorage: Project = {
-      //   //   _id: storedProjectId,
-      //   //   name: storedProjectName,
-      //   //   role: projectUser_role,
-      //   //   operatingHours: storedProjectOH
-      //   // }
-
-      //   // RESET THE PROJECT IN THE STORAGE WITH THE UPDATED ROLE
-      //   localStorage.setItem(storedProjectId, JSON.stringify(projectForStorage));
-      // }
-    // }
-  }
-
-
   /**
    * UPDATE PROJECT-USER AVAILABILITY (PUT)
    * @param projectUser_id 
diff --git a/src/app/services/websocket/ws-requests.service.ts b/src/app/services/websocket/ws-requests.service.ts
index 0ff0c73b737d..8bd9c42b9661 100755
--- a/src/app/services/websocket/ws-requests.service.ts
+++ b/src/app/services/websocket/ws-requests.service.ts
@@ -188,7 +188,6 @@ export class WsRequestsService implements OnDestroy {
         //   this.webSocketJs.unsubscribe('/' + this.project_id + '/requests/' + this.subscribed_request_id); // WHEN CHANGING THE PROJECT I UNSUBSCRIBE FROM THE "REQUEST BY ID" TO WHICH IT IS POSSIBLY SUBSCRIBED
         //   this.webSocketJs.unsubscribe('/' + this.project_id + '/requests/' + this.subscribed_request_id + '/messages'); // AS ABOVE BUT FOR MESSAGES
         // }
-
         //  unsuscribe requester presence al cambio progetto
         if (this.subscribed_requester_id) {
           this.webSocketJs.unsubscribe('/' + this.project_id + '/project_users/users/' + this.subscribed_requester_id);
@@ -215,6 +214,7 @@ export class WsRequestsService implements OnDestroy {
           function (data, notification) {
 
             if (data) {
+              // console.log("[WS-REQUESTS-SERV] DSHB - Create - DATA ", data);
               // ------------------------------------------------
               // @ Agents - pass in data agents get from snapshot
               // ------------------------------------------------
@@ -486,7 +486,7 @@ export class WsRequestsService implements OnDestroy {
    * @param id_request 
    */
   subscribeTo_wsRequestById(id_request) {
-    // this.logger.log("[WS-REQUESTS-SERV] - SUBSCR TO WS REQUEST-BY-ID (REF) id_request ", id_request);
+    this.logger.log("[WS-REQUESTS-SERV] - SUBSCR TO WS REQUEST-BY-ID (REF) id_request ", id_request);
 
     this.unsubscribePreviousRequestId()
 
@@ -1209,7 +1209,10 @@ export class WsRequestsService implements OnDestroy {
 
     // const url = this.SERVER_BASE_PATH + 'modules/tilebot/ext/parameters/requests/' + id_request;
     const url = this.SERVER_BASE_PATH + this.project_id + '/requests/' + id_request + '/chatbot/parameters';
-    // this.logger.log('[WS-REQUESTS-SERV] - GET CONVERSATION WITH BOT URL ', url);
+    // https://tiledesk-server-pre.herokuapp.com/62c3f10152dc7400352bab0d/requests/support-group-62c3f10152dc7400352bab0d-e81d9c55-wab-109639215462567-393484506627/chatbot/parameters
+    
+
+    // console.log('[WS-REQUESTS-SERV] - GET CONVERSATION WITH BOT URL ', url);
 
     // 'Authorization': this.TOKEN,
     const httpOptions = {
diff --git a/src/app/static-pages/activities-static/activities-static.component.ts b/src/app/static-pages/activities-static/activities-static.component.ts
index 008591e8af4d..a363123aeb4b 100755
--- a/src/app/static-pages/activities-static/activities-static.component.ts
+++ b/src/app/static-pages/activities-static/activities-static.component.ts
@@ -14,6 +14,7 @@ import { PricingBaseComponent } from 'app/pricing/pricing-base/pricing-base.comp
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators'
 import { Location } from '@angular/common';
+import { ProjectUser } from 'app/models/project-user';
 import { RoleService } from 'app/services/role.service';
 const swal = require('sweetalert');
 
@@ -134,14 +135,12 @@ export class ActivitiesStaticComponent extends PricingBaseComponent implements O
   }
 
   getProjectUserRole() {
-    this.usersService.project_user_role_bs
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((user_role) => {
-        this.USER_ROLE = user_role;
+    this.usersService.projectUser_bs.pipe(takeUntil(this.unsubscribe$)).subscribe((projectUser: ProjectUser) => {
+       if(projectUser){
+        this.USER_ROLE = projectUser.role;
         this.logger.log('[ACTIVITIES-STATIC] - PROJECT USER ROLE: ', this.USER_ROLE);
-      });
+       }
+    });
   }
 
 
diff --git a/src/app/static-pages/analytics-static/analytics-static.component.ts b/src/app/static-pages/analytics-static/analytics-static.component.ts
index 19afac09a495..9fd54aafd2db 100755
--- a/src/app/static-pages/analytics-static/analytics-static.component.ts
+++ b/src/app/static-pages/analytics-static/analytics-static.component.ts
@@ -13,6 +13,7 @@ import { PricingBaseComponent } from 'app/pricing/pricing-base/pricing-base.comp
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators'
 import { Location } from '@angular/common';
+import { ProjectUser } from 'app/models/project-user';
 import { RoleService } from 'app/services/role.service';
 
 const swal = require('sweetalert');
@@ -158,15 +159,12 @@ export class AnalyticsStaticComponent extends PricingBaseComponent implements On
   }
 
   getProjectUserRole() {
-    this.usersService.project_user_role_bs
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((user_role) => {
-        this.USER_ROLE = user_role;
+    this.usersService.projectUser_bs.pipe(takeUntil(this.unsubscribe$)).subscribe((projectUser: ProjectUser) => {
+      if(projectUser){
+        this.USER_ROLE = projectUser.role;
         this.logger.log('[ANALYTICS-STATIC] - PROJECT USER ROLE: ', this.USER_ROLE);
-        // this.hideNavigationElem(this.USER_ROLE)
-      });
+      }    
+    });
   }
 
   hideNavigationElem(USER_ROLE) {
diff --git a/src/app/static-pages/automation-static/automation-static.component.ts b/src/app/static-pages/automation-static/automation-static.component.ts
index 29ebe5612851..53a1dd5adcae 100644
--- a/src/app/static-pages/automation-static/automation-static.component.ts
+++ b/src/app/static-pages/automation-static/automation-static.component.ts
@@ -13,6 +13,7 @@ import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators'
 import { PricingBaseComponent } from 'app/pricing/pricing-base/pricing-base.component';
 import { Location } from '@angular/common';
+import { ProjectUser } from 'app/models/project-user';
 import { RoleService } from 'app/services/role.service';
 @Component({
   selector: 'appdashboard-automation-static',
@@ -140,14 +141,12 @@ export class AutomationStaticComponent extends PricingBaseComponent implements O
 
 
   getProjectUserRole() {
-    this.usersService.project_user_role_bs
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((user_role) => {
-        this.USER_ROLE = user_role;
+    this.usersService.projectUser_bs.pipe(takeUntil(this.unsubscribe$)).subscribe((projectUser: ProjectUser) => {
+      if(projectUser){
+        this.USER_ROLE = projectUser.role;
         this.logger.log('[AUTOMATION-COMP-STATIC] - PROJECT USER ROLE: ', this.USER_ROLE);
-      });
+      }
+    });
   }
 
   getBrowserLang() {
diff --git a/src/app/static-pages/bots-static/bots-static.component.ts b/src/app/static-pages/bots-static/bots-static.component.ts
index b322223b5b60..431e1c61055a 100644
--- a/src/app/static-pages/bots-static/bots-static.component.ts
+++ b/src/app/static-pages/bots-static/bots-static.component.ts
@@ -3,6 +3,7 @@ import { Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
 import { AuthService } from 'app/core/auth.service';
 import { NotifyService } from 'app/core/notify.service';
+import { ProjectUser } from 'app/models/project-user';
 import { PricingBaseComponent } from 'app/pricing/pricing-base/pricing-base.component';
 import { LoggerService } from 'app/services/logger/logger.service';
 import { ProjectPlanService } from 'app/services/project-plan.service';
@@ -77,13 +78,11 @@ export class BotsStaticComponent extends PricingBaseComponent implements OnInit
   }
 
   getProjectUserRole() {
-    this.usersService.project_user_role_bs
-    .pipe(
-      takeUntil(this.unsubscribe$)
-    )
-    .subscribe((user_role) => {
-      this.USER_ROLE = user_role;
-      this.logger.log('[BOTS-STATIC] - PROJECT USER ROLE: ', this.USER_ROLE);
+    this.usersService.projectUser_bs.pipe(takeUntil(this.unsubscribe$)).subscribe((projectUser: ProjectUser) => {
+      if(projectUser){
+        this.USER_ROLE = projectUser.role;
+        this.logger.log('[BOTS-STATIC] - PROJECT USER ROLE: ', this.USER_ROLE);
+      }
     });
   }
 
diff --git a/src/app/static-pages/canned-responses-static/canned-responses-static.component.ts b/src/app/static-pages/canned-responses-static/canned-responses-static.component.ts
index 5df766293031..d12cf4d23a55 100644
--- a/src/app/static-pages/canned-responses-static/canned-responses-static.component.ts
+++ b/src/app/static-pages/canned-responses-static/canned-responses-static.component.ts
@@ -13,6 +13,7 @@ import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators'
 import { PricingBaseComponent } from 'app/pricing/pricing-base/pricing-base.component';
 import { Location } from '@angular/common';
+import { ProjectUser } from 'app/models/project-user';
 import { RoleService } from 'app/services/role.service';
 
 @Component({
@@ -137,14 +138,12 @@ export class CannedResponsesStaticComponent extends PricingBaseComponent impleme
   }
 
   getProjectUserRole() {
-    this.usersService.project_user_role_bs
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((user_role) => {
-        this.USER_ROLE = user_role;
+    this.usersService.projectUser_bs.pipe(takeUntil(this.unsubscribe$)).subscribe((projectUser: ProjectUser) => {
+      if(projectUser){
+        this.USER_ROLE = projectUser.role;
         this.logger.log('[CANNED-RES-STATIC] - PROJECT USER ROLE: ', this.USER_ROLE);
-      });
+      }
+    });
   }
 
 
diff --git a/src/app/static-pages/contacts-static/contacts-static.component.ts b/src/app/static-pages/contacts-static/contacts-static.component.ts
index 7ab714a8433a..cf3cc69ce578 100644
--- a/src/app/static-pages/contacts-static/contacts-static.component.ts
+++ b/src/app/static-pages/contacts-static/contacts-static.component.ts
@@ -13,6 +13,7 @@ import { PricingBaseComponent } from 'app/pricing/pricing-base/pricing-base.comp
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators'
 import { Location } from '@angular/common';
+import { ProjectUser } from 'app/models/project-user';
 
 @Component({
   selector: 'appdashboard-contacts-static',
@@ -127,14 +128,12 @@ export class ContactsStaticComponent extends PricingBaseComponent implements OnI
   }
 
   getProjectUserRole() {
-    this.usersService.project_user_role_bs
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((user_role) => {
-        this.USER_ROLE = user_role;
-        this.logger.log('[CNTCTS-STATIC] - PROJECT USER ROLE: ', this.USER_ROLE);
-      });
+    this.usersService.projectUser_bs.pipe(takeUntil(this.unsubscribe$)).subscribe((projectUser: ProjectUser) => {
+     if(projectUser){
+      this.USER_ROLE = projectUser.role;
+      this.logger.log('[CNTCTS-STATIC] - PROJECT USER ROLE: ', this.USER_ROLE);
+     }
+    });
   }
 
   getBrowserLang() {
diff --git a/src/app/static-pages/departments-static/departments-static.component.ts b/src/app/static-pages/departments-static/departments-static.component.ts
index 32cf3613cabc..27935cf9ec37 100755
--- a/src/app/static-pages/departments-static/departments-static.component.ts
+++ b/src/app/static-pages/departments-static/departments-static.component.ts
@@ -13,6 +13,7 @@ import { PricingBaseComponent } from 'app/pricing/pricing-base/pricing-base.comp
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators'
 import { Location } from '@angular/common';
+import { ProjectUser } from 'app/models/project-user';
 import { RoleService } from 'app/services/role.service';
 
 const swal = require('sweetalert');
@@ -149,14 +150,12 @@ export class DepartmentsStaticComponent extends PricingBaseComponent implements
 
 
   getProjectUserRole() {
-    this.usersService.project_user_role_bs
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((user_role) => {
-        this.USER_ROLE = user_role;
+    this.usersService.projectUser_bs.pipe(takeUntil(this.unsubscribe$)).subscribe((projectUser: ProjectUser) => {
+      if(projectUser){
+        this.USER_ROLE = projectUser.role;
         this.logger.log('[DEPTS-STATIC] - PROJECT USER ROLE: ', this.USER_ROLE);
-      });
+      }
+    });
   }
 
   getBrowserLang() {
diff --git a/src/app/static-pages/email-ticketing-static/email-ticketing-static.component.ts b/src/app/static-pages/email-ticketing-static/email-ticketing-static.component.ts
index 3ff6923806d4..0b459b09f0e2 100644
--- a/src/app/static-pages/email-ticketing-static/email-ticketing-static.component.ts
+++ b/src/app/static-pages/email-ticketing-static/email-ticketing-static.component.ts
@@ -13,6 +13,7 @@ import { PricingBaseComponent } from 'app/pricing/pricing-base/pricing-base.comp
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 import { Location } from '@angular/common';
+import { ProjectUser } from 'app/models/project-user';
 import { RoleService } from 'app/services/role.service';
 
 @Component({
@@ -130,14 +131,12 @@ export class EmailTicketingStaticComponent extends PricingBaseComponent implemen
   }
 
   getProjectUserRole() {
-    this.usersService.project_user_role_bs
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((user_role) => {
-        this.USER_ROLE = user_role;
+    this.usersService.projectUser_bs.pipe(takeUntil(this.unsubscribe$)).subscribe((projectUser: ProjectUser) => {
+      if(projectUser){
+        this.USER_ROLE = projectUser.role;
         this.logger.log('[EMAIL-TKTNG-STATIC] - PROJECT USER ROLE: ', this.USER_ROLE);
-      });
+      }
+    });
   }
 
 
diff --git a/src/app/static-pages/groups-static/groups-static.component.ts b/src/app/static-pages/groups-static/groups-static.component.ts
index b98a4693695a..254263ddb5e9 100755
--- a/src/app/static-pages/groups-static/groups-static.component.ts
+++ b/src/app/static-pages/groups-static/groups-static.component.ts
@@ -13,6 +13,7 @@ import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators'
 import { PricingBaseComponent } from 'app/pricing/pricing-base/pricing-base.component';
 import { Location } from '@angular/common';
+import { ProjectUser } from 'app/models/project-user';
 import { RoleService } from 'app/services/role.service';
 const swal = require('sweetalert');
 
@@ -143,14 +144,12 @@ export class GroupsStaticComponent extends PricingBaseComponent implements OnIni
   }
 
   getProjectUserRole() {
-    this.usersService.project_user_role_bs
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((user_role) => {
-        this.USER_ROLE = user_role;
+    this.usersService.projectUser_bs.pipe(takeUntil(this.unsubscribe$)).subscribe((projectUser: ProjectUser) => {
+      if(projectUser){
+        this.USER_ROLE = projectUser.role;
         this.logger.log('[GROUPS-STATIC] - PROJECT USER ROLE: ', this.USER_ROLE);
-      });
+      }
+    });
   }
 
   getBrowserLang() {
diff --git a/src/app/static-pages/hours-static/hours-static.component.ts b/src/app/static-pages/hours-static/hours-static.component.ts
index ffe9d2f0c625..2c0d3c190f8d 100755
--- a/src/app/static-pages/hours-static/hours-static.component.ts
+++ b/src/app/static-pages/hours-static/hours-static.component.ts
@@ -13,6 +13,7 @@ import { PricingBaseComponent } from 'app/pricing/pricing-base/pricing-base.comp
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 import { Location } from '@angular/common';
+import { ProjectUser } from 'app/models/project-user';
 import { RoleService } from 'app/services/role.service';
 const swal = require('sweetalert');
 
@@ -131,14 +132,12 @@ export class HoursStaticComponent extends PricingBaseComponent implements OnInit
 
 
   getProjectUserRole() {
-    this.usersService.project_user_role_bs
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((user_role) => {
-        this.USER_ROLE = user_role;
+    this.usersService.projectUser_bs.pipe(takeUntil(this.unsubscribe$)).subscribe((projectUser: ProjectUser) => {
+      if(projectUser){
+        this.USER_ROLE = projectUser.role;
         this.logger.log('[HOURS-STATIC] - PROJECT USER ROLE: ', this.USER_ROLE);
-      });
+      }
+    });
   }
 
   goBack() {
diff --git a/src/app/static-pages/trigger-static/trigger-static.component.ts b/src/app/static-pages/trigger-static/trigger-static.component.ts
index 9424bacf0565..45d8d512f4d8 100755
--- a/src/app/static-pages/trigger-static/trigger-static.component.ts
+++ b/src/app/static-pages/trigger-static/trigger-static.component.ts
@@ -9,6 +9,7 @@ import { UsersService } from '../../services/users.service';
 import { LoggerService } from '../../services/logger/logger.service';
 import { AppConfigService } from 'app/services/app-config.service';
 import { PLAN_NAME } from 'app/utils/util';
+import { ProjectUser } from 'app/models/project-user';
 const swal = require('sweetalert');
 
 @Component({
@@ -96,9 +97,11 @@ export class TriggerStaticComponent  implements OnInit, OnDestroy {
   }
 
   getProjectUserRole() {
-    this.usersService.project_user_role_bs.subscribe((user_role) => {
-      this.USER_ROLE = user_role;
-      this.logger.log('[TRIGGER-STATIC] - PROJECT USER ROLE: ', this.USER_ROLE);
+    this.usersService.projectUser_bs.subscribe((projectUser: ProjectUser) => {
+      if(projectUser){
+        this.USER_ROLE = projectUser.role;
+        this.logger.log('[TRIGGER-STATIC] - PROJECT USER ROLE: ', this.USER_ROLE);
+      }
     });
   }
 
diff --git a/src/app/static-pages/wsrequests-static/wsrequests-static.component.ts b/src/app/static-pages/wsrequests-static/wsrequests-static.component.ts
index 4e37ddc472a0..bf6da237ea7a 100644
--- a/src/app/static-pages/wsrequests-static/wsrequests-static.component.ts
+++ b/src/app/static-pages/wsrequests-static/wsrequests-static.component.ts
@@ -14,6 +14,7 @@ import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators'
 import { PricingBaseComponent } from 'app/pricing/pricing-base/pricing-base.component';
 import { Location } from '@angular/common';
+import { ProjectUser } from 'app/models/project-user';
 @Component({
   selector: 'appdashboard-wsrequests-static',
   templateUrl: './wsrequests-static.component.html',
@@ -135,14 +136,12 @@ export class WsrequestsStaticComponent extends PricingBaseComponent implements O
   }
 
   getProjectUserRole() {
-    this.usersService.project_user_role_bs
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((user_role) => {
-        this.USER_ROLE = user_role;
+    this.usersService.projectUser_bs.pipe(takeUntil(this.unsubscribe$)).subscribe((projectUser: ProjectUser) => {
+      if(projectUser){
+        this.USER_ROLE = projectUser.role;
         this.logger.log('[WSREQUEST-STATIC] - PROJECT USER ROLE: ', this.USER_ROLE);
-      });
+      }
+    });
   }
 
 
diff --git a/src/app/ui/notification-message/notification-message.component.ts b/src/app/ui/notification-message/notification-message.component.ts
index 63b5d06678c0..467e626e3007 100755
--- a/src/app/ui/notification-message/notification-message.component.ts
+++ b/src/app/ui/notification-message/notification-message.component.ts
@@ -14,6 +14,7 @@ import { UsersService } from '../../services/users.service';
 import { takeUntil } from 'rxjs/operators';
 import { PLAN_NAME } from 'app/utils/util';
 import { PricingBaseComponent } from 'app/pricing/pricing-base/pricing-base.component';
+import { ProjectUser } from 'app/models/project-user';
 const swal = require('sweetalert');
 @Component({
   selector: 'notification-message',
@@ -85,27 +86,18 @@ export class NotificationMessageComponent extends PricingBaseComponent implement
     // this.getProjectById();
     this.translateMsgSubscriptionCanceledSuccessfully();
     this.translateMsgSubscriptionCanceledError();
-    this.getUserRole();
+    this.getProjectUser();
     this.getCurrentUser()
     this.getProjectPlan();
     this.getWidgetUrl();
     this.getChatUrl();
     this.translateModalOnlyOwnerCanManageProjectAccount();
-    this.getUserAvailability()
   }
 
   ngOnDestroy() {
     // this.subscription.unsubscribe();
   }
 
-  getUserAvailability() {
-    this.usersService.user_is_available_bs.subscribe((user_available) => {
-      this.IS_AVAILABLE = user_available;
-      this.logger.log('[NAVBAR]- USER IS AVAILABLE ', this.IS_AVAILABLE);
-    });
-  }
-
-
   translateModalOnlyOwnerCanManageProjectAccount() {
     this.translate.get('OnlyUsersWithTheOwnerRoleCanManageTheAccountPlan')
       .subscribe((translation: any) => {
@@ -119,17 +111,17 @@ export class NotificationMessageComponent extends PricingBaseComponent implement
   }
 
 
-  getUserRole() {
-    this.usersService.project_user_role_bs
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((userRole) => {
+  getProjectUser() {
+    this.usersService.projectUser_bs.pipe(takeUntil(this.unsubscribe$)).subscribe((projectUser: ProjectUser) => {
+      this.logger.log('[NOTIFICATION-MSG] - SUBSCRIPTION TO USER ROLE »»» ', projectUser)
+      if(projectUser){
+      // used to display / hide 'WIDGET' and 'ANALITCS' in home.component.html
+        this.USER_ROLE = projectUser.role;
 
-        this.logger.log('[NOTIFICATION-MSG] - SUBSCRIPTION TO USER ROLE »»» ', userRole)
-        // used to display / hide 'WIDGET' and 'ANALITCS' in home.component.html
-        this.USER_ROLE = userRole;
-      })
+        this.IS_AVAILABLE = projectUser.user_available;
+        this.logger.log('[NAVBAR]- USER IS AVAILABLE ', this.IS_AVAILABLE);
+      }
+    })
   }
 
   getChatUrl() {
diff --git a/src/app/user-edit-add/user-edit-add.component.ts b/src/app/user-edit-add/user-edit-add.component.ts
index f83d472639c5..2b0ad1465d82 100755
--- a/src/app/user-edit-add/user-edit-add.component.ts
+++ b/src/app/user-edit-add/user-edit-add.component.ts
@@ -17,6 +17,7 @@ import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 import { LoggerService } from '../services/logger/logger.service';
 import { PricingBaseComponent } from 'app/pricing/pricing-base/pricing-base.component';
+import { ProjectUser } from 'app/models/project-user';
 const swal = require('sweetalert');
 
 @Component({
@@ -311,11 +312,10 @@ export class UserEditAddComponent extends PricingBaseComponent implements OnInit
   }
 
   getUserRole() {
-    this.subscription = this.usersService.project_user_role_bs.subscribe((userRole) => {
-
-      this.logger.log('[USER-EDIT-ADD] - PROJECT-USER DETAILS - CURRENT USER ROLE »»» ', userRole)
+    this.subscription = this.usersService.projectUser_bs.subscribe((projectUser: ProjectUser) => {
+      this.logger.log('[USER-EDIT-ADD] - PROJECT-USER DETAILS - CURRENT USER ROLE »»» ', projectUser)
       // used to display / hide 'WIDGET' and 'ANALITCS' in home.component.html
-      this.CURRENT_USER_ROLE = userRole;
+      this.CURRENT_USER_ROLE = projectUser.role;
     })
   }
 
diff --git a/src/app/user-profile/account-settings/account-settings.component.ts b/src/app/user-profile/account-settings/account-settings.component.ts
index 9acdce6e5835..d04f653e4be2 100755
--- a/src/app/user-profile/account-settings/account-settings.component.ts
+++ b/src/app/user-profile/account-settings/account-settings.component.ts
@@ -15,6 +15,7 @@ import { APP_SUMO_PLAN_NAME, PLAN_NAME } from 'app/utils/util';
 import { NotifyService } from 'app/core/notify.service';
 import { PricingBaseComponent } from 'app/pricing/pricing-base/pricing-base.component';
 import { BrandService } from 'app/services/brand.service';
+import { ProjectUser } from 'app/models/project-user';
 const swal = require('sweetalert');
 
 @Component({
@@ -159,16 +160,12 @@ export class AccountSettingsComponent extends PricingBaseComponent implements On
 
 
   getProjectUserRole() {
-    this.usersService.project_user_role_bs
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((user_role) => {
-        this.logger.log('[USER-PROFILE][ACCOUNT-SETTINGS] - USER ROLE ', user_role);
-        if (user_role) {
-          this.USER_ROLE = user_role
-        }
-      });
+    this.usersService.projectUser_bs.pipe(takeUntil(this.unsubscribe$)).subscribe((projectUser: ProjectUser) => {
+      this.logger.log('[USER-PROFILE][ACCOUNT-SETTINGS] - USER ROLE ', projectUser);
+      if (projectUser) {
+        this.USER_ROLE = projectUser.role
+      }
+    });
   }
 
 
diff --git a/src/app/user-profile/notification-settings/notification-settings.component.ts b/src/app/user-profile/notification-settings/notification-settings.component.ts
index 0756f502094d..53a6f2b26afe 100755
--- a/src/app/user-profile/notification-settings/notification-settings.component.ts
+++ b/src/app/user-profile/notification-settings/notification-settings.component.ts
@@ -9,6 +9,7 @@ import { Location } from '@angular/common';
 import { Component, OnInit } from '@angular/core';
 import { LoggerService } from './../../services/logger/logger.service';
 import { BrandService } from 'app/services/brand.service';
+import { ProjectUser } from 'app/models/project-user';
 @Component({
   selector: 'appdashboard-notification-settings',
   templateUrl: './notification-settings.component.html',
@@ -119,10 +120,10 @@ export class NotificationSettingsComponent implements OnInit {
   }
 
   checkCurrentStatus() {
-    this.usersService.project_user_id_bs.subscribe((project_user_id) => {
+    this.usersService.projectUser_bs.subscribe((projectUser: ProjectUser) => {
 
-      this.logger.log("[USER-PROFILE][NOTIFICATION-SETTINGS] - CHECK NOTIFICATION checkCurrentStatus: ", project_user_id);
-      this.notificationService.checkNotificationsStatus(project_user_id).subscribe((result: any) => {
+      this.logger.log("[USER-PROFILE][NOTIFICATION-SETTINGS] - CHECK NOTIFICATION checkCurrentStatus: ", projectUser._id);
+      this.notificationService.checkNotificationsStatus(projectUser._id).subscribe((result: any) => {
         this.logger.log("[USER-PROFILE][NOTIFICATION-SETTINGS] - CHECK NOTIFICATION STATUS RESULT: ", result);
 
         if (result.settings) {
diff --git a/src/app/user-profile/user-profile.component.ts b/src/app/user-profile/user-profile.component.ts
index 16c10ff89c67..6e703e4aac6f 100755
--- a/src/app/user-profile/user-profile.component.ts
+++ b/src/app/user-profile/user-profile.component.ts
@@ -21,6 +21,7 @@ import { ProjectPlanService } from 'app/services/project-plan.service';
 import { DomSanitizer } from '@angular/platform-browser';
 import { PricingBaseComponent } from 'app/pricing/pricing-base/pricing-base.component';
 import { BrandService } from 'app/services/brand.service';
+import { ProjectUser } from 'app/models/project-user';
 const swal = require('sweetalert');
 
 
@@ -512,16 +513,11 @@ export class UserProfileComponent extends PricingBaseComponent implements OnInit
   }
 
   getProjectUserRole() {
-    this.usersService.project_user_role_bs
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((user_role) => {
-        this.logger.log('[USER-PROFILE] - USER ROLE ', user_role);
-        if (user_role) {
+    this.usersService.projectUser_bs.pipe(takeUntil(this.unsubscribe$)).subscribe((projectUser: ProjectUser) => {
+        this.logger.log('[USER-PROFILE] - USER ROLE ', projectUser);
+        if (projectUser) {
           // this.userRole = user_role
-
-          this.translate.get(user_role)
+          this.translate.get(projectUser.role)
             .subscribe((text: string) => {
               this.userRole = text;
             });
diff --git a/src/app/users/users.component.ts b/src/app/users/users.component.ts
index d273688d7ba0..2ddc59992aef 100755
--- a/src/app/users/users.component.ts
+++ b/src/app/users/users.component.ts
@@ -378,14 +378,12 @@ export class UsersComponent extends PricingBaseComponent implements OnInit, Afte
   }
 
   getProjectUserRole() {
-    this.usersService.project_user_role_bs
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((user_role) => {
-        this.USER_ROLE = user_role
+    this.usersService.projectUser_bs.pipe(takeUntil(this.unsubscribe$)).subscribe((projectUser: ProjectUser) => {
+      if(projectUser){
+        this.USER_ROLE = projectUser.role
         this.logger.log('[USERS] - GET PROJECT USER ROLE - USER_ROLE : ', this.USER_ROLE)
-      })
+      }
+    })
   }
 
   getBrowserVersion() {
diff --git a/src/app/webhook/webhook-add-edit/webhook-add-edit.component.ts b/src/app/webhook/webhook-add-edit/webhook-add-edit.component.ts
index eb27764fb111..3e7ad6d1b505 100755
--- a/src/app/webhook/webhook-add-edit/webhook-add-edit.component.ts
+++ b/src/app/webhook/webhook-add-edit/webhook-add-edit.component.ts
@@ -59,6 +59,8 @@ export class WebhookAddEditComponent implements OnInit {
     { id: "group.delete", name:"Group Delete"},
     { id: "operator.select", name:"Operator Selection"},
     { id: "event.emit", name:"Event Emit"},
+    { id: "smart_assignment.request_abandoned", name:"Request Abandoned"},
+    { id: "request.fully_abandoned", name:"Request Fully Abandoned"},
   ]
 
   constructor(
diff --git a/src/app/widget_components/widget-set-up/widget-set-up.component.ts b/src/app/widget_components/widget-set-up/widget-set-up.component.ts
index e76e61ba401f..957f66fbd6db 100755
--- a/src/app/widget_components/widget-set-up/widget-set-up.component.ts
+++ b/src/app/widget_components/widget-set-up/widget-set-up.component.ts
@@ -37,6 +37,7 @@ import { isDevMode } from '@angular/core';
 import { SelectOptionsTranslatePipe } from '../../selectOptionsTranslate.pipe';
 import { AnalyticsService } from 'app/services/analytics.service';
 import { LocalDbService } from 'app/services/users-local-db.service';
+import { ProjectUser } from 'app/models/project-user';
 
 @Component({
   selector: 'appdashboard-widget-set-up',
@@ -1365,17 +1366,12 @@ export class WidgetSetUp extends WidgetSetUpBaseComponent implements OnInit, Aft
   getProjectUserRole() {
     // const user___role =  this.usersService.project_user_role_bs.value;
     // this.logger.log('[NAVBAR] % »»» WebSocketJs WF +++++ ws-requests--- navbar - USER ROLE 1 ', user___role);
-    this.usersService.project_user_role_bs
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((user_role) => {
-        this.logger.log('[NAVBAR] % »»» WebSocketJs WF +++++ ws-requests--- navbar - USER ROLE 2', user_role);
-        if (user_role) {
-          this.USER_ROLE = user_role
-
-        }
-      });
+    this.usersService.projectUser_bs.pipe(takeUntil(this.unsubscribe$)).subscribe((projectUser: ProjectUser) => {
+      this.logger.log('[NAVBAR] % »»» WebSocketJs WF +++++ ws-requests--- navbar - USER ROLE 2', projectUser);
+      if (projectUser) {
+        this.USER_ROLE = projectUser.role
+      }
+    });
   }
 
   getLoggedUser() {
diff --git a/src/app/ws_requests/for-panel/ws-request-detail-for-panel/ws-request-detail-for-panel.component.ts b/src/app/ws_requests/for-panel/ws-request-detail-for-panel/ws-request-detail-for-panel.component.ts
index ed0588985bd7..976278222fa4 100755
--- a/src/app/ws_requests/for-panel/ws-request-detail-for-panel/ws-request-detail-for-panel.component.ts
+++ b/src/app/ws_requests/for-panel/ws-request-detail-for-panel/ws-request-detail-for-panel.component.ts
@@ -24,6 +24,7 @@ import { LoggerService } from '../../../services/logger/logger.service';
 // import * as moment from 'moment';
 import moment from "moment";
 import { WebSocketJs } from 'app/services/websocket/websocket-js';
+import { ProjectUser } from 'app/models/project-user';
 @Component({
   selector: 'appdashboard-ws-request-detail-for-panel',
   templateUrl: './ws-request-detail-for-panel.component.html',
@@ -176,18 +177,11 @@ export class WsRequestDetailForPanelComponent extends WsSharedComponent implemen
   getProjectUserRole() {
     // const user___role =  this.usersService.project_user_role_bs.value;
     // this.logger.log('[NAVBAR] % »»» WebSocketJs WF +++++ ws-requests--- navbar - USER ROLE 1 ', user___role);
-
-    this.usersService.project_user_role_bs
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((user_role) => {
-        this.logger.log('[REQUEST-DTLS-X-PANEL] USER ROLE ', user_role);
-        if (user_role) {
-
-          if (user_role === 'agent') {
+    this.usersService.projectUser_bs.pipe(takeUntil(this.unsubscribe$)).subscribe((projectUser: ProjectUser) => {
+        this.logger.log('[REQUEST-DTLS-X-PANEL] USER ROLE ', projectUser);
+        if (projectUser) {
+          if (projectUser.role === 'agent') {
             this.ROLE_IS_AGENT = true;
-
           } else {
             this.ROLE_IS_AGENT = false;
           }
diff --git a/src/app/ws_requests/for-panel/ws-requests-unserved-for-panel/ws-requests-unserved-for-panel.component.html b/src/app/ws_requests/for-panel/ws-requests-unserved-for-panel/ws-requests-unserved-for-panel.component.html
index 0727143e1138..343af35942da 100755
--- a/src/app/ws_requests/for-panel/ws-requests-unserved-for-panel/ws-requests-unserved-for-panel.component.html
+++ b/src/app/ws_requests/for-panel/ws-requests-unserved-for-panel/ws-requests-unserved-for-panel.component.html
@@ -1,4 +1,3 @@
-<!-- <appdashboard-navbar-for-panel></appdashboard-navbar-for-panel> -->
 <!-- border-bottom: 1px solid #3f3f40; -->
 
 
diff --git a/src/app/ws_requests/for-panel/ws-requests-unserved-for-panel/ws-requests-unserved-for-panel.component.ts b/src/app/ws_requests/for-panel/ws-requests-unserved-for-panel/ws-requests-unserved-for-panel.component.ts
index 635d1791fb73..ef4d632a2d68 100755
--- a/src/app/ws_requests/for-panel/ws-requests-unserved-for-panel/ws-requests-unserved-for-panel.component.ts
+++ b/src/app/ws_requests/for-panel/ws-requests-unserved-for-panel/ws-requests-unserved-for-panel.component.ts
@@ -28,6 +28,7 @@ const swal = require('sweetalert');
 import { ContactsService } from '../../../services/contacts.service';
 import { LoggerService } from '../../../services/logger/logger.service';
 import { WebSocketJs } from 'app/services/websocket/websocket-js';
+import { ProjectUser } from 'app/models/project-user';
 
 @Component({
   selector: 'appdashboard-ws-requests-unserved-for-panel',
@@ -202,14 +203,12 @@ export class WsRequestsUnservedForPanelComponent extends WsSharedComponent imple
  
 
   getUserRole() {
-    this.usersService.project_user_role_bs
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((userRole) => {
-        this.logger.log('[WS-REQUESTS-UNSERVED-X-PANEL] - SUBSCRIPTION TO USER ROLE »»» ', userRole)
-        this.USER_ROLE = userRole;
-      })
+    this.usersService.projectUser_bs.pipe(takeUntil(this.unsubscribe$)).subscribe((projectUser: ProjectUser) => {
+      if(projectUser){
+        this.logger.log('[WS-REQUESTS-UNSERVED-X-PANEL] - SUBSCRIPTION TO USER ROLE »»» ', projectUser)
+        this.USER_ROLE = projectUser.role;
+      }
+    })
   }
 
   // ------------------------------------------
@@ -438,29 +437,24 @@ export class WsRequestsUnservedForPanelComponent extends WsSharedComponent imple
   }
 
   getProjectUserRole() {
-    this.usersService.project_user_role_bs
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((user_role) => {
-        this.logger.log('[WS-REQUESTS-UNSERVED-X-PANEL] - GET PROJECT-USER ROLE user_role ', user_role);
-
-        this.ONLY_MY_REQUESTS = true
-        this.getWsRequests$();
-        // if (user_role) {
-        //   if (user_role === 'agent') {
-        //     this.ROLE_IS_AGENT = true
-        //     // this.displayBtnLabelSeeYourRequets = true
-        //     // ------ 
-        //     this.ONLY_MY_REQUESTS = true
-        //     this.getWsRequests$();
-        //   } else {
-        //     this.ROLE_IS_AGENT = false
-        //     // this.displayBtnLabelSeeYourRequets = false;
-        //     this.getWsRequests$();
-        //   }
-        // }
-      });
+    this.usersService.projectUser_bs.pipe(takeUntil(this.unsubscribe$)).subscribe((projectUser: ProjectUser) => {
+      this.logger.log('[WS-REQUESTS-UNSERVED-X-PANEL] - GET PROJECT-USER ROLE user_role ', projectUser);
+      this.ONLY_MY_REQUESTS = true
+      this.getWsRequests$();
+      // if (user_role) {
+      //   if (user_role === 'agent') {
+      //     this.ROLE_IS_AGENT = true
+      //     // this.displayBtnLabelSeeYourRequets = true
+      //     // ------ 
+      //     this.ONLY_MY_REQUESTS = true
+      //     this.getWsRequests$();
+      //   } else {
+      //     this.ROLE_IS_AGENT = false
+      //     // this.displayBtnLabelSeeYourRequets = false;
+      //     this.getWsRequests$();
+      //   }
+      // }
+    });
   }
 
 
diff --git a/src/app/ws_requests/history-and-nort-convs/history-and-nort-convs.component.html b/src/app/ws_requests/history-and-nort-convs/history-and-nort-convs.component.html
index 253522ca920a..c4e6e4f31a20 100755
--- a/src/app/ws_requests/history-and-nort-convs/history-and-nort-convs.component.html
+++ b/src/app/ws_requests/history-and-nort-convs/history-and-nort-convs.component.html
@@ -659,12 +659,12 @@
 
     <!-- || conversation_type  === 'chat21'  && conversation_type !== 'all'-->
     <div id="conversation-type" *ngIf="
-          conversationTypeValue === CHANNELS_NAME.CHAT21 ||
-          conversationTypeValue === CHANNELS_NAME.FORM ||
-          conversationTypeValue === CHANNELS_NAME.MESSANGER ||
-          conversationTypeValue === CHANNELS_NAME.TELEGRAM || 
-          conversationTypeValue === CHANNELS_NAME.WHATSAPP || 
-          conversationTypeValue === CHANNELS_NAME.EMAIL ||
+          conversationTypeValue  === CHANNELS_NAME.CHAT21 ||
+          conversationTypeValue  === CHANNELS_NAME.FORM ||
+          conversationTypeValue  === CHANNELS_NAME.MESSANGER ||
+          conversationTypeValue  === CHANNELS_NAME.TELEGRAM || 
+          conversationTypeValue  === CHANNELS_NAME.WHATSAPP || 
+          conversationTypeValue  === CHANNELS_NAME.EMAIL ||
           conversationTypeValue === CHANNELS_NAME.VOICE_VXML || 
           conversationTypeValue === CHANNELS_NAME.VOICE_TWILIO || 
           conversationTypeValue === CHANNELS_NAME.SMS_TWILIO" class="applied-filter">
@@ -1575,6 +1575,7 @@
                         </span>
                       </span>
 
+                    
                       <!-- ---------------------------------------- -->
                       <!-- Channel - SMS -->
                       <!-- ---------------------------------------- -->
@@ -1588,6 +1589,7 @@
                           <i></i>
                         </span>
                       </span>
+                      
                       <!-- ---------------------------------------- -->
                       <!-- Channel - WhatsApp -->
                       <!-- ---------------------------------------- -->
diff --git a/src/app/ws_requests/history-and-nort-convs/history-and-nort-convs.component.ts b/src/app/ws_requests/history-and-nort-convs/history-and-nort-convs.component.ts
index 4cd46d8d2342..4738eb323fc5 100755
--- a/src/app/ws_requests/history-and-nort-convs/history-and-nort-convs.component.ts
+++ b/src/app/ws_requests/history-and-nort-convs/history-and-nort-convs.component.ts
@@ -32,6 +32,7 @@ import { WsMsgsService } from 'app/services/websocket/ws-msgs.service';
 import { FormGroup, FormControl } from '@angular/forms';
 import { MAT_DATE_FORMATS } from '@angular/material/core';
 import { BrandService } from 'app/services/brand.service';
+import { ProjectUser } from 'app/models/project-user';
 
 export const MY_DATE_FORMATS = {
   parse: {
@@ -401,28 +402,6 @@ export class HistoryAndNortConvsComponent extends WsSharedComponent implements O
     
   }
 
-  getProjectUserRole() {
-    this.usersService.project_user_role_bs
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((user_role) => {
-        this.logger.log('[HISTORY & NORT-CONVS] - USER ROLE ', user_role);
-        if (user_role) {
-          this.USER_ROLE = user_role
-          this.manageStatusInHistoryForAgentAndExpiredPlan(this.USER_ROLE)
-        }
-        if (user_role) {
-          if (user_role === 'agent') {
-            this.ROLE_IS_AGENT = true
-
-          } else {
-            this.ROLE_IS_AGENT = false
-          }
-        }
-      });
-  }
-
   manageStatusInHistoryForAgentAndExpiredPlan(USER_ROLE) {
     this.logger.log('[HISTORY & NORT-CONVS] manageStatusInHistoryForAgentAndExpiredPlan statusInHistory', this.statusInHistory)
     if (USER_ROLE === 'agent') {
@@ -1605,7 +1584,20 @@ export class HistoryAndNortConvsComponent extends WsSharedComponent implements O
     this.logger.log('[HISTORY & NORT-CONVS] - detectMobile IS MOBILE ', this.isMobile);
   }
 
-  
+  getProjectUserRole() {
+    this.usersService.projectUser_bs.pipe(takeUntil(this.unsubscribe$)).subscribe((projectUser: ProjectUser) => {
+        this.logger.log('[HISTORY & NORT-CONVS] - USER ROLE ', projectUser);
+        if (projectUser) {
+          this.USER_ROLE = projectUser.role
+          this.manageStatusInHistoryForAgentAndExpiredPlan(this.USER_ROLE)
+          if (this.USER_ROLE === 'agent') {
+            this.ROLE_IS_AGENT = true
+          } else {
+            this.ROLE_IS_AGENT = false
+          }
+        }
+      });
+  }
 
 
   // requestWillBePermanentlyDeleted
@@ -2527,7 +2519,8 @@ export class HistoryAndNortConvsComponent extends WsSharedComponent implements O
     //   this.conversationTypeValue = '';
 
     // }
-
+    
+    
 
     if (this.requester_email) {
       this.emailValue = this.requester_email;
@@ -2952,12 +2945,12 @@ export class HistoryAndNortConvsComponent extends WsSharedComponent implements O
   // SERVED_BY: add this if not exist -->
   getProjectuserbyUseridAndGoToEditProjectuser(member_id: string) {
     this.usersService.getProjectUserByUserId(member_id)
-      .subscribe((projectUser: any) => {
+      .subscribe((projectUser: ProjectUser) => {
         this.logger.log('[HISTORY & NORT-CONVS] GET projectUser by USER-ID ', projectUser)
         if (projectUser) {
-          this.logger.log('[HISTORY & NORT-CONVS] GET projectUser by USER-ID > projectUser id', projectUser[0]._id);
+          this.logger.log('[HISTORY & NORT-CONVS] GET projectUser by USER-ID > projectUser id', projectUser._id);
 
-          this.router.navigate(['project/' + this.projectId + '/user/edit/' + projectUser[0]._id]);
+          this.router.navigate(['project/' + this.projectId + '/user/edit/' + projectUser._id]);
         }
       }, (error) => {
         this.logger.error('[HISTORY & NORT-CONVS] GET projectUser by USER-ID - ERROR ', error);
diff --git a/src/app/ws_requests/ws-requests-list/ws-requests-list.component.ts b/src/app/ws_requests/ws-requests-list/ws-requests-list.component.ts
index e12724e03e64..4f20ec88bab4 100755
--- a/src/app/ws_requests/ws-requests-list/ws-requests-list.component.ts
+++ b/src/app/ws_requests/ws-requests-list/ws-requests-list.component.ts
@@ -541,15 +541,11 @@ export class WsRequestsListComponent extends WsSharedComponent implements OnInit
 
   getProjectUserRole() {
     // this.logger.log('[WS-REQUESTS-LIST] - GET PROJECT-USER ROLE calling getProjectUserRole ');
-    this.usersService.project_user_role_bs
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((user_role) => {
+    this.usersService.projectUser_bs.pipe(takeUntil(this.unsubscribe$)).subscribe((projectUser: ProjectUser) => {
         // this.logger.log('[WS-REQUESTS-LIST] - GET PROJECT-USER ROLE user_role ', user_role);
-        if (user_role) {
-          this.CURRENT_USER_ROLE = user_role;
-          if (user_role === 'agent') {
+        if (projectUser) {
+          this.CURRENT_USER_ROLE = projectUser.role;
+          if (this.CURRENT_USER_ROLE === 'agent') {
             this.ROLE_IS_AGENT = true
             this.displayBtnLabelSeeYourRequets = true
 
diff --git a/src/app/ws_requests/ws-requests-list/ws-requests-served/ws-requests-served.component.html b/src/app/ws_requests/ws-requests-list/ws-requests-served/ws-requests-served.component.html
index e60298989280..a299dcbd08fe 100755
--- a/src/app/ws_requests/ws-requests-list/ws-requests-served/ws-requests-served.component.html
+++ b/src/app/ws_requests/ws-requests-list/ws-requests-served/ws-requests-served.component.html
@@ -541,6 +541,21 @@ <h4 class="title customh4" style="margin-bottom:2px;">
                   </span>
                 </span>
 
+                <!-- ---------------------------------------- -->
+                <!-- Channel - SMS  -->
+                <!-- ---------------------------------------- -->
+                <span  *ngIf="request?.channel?.name === CHANNELS_NAME.SMS_TWILIO" class="tool_tip">
+                  <img style="width: 24px;height: 24px;" src="assets/img/channel_icons/sms.svg"
+                    class="img-fluid">
+                  <span class="bottom tool-tip-bottom--custom">
+                    <span style="font-weight: 400;">
+                      {{'MessageChannel' | translate}}:
+                    </span>
+                    <span style="font-weight: 400;">SMS </span>
+                    <i></i>
+                  </span>
+                </span>
+
                 <!-- ---------------------------------------- -->
                 <!-- Channel - WhatsApp -->
                 <!-- ---------------------------------------- -->
diff --git a/src/app/ws_requests/ws-requests-list/ws-requests-served/ws-requests-served.component.ts b/src/app/ws_requests/ws-requests-list/ws-requests-served/ws-requests-served.component.ts
index d87e33225107..1d1726ea819f 100755
--- a/src/app/ws_requests/ws-requests-list/ws-requests-served/ws-requests-served.component.ts
+++ b/src/app/ws_requests/ws-requests-list/ws-requests-served/ws-requests-served.component.ts
@@ -25,6 +25,7 @@ import { MatMenuTrigger } from '@angular/material/menu';
 
 const swal = require('sweetalert');
 import scrollToWithAnimation from 'scrollto-with-animation'
+import { ProjectUser } from 'app/models/project-user';
 
 @Component({
   selector: 'appdashboard-ws-requests-served',
@@ -405,15 +406,11 @@ export class WsRequestsServedComponent extends WsSharedComponent implements OnIn
   // @ Subscribe to project user role
   // -------------------------------------------------------------
   getProjectUserRole() {
-    this.usersService.project_user_role_bs
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((user_role) => {
-        this.logger.log('[WS-REQUESTS-LIST][SERVED] GET PROJECT-USER ROLE ', user_role);
-        if (user_role) {
-          this.USER_ROLE = user_role;
-          if (user_role === 'agent') {
+    this.usersService.projectUser_bs.pipe(takeUntil(this.unsubscribe$)).subscribe((projectUser: ProjectUser) => {
+        this.logger.log('[WS-REQUESTS-LIST][SERVED] GET PROJECT-USER ROLE ', projectUser);
+        if (projectUser) {
+          this.USER_ROLE = projectUser.role;
+          if (this.USER_ROLE === 'agent') {
             this.ROLE_IS_AGENT = true
           } else {
             this.ROLE_IS_AGENT = false
@@ -616,12 +613,12 @@ export class WsRequestsServedComponent extends WsSharedComponent implements OnIn
   // SERVED_BY: add this if not exist -->
   getProjectuserbyUseridAndGoToEditProjectuser(member_id: string) {
     this.usersService.getProjectUserByUserId(member_id)
-      .subscribe((projectUser: any) => {
+      .subscribe((projectUser: ProjectUser) => {
         this.logger.log('[WS-REQUESTS-LIST][SERVED] GET PROJECT-USER-BY-USER-ID & GO TO EDIT PROJECT-USER - projectUser ', projectUser)
         if (projectUser) {
-          this.logger.log('[WS-REQUESTS-LIST][SERVED] GET PROJECT-USER-BY-USER-ID & GO TO EDIT PROJECT-USER - projectUser id', projectUser[0]._id);
+          this.logger.log('[WS-REQUESTS-LIST][SERVED] GET PROJECT-USER-BY-USER-ID & GO TO EDIT PROJECT-USER - projectUser id', projectUser._id);
 
-          this.router.navigate(['project/' + this.projectId + '/user/edit/' + projectUser[0]._id]);
+          this.router.navigate(['project/' + this.projectId + '/user/edit/' + projectUser._id]);
         }
       }, (error) => {
         this.logger.error('[WS-REQUESTS-LIST][SERVED] GET PROJECT-USER-BY-USER-ID & GO TO EDIT PROJECT-USER - ERROR ', error);
@@ -879,7 +876,7 @@ export class WsRequestsServedComponent extends WsSharedComponent implements OnIn
 
   _getProjectUserByUserId(member_id) {
     this.usersService.getProjectUserByUserId(member_id)
-      .subscribe((projectUser: any) => {
+      .subscribe((projectUser: ProjectUser) => {
         this.logger.log('[WS-REQUESTS-LIST][SERVED] GET projectUser by USER-ID ', projectUser)
         if (projectUser) {
           this.logger.log('WS-REQUESTS-LIST][SERVED] GET projectUser by USER-ID projectUser id', projectUser);
diff --git a/src/app/ws_requests/ws-requests-list/ws-requests-unserved/ws-requests-unserved.component.html b/src/app/ws_requests/ws-requests-list/ws-requests-unserved/ws-requests-unserved.component.html
index a8a632f84f88..440606c08949 100755
--- a/src/app/ws_requests/ws-requests-list/ws-requests-unserved/ws-requests-unserved.component.html
+++ b/src/app/ws_requests/ws-requests-list/ws-requests-unserved/ws-requests-unserved.component.html
@@ -787,8 +787,8 @@ <h4 style="font-weight:400" style="white-space: nowrap;">
                     {{ request?.requester_fullname_initial }}
                   </span>
 
-                  <!-- *ngIf="request?.requester_is_verified === true" -->
-                  <div class="verified-user-icon-wpr">
+                 
+                  <div class="verified-user-icon-wpr" *ngIf="request?.requester_is_verified === true">
                     <svg class="requester-verified--icon" version="1.1" id="Livello_1" xmlns="http://www.w3.org/2000/svg"
                       xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 26.6 26.6" width="17"
                       height="17" xml:space="preserve">
diff --git a/src/app/ws_requests/ws-requests-list/ws-requests-unserved/ws-requests-unserved.component.ts b/src/app/ws_requests/ws-requests-list/ws-requests-unserved/ws-requests-unserved.component.ts
index 14fe8e13f46d..369e90a56849 100755
--- a/src/app/ws_requests/ws-requests-list/ws-requests-unserved/ws-requests-unserved.component.ts
+++ b/src/app/ws_requests/ws-requests-list/ws-requests-unserved/ws-requests-unserved.component.ts
@@ -20,6 +20,7 @@ import { LoggerService } from '../../../services/logger/logger.service';
 import { WsMsgsService } from 'app/services/websocket/ws-msgs.service';
 import scrollToWithAnimation from 'scrollto-with-animation'
 import { CHANNELS_NAME } from 'app/utils/util';
+import { ProjectUser } from 'app/models/project-user';
 const swal = require('sweetalert');
 const Swal = require('sweetalert2')
 
@@ -272,15 +273,11 @@ export class WsRequestsUnservedComponent extends WsSharedComponent implements On
   // @ Subscribe to project user role
   // -------------------------------------------------------------
   getProjectUserRole() {
-    this.usersService.project_user_role_bs
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((user_role) => {
-        this.logger.log('[WS-REQUESTS-LIST][UNSERVED] GET PROJECT-USER ROLE ', user_role);
-        if (user_role) {
-          this.USER_ROLE = user_role;
-          if (user_role === 'agent') {
+    this.usersService.projectUser_bs.pipe(takeUntil(this.unsubscribe$)).subscribe((projectUser: ProjectUser) => {
+        this.logger.log('[WS-REQUESTS-LIST][UNSERVED] GET PROJECT-USER ROLE ', projectUser);
+        if (projectUser) {
+          this.USER_ROLE = projectUser.role;
+          if (this.USER_ROLE === 'agent') {
             this.ROLE_IS_AGENT = true
           } else {
             this.ROLE_IS_AGENT = false
diff --git a/src/app/ws_requests/ws-requests-msgs/ws-requests-msgs.component.scss b/src/app/ws_requests/ws-requests-msgs/ws-requests-msgs.component.scss
index 72725375c3fc..364c094d5190 100755
--- a/src/app/ws_requests/ws-requests-msgs/ws-requests-msgs.component.scss
+++ b/src/app/ws_requests/ws-requests-msgs/ws-requests-msgs.component.scss
@@ -4846,6 +4846,7 @@ label {
   overflow: hidden;
   text-overflow: ellipsis;
   -webkit-line-clamp: var(--no-tags-line-clamp);
+  line-clamp: var(--no-tags-line-clamp);
   display: -webkit-box;
   -webkit-box-orient: vertical;
   font-family: var(--content-font-family);
@@ -5677,6 +5678,10 @@ label {
   letter-spacing: -0.01em;
 }
 
+.mat-tab-group-on-panel {
+  margin-top: 5px;
+}
+
 ::ng-deep .mat-tab-group.mat-primary .mat-ink-bar,.mat-tab-nav-bar.mat-primary .mat-ink-bar {
   background-color: #0566ff;
 }
diff --git a/src/app/ws_requests/ws-requests-msgs/ws-requests-msgs.component.ts b/src/app/ws_requests/ws-requests-msgs/ws-requests-msgs.component.ts
index fae9dd2832e3..610071c7a1f9 100755
--- a/src/app/ws_requests/ws-requests-msgs/ws-requests-msgs.component.ts
+++ b/src/app/ws_requests/ws-requests-msgs/ws-requests-msgs.component.ts
@@ -45,6 +45,7 @@ import { ModalChatbotNameComponent } from 'app/knowledge-bases/modals/modal-chat
 import { ModalChatbotReassignmentComponent } from './modal-chatbot-reassignment/modal-chatbot-reassignment.component';
 import { FaqService } from 'app/services/faq.service';
 import { Chatbot } from 'app/models/faq_kb-model';
+import { ProjectUser } from 'app/models/project-user';
 
 const swal = require('sweetalert');
 const Swal = require('sweetalert2')
@@ -62,7 +63,6 @@ export class WsRequestsMsgsComponent extends WsSharedComponent implements OnInit
   featureAvailableFromBPlan: string;
   featureAvailableFromEPlan: string;
   upgradePlan: string;
-  currentUserIsInParticipants: any
 
   objectKeys = Object.keys;
   isVisiblePaymentTab: boolean;
@@ -212,7 +212,7 @@ export class WsRequestsMsgsComponent extends WsSharedComponent implements OnInit
 
   showSpinnerInAddNoteBtn: boolean = false;
   subscription: Subscription;
-  CURRENT_USER_ROLE: any;
+  CURRENT_USER_ROLE: string;
 
   CHAT_PANEL_MODE: boolean  // = true; // Nikola for test change color
   dshbrdBaseUrl: string;
@@ -1308,7 +1308,7 @@ export class WsRequestsMsgsComponent extends WsSharedComponent implements OnInit
       this.overridePay = false;
     }
 
-
+    
   }
 
   // -------------------------------------------------------------
@@ -1329,14 +1329,12 @@ export class WsRequestsMsgsComponent extends WsSharedComponent implements OnInit
   // @ Subscribe to project user role
   // -------------------------------------------------------------
   getProjectUserRole() {
-    this.usersService.project_user_role_bs
-      .pipe(
-        takeUntil(this.unsubscribe$)
-      )
-      .subscribe((userRole) => {
-        this.logger.log('[WS-REQUESTS-MSGS] - GET CURRENT PTOJECT-USER ROLE - userRole ', userRole)
-        // used to display / hide 'WIDGET' and 'ANALITCS' in home.component.html
-        this.CURRENT_USER_ROLE = userRole;
+    this.usersService.projectUser_bs.pipe(takeUntil(this.unsubscribe$)).subscribe((projectUser: ProjectUser) => {
+        if(projectUser){
+          this.logger.log('[WS-REQUESTS-MSGS] - GET CURRENT PTOJECT-USER ROLE - userRole ', projectUser)
+          // used to display / hide 'WIDGET' and 'ANALITCS' in home.component.html
+          this.CURRENT_USER_ROLE = projectUser.role;
+        }
       })
   }
 
@@ -1693,26 +1691,23 @@ export class WsRequestsMsgsComponent extends WsSharedComponent implements OnInit
     else if (+hours < 24) return hours + " " + this.translate.instant('Analytics.Hours');
     else return days + " " + this.translate.instant('Analytics.Days');
 
-  }
- 
 
+  }
 
-  async  getWsRequestById$() {
+  getWsRequestById$() {
     this.wsRequestsService.wsRequest$
       .pipe(
         takeUntil(this.unsubscribe$)
       )
-      .subscribe(async (wsrequest) => {
+      .subscribe(async(wsrequest) => {
 
         this.logger.log('[WS-REQUESTS-MSGS] - getWsRequestById$ *** wsrequest *** NIKO 2 ', wsrequest)
         this.request = wsrequest;
-       
+
 
         if (this.request) {
           this.getfromStorageIsOpenAppSidebar()
 
-          //  this.currentUserIdIsInParticipants this.hasmeInParticipants( this.request.participants)
-
           // -----------------------------
           // Request dnis (called number) 
           // -----------------------------
@@ -1786,12 +1781,12 @@ export class WsRequestsMsgsComponent extends WsSharedComponent implements OnInit
                 this.logger.log('[WS-REQUESTS-MSGS] request >  closed_by label ', this.request['closed_by_label'])
               } else {
                 this.usersService.getProjectUserByUserId(this.request['closed_by'])
-                  .subscribe((projectUser: any) => {
+                  .subscribe((projectUser: ProjectUser) => {
                     // this.logger.log('projectUser ', projectUser)
-                    if (projectUser && projectUser[0] && projectUser[0].id_user) {
-                      this.usersLocalDbService.saveMembersInStorage(projectUser[0].id_user._id, projectUser[0].id_user, 'ws-requests-msgs');
+                    if (projectUser && projectUser.id_user) {
+                      this.usersLocalDbService.saveMembersInStorage(projectUser.id_user._id, projectUser.id_user, 'ws-requests-msgs');
                       this.logger.log('WS-REQUESTS-MSGS] GET projectUser by USER-ID projectUser id', projectUser);
-                      this.request['closed_by_label'] = this.translate.instant('By') + ' ' + projectUser[0].id_user.firstname + ' ' + projectUser[0].id_user.lastname
+                      this.request['closed_by_label'] = this.translate.instant('By') + ' ' + projectUser.id_user.firstname + ' ' + projectUser.id_user.lastname
                     } else {
                       // this.logger.log('[WS-REQUESTS-MSGS] THE REQUEST HAS NOT BEEN CLOSED BY A PROJECT USER');
                       this.request['closed_by_label'] = this.translate.instant('By') + ' ' + this.request.requester_fullname
@@ -1893,7 +1888,6 @@ export class WsRequestsMsgsComponent extends WsSharedComponent implements OnInit
           // User Agent
           // -------------------------------------------------------------------
           const user_agent_result = this.parseUserAgent(this.request.userAgent);
-          // console.log('user_agent_result  ', user_agent_result)
 
           if (user_agent_result.browser.name) {
             if (user_agent_result.browser.version) {
@@ -1926,41 +1920,29 @@ export class WsRequestsMsgsComponent extends WsSharedComponent implements OnInit
           // Members array
           // -------------------------------------------------------------------
           this.members_array = this.request.participants;
-          this.logger.log('[WS-REQUESTS-MSGS] - *** PARTICIPANTS_ARRAY ', this.members_array)
-          this.logger.log('[WS-REQUESTS-MSGS] - *** currentUserID ', this.currentUserID)
-          this.logger.log('[WS-REQUESTS-MSGS] - *** CURRENT_USER_ROLE ', this.CURRENT_USER_ROLE);
-          this.logger.log('[WS-REQUESTS-MSGS] - *** id_project ', this.request.id_project);
+          this.logger.log('[WS-REQUESTS-MSGS] - getWsRequestById PARTICIPANTS_ARRAY ', this.members_array)
 
-
-          
-            // if (!this.CURRENT_USER_ROLE) {
-            //   this.CURRENT_USER_ROLE = await this.getProjectUserInProject(this.currentUserID, this.request.id_project)
-            //   this.logger.log('[WS-REQUESTS-MSGS] - *** CURRENT_USER_ROLE 2 ', this.CURRENT_USER_ROLE);
-            // }
           if(!this.CURRENT_USER_ROLE) {
             this.CURRENT_USER_ROLE = await this.getProjectUserInProject(this.currentUserID, this.request.id_project) 
             this.logger.log('[WS-REQUESTS-MSGS] - *** CURRENT_USER_ROLE 2 ', this.CURRENT_USER_ROLE);
           }
 
           this.members_array.forEach(member => {
-            this.logger.log('[WS-REQUESTS-MSGS] - *** member', member)
 
             // ----------------------------------------------------------------------------------------------
             // disable notes and tags if the current user has agent role and is not among the participants
             // ----------------------------------------------------------------------------------------------
+            this.logger.log('[WS-REQUESTS-MSGS] - getWsRequestById CURRENT_USER_ROLE ', this.CURRENT_USER_ROLE);
+            this.logger.log('[WS-REQUESTS-MSGS] - getWsRequestById CURRENT_USER_ID ', this.currentUserID);
 
-            this.logger.log('[WS-REQUESTS-MSGS] - *** CURRENT_USER_ID ', this.currentUserID);
-            this.logger.log('[WS-REQUESTS-MSGS] - *** CURRENT_USER_ROLE 3 ', this.CURRENT_USER_ROLE);
 
             if (this.currentUserID !== member && this.CURRENT_USER_ROLE === 'agent') {
-              this.logger.log('[WS-REQUESTS-MSGS] - *** CURRENT USER NOT IN PARTICIPANT AND IS AGENT currentUserID', this.currentUserID);
+              this.logger.log('[WS-REQUESTS-MSGS] - getWsRequestById CURRENT USER NOT IN PARTICIPANT AND IS AGENT');
               this.DISABLE_ADD_NOTE_AND_TAGS = true;
-              this.logger.log('[WS-REQUESTS-MSGS] - *** DISABLE_ADD_NOTE_AND_TAGS ', this.DISABLE_ADD_NOTE_AND_TAGS);
               this.DISABLE_BTN_AGENT_NO_IN_PARTICIPANTS = true;
             } else if (this.currentUserID === member && this.CURRENT_USER_ROLE === 'agent') {
-              this.logger.log('[WS-REQUESTS-MSGS] - *** CURRENT USER IS IN PARTICIPANT AND IS AGENT');
+              this.logger.log('[WS-REQUESTS-MSGS] - getWsRequestById CURRENT USER IS IN PARTICIPANT AND IS AGENT');
               this.DISABLE_ADD_NOTE_AND_TAGS = false;
-              this.logger.log('[WS-REQUESTS-MSGS] - *** DISABLE_ADD_NOTE_AND_TAGS ', this.DISABLE_ADD_NOTE_AND_TAGS);
               this.DISABLE_BTN_AGENT_NO_IN_PARTICIPANTS = false;
             }
 
@@ -3034,24 +3016,24 @@ export class WsRequestsMsgsComponent extends WsSharedComponent implements OnInit
   addNote() {
     // this.disableMainPanelScroll();
     if (this.DISABLE_ADD_NOTE_AND_TAGS === false) {
-    this.showSpinnerInAddNoteBtn = true;
-    this.wsRequestsService.createNote(this.new_note, this.id_request)
-      .subscribe((responses: any) => {
-        this.logger.log('[WS-REQUESTS-MSGS] - CREATE NOTE - RES ', responses);
-      }, (error) => {
-        this.logger.error('[WS-REQUESTS-MSGS] - CREATE NOTE - ERROR ', error);
-        this.notify.showWidgetStyleUpdateNotification(this.translationMap.get('Notes.NotificationMsgs')['CreateNoteError'], 4, 'report_problem');
-        this.showSpinnerInAddNoteBtn = false;
-      }, () => {
-        this.logger.error('[WS-REQUESTS-MSGS] - CREATE NOTE * COMPLETE *');
-        this.new_note = ''
-        // var panel = <HTMLElement>document.querySelector('.note-panel')
-        // panel.scrollTop = panel.scrollHeight;
-        // this.logger.log('% Ws-REQUESTS-Msgs - note-wf - CREATE NOTE * COMPLETE *');
+      this.showSpinnerInAddNoteBtn = true;
+      this.wsRequestsService.createNote(this.new_note, this.id_request)
+        .subscribe((responses: any) => {
+          this.logger.log('[WS-REQUESTS-MSGS] - CREATE NOTE - RES ', responses);
+        }, (error) => {
+          this.logger.error('[WS-REQUESTS-MSGS] - CREATE NOTE - ERROR ', error);
+          this.notify.showWidgetStyleUpdateNotification(this.translationMap.get('Notes.NotificationMsgs')['CreateNoteError'], 4, 'report_problem');
+          this.showSpinnerInAddNoteBtn = false;
+        }, () => {
+          this.logger.error('[WS-REQUESTS-MSGS] - CREATE NOTE * COMPLETE *');
+          this.new_note = ''
+          // var panel = <HTMLElement>document.querySelector('.note-panel')
+          // panel.scrollTop = panel.scrollHeight;
+          // this.logger.log('% Ws-REQUESTS-Msgs - note-wf - CREATE NOTE * COMPLETE *');
 
-        this.notify.showWidgetStyleUpdateNotification(this.translationMap.get('Notes.NotificationMsgs')['CreateNoteSuccess'], 2, 'done');
-        this.showSpinnerInAddNoteBtn = false;
-        // this.enableMainPanelScroll()
+          this.notify.showWidgetStyleUpdateNotification(this.translationMap.get('Notes.NotificationMsgs')['CreateNoteSuccess'], 2, 'done');
+          this.showSpinnerInAddNoteBtn = false;
+          // this.enableMainPanelScroll()
 
         });
     }
@@ -5043,12 +5025,12 @@ export class WsRequestsMsgsComponent extends WsSharedComponent implements OnInit
 
 
   getProjectuserbyUseridAndGoToEditProjectuser(member_id: string) {
-    this.usersService.getProjectUserByUserId(member_id).subscribe((projectUser: any) => {
+    this.usersService.getProjectUserByUserId(member_id).subscribe((projectUser: ProjectUser) => {
       this.logger.log('[WS-REQUESTS-MSGS] GET projectUser by USER-ID & GO TO EDIT PROJECT USER - projectUser', projectUser)
       if (projectUser) {
-        this.logger.log('[WS-REQUESTS-MSGS] GET projectUser by USER-ID & GO TO EDIT PROJECT USER - projectUser id', projectUser[0]._id);
+        this.logger.log('[WS-REQUESTS-MSGS] GET projectUser by USER-ID & GO TO EDIT PROJECT USER - projectUser id', projectUser._id);
 
-        this.router.navigate(['project/' + this.id_project + '/user/edit/' + projectUser[0]._id]);
+        this.router.navigate(['project/' + this.id_project + '/user/edit/' + projectUser._id]);
       }
     }, (error) => {
       this.logger.error('[WS-REQUESTS-MSGS] GET projectUser by USER-ID & GO TO EDIT PROJECT USER - ERROR ', error);
diff --git a/src/app/ws_requests/ws-shared/ws-shared.component.ts b/src/app/ws_requests/ws-shared/ws-shared.component.ts
index 1245e430d9f2..be611d2dedac 100755
--- a/src/app/ws_requests/ws-shared/ws-shared.component.ts
+++ b/src/app/ws_requests/ws-shared/ws-shared.component.ts
@@ -9,6 +9,7 @@ import { UsersService } from '../../services/users.service';
 import { NotifyService } from '../../core/notify.service';
 import { LoggerService } from '../../services/logger/logger.service';
 import { TranslateService } from '@ngx-translate/core';
+import { ProjectUser } from 'app/models/project-user';
 
 @Component({
   selector: 'appdashboard-ws-shared',
@@ -608,7 +609,7 @@ export class WsSharedComponent implements OnInit {
 
   _getProjectUserByUserId(member_id) {
     this.usersService.getProjectUserByUserId(member_id)
-      .subscribe((projectUser: any) => {
+      .subscribe((projectUser: ProjectUser) => {
         this.logger.log('[WS-SHARED][WS-REQUESTS-LIST][SERVED] - GET projectUser by USER-ID ', projectUser)
         if (projectUser) {
           this.logger.log('[WS-SHARED][WS-REQUESTS-LIST][SERVED] - GET projectUser id', projectUser);