Merge remote-tracking branch 'origin/develop' into chat-refactor

src/components/extra_notifications/extra_notifications.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="ExtraNotifications">
+  <div class="ExtraNotifications panel-body">
     <div
       v-if="shouldShowChats"
       class="notification unseen"
@@ -87,6 +87,11 @@
   flex-direction: column;
   align-items: stretch;
 
+  &.panel-body::before {
+    content: '';
+    padding: 0;
+  }
+
   .notification {
     width: 100%;
     border-bottom: 1px solid;

src/components/login_form/login_form.js

@@ -63,8 +63,8 @@ const LoginForm = {
             })
           })
           .catch((error) => {
-            if (error.errorData?.error === 'mfa_required') {
-              this.requireMFA({ settings: error })
+            if (error.errorData === 'mfa_required') {
+              this.requireMFA({ settings: error.error })
             } else if (error.identifier === 'password_reset_required') {
               this.$router.push({
                 name: 'password-reset',

src/components/mfa_form/recovery_form.js

@@ -44,7 +44,7 @@ export default {
       }
 
       verifyRecoveryCode(data)
-        .then((result) => {
+        .then(({ data: result }) => {
           this.login(result).then(() => {
             this.$router.push({ name: 'friends' })
           })

src/components/settings_modal/tabs/general_tab.vue

@@ -68,7 +68,7 @@
             :model-value="mergedConfig.fontInterface"
             name="ui"
             :label="$t('settings.style.fonts.components_inline.interface')"
-            :fallback="{ family: 'sans-serif' }"
+            fallback="sans-serif"
             no-inherit="1"
             @update:model-value="v => updateFont('fontInterface', v)"
           />
@@ -77,7 +77,7 @@
           <FontControl
             :model-value="mergedConfig.fontInput"
             name="input"
-            :fallback="{ family: 'inherit' }"
+            fallback="inherit"
             :label="$t('settings.style.fonts.components_inline.input')"
             @update:model-value="v => updateFont('fontInput', v)"
           />

src/components/settings_modal/tabs/posts_tab.vue

@@ -58,7 +58,7 @@
           <FontControl
             :model-value="mergedConfig.fontPosts"
             name="post"
-            :fallback="{ family: 'inherit' }"
+            fallback="inherit"
             :label="$t('settings.style.fonts.components.post')"
             @update:model-value="v => updateFont('fontPosts', v)"
           />
@@ -67,7 +67,7 @@
           <FontControl
             :model-value="mergedConfig.fontMonospace"
             name="postCode"
-            :fallback="{ family: 'monospace' }"
+            fallback="monospace"
             :label="$t('settings.style.fonts.components.monospace')"
             @update:model-value="v => updateFont('fontMonospace', v)"
           />