From 876cb15cb1ebd6afbb5dbcea67277b0ae453b645 Mon Sep 17 00:00:00 2001
From: Yulia Hermak <germak372@gmail.com>
Date: Tue, 3 Oct 2023 23:39:40 +0100
Subject: [PATCH 1/6] fix(chat): added ellipsis for long chat names

---
 src/components/ChatPreview.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/ChatPreview.vue b/src/components/ChatPreview.vue
index d47e4c5a1..767810f2b 100644
--- a/src/components/ChatPreview.vue
+++ b/src/components/ChatPreview.vue
@@ -276,6 +276,10 @@ export default {
   }
 
   &__title {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    margin-right: 80px;
     line-height: 24px;
     margin-bottom: 0;
   }

From 1062a056b24e9ce712dca347d3bd0b25c5821074 Mon Sep 17 00:00:00 2001
From: Yulia Hermak <germak372@gmail.com>
Date: Wed, 4 Oct 2023 19:11:50 +0100
Subject: [PATCH 2/6] fix: positioned the date through the flex

---
 src/components/ChatPreview.vue | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/components/ChatPreview.vue b/src/components/ChatPreview.vue
index 767810f2b..0efcb4b77 100644
--- a/src/components/ChatPreview.vue
+++ b/src/components/ChatPreview.vue
@@ -27,13 +27,18 @@
     </template>
 
     <div>
-      <v-list-item-title
-        :class="{
-          'a-text-regular-enlarged-bold': true,
-          [`${className}__title`]: true
-        }"
-        v-text="isAdamantChat(contactId) ? $t(contactName) : contactName"
-      />
+      <div :class="`${className}__heading`">
+        <v-list-item-title
+          :class="{
+            'a-text-regular-enlarged-bold': true,
+            [`${className}__title`]: true
+          }"
+          v-text="isAdamantChat(contactId) ? $t(contactName) : contactName"
+        />
+        <div v-if="!isMessageReadonly" :class="`${className}__date`">
+          {{ formatDate(createdAt) }}
+        </div>
+      </div>
 
       <!-- New chat (no messages yet) -->
       <template v-if="isNewChat">
@@ -70,10 +75,6 @@
         </v-list-item-subtitle>
       </template>
     </div>
-
-    <div v-if="!isMessageReadonly" :class="`${className}__date`">
-      {{ formatDate(createdAt) }}
-    </div>
   </v-list-item>
 </template>
 
@@ -262,6 +263,7 @@ export default {
 /**
  * 1. Message/Transaction content.
  */
+
 .chat-brief {
   position: relative;
 
@@ -275,11 +277,15 @@ export default {
     margin-right: 16px;
   }
 
+  &__heading {
+    display: flex;
+    justify-content: space-between;
+  }
+
   &__title {
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
-    margin-right: 80px;
     line-height: 24px;
     margin-bottom: 0;
   }
@@ -294,7 +300,8 @@ export default {
 
   &__date {
     @include a-text-explanation-small();
-    position: absolute;
+    margin-left: 16px;
+    white-space: nowrap;
     top: 16px;
     right: 16px;
   }

From 1f4cc00da4fc2bb35be27534365e2181fd539290 Mon Sep 17 00:00:00 2001
From: Yulia Hermak <germak372@gmail.com>
Date: Wed, 4 Oct 2023 19:15:23 +0100
Subject: [PATCH 3/6] refactor

---
 src/components/ChatPreview.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/ChatPreview.vue b/src/components/ChatPreview.vue
index 0efcb4b77..3f69cf9b4 100644
--- a/src/components/ChatPreview.vue
+++ b/src/components/ChatPreview.vue
@@ -263,7 +263,6 @@ export default {
 /**
  * 1. Message/Transaction content.
  */
-
 .chat-brief {
   position: relative;
 

From f4a6c046549ae6d32dbebefb99c25e167091c249 Mon Sep 17 00:00:00 2001
From: Yulia Hermak <germak372@gmail.com>
Date: Wed, 4 Oct 2023 22:00:13 +0100
Subject: [PATCH 4/6] fix: margin

---
 src/components/ChatPreview.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/ChatPreview.vue b/src/components/ChatPreview.vue
index 3f69cf9b4..b832cdede 100644
--- a/src/components/ChatPreview.vue
+++ b/src/components/ChatPreview.vue
@@ -301,8 +301,7 @@ export default {
     @include a-text-explanation-small();
     margin-left: 16px;
     white-space: nowrap;
-    top: 16px;
-    right: 16px;
+    margin-top: 4px;
   }
 
   &__badge {

From 3a2ee1454603e70be5bca428384026dd0a0a895a Mon Sep 17 00:00:00 2001
From: Yulia Hermak <germak372@gmail.com>
Date: Wed, 4 Oct 2023 23:24:59 +0100
Subject: [PATCH 5/6] fix: deleted unnecessary styles

---
 src/components/ChatPreview.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/components/ChatPreview.vue b/src/components/ChatPreview.vue
index b832cdede..c854e29dd 100644
--- a/src/components/ChatPreview.vue
+++ b/src/components/ChatPreview.vue
@@ -282,9 +282,6 @@ export default {
   }
 
   &__title {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
     line-height: 24px;
     margin-bottom: 0;
   }

From 90109ecfed30a7b84607e2ac7b5eda4329cf513a Mon Sep 17 00:00:00 2001
From: martiliones <hi@martilion.es>
Date: Fri, 6 Oct 2023 05:24:34 +0600
Subject: [PATCH 6/6] refactor(ChatPreview): align date using flexbox

---
 src/components/ChatPreview.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ChatPreview.vue b/src/components/ChatPreview.vue
index c854e29dd..6097cfc71 100644
--- a/src/components/ChatPreview.vue
+++ b/src/components/ChatPreview.vue
@@ -279,6 +279,7 @@ export default {
   &__heading {
     display: flex;
     justify-content: space-between;
+    align-items: center;
   }
 
   &__title {
@@ -298,7 +299,6 @@ export default {
     @include a-text-explanation-small();
     margin-left: 16px;
     white-space: nowrap;
-    margin-top: 4px;
   }
 
   &__badge {