From 895b84b586c6a927cfb7000fa8bac3fa3a20a22e Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Tue, 17 Jan 2023 10:57:26 +0100
Subject: [PATCH] remove clock

---
 src/app/pages/chat/messages/messages.page.html  |  3 +--
 src/app/shared/chat/messages/messages.page.html |  4 ++--
 version/git-version.ts                          | 12 ++++++------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html
index 6a26f2b97..94b5ead33 100644
--- a/src/app/pages/chat/messages/messages.page.html
+++ b/src/app/pages/chat/messages/messages.page.html
@@ -160,8 +160,7 @@
                     </ion-label>
 
                     <ion-label class="float-status-all float-status" *ngIf="msg.u.username==sessionStore.user.UserName">
-                      
-                      <ion-icon *ngIf="msg.messageSend == false" src="assets/images/clock-regular.svg"></ion-icon>
+                    
                       
                       <ion-icon *ngIf="msg.messageSend == false && !msg.manualRetry" src="assets/images/clock-regular.svg"></ion-icon>
                       <ion-icon *ngIf="msg.messageSend == true && msg.received.length == 0 && msg.viewed.length == 0" src="assets/images/check-solid.svg"></ion-icon>
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index 584c6c4e3..f63c3c362 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -104,7 +104,7 @@
                 </div>
                   <img *ngIf="msg.attachments[0].image_url" src={{msg.attachments[0].image_url}} alt="image">
                   <ion-label class="float-status-all float-status"  *ngIf="msg.u.username==sessionStore.user.UserName">
-                    {{ msg.viewed }}
+                    
                     <ion-icon *ngIf="msg.messageSend == false && !msg.manualRetry" src="assets/images/clock-regular.svg"></ion-icon>
                     <ion-icon *ngIf="msg.messageSend == true && msg.received.length == 0 && msg.viewed.length == 0" src="assets/images/check-solid.svg"></ion-icon>
                     <ion-icon *ngIf="msg.messageSend && msg.received.length >= 1 && msg.viewed.length == 0" src="assets/images/check-double-solid.svg"></ion-icon>
@@ -170,7 +170,7 @@
                      
                     </ion-label>
                     <ion-label class="float-status-all float-status"  *ngIf="msg.u.username==sessionStore.user.UserName">
-                      {{ msg.viewed }}
+                      
                       <ion-icon *ngIf="msg.messageSend == false && !msg.manualRetry" src="assets/images/clock-regular.svg"></ion-icon>
                       <ion-icon *ngIf="msg.messageSend == true && msg.received.length == 0 && msg.viewed.length == 0" src="assets/images/check-solid.svg"></ion-icon>
                       <ion-icon *ngIf="msg.messageSend && msg.received.length >= 1 && msg.viewed.length == 0" src="assets/images/check-double-solid.svg"></ion-icon>
diff --git a/version/git-version.ts b/version/git-version.ts
index f1963ca53..eef3c4ad9 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "d2478bf31",
-  "SHA": "d2478bf311a985605138bfe510f5d2c64a7950a9",
+  "shortSHA": "50f2fd39a",
+  "SHA": "50f2fd39a2f8e3b7ff53abe4b1c93373d1e714fd",
   "branch": "no_bug_movemente",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Tue Jan 17 10:45:20 2023 +0100'",
-  "lastCommitMessage": "return icons",
-  "lastCommitNumber": "4631",
+  "lastCommitTime": "'Tue Jan 17 10:47:45 2023 +0100'",
+  "lastCommitMessage": "fix merge",
+  "lastCommitNumber": "4633",
   "change": "",
-  "changeStatus": "On branch no_bug_movemente\nAll conflicts fixed but you are still merging.\n  (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified:   src/app/modals/profile/profile.page.ts\n\tmodified:   version/git-version.ts",
+  "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/chat/messages/messages.page.html\n\tmodified:   src/app/shared/chat/messages/messages.page.html",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file