From 6b272b9c99107408b2952f214b75800f3a372174 Mon Sep 17 00:00:00 2001
From: eugenijm <eugenijm@protonmail.com>
Date: Thu, 21 May 2020 08:17:40 +0300
Subject: [PATCH] WIP chat improvements

---
 src/components/chat/chat.js   |  7 ++++++-
 src/components/chat/chat.scss | 14 +++++++++++++
 src/components/chat/chat.vue  | 37 +++++++++++------------------------
 3 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/src/components/chat/chat.js b/src/components/chat/chat.js
index 16ec4fd9..43e5ff8e 100644
--- a/src/components/chat/chat.js
+++ b/src/components/chat/chat.js
@@ -60,7 +60,12 @@ const Chat = {
       if (this.currentChat) {
         return [this.currentChat.account]
       } else {
-        return []
+        const user = this.findUser(this.recipientId)
+        if (user) {
+          return [user]
+        } else {
+          return []
+        }
       }
     },
     recipient () {
diff --git a/src/components/chat/chat.scss b/src/components/chat/chat.scss
index 115918e4..a8b607ba 100644
--- a/src/components/chat/chat.scss
+++ b/src/components/chat/chat.scss
@@ -44,6 +44,20 @@
         position: -webkit-sticky;
         position: sticky;
 
+        .direct-conversation-title {
+          display: flex;
+
+          a {
+            display: flex;
+            align-items: center;
+          }
+        }
+
+        .go-back-button-wrapper {
+          display: flex;
+          width: 100%;
+        }
+
         .button-icon {
           cursor: pointer;
           display: flex;
diff --git a/src/components/chat/chat.vue b/src/components/chat/chat.vue
index d070a02f..9db3f4b6 100644
--- a/src/components/chat/chat.vue
+++ b/src/components/chat/chat.vue
@@ -10,36 +10,21 @@
           ref="header"
           class="panel-heading direct-conversation-view-heading mobile-hidden"
         >
-          <!-- <a
-            class="go-back-button"
-            @click="goBack"
-          > -->
-          <i
-            class="button-icon icon-left-open"
-            @click="goBack"
-          />
-          <!-- </a> -->
-          <div class="title text-center">
-            <ChatTitle
-              :users="chatParticipants"
-              :fallback-user="currentUser"
-              :with-avatar="true"
+          <div class="go-back-button-wrapper">
+            <i
+              class="button-icon icon-left-open go-back-button"
+              @click="goBack"
             />
+            <div class="title text-center">
+              <ChatTitle
+                :users="chatParticipants"
+                :fallback-user="currentUser"
+                :with-avatar="true"
+              />
+            </div>
           </div>
           <div style="">
-            <!-- <ChatAvatar
-              :users="chatParticipants"
-              :fallback-user="currentUser"
-              width="23px"
-              height="23px"
-            /> -->
-            <!-- <a
-              class=""
-              style="margin-right: 0.3em;"
-              @click="goBack"
-            > -->
             <i class="button-icon icon-info-circled" />
-            <!-- </a> -->
           </div>
         </div>
         <template>