From 2ca3859f87e8942e477613d847e3ae66deb4d2d3 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Mon, 26 Jul 2021 14:09:26 +0100
Subject: [PATCH] save

---
 .../group-messages/group-messages.page.html   | 22 ++++++++++---------
 .../group-messages/group-messages.page.scss   | 18 ++++++++-------
 .../group-messages/group-messages.page.ts     | 14 +++++++++---
 .../group-messages/group-messages.page.html   | 11 +++++-----
 .../group-messages/group-messages.page.scss   |  3 ++-
 5 files changed, 41 insertions(+), 27 deletions(-)

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 1b0535c0d..4880a8ba5 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.html
+++ b/src/app/pages/chat/group-messages/group-messages.page.html
@@ -37,19 +37,21 @@
     <ion-label>Esta conversa passou a grupo</ion-label><br />
     <ion-label>A conversa original mantêm-se como chat individual</ion-label>
   </div>
-  <div *ngFor="let msg of messages" class="messages" #scrollMe>
-    <div *ngIf="msg.t != 'r'" class='incoming-{{msg.u.username!=loggedUser.me.username}}'>
-      <div class="title">
-        <ion-label>{{msg.u.name}}</ion-label>
-        <span class="time">{{msg._updatedAt | date: 'HH:mm' }}</span>
+  <div class="messages overflow-y-auto" #scrollMe>
+    <div *ngFor="let msg of messages" >
+      <div *ngIf="msg.t != 'r'" class='incoming-{{msg.u.username!=loggedUser.me.username}}'>
+        <div class="title">
+          <ion-label>{{msg.u.name}}</ion-label>
+          <span class="time">{{msg._updatedAt | date: 'HH:mm' }}</span>
+        </div>
+        <div>
+          <ion-label>{{msg.msg}}</ion-label>
+        </div>
       </div>
-      <div>
-        <ion-label>{{msg.msg}}</ion-label>
+      <div *ngIf="msg.t == 'r'" class="info-text">
+        <ion-label>Alterou o assunto para "{{msg.msg.split('-').join(' ')}}"</ion-label><br />
       </div>
     </div>
-    <div *ngIf="msg.t == 'r'" class="info-text">
-      <ion-label>Alterou o assunto para "{{msg.msg.split('-').join(' ')}}"</ion-label><br />
-    </div>
   </div>
   <div *ngIf="leaveStatus" class="info-text-leave">
     <ion-label>{{leaveStatus}}</ion-label>
diff --git a/src/app/pages/chat/group-messages/group-messages.page.scss b/src/app/pages/chat/group-messages/group-messages.page.scss
index 4d9f6849f..d6d2e2fda 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.scss
+++ b/src/app/pages/chat/group-messages/group-messages.page.scss
@@ -14,7 +14,7 @@
         padding: 30px 20px 0px 20px;
         color:#000;
         transform: translate3d(0, 1px, 0);
-        
+
         .header-top{
           overflow: auto;
           padding: 0 !important;
@@ -57,7 +57,7 @@
             margin: 1px;
           }
         }
-    
+
         .title{
           font-size: 25px;
         }
@@ -71,7 +71,7 @@
         .div-icon ion-icon{
           float: right;
           padding-left: 20px;
-        } 
+        }
     }
  }
  ion-content{
@@ -123,6 +123,8 @@
     font-size: 13px;
     font-family: Roboto;
     overflow: auto;
+    width: 100%;
+    //height: 100%;
 
     .incoming-true, .incoming-false{
       width: 305px;
@@ -143,7 +145,7 @@
      }
      .title{
       color: #0782c9;
-      
+
       font-weight: bold;
       margin-bottom: 5px;
 
@@ -176,9 +178,9 @@
  .container{
    justify-content: center;
    justify-content: space-evenly;
-   
+
  }
- 
+
  .chat-icon-options{
    display:block !important;
    font-size: 25px;
@@ -205,5 +207,5 @@
      align-self: center;
    }
  }
- 
-}
\ No newline at end of file
+
+}
diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts
index 595cefe07..c9c331f2d 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.ts
+++ b/src/app/pages/chat/group-messages/group-messages.page.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, ElementRef, OnInit, ViewChild } from '@angular/core';
 import { ActionSheetController, MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
 import { AlertService } from 'src/app/services/alert.service';
 import { AuthService } from 'src/app/services/auth.service';
@@ -30,6 +30,8 @@ export class GroupMessagesPage implements OnInit {
   roomId: string;
   loggedUserChat:any;
 
+  @ViewChild('scrollMe') private myScrollContainer: ElementRef;
+
   constructor(
     private menu: MenuController,
     private modalController: ModalController,
@@ -51,8 +53,14 @@ export class GroupMessagesPage implements OnInit {
     this.getRoomInfo();
   }
 
-  notImplemented(){
-    this.alertService.presentAlert('Funcionalidade em desenvolvimento');
+  ngAfterViewChecked() {
+    this.scrollToBottom();
+  }
+
+  scrollToBottom(): void {
+    try {
+      this.myScrollContainer.nativeElement.scrollTop = this.myScrollContainer.nativeElement.scrollHeight;
+    } catch(err) { }
   }
 
   getRoomInfo(){
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 13dc07e08..1df0d7960 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -32,11 +32,12 @@
     <ion-refresher-content>
     </ion-refresher-content>
   </ion-refresher>
-  <div class="welcome-text">
-    <ion-label> {{message}} Esta conversa passou a grupo</ion-label><br />
-    <ion-label>A conversa original mantêm-se como chat individual</ion-label>
-  </div>
-  <div class="messages" #scrollMe>
+
+  <div class="messages overflow-y-auto" #scrollMe>
+    <div class="welcome-text">
+      <ion-label> Esta conversa passou a grupo</ion-label><br />
+      <ion-label>A conversa original mantêm-se como chat individual</ion-label>
+    </div>
     <div class="container-width-100" *ngFor="let msg of messages" #scrollMe>
       <div *ngIf="msg.t != 'r'" class='incoming-{{msg.u.username!=loggedUser.me.username}} max-width-45'>
         <div class="title">
diff --git a/src/app/shared/chat/group-messages/group-messages.page.scss b/src/app/shared/chat/group-messages/group-messages.page.scss
index cd36c3f60..46a69b6a8 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.scss
+++ b/src/app/shared/chat/group-messages/group-messages.page.scss
@@ -117,7 +117,8 @@
    .messages{
     font-size: 13px;
     font-family: Roboto;
-    overflow: auto;
+    width: 100%;
+    height: 100%;
 
     .incoming-true, .incoming-false{
        padding: 15px 20px;