diff --git a/app/soapbox/components/display_name.js b/app/soapbox/components/display_name.js
index 30dbce9a2..7ab8b9e60 100644
--- a/app/soapbox/components/display_name.js
+++ b/app/soapbox/components/display_name.js
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
import ImmutablePropTypes from 'react-immutable-proptypes';
import VerificationBadge from './verification_badge';
import { acctFull } from '../utils/accounts';
+import { List as ImmutableList } from 'immutable';
export default class DisplayName extends React.PureComponent {
@@ -16,13 +17,14 @@ export default class DisplayName extends React.PureComponent {
const { account, others, children } = this.props;
let displayName, suffix;
+ const verified = account.getIn(['pleroma', 'tags'], ImmutableList()).includes('verified');
if (others && others.size > 1) {
displayName = others.take(2).map(a => [
,
- a.get('is_verified') && ,
+ verified && ,
]).reduce((prev, cur) => [prev, ', ', cur]);
if (others.size - 2 > 0) {
@@ -32,7 +34,7 @@ export default class DisplayName extends React.PureComponent {
displayName = (
<>
- {account.get('is_verified') && }
+ {verified && }
>
);
suffix = @{acctFull(account)};
diff --git a/app/soapbox/features/edit_profile/components/profile_preview.js b/app/soapbox/features/edit_profile/components/profile_preview.js
index 6b4166d22..808f18a55 100644
--- a/app/soapbox/features/edit_profile/components/profile_preview.js
+++ b/app/soapbox/features/edit_profile/components/profile_preview.js
@@ -2,6 +2,8 @@ import React from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes';
import { acctFull } from 'soapbox/utils/accounts';
import StillImage from 'soapbox/components/still_image';
+import VerificationBadge from 'soapbox/components/verification_badge';
+import { List as ImmutableList } from 'immutable';
const ProfilePreview = ({ account }) => (
@@ -16,7 +18,10 @@ const ProfilePreview = ({ account }) => (
{account.get('username')}
- {account.get('display_name')}
+
+ {account.get('display_name')}
+ {account.getIn(['pleroma', 'tags'], ImmutableList()).includes('verified') && }
+
{acctFull(account)}
diff --git a/app/soapbox/features/edit_profile/index.js b/app/soapbox/features/edit_profile/index.js
index fce8e33df..5445ff30a 100644
--- a/app/soapbox/features/edit_profile/index.js
+++ b/app/soapbox/features/edit_profile/index.js
@@ -24,6 +24,7 @@ const messages = defineMessages({
heading: { id: 'column.edit_profile', defaultMessage: 'Edit profile' },
metaFieldLabel: { id: 'edit_profile.fields.meta_fields.label_placeholder', defaultMessage: 'Label' },
metaFieldContent: { id: 'edit_profile.fields.meta_fields.content_placeholder', defaultMessage: 'Content' },
+ verified: { id: 'edit_profile.fields.verified_display_name', defaultMessage: 'Verified users may not update their display name' },
});
const mapStateToProps = state => {
@@ -155,7 +156,8 @@ class EditProfile extends ImmutablePureComponent {
}
render() {
- const { intl, maxFields } = this.props;
+ const { intl, maxFields, account } = this.props;
+ const verified = account.get('pleroma').get('tags').includes('verified');
return (
@@ -163,10 +165,13 @@ class EditProfile extends ImmutablePureComponent {