From 29fcd07a93951b1a848b6e301280a8b0c4e87525 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Tue, 4 Oct 2022 12:08:35 +0100
Subject: [PATCH] improve chat and remove word capitalization

---
 src/app/pages/agenda/view-event/view-event.page.html        | 2 +-
 src/app/pages/agenda/view-event/view-event.page.scss        | 4 ++++
 src/app/services/chat/rochet-chat-connector.service.ts      | 2 +-
 src/app/services/chat/room.service.ts                       | 2 ++
 src/app/shared/agenda/approve-event/approve-event.page.html | 2 +-
 src/app/shared/agenda/approve-event/approve-event.page.scss | 5 +++++
 src/app/shared/agenda/view-event/view-event.page.html       | 2 +-
 src/app/shared/agenda/view-event/view-event.page.scss       | 4 ++++
 8 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/app/pages/agenda/view-event/view-event.page.html b/src/app/pages/agenda/view-event/view-event.page.html
index 96ae78e19..e5fa4b74b 100644
--- a/src/app/pages/agenda/view-event/view-event.page.html
+++ b/src/app/pages/agenda/view-event/view-event.page.html
@@ -83,7 +83,7 @@
           <div *ngIf="loadedEvent.Body.Text">
             <h5>Detalhes</h5>
             <ion-item lines="none" class="ion-no-margin ion-no-padding">
-              <div disabled class="width-100" [innerHTML]="loadedEvent.Body.Text" rows="6"></div>
+              <div  class="width-100 text"  >{{ loadedEvent.Body.Text }}</div>
             </ion-item>
             <div class="line"></div>
           </div>
diff --git a/src/app/pages/agenda/view-event/view-event.page.scss b/src/app/pages/agenda/view-event/view-event.page.scss
index acc6321ca..79c94b3dd 100644
--- a/src/app/pages/agenda/view-event/view-event.page.scss
+++ b/src/app/pages/agenda/view-event/view-event.page.scss
@@ -299,3 +299,7 @@ ion-menu{
     padding: 5px 13.5px 5px 13.5px;
     color: #fff;
   }
+
+  .text {
+    text-transform: initial !important
+  }
\ No newline at end of file
diff --git a/src/app/services/chat/rochet-chat-connector.service.ts b/src/app/services/chat/rochet-chat-connector.service.ts
index fe8139b8e..fe10bd718 100644
--- a/src/app/services/chat/rochet-chat-connector.service.ts
+++ b/src/app/services/chat/rochet-chat-connector.service.ts
@@ -772,7 +772,7 @@ export class RochetChatConnectorService {
 
       this.connect()
       this.login()
-      // console.log("close connection ===============================");
+      console.log("close connection ===============================");
 
       for (const [key, value] of Object.entries(this.wsCallbacks)) {
         if(value.type == 'Offline') {
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 38e55d56d..26c76e868 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -145,6 +145,8 @@ export class RoomService {
          *  when the connection is lost the subscribe is also lost, so we have to subscribe again when reconnection is establish.
          */
         this.resetStatus();
+        this.hasLoadHistory = false
+        this.subscribeAttempt = false
       }
     })
 
diff --git a/src/app/shared/agenda/approve-event/approve-event.page.html b/src/app/shared/agenda/approve-event/approve-event.page.html
index 3ebb71116..33d8046d3 100644
--- a/src/app/shared/agenda/approve-event/approve-event.page.html
+++ b/src/app/shared/agenda/approve-event/approve-event.page.html
@@ -92,7 +92,7 @@
             <div *ngIf="loadedEvent.workflowInstanceDataFields.Body">
               <h5>Detalhes</h5>
               <ion-item lines="none" class="ion-no-margin ion-no-padding">
-                  <p [innerHTML]="loadedEvent.workflowInstanceDataFields.Body"></p>
+                  <p class="text" [innerHTML]="loadedEvent.workflowInstanceDataFields.Body"></p>
               </ion-item>
               <div class="line"></div>
             </div>
diff --git a/src/app/shared/agenda/approve-event/approve-event.page.scss b/src/app/shared/agenda/approve-event/approve-event.page.scss
index 146eb255b..ef234d200 100644
--- a/src/app/shared/agenda/approve-event/approve-event.page.scss
+++ b/src/app/shared/agenda/approve-event/approve-event.page.scss
@@ -220,3 +220,8 @@
   background: #d30606;
   border-radius: 20px;
 }
+
+
+  .text {
+    text-transform: initial !important
+  }
diff --git a/src/app/shared/agenda/view-event/view-event.page.html b/src/app/shared/agenda/view-event/view-event.page.html
index 856eb4426..c64efc61b 100644
--- a/src/app/shared/agenda/view-event/view-event.page.html
+++ b/src/app/shared/agenda/view-event/view-event.page.html
@@ -80,7 +80,7 @@
       <div *ngIf="loadedEvent.Body.Text">
         <h5>Detalhes</h5>
         <ion-item lines="none" class="ion-no-margin ion-no-padding">
-          <div [innerHTML]="loadedEvent.Body.Text"></div>
+          <div class="text"> {{ loadedEvent.Body.Text }} </div>
         </ion-item>
         <div class="line"></div>
       </div>
diff --git a/src/app/shared/agenda/view-event/view-event.page.scss b/src/app/shared/agenda/view-event/view-event.page.scss
index 039695b83..3de94031a 100644
--- a/src/app/shared/agenda/view-event/view-event.page.scss
+++ b/src/app/shared/agenda/view-event/view-event.page.scss
@@ -209,4 +209,8 @@ ion-content{
   width: 35px; 
   height: 41px;
   align-items: center;
+}
+
+.text {
+  text-transform: initial !important
 }
\ No newline at end of file