animation username config

Pony-House · Aug 15, 2023 · 1783a93 · 1783a93
1 parent e816cbe
commit 1783a93
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/src/app/atoms/text/Text.jsx b/src/app/atoms/text/Text.jsx
@@ -16,7 +16,7 @@ function Text({
   if (variant === 'h1') return <h1 className={textClass} style={style}>{children}</h1>;
   if (variant === 'h2') return <h2 className={textClass} style={style}>{children}</h2>;
   if (variant === 's1') return <h4 className={textClass} style={style}>{children}</h4>;
-  return <p className={textClass} style={style}>{children}</p>;
+  return (children && <p className={textClass} style={style}>{children}</p>);
 }
 
 Text.defaultProps = {

diff --git a/src/app/molecules/message/Message.jsx b/src/app/molecules/message/Message.jsx
@@ -68,12 +68,20 @@ const MessageAvatar = React.memo(({
 // Message Header
 const MessageHeader = React.memo(({
   userId, username,
-}) => (
-  <span className='username-base emoji-size-fix' style={{ color: colorMXID(userId) }}>
-    <span className='username'>{twemojifyReact(username)}</span>
-    <span className='user-id'>{twemojifyReact(userId)}</span>
-  </span>
-));
+}) => {
+
+  const mx = initMatrix.matrixClient;
+  const appAppearance = mx.getAccountData('pony.house.appearance')?.getContent() ?? {};
+  const tinyUsername = twemojifyReact(username);
+
+  return (
+    <span className='username-base emoji-size-fix' style={{ color: colorMXID(userId) }}>
+      <span className='username'>{tinyUsername}</span>
+      <span className='user-id'>{!appAppearance.isUNhoverDisabled ? twemojifyReact(userId) : tinyUsername}</span>
+    </span>
+  );
+
+});
 
 MessageHeader.propTypes = {
   userId: PropTypes.string.isRequired,