imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use styled mxids in member list v2 (#8110)

Browse source 
* Revert "Revert "Use styled mxids in member list (#6328)" (#8107)"

This reverts commit 709e6e78d2.

* Fix disambiguated profile for bubbles

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
This commit is contained in:
Šimon Brandner 2022-03-22 23:14:55 +01:00 • committed by GitHub
parent cfabcdda35
commit bff1ef31d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 141 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/components/views/rooms/MemberTile.tsx
View file

@ -33,6 +33,7 @@ import { Action } from "../../../dispatcher/actions";
import { replaceableComponent } from "../../../utils/replaceableComponent";
import EntityTile, { PowerStatus } from "./EntityTile";
import MemberAvatar from "./../avatars/MemberAvatar";
import DisambiguatedProfile from "../messages/DisambiguatedProfile";
import UserIdentifierCustomisations from '../../../customisations/UserIdentifier';
interface IProps {
@ -258,6 +259,13 @@ export default class MemberTile extends React.Component<IProps, IState> {
e2eStatus = this.state.e2eStatus;
}
const nameJSX = (
<DisambiguatedProfile
member={member}
fallbackName={name || ""}
/>
);
return (
<EntityTile
{...this.props}
@ -268,6 +276,7 @@ export default class MemberTile extends React.Component<IProps, IState> {
avatarJsx={av}
title={this.getPowerLabel()}
name={name}
nameJSX={nameJSX}
powerStatus={powerStatus}
showPresence={this.props.showPresence}
subtextLabel={statusMessage}