Merge pull request #779 from nanu-c/glitches

Remove some glitches in axolotl Web
axolotl-chat · Mar 16, 2022 · a118c51 · a118c51
2 parents b8cc6b8 + 38e9901
commit a118c51
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 18 deletions.
diff --git a/axolotl-web/src/assets/style.scss b/axolotl-web/src/assets/style.scss
@@ -105,4 +105,8 @@ $link-color: $primary;
   font-weight: normal;
   font-style: normal;
 
+}
+
+body{
+  font-size:14px;
 }
diff --git a/axolotl-web/src/components/ConfirmationModal.vue b/axolotl-web/src/components/ConfirmationModal.vue
@@ -4,7 +4,7 @@
       <div class="modal-content">
         <div class="modal-header">
           <h5 class="modal-title">{{ title }}</h5>
-          <button type="button" class="close" @click="$emit('close')">
+          <button type="button" class="close btn" @click="$emit('close')">
             <span aria-hidden="true">&times;</span>
           </button>
         </div>

diff --git a/axolotl-web/src/components/LegacyHeader.vue b/axolotl-web/src/components/LegacyHeader.vue
@@ -17,10 +17,10 @@
             <button class="btn" @click="back()">
               <font-awesome-icon icon="arrow-left" />
             </button>
-            <div v-if="currentChat !== null" class="row w-100">
+            <div v-if="currentChat !== null && currentChat" class="row w-100">
               <div class="col-2 badge-container">
                 <div
-                  v-if="currentChat !== null && currentChat.IsGroup"
+                  v-if="currentChat.IsGroup"
                   class="badge-name"
                 >
                   <img
@@ -39,14 +39,13 @@
                   <div class="col-12">
                     <div
                       v-if="
-                        currentChat !== null &&
-                          currentChat.IsGroup &&
+                        currentChat.IsGroup &&
                           currentChat.Name === currentChat.Tel
                       "
                       class="header-text-chat"
                     >
                       <div
-                        v-if="currentChat !== null && !currentChat.Notification"
+                        v-if="!currentChat.Notification"
                         class="mute-badge"
                       >
                         <font-awesome-icon class="mute" icon="volume-mute" />
@@ -55,15 +54,14 @@
                     </div>
                     <div v-else class="header-text-chat">
                       <div
-                        v-if="currentChat !== null && !currentChat.Notification"
+                        v-if="!currentChat.Notification"
                         class="mute-badge"
                       >
                         <font-awesome-icon class="mute" icon="volume-mute" />
                       </div>
                       <div
                         v-if="
-                          currentChat !== null &&
-                            currentChat.Name !== currentChat.Tel
+                          currentChat.Name !== currentChat.Tel
                         "
                         class=""
                       >
@@ -74,8 +72,7 @@
                   <div class="col-12">
                     <div
                       v-if="
-                        currentChat !== null &&
-                          currentChat.IsGroup &&
+                        currentChat.IsGroup &&
                           currentGroup !== null &&
                           typeof currentGroup !== 'undefined'
                       "
@@ -87,8 +84,7 @@
                     </div>
                     <div
                       v-if="
-                        currentChat !== null &&
-                          currentChat.IsGroup &&
+                        currentChat.IsGroup &&
                           currentGroup !== null &&
                           typeof currentGroup !== 'undefined'
                       "
@@ -100,8 +96,7 @@
                     </div>
                     <div
                       v-if="
-                        currentChat !== null &&
-                          !currentChat.IsGroup &&
+                        !currentChat.IsGroup &&
                           currentChat.Name === currentChat.Tel
                       "
                       class="number-text"
@@ -444,6 +439,10 @@ export default {
       this.showSettingsMenu = false;
     },
     currentChat: {
+      handler() {
+        this.names = [];
+        this.showSettingsMenu = false;
+      },
       deep: true,
     },
   },

diff --git a/axolotl-web/src/pages/Contacts.vue b/axolotl-web/src/pages/Contacts.vue
@@ -37,7 +37,7 @@
               @click="contactClick(c)"
             >
               <div class="badge-name">
-                {{ c.Name[0] + c.Name[1] }}
+                {{ c.Name[1] ? c.Name[0] + c.Name[1] : c.Name[0] }}
               </div>
             </div>
             <div
@@ -71,7 +71,7 @@
             :class="'avatar col-3 avatar ' + checkForUUIDClass(c)"
             @click="contactClick(c)"
           >
-            <div class="badge-name">{{ c.Name[0] + c.Name[1] }}</div>
+            <div class="badge-name">{{ c.Name[1] ? c.Name[0] + c.Name[1] : c.Name[0] }}</div>
           </div>
           <div
             class="meta col-8"

diff --git a/axolotl-web/src/pages/MessageList.vue b/axolotl-web/src/pages/MessageList.vue
@@ -352,7 +352,8 @@ export default {
       }
     },
     scrollDown() {
-      document.getElementById("chat-bottom").scrollIntoView();
+      if (this.messages.length !== 0 )
+        document.getElementById("chat-bottom").scrollIntoView();
     },
     recordAudio(){
       var that = this;