Skip to content

Commit e1e4d26

Browse files
More memberlist changes (#29069)
* Remove parenthesis from Invited user label * Ensure adequate margin * Truncate user id with ellipsis * Fix tests
1 parent 84c6146 commit e1e4d26

File tree

7 files changed

+7
-4
lines changed

7 files changed

+7
-4
lines changed

playwright/e2e/right-panel/memberlist.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ test.describe("Memberlist", () => {
4242
await app.viewRoomByName(ROOM_NAME);
4343
const memberlist = await app.toggleMemberlistPanel();
4444
await expect(memberlist.locator(".mx_MemberTileView")).toHaveCount(4);
45-
await expect(memberlist.getByText("(Invited)")).toHaveCount(1);
45+
await expect(memberlist.getByText("Invited")).toHaveCount(1);
4646
await expect(page.locator(".mx_MemberListView")).toMatchScreenshot("with-four-members.png");
4747
});
4848
});
Loading

res/css/views/messages/_DisambiguatedProfile.pcss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ Please see LICENSE files in the repository root for full details.
3535
.mx_DisambiguatedProfile_mxid {
3636
margin-inline-start: 0;
3737
font: var(--cpd-font-body-sm-regular);
38+
text-overflow: ellipsis;
39+
overflow: hidden;
3840
}
3941

4042
span:not(.mx_DisambiguatedProfile_mxid) {

res/css/views/rooms/_MemberTileView.pcss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ Please see LICENSE files in the repository root for full details.
3535
font: var(--cpd-font-body-sm-regular);
3636
font-size: 13px;
3737
color: var(--cpd-color-text-secondary);
38+
margin-left: var(--cpd-space-4x);
3839
}
3940

4041
.mx_MemberTileView_avatar {

src/components/viewmodels/memberlist/tiles/MemberTileViewModel.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ export function useMemberTileViewModel(props: MemberTileViewModelProps): MemberT
145145
userLabel = _t(PowerLabel[powerStatus]);
146146
}
147147
if (props.member.isInvite) {
148-
userLabel = `(${_t("member_list|invited_label")})`;
148+
userLabel = _t("member_list|invited_label");
149149
}
150150

151151
return {

src/components/viewmodels/memberlist/tiles/ThreePidTileViewModel.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export function useThreePidTileViewModel(props: ThreePidTileViewModelProps): Thr
3030
});
3131
};
3232

33-
const userLabel = `(${_t("member_list|invited_label")})`;
33+
const userLabel = _t("member_list|invited_label");
3434

3535
return {
3636
name,

test/unit-tests/components/views/rooms/memberlist/__snapshots__/MemberTileView-test.tsx.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ exports[`MemberTileView ThreePidInviteTileView renders ThreePidInvite correctly
228228
<div
229229
class="mx_MemberTileView_userLabel"
230230
>
231-
(Invited)
231+
Invited
232232
</div>
233233
<div
234234
class="mx_Flex mx_InvitedIconView"

0 commit comments

Comments
 (0)