diff --git a/angular.json b/angular.json
index 0c755a853..80af72b60 100644
--- a/angular.json
+++ b/angular.json
@@ -82,6 +82,22 @@
                 }
               ]
             },
+            "oapr": {
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/suport/oapr.ts",
+                  "with": "src/environments/suport/oapr.ts"
+                }
+              ]
+            },
+            "div": {
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/suport/dev.ts",
+                  "with": "src/environments/suport/dev.ts"
+                }
+              ]
+            },
             "ci": {
               "progress": false
             }
diff --git a/package.json b/package.json
index 9ffb77015..20a04a850 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,9 @@
     "cypress:open": "cypress open",
     "cypress:run": "cypress run",
     "docker:build": "docker build -t gabinetedigital:0.0.0.1 .",
-    "docker:publish": "docker run -p gabinetedigital:0.0.0.1"
+    "docker:publish": "docker run -p gabinetedigital:0.0.0.1",
+    "build:oapr": "ionic cap build android --configuration oapr",
+    "build:dev": "ionic cap build android  --configuration dev"
   },
   "private": true,
   "dependencies": {
diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index a06bfde06..aa03c4cd4 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -230,9 +230,10 @@
                   <!-- {{ month.monthInfo.monthName | json }} -->
                   <!-- <hr> -->
 
-                  <div *ngFor="let day of month.days " class="EventListBox-container" >
+                  <div *ngFor="let day of month.days; let i = index " class="EventListBox-container" >
+
+                    <div class="day" *ngIf="!(i == 0 && isSelectedDayHasEvent)" >
 
-                    <div class="day " [class.dayShow]="isSelectedDayHasEvent && hasEventToday" >
                       {{ day.daysInfo.dayName  }} <div style="text-transform: capitalize; display: inline;">{{month.monthInfo.monthName}}</div>
                     </div>
 
diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts
index 6a69b0a90..8f1ffd575 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -1200,6 +1200,12 @@ export class AgendaPage implements OnInit {
     return this.eventService.calendarRole.includes(str);
   }
 
+  validateEvent(year, month, day) {
+    console.log(year, month, day)
+
+    return true
+  }
+
 }
 
 function endOfMonth(myDate) {
diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index cc6274e5c..18a568ae9 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -123,8 +123,11 @@
           <ion-list *ngSwitchCase="'Grupos'">
               <ion-item-sliding >
                   <div *ngFor="let group of ChatSystemService._group"
+
                   [class.item-active]="group.id ==idSelected"
                   class="item item-hover d-flex">
+
+
                     <div class="item-icon">
                       <!-- <ion-icon class="icon" slot="start" src="assets/images/icons-chat-group-chat-40.svg"></ion-icon> -->
 
@@ -139,11 +142,11 @@
                         <div class="item-title add-ellipsis" [class.item-title-active]="group.id ==idSelected">
                           <p class="font-15-em add-ellipsis mb-0 white-space-nowrap" [class.bold-message]="group.messageUnread == true">{{group.name.split('-').join(' ')}}</p>
                         </div>
-                        <div class="item-date font-13-em" [class.item-date-active]="group.id ==idSelected" *ngIf="group.lastMessage && !group.customFields.countDownDate">{{group.duration}}</div>
-                        <div class="item-date font-13-em" [class.item-date-active]="group.id ==idSelected" *ngIf="group.customFields.countDownDate">{{group.countDownTime}}</div>
+                        <div class="item-date font-13-em" [class.item-date-active]="group.id ==idSelected" *ngIf="group.lastMessage && !group.customFields.countDownDate">{{group.duration }}</div>
+                        <div class="item-date font-13-em" [class.item-date-active]="group.id ==idSelected" *ngIf="group.customFields.countDownDate">{{group.countDownTime }}</div>
                       </div>
                       <div *ngIf="group.lastMessage" class="item-description d-flex align-items-center" [class.item-description-active]="group.id ==idSelected">
-                        <div class="item-message font-13-em add-ellipsis white-space-nowrap" *ngIf="group.otherUserType == false">{{group.lastMessage.u.name}}: {{group.lastMessage.msg}} </div>
+                        <div class="item-message font-13-em add-ellipsis white-space-nowrap" *ngIf="group.otherUserType == false">{{group.lastMessage.u.name}} <span *ngIf="group.lastMessage.u.name">:</span> {{group.lastMessage.msg}} </div>
                         <div class="font-13-em" *ngIf="group.otherUserType == true">{{group.userThatIsTyping}} está escrever ...</div>
 
                         <div class="item-files add-ellipsis" *ngIf="group.lastMessage.file">
diff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/pages/chat/group-messages/group-messages.page.html
index 5dd2879c2..86a3a4b28 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.html
+++ b/src/app/pages/chat/group-messages/group-messages.page.html
@@ -31,14 +31,14 @@
         </div>
         <div class="header-bottom-contacts" *ngIf="ChatSystemService.getGroupRoom(roomId)">
           <ion-label class="contacts-list"
-            *ngFor="let member of ChatSystemService.getGroupRoom(roomId).membersExcludeMe">
-            {{member.name}},
+            *ngFor="let member of ChatSystemService.getGroupRoom(roomId).membersExcludeMe; let last = last">
+            {{member.name}}<span *ngIf="!last">, </span>
           </ion-label>
         </div>
       </div>
       <div *ngIf="roomCountDownDate" class="d-flex align-items-center yellow-orange pl-10">
         <i class="far fa-clock font-15"></i>
-        <ion-label class="font-15 pl-10" color="warning">{{roomCountDownDate}}</ion-label>
+        <ion-label class="font-15 pl-10" color="warning">{{ChatSystemService.getGroupRoom(roomId).countDownTime}}</ion-label>
       </div>
     </div>
   </ion-toolbar>
diff --git a/src/app/services/agenda/list-box.service.ts b/src/app/services/agenda/list-box.service.ts
index 5f8335b3c..47151f290 100644
--- a/src/app/services/agenda/list-box.service.ts
+++ b/src/app/services/agenda/list-box.service.ts
@@ -131,6 +131,10 @@ export class ListBoxService {
 
 			if (this.dateService.notSameDate(startDate, endDate)) {
 
+        const cloneSelectedDate = new Date(selectedDate)
+        cloneSelectedDate.setHours(0)
+        cloneSelectedDate.setMinutes(0)
+        cloneSelectedDate.setSeconds(0)
 
 				if (diffDays <= 150 ) {
 
@@ -138,7 +142,9 @@ export class ListBoxService {
 
 						const StartEvent =  this.transForm(event, {startMany: true, endMany: false,	middle: false})
 
-						if(this.CanPush(event, selectedDate)) {days[day].push(StartEvent); this.push(StartEvent, year)}
+						if(this.CanPush(event, selectedDate) && (new Date(event.start)).getTime() >= cloneSelectedDate.getTime()) {
+              days[day].push(StartEvent); this.push(StartEvent, year)
+            }
 
 						let i = 1;
 
@@ -150,11 +156,12 @@ export class ListBoxService {
 							const newDate = startDate.setDate(startDate.getDate()+ i)
 							let otherDays =   this.dateService.getDay(newDate)
 
-							event['other'] = true
+              const cloneEvent = {...event}
+							cloneEvent['other'] = true
+
+							cloneEvent.start = new Date(startDate)
 
-							event.start = newDate
 							if(!days.hasOwnProperty(otherDays)) {
-
 								days[otherDays] = []
 							}
 
@@ -162,13 +169,18 @@ export class ListBoxService {
 							startDate.getMonth() != endDate.getMonth() ||
 							startDate.getDate() != endDate.getDate())) {
 								// last push
-								const EndEvent = this.transForm(event, {startMany: false, endMany: true, middle: false})
-								if(this.CanPush(event, selectedDate)) {days[otherDays].push(EndEvent) ; this.push(event, year)}
+								const EndEvent = this.transForm(cloneEvent, {startMany: false, endMany: true, middle: false})
+								if(this.CanPush(cloneEvent, selectedDate) && cloneEvent.start.getTime() >= cloneSelectedDate.getTime()) {
+                  days[otherDays].push(EndEvent) ; this.push(cloneEvent, year)
+                }
 
 							} else {
 
-								const EndEvent = this.transForm(event, {startMany: false,endMany: true,	middle: true})
-								if(this.CanPush(event, selectedDate)) {days[otherDays].push(EndEvent) ; this.push(event, year)}
+								const EndEvent = this.transForm(cloneEvent, {startMany: false,endMany: true,	middle: true})
+								if(this.CanPush(cloneEvent, selectedDate) && cloneEvent.start.getTime() >= cloneSelectedDate.getTime()) {
+                  days[otherDays].push(EndEvent) ; this.push(cloneEvent, year)
+                }
+
 							}
 
               days[otherDays] = days[otherDays].reverse()
@@ -256,6 +268,12 @@ export class ListBoxService {
 
 	CanPush(event: any, selectedDate: Date) {
 
+    const cloneSelectedDate = new Date(selectedDate);
+
+    cloneSelectedDate.setHours(0)
+    cloneSelectedDate.setMinutes(0)
+    cloneSelectedDate.setSeconds(0)
+
     const limite = this.endOfMonth(selectedDate)
     limite.setDate(limite.getDate() + 10)
     limite.setHours(0)
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 8278a55c3..8b9f60be1 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -245,6 +245,12 @@ export class RoomService {
         this.ChatSystemService.deleteRoom(this.id);
         this.ChatSystemService.getAllRooms();
         this.chatServiceDeleteRoom(this.id);
+      }, (error)=> {
+        if(error.status != 0) {
+          this.ChatSystemService.deleteRoom(this.id);
+          this.ChatSystemService.getAllRooms();
+          this.chatServiceDeleteRoom(this.id);
+        }
       });
     }
     else {
@@ -252,6 +258,12 @@ export class RoomService {
         this.ChatSystemService.deleteRoom(this.id);
         this.ChatSystemService.getAllRooms();
         this.chatServiceDeleteRoom(this.id);
+      }, (error)=> {
+        if(error.status != 0) {
+          this.ChatSystemService.deleteRoom(this.id);
+          this.ChatSystemService.getAllRooms();
+          this.chatServiceDeleteRoom(this.id);
+        }
       });
     }
   }
diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html
index 5d2516d3f..88a865d57 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -19,8 +19,8 @@
           <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/icon/theme/gov/icons-user.svg"></ion-icon>
         </div>
         <div class="header-bottom-contacts" *ngIf="ChatSystemService.getGroupRoom(roomId)">
-          <ion-label class="contacts-list" *ngFor="let member of ChatSystemService.getGroupRoom(roomId).membersExcludeMe" >
-            {{member.name}},
+          <ion-label class="contacts-list" *ngFor="let member of ChatSystemService.getGroupRoom(roomId).membersExcludeMe; let last = last" >
+            {{member.name}}<span *ngIf="!last">, </span>
           </ion-label>
         </div>
       </div>
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index fcd6355f2..1b55290ea 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -1,6 +1,6 @@
 import { Environment } from './../app/models/envarioment'
-import { oaprProd } from './suport/oapr'
-import { doneITProd } from './suport/doneIt'
+import { environment as oaprProd } from './suport/oapr'
+import { environment as doneITProd } from './suport/doneIt'
  import { DevDev } from './suport/dev'
 
 
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 1618c4dec..3bd65b833 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -1,7 +1,7 @@
 import { Environment } from './../app/models/envarioment'
-import { oaprDev } from './suport/oapr'
+import { environment as oaprDev } from './suport/oapr'
 import { doneITDev } from './suport/doneIt'
 import { DevDev } from './suport/dev'
 
 
-export const environment: Environment = DevDev
+export const environment: Environment = oaprDev
diff --git a/src/environments/suport/dev.ts b/src/environments/suport/dev.ts
index a5fd1e42f..83092c1c6 100644
--- a/src/environments/suport/dev.ts
+++ b/src/environments/suport/dev.ts
@@ -1,7 +1,7 @@
 import { versionData } from '../../../version/git-version'
 import { Environment } from './../../app/models/envarioment'
 
-export const DevProd: Environment = {
+export const environment: Environment = {
   id:'3',
   apiURL: 'http://gpr-dev-01:83/jwt/api/',
   /* apiURL: 'https://gdapi-dev-0.dyndns.info/jwt/api/', */
diff --git a/src/environments/suport/doneIt.ts b/src/environments/suport/doneIt.ts
index ec9d71d5f..5ad8263e7 100644
--- a/src/environments/suport/doneIt.ts
+++ b/src/environments/suport/doneIt.ts
@@ -1,7 +1,7 @@
 import { versionData } from '../../../version/git-version';
 import { Environment } from './../../app/models/envarioment';
 
-export const doneITProd: Environment = {
+export const environment: Environment = {
   id:'1',
   apiURL: 'https://gdapi-dev.dyndns.info/api/',
   apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/',
@@ -59,4 +59,4 @@ export const doneITDev: Environment = {
   dispatchPR: 'Despachos Titular',
   storageProduction: false,
   rejectUnauthorized: "true"
-};
\ No newline at end of file
+};
diff --git a/src/environments/suport/oapr.ts b/src/environments/suport/oapr.ts
index 86ca58e8c..c582527dd 100644
--- a/src/environments/suport/oapr.ts
+++ b/src/environments/suport/oapr.ts
@@ -2,7 +2,7 @@ import { versionData } from '../../../version/git-version'
 import { Environment } from './../../app/models/envarioment'
 
 
-export const oaprProd: Environment = {
+export const environment: Environment = {
   id: '0',
   /* apiURL: 'http://gpr-dev-01:83/jwt/api/', */
   apiURL: 'https://gdqas-api.oapr.gov.ao/api/',
diff --git a/workspace.code-workspace b/workspace.code-workspace
index 07d71037b..bf4bc2067 100644
--- a/workspace.code-workspace
+++ b/workspace.code-workspace
@@ -10,4 +10,4 @@
 		],
 		"nuxt.isNuxtApp": false
     }
-}
\ No newline at end of file
+}