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

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/cr/72

Browse source 
# Conflicts:
#	test/components/views/rooms/__snapshots__/RoomHeader-test.tsx.snap
This commit is contained in:
Michael Telatynski 2023-09-14 11:33:22 +01:00
commit e301fe474b
No known key found for this signature in database
GPG key ID: A2B008A5F49F5D0D
104 changed files with 7047 additions and 6250 deletions
Download patch file Download diff file Expand all files Collapse all files

1
test/components/views/rooms/SendMessageComposer-test.tsx
View file

@ -85,7 +85,6 @@ describe("<SendMessageComposer/>", () => {
msc3946ProcessDynamicPredecessor: false,
canAskToJoin: false,
promptAskToJoin: false,
knocked: false,
};
describe("createMessageContent", () => {
const permalinkCreator = jest.fn() as any;

10
test/components/views/rooms/__snapshots__/RoomHeader-test.tsx.snap
View file

@ -22,7 +22,7 @@ exports[`RoomHeader does not show the face pile for DMs 1`] = `
>
<div
aria-level="1"
class="_font-body-lg-semibold_1g2sj_89 mx_RoomHeader_heading"
class="_font-body-lg-semibold_1jx6b_83 mx_RoomHeader_heading"
dir="auto"
role="heading"
title="!1:example.org"
@ -36,7 +36,7 @@ exports[`RoomHeader does not show the face pile for DMs 1`] = `
>
<button
aria-label="There's no one here to call"
class="_icon-button_1k9cw_17"
class="_icon-button_1segd_17"
data-state="closed"
disabled=""
style="--cpd-icon-button-size: 32px;"
@ -45,7 +45,7 @@ exports[`RoomHeader does not show the face pile for DMs 1`] = `
</button>
<button
aria-label="There's no one here to call"
class="_icon-button_1k9cw_17"
class="_icon-button_1segd_17"
data-state="closed"
disabled=""
style="--cpd-icon-button-size: 32px;"
@ -54,7 +54,7 @@ exports[`RoomHeader does not show the face pile for DMs 1`] = `
</button>
<button
aria-label="Threads"
class="_icon-button_1k9cw_17"
class="_icon-button_1segd_17"
data-state="closed"
style="--cpd-icon-button-size: 32px;"
>
@ -62,7 +62,7 @@ exports[`RoomHeader does not show the face pile for DMs 1`] = `
</button>
<button
aria-label="Notifications"
class="_icon-button_1k9cw_17"
class="_icon-button_1segd_17"
data-state="closed"
style="--cpd-icon-button-size: 32px;"
>