From 17372a3ec0aed532825d04f4c9f09fd9f9975412 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 23 Jun 2023 16:34:27 +0200
Subject: [PATCH] [Glitch] Change labels and styles on the onboarding screen in
`Account` component
Partial port of a985d587e13494b78ef2879e4d97f78a2df693db to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
.../flavours/glitch/components/account.jsx | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/app/javascript/flavours/glitch/components/account.jsx b/app/javascript/flavours/glitch/components/account.jsx
index 663c614cd1..86395407c4 100644
--- a/app/javascript/flavours/glitch/components/account.jsx
+++ b/app/javascript/flavours/glitch/components/account.jsx
@@ -1,6 +1,6 @@
import PropTypes from 'prop-types';
-import { defineMessages, injectIntl } from 'react-intl';
+import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import classNames from 'classnames';
@@ -50,6 +50,7 @@ class Account extends ImmutablePureComponent {
actionTitle: PropTypes.string,
defaultAction: PropTypes.string,
onActionClick: PropTypes.func,
+ withBio: PropTypes.bool,
};
static defaultProps = {
@@ -81,7 +82,7 @@ class Account extends ImmutablePureComponent {
};
render () {
- const { account, intl, hidden, onActionClick, actionIcon, actionTitle, defaultAction, size, minimal } = this.props;
+ const { account, intl, hidden, withBio, onActionClick, actionIcon, actionTitle, defaultAction, size, minimal } = this.props;
if (!account) {
return <EmptyAccount size={size} minimal={minimal} />;
@@ -172,6 +173,15 @@ class Account extends ImmutablePureComponent {
</div>
)}
</div>
+
+ {withBio && (account.get('note').length > 0 ? (
+ <div
+ className='account__note translate'
+ dangerouslySetInnerHTML={{ __html: account.get('note_emojified') }}
+ />
+ ) : (
+ <div className='account__note account__note--missing'><FormattedMessage id='account.no_bio' defaultMessage='No description provided.' /></div>
+ ))}
</div>
);
}