From 835feea1633fa1a5f3ea6f28bc3760a345e52cf1 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 5 Apr 2022 17:44:30 +0300
Subject: fix random error that sometimes occurs

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

(limited to 'src/components/chat_title/chat_title.vue')

diff --git a/src/components/chat_title/chat_title.vue b/src/components/chat_title/chat_title.vue
index a92028e8..06ad129d 100644
--- a/src/components/chat_title/chat_title.vue
+++ b/src/components/chat_title/chat_title.vue
@@ -15,7 +15,7 @@
     </router-link>
     <RichContent
       class="username"
-      :title="'@'+user.screen_name_ui"
+      :title="'@'+(user && user.screen_name_ui)"
       :html="htmlTitle"
       :emoji="user.emoji"
     />
-- 
cgit v1.2.3-70-g09d2


From 08ad2923a58b08f8522b90938d9a330993904ea7 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 12 Apr 2022 17:17:52 +0300
Subject: fix chats button alignment

---
 src/components/chat/chat.scss            |  9 ++++-----
 src/components/chat/chat.vue             |  6 +++---
 src/components/chat_title/chat_title.vue | 16 +++++++++-------
 3 files changed, 16 insertions(+), 15 deletions(-)

(limited to 'src/components/chat_title/chat_title.vue')

diff --git a/src/components/chat/chat.scss b/src/components/chat/chat.scss
index 430319d9..8b745e86 100644
--- a/src/components/chat/chat.scss
+++ b/src/components/chat/chat.scss
@@ -47,7 +47,6 @@
   }
 
   .chat-view-heading {
-    align-items: center;
     justify-content: space-between;
     display: flex;
     z-index: 2;
@@ -56,11 +55,11 @@
   }
 
   .go-back-button {
-    cursor: pointer;
-    width: 28px;
     text-align: center;
-    padding: 0.6em;
-    margin: -0.6em 0.6em -0.6em -0.6em;
+    padding: 0 0.7em;
+    line-height: 100%;
+    height: 100%;
+    align-self: stretch;
   }
 
   .jump-to-bottom-button {
diff --git a/src/components/chat/chat.vue b/src/components/chat/chat.vue
index d909bed9..31eecbc0 100644
--- a/src/components/chat/chat.vue
+++ b/src/components/chat/chat.vue
@@ -9,15 +9,15 @@
           ref="header"
           class="panel-heading -sticky chat-view-heading mobile-hidden"
         >
-          <a
-            class="go-back-button"
+          <button
+            class="button-unstyled go-back-button"
             @click="goBack"
           >
             <FAIcon
               size="lg"
               icon="chevron-left"
             />
-          </a>
+          </button>
           <div class="title text-center">
             <ChatTitle
               :user="recipient"
diff --git a/src/components/chat_title/chat_title.vue b/src/components/chat_title/chat_title.vue
index 06ad129d..99a7a64e 100644
--- a/src/components/chat_title/chat_title.vue
+++ b/src/components/chat_title/chat_title.vue
@@ -4,13 +4,13 @@
     :title="title"
   >
     <router-link
+      class="avatar-container"
       v-if="withAvatar && user"
       :to="getUserProfileLink(user)"
     >
       <UserAvatar
+        class="titlebar-avatar"
         :user="user"
-        width="23px"
-        height="23px"
       />
     </router-link>
     <RichContent
@@ -32,7 +32,6 @@
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
-  align-items: center;
 
   --emoji-size: 14px;
 
@@ -45,11 +44,14 @@
     overflow: hidden;
   }
 
-  .Avatar {
-    width: 23px;
-    height: 23px;
-    margin-right: 0.5em;
+  .avatar-container {
+    align-self: center;
+  }
 
+  .titlebar-avatar {
+    margin-right: 0.5em;
+    height: 1.5em;
+    width: 1.5em;
     border-radius: $fallback--avatarAltRadius;
     border-radius: var(--avatarAltRadius, $fallback--avatarAltRadius);
 
-- 
cgit v1.2.3-70-g09d2


From be8098e8ec41ffa909987ee5db990a8c349a9034 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 20 Apr 2022 20:16:41 +0300
Subject: fix chat

---
 src/components/chat/chat.scss            | 10 +++-------
 src/components/chat_title/chat_title.vue |  1 +
 2 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'src/components/chat_title/chat_title.vue')

diff --git a/src/components/chat/chat.scss b/src/components/chat/chat.scss
index 8b745e86..63fd2a1f 100644
--- a/src/components/chat/chat.scss
+++ b/src/components/chat/chat.scss
@@ -47,19 +47,15 @@
   }
 
   .chat-view-heading {
-    justify-content: space-between;
-    display: flex;
-    z-index: 2;
-    position: sticky;
-    overflow: hidden;
+    grid-template-columns: auto 1fr;
   }
 
   .go-back-button {
     text-align: center;
-    padding: 0 0.7em;
     line-height: 100%;
     height: 100%;
-    align-self: stretch;
+    align-self: start;
+    width: var(--__panel-heading-height-inner);
   }
 
   .jump-to-bottom-button {
diff --git a/src/components/chat_title/chat_title.vue b/src/components/chat_title/chat_title.vue
index 99a7a64e..e62c52b2 100644
--- a/src/components/chat_title/chat_title.vue
+++ b/src/components/chat_title/chat_title.vue
@@ -46,6 +46,7 @@
 
   .avatar-container {
     align-self: center;
+    line-height: 1;
   }
 
   .titlebar-avatar {
-- 
cgit v1.2.3-70-g09d2


From 895eda3714e9977d931a5e4a0f215c304df021af Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 20 Apr 2022 20:19:22 +0300
Subject: fix some chat errors/warnings that sometimes happen

---
 src/components/chat_title/chat_title.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/components/chat_title/chat_title.vue')

diff --git a/src/components/chat_title/chat_title.vue b/src/components/chat_title/chat_title.vue
index a92028e8..f4706caf 100644
--- a/src/components/chat_title/chat_title.vue
+++ b/src/components/chat_title/chat_title.vue
@@ -14,10 +14,11 @@
       />
     </router-link>
     <RichContent
+      v-if="user"
       class="username"
       :title="'@'+user.screen_name_ui"
       :html="htmlTitle"
-      :emoji="user.emoji"
+      :emoji="user.emoji || []"
     />
   </div>
 </template>
-- 
cgit v1.2.3-70-g09d2