Skip to content

Commit d053a20

Browse files
authored
Merge branch 'develop' into kaylendog/msc3414
2 parents d51ba4b + 2d28b79 commit d053a20

File tree

42 files changed

+45
-45
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+45
-45
lines changed
-831 Bytes

src/components/views/settings/encryption/AdvancedPanel.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ function EncryptionDetails({ onResetIdentityClick }: EncryptionDetails): JSX.Ele
7474
<Button
7575
size="sm"
7676
kind="secondary"
77-
Icon={ShareIcon}
77+
Icon={DownloadIcon}
7878
onClick={() =>
7979
Modal.createDialog(
8080
lazy(
@@ -89,7 +89,7 @@ function EncryptionDetails({ onResetIdentityClick }: EncryptionDetails): JSX.Ele
8989
<Button
9090
size="sm"
9191
kind="secondary"
92-
Icon={DownloadIcon}
92+
Icon={ShareIcon}
9393
onClick={() =>
9494
Modal.createDialog(
9595
lazy(

test/unit-tests/__snapshots__/SlashCommands-test.tsx.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Jest Snapshot v1, https://goo.gl/fbAQLP
1+
// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
22

33
exports[`SlashCommands /lenny should match snapshot with args 1`] = `
44
{

test/unit-tests/__snapshots__/TextForEvent-test.ts.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Jest Snapshot v1, https://goo.gl/fbAQLP
1+
// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
22

33
exports[`TextForEvent textForJoinRulesEvent() returns correct JSX message when room join rule changed to restricted 1`] = `
44
<span>

test/unit-tests/components/structures/__snapshots__/MatrixChat-test.tsx.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Jest Snapshot v1, https://goo.gl/fbAQLP
1+
// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
22

33
exports[`<MatrixChat /> Multi-tab lockout shows the lockout page when a second tab opens after a session is restored 1`] = `
44
<div>

test/unit-tests/components/structures/__snapshots__/MessagePanel-test.tsx.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Jest Snapshot v1, https://goo.gl/fbAQLP
1+
// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
22

33
exports[`MessagePanel should handle large numbers of hidden events quickly 1`] = `
44
<DocumentFragment>

test/unit-tests/components/structures/__snapshots__/RoomView-test.tsx.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Jest Snapshot v1, https://goo.gl/fbAQLP
1+
// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
22

33
exports[`RoomView for a local room in state CREATING should match the snapshot 1`] = `
44
<div>

test/unit-tests/components/structures/__snapshots__/SpaceHierarchy-test.tsx.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Jest Snapshot v1, https://goo.gl/fbAQLP
1+
// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
22

33
exports[`SpaceHierarchy <SpaceHierarchy /> renders 1`] = `
44
<DocumentFragment>

test/unit-tests/components/structures/__snapshots__/ThreadPanel-test.tsx.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Jest Snapshot v1, https://goo.gl/fbAQLP
1+
// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
22

33
exports[`ThreadPanel Header expect that All filter for ThreadPanelHeader properly renders Show: All threads 1`] = `
44
<DocumentFragment>

test/unit-tests/components/views/beacon/__snapshots__/BeaconViewDialog-test.tsx.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Jest Snapshot v1, https://goo.gl/fbAQLP
1+
// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
22

33
exports[`<BeaconViewDialog /> renders a fallback when there are no locations 1`] = `
44
<div

0 commit comments

Comments
 (0)