Merge branch 'develop' into mfm

src/components/chat/chat.js

@@ -16,6 +16,7 @@ import {
 } from './chat_layout_utils.js'
 
 import { useInterfaceStore } from 'src/stores/interface.js'
+import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
 
 import {
@@ -116,8 +117,8 @@ const Chat = {
       'currentChat',
       'currentChatMessageService',
       'findOpenedChatByRecipientId',
-      'mergedConfig',
     ]),
+    ...mapPiniaState(useMergedConfigStore, ['mergedConfig']),
     ...mapPiniaState(useInterfaceStore, {
       mobileLayout: (store) => store.layoutType === 'mobile',
     }),
@@ -381,7 +382,7 @@ const Chat = {
       if (retriesLeft <= 0) return
 
       sendChatMessage({
-        params,
+        ...params,
         credentials: useOAuthStore().token,
       })
         .then(({ data }) => {

src/components/chat_new/chat_new.js

@@ -5,6 +5,8 @@ import UserAvatar from 'src/components/user_avatar/user_avatar.vue'
 
 import { useOAuthStore } from 'src/stores/oauth.js'
 
+import { chats } from 'src/api/chats.js'
+
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faChevronLeft, faSearch } from '@fortawesome/free-solid-svg-icons'
 
@@ -24,10 +26,10 @@ const chatNew = {
     }
   },
   async created() {
-    const { chats } = await chats({
+    const { chatList } = await chats({
       credentials: useOAuthStore().token,
     })
-    chats.forEach((chat) => this.suggestions.push(chat.account))
+    chatList.forEach((chat) => this.suggestions.push(chat.account))
   },
   computed: {
     users() {

src/components/global_error/global_error.js

@@ -1,12 +1,13 @@
 import { mapActions, mapState } from 'pinia'
-
-import ErrorModal from 'src/components/error_modal/error_modal.vue'
+import { defineAsyncComponent } from 'vue'
 
 import { useInterfaceStore } from 'src/stores/interface.js'
 
 const GlobalError = {
   components: {
-    ErrorModal,
+    ErrorModal: defineAsyncComponent(
+      () => import('src/components/error_modal/error_modal.vue'),
+    ),
   },
   computed: {
     title() {

src/components/notification/notification.scss

@@ -10,11 +10,6 @@
     cursor: pointer;
   }
 
-  &.Status {
-    /* stylelint-disable-next-line declaration-no-important */
-    background-color: transparent !important;
-  }
-
   --emoji-size: 1em;
 
   &:hover {

src/components/notification/notification.style.js

@@ -1,6 +1,6 @@
 export default {
   name: 'Notification',
-  selector: '.Notification',
+  selector: '.NotificationParent',
   validInnerComponents: [
     'Text',
     'Link',
@@ -9,5 +9,11 @@ export default {
     'Avatar',
     'PollGraph',
   ],
-  defaultRules: [],
+  defaultRules: [
+    {
+      directives: {
+        background: '--bg',
+      },
+    },
+  ],
 }

src/components/notification/notification.vue

@@ -13,7 +13,7 @@
   <article
     v-else
     ref="root"
-    class="NotificationParent"
+    class="NotificationParent panel-body"
     :class="{ '-expandable': expandable }"
   >
     <div

src/components/notifications/notifications.vue

@@ -51,7 +51,6 @@
           <NotificationFilters class="rightside-button" />
         </div>
         <div
-          class="panel-body"
           role="feed"
         >
           <div

src/components/post_status_form/post_status_form.js

@@ -596,16 +596,18 @@ const PostStatusForm = {
         ? this.postHandler
         : statusPoster.postStatus
 
-      postHandler(postingOptions).then((data) => {
-        if (!data.error) {
+      postHandler(postingOptions)
+        .then((data) => {
           this.abandonDraft()
           this.clearStatus()
           this.$emit('posted', data)
-        } else {
-          this.error = data.error
-        }
-        this.posting = false
-      })
+        })
+        .catch((error) => {
+          this.error = error
+        })
+        .finally(() => {
+          this.posting = false
+        })
     },
     previewStatus() {
       if (this.emptyStatus && this.newStatus.spoilerText.trim() === '') {