Merge remote-tracking branch 'origin/develop' into setttingssync

src/components/user_card/user_card.js

@@ -1,3 +1,4 @@
+import ldEscape from 'lodash/escape'
 import isEqual from 'lodash/isEqual'
 import merge from 'lodash/merge'
 import ldUnescape from 'lodash/unescape'
@@ -160,6 +161,9 @@ export default {
     this.$store.dispatch('fetchUserRelationship', this.user.id)
   },
   computed: {
+    escapedNewBio() {
+      return ldEscape(this.newBio).replace(/\n/g, '<br>')
+    },
     somethingToSave() {
       if (this.newName !== this.user.name_unescaped) return true
       if (this.newBio !== ldUnescape(this.user.description)) return true
@@ -427,7 +431,7 @@ export default {
     zoomAvatar() {
       const attachment = {
         url: this.user.profile_image_url_original,
-        mimetype: 'image',
+        type: 'image',
       }
       useMediaViewerStore().setMedia([attachment])
       useMediaViewerStore().setCurrentMedia(attachment)