diff --git a/src/app/shared/chat/messages/messages.page.scss b/src/app/shared/chat/messages/messages.page.scss
index 0ac9c17ab..20779a145 100644
--- a/src/app/shared/chat/messages/messages.page.scss
+++ b/src/app/shared/chat/messages/messages.page.scss
@@ -1,4 +1,4 @@
-@import '~src/function.scss';
+@import "~src/function.scss";
.header-toolbar {
--background: transparent;
@@ -29,7 +29,6 @@
margin: 2px 0 0 5px;
display: flex;
align-items: center;
-
}
.right {
@@ -45,13 +44,11 @@
width: 95%;
overflow: auto;
-
.header-bottom-icon {
width: rem(30);
font-size: rem(25);
float: left;
padding: 2px;
-
}
.header-bottom-contacts {
@@ -164,7 +161,6 @@ ion-content {
overflow: auto;
}
-
.incoming-true,
.incoming-false {
padding: 15px 20px;
@@ -267,7 +263,6 @@ ion-footer {
align-self: center;
}
}
-
}
.text-color-blue {
@@ -319,6 +314,11 @@ ion-footer {
padding-left: 10px;
}
+.dateLabel {
+ background: #000 !important;
+ margin: 0 auto;
+}
+
.float-status {
position: relative !important;
float: right;
@@ -357,7 +357,6 @@ ion-footer {
align-items: center;
}
-
.typing ngx-letters-avatar {
padding-right: 5px;
}
@@ -390,23 +389,22 @@ ion-footer {
right: 50%;
}
-
.try {
color: red;
- background: #f3414159;
- padding: 6px;
- border-radius: 10px;
- cursor: pointer;
+ background: #f3414159;
+ padding: 6px;
+ border-radius: 10px;
+ cursor: pointer;
}
.red-top {
border-top: 1px solid red !important;
}
.red {
- color: red !important;
+ color: red !important;
}
-
-.lido, .enviado {
+.lido,
+.enviado {
font-size: rem(11);
-}
\ No newline at end of file
+}
diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts
index 98303bd66..0fd42c917 100644
--- a/src/app/shared/chat/messages/messages.page.ts
+++ b/src/app/shared/chat/messages/messages.page.ts
@@ -1,4 +1,4 @@
-import { AfterViewInit, Component, ElementRef, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges, ViewChild } from '@angular/core';
+import { AfterViewInit, ChangeDetectorRef, Component, ElementRef, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges, ViewChild } from '@angular/core';
import { AnimationController, GestureController, IonRange, ModalController, PopoverController } from '@ionic/angular';
import { ChatService } from 'src/app/services/chat.service';
import { ToastService } from 'src/app/services/toast.service';
@@ -100,6 +100,9 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
roomName: any;
isAdmin = false;
roomCountDownDate: string;
+ groupedMessages: { date: string; messages: any[] }[] = [];
+ msgArray: any = new Array();
+
constructor(
public popoverController: PopoverController,
@@ -121,6 +124,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
private platform: Platform,
private fileOpener: FileOpener,
public p: PermissionService,
+ private cdr: ChangeDetectorRef
) {
// update
this.checkAudioPermission()
@@ -137,6 +141,11 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
this.showAvatar = false
+ this.msgArray = this.ChatSystemService.getDmRoom(this.roomId).messages;
+
+
+
+
setTimeout(() => {
this.scrollToBottomClicked()
this.showAvatar = true
@@ -144,7 +153,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
this.deleteRecording()
-
// this.ChatSystemService.getDmRoom(this.roomId).deleteAll()
}
@@ -183,6 +191,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
this.deleteRecording();
this.loadFiles();
+
}
diff --git a/version/git-version.ts b/version/git-version.ts
index 874f16a55..d1341ec73 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
export let versionData = {
- "shortSHA": "fb1bd07ad",
- "SHA": "fb1bd07ad0a5ba460b84408f87a08f72604cb41f",
+ "shortSHA": "42c2fc92f",
+ "SHA": "42c2fc92ffbe3543abe904e1d8ba6a53fb47e462",
"branch": "developer-prod",
"lastCommitAuthor": "'Eudes InĂ¡cio'",
- "lastCommitTime": "'Wed Sep 6 21:23:21 2023 +0100'",
- "lastCommitMessage": "a lot of changes",
- "lastCommitNumber": "5257",
+ "lastCommitTime": "'Sat Sep 9 14:40:08 2023 +0100'",
+ "lastCommitMessage": "upload profile picture",
+ "lastCommitNumber": "5258",
"change": "",
- "changeStatus": "On branch developer-prod\nYour branch is up to date with 'origin/developer-prod'.\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/modals/create-process/create-process.page.html\n\tmodified: src/app/modals/profile/edit-profile/edit-profile.page.ts\n\tmodified: src/app/modals/profile/profile.page.ts\n\tmodified: src/app/shared/header/header.page.ts",
+ "changeStatus": "On branch developer-prod\nYour branch is up to date with 'origin/developer-prod'.\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: android/app/src/main/AndroidManifest.xml\n\tmodified: src/app/services/chat/message.service.ts\n\tmodified: src/app/services/chat/room.service.ts\n\tmodified: src/app/shared/chat/messages/messages.page.html\n\tmodified: src/app/shared/chat/messages/messages.page.scss\n\tmodified: src/app/shared/chat/messages/messages.page.ts",
"changeAuthor": "eudes.inacio"
}
\ No newline at end of file