|
-
|
diff --git a/src/components/views/rooms/RoomList.tsx b/src/components/views/rooms/RoomList.tsx
index 7bb1e62200..010780565b 100644
--- a/src/components/views/rooms/RoomList.tsx
+++ b/src/components/views/rooms/RoomList.tsx
@@ -428,7 +428,9 @@ export default class RoomList extends React.PureComponent {
groupId={g.groupId}
groupName={g.name}
groupAvatarUrl={g.avatarUrl}
- width={32} height={32} resizeMethod='crop'
+ width={32}
+ height={32}
+ resizeMethod='crop'
/>
);
const openGroup = () => {
diff --git a/src/components/views/rooms/RoomPreviewBar.js b/src/components/views/rooms/RoomPreviewBar.js
index 3cd34b1966..b8a4315e2d 100644
--- a/src/components/views/rooms/RoomPreviewBar.js
+++ b/src/components/views/rooms/RoomPreviewBar.js
@@ -536,8 +536,10 @@ export default class RoomPreviewBar extends React.Component {
"If you think you're seeing this message in error, please " +
"submit a bug report.",
{ errcode: this.props.error.errcode },
- { issueLink: label => { label } },
+ { issueLink: label => { label } },
),
];
break;
diff --git a/src/components/views/rooms/SimpleRoomHeader.js b/src/components/views/rooms/SimpleRoomHeader.js
index 768a456b35..a2b5566e39 100644
--- a/src/components/views/rooms/SimpleRoomHeader.js
+++ b/src/components/views/rooms/SimpleRoomHeader.js
@@ -35,13 +35,15 @@ export default class SimpleRoomHeader extends React.Component {
let icon;
if (this.props.icon) {
icon =  ;
}
return (
-
+
{ icon }
{ this.props.title }
diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index c0e6826ba5..6649948331 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -403,8 +403,7 @@ export default class Stickerpicker extends React.PureComponent {
onClick={this._onHideStickersClick}
active={this.state.showStickers.toString()}
title={_t("Hide Stickers")}
- >
- ;
+ />;
const GenericElementContextMenu = sdk.getComponent('context_menus.GenericElementContextMenu');
stickerPicker =
- ;
+ />;
}
return
{ stickersButton }
diff --git a/src/components/views/rooms/TopUnreadMessagesBar.js b/src/components/views/rooms/TopUnreadMessagesBar.js
index 0f632e7128..d2a3e3a303 100644
--- a/src/components/views/rooms/TopUnreadMessagesBar.js
+++ b/src/components/views/rooms/TopUnreadMessagesBar.js
@@ -32,14 +32,16 @@ export default class TopUnreadMessagesBar extends React.Component {
render() {
return (
-
-
-
+
-
+ onClick={this.props.onCloseClick}
+ />
-
+
{ _t("Enable") }
{ this.state.enabling ? : }
@@ -203,8 +206,10 @@ export default class EventIndexPanel extends React.Component<{}, IState> {
brand,
},
{
- nativeLink: sub => { sub },
},
) }
@@ -219,8 +224,10 @@ export default class EventIndexPanel extends React.Component<{}, IState> {
brand,
},
{
- desktopLink: sub => { sub },
},
) }
diff --git a/src/components/views/settings/ProfileSettings.js b/src/components/views/settings/ProfileSettings.js
index 02eaaaeea8..d05fca983c 100644
--- a/src/components/views/settings/ProfileSettings.js
+++ b/src/components/views/settings/ProfileSettings.js
@@ -172,7 +172,8 @@ export default class ProfileSettings extends React.Component {
>
@@ -181,7 +182,8 @@ export default class ProfileSettings extends React.Component {
{ _t("Profile") }
diff --git a/src/components/views/settings/SetIdServer.tsx b/src/components/views/settings/SetIdServer.tsx
index fd8abc0dbe..1f488f1e67 100644
--- a/src/components/views/settings/SetIdServer.tsx
+++ b/src/components/views/settings/SetIdServer.tsx
@@ -426,7 +426,9 @@ export default class SetIdServer extends React.Component {
disabled={this.state.busy}
forceValidity={this.state.error ? false : null}
/>
- { _t("Change") }
diff --git a/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js b/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
index e2f30192b9..b90fb310e0 100644
--- a/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
+++ b/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
@@ -97,9 +97,12 @@ export default class GeneralRoomSettingsTab extends React.Component {
{ _t("Room Addresses") }
{ _t("Other") }
{ flairSection }
diff --git a/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx b/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx
index edc0220921..9225bc6b94 100644
--- a/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx
+++ b/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx
@@ -346,8 +346,11 @@ export default class RolesRoomSettingsTab extends React.Component {
let bannedBy = member.events.member.getSender(); // start by falling back to mxid
if (sender) bannedBy = sender.name;
return (
-
);
diff --git a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
index 320bc52ccd..ede9a5ddb5 100644
--- a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
+++ b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
@@ -138,8 +138,10 @@ export default class SecurityRoomSettingsTab extends React.ComponentLearn more about encryption.",
{},
{
- a: sub => { sub },
},
),
diff --git a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
index d1c497b351..44873816dc 100644
--- a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
@@ -303,9 +303,12 @@ export default class AppearanceUserSettingsTab extends React.Component
{ _t("Add theme") }
+ >
+ { _t("Add theme") }
+
{ messageElement }
![{_t("Warning")}]({require("../../../../../../res/img/feather-customised/warning-triangle.svg")})
+ width="18"
+ height="18"
+ alt={_t("Warning")}
+ />
: null;
let accountManagementSection;
diff --git a/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx b/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx
index 33de634611..eaf52e6062 100644
--- a/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx
@@ -134,28 +134,39 @@ export default class HelpUserSettingsTab extends React.Component
{ _t("Credits") }
@@ -254,7 +265,8 @@ export default class HelpUserSettingsTab extends React.Component
"Security Disclosure Policy.", {},
{
a: sub => { sub },
},
) }
diff --git a/src/components/views/settings/tabs/user/LabsUserSettingsTab.js b/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
index aace4ca557..fa854fc4d8 100644
--- a/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
@@ -86,8 +86,11 @@ export default class LabsUserSettingsTab extends React.Component {
'test out new features and help shape them before they actually launch. ' +
'Learn more.', {}, {
'a': (sub) => {
- return { sub };
+ return { sub };
},
})
}
diff --git a/src/components/views/spaces/SpaceBasicSettings.tsx b/src/components/views/spaces/SpaceBasicSettings.tsx
index 6d2cc1f5db..9d3696c5a9 100644
--- a/src/components/views/spaces/SpaceBasicSettings.tsx
+++ b/src/components/views/spaces/SpaceBasicSettings.tsx
@@ -57,11 +57,15 @@ export const SpaceAvatar = ({
src={avatar}
alt=""
/>
- {
- avatarUploadRef.current.value = "";
- setAvatarDataUrl(undefined);
- setAvatar(undefined);
- }} kind="link" className="mx_SpaceBasicSettings_avatar_remove">
+ {
+ avatarUploadRef.current.value = "";
+ setAvatarDataUrl(undefined);
+ setAvatar(undefined);
+ }}
+ kind="link"
+ className="mx_SpaceBasicSettings_avatar_remove"
+ >
{ _t("Delete") }
;
@@ -77,16 +81,21 @@ export const SpaceAvatar = ({
return
{ avatarSection }
- {
- if (!e.target.files?.length) return;
- const file = e.target.files[0];
- setAvatar(file);
- const reader = new FileReader();
- reader.onload = (ev) => {
- setAvatarDataUrl(ev.target.result as string);
- };
- reader.readAsDataURL(file);
- }} accept="image/*" />
+ {
+ if (!e.target.files?.length) return;
+ const file = e.target.files[0];
+ setAvatar(file);
+ const reader = new FileReader();
+ reader.onload = (ev) => {
+ setAvatarDataUrl(ev.target.result as string);
+ };
+ reader.readAsDataURL(file);
+ }}
+ accept="image/*"
+ />
;
};
diff --git a/src/components/views/voip/CallView.tsx b/src/components/views/voip/CallView.tsx
index 8bdd6e0f55..e53c2f4823 100644
--- a/src/components/views/voip/CallView.tsx
+++ b/src/components/views/voip/CallView.tsx
@@ -665,15 +665,19 @@ export default class CallView extends React.Component {
let fullScreenButton;
if (this.props.call.type === CallType.Video && !this.props.pipMode) {
- fullScreenButton = ;
}
let expandButton;
if (this.props.pipMode) {
- expandButton = ;
}
@@ -685,7 +689,7 @@ export default class CallView extends React.Component {
let header: React.ReactNode;
if (!this.props.pipMode) {
header =
-
+
{ callTypeText }
{ headerControls }
+
${n.textContent}`);
+ case "SUB":
+ return partCreator.plain(`${n.textContent}`);
+ case "SUP":
+ return partCreator.plain(`${n.textContent}`);
+ case "U":
+ return partCreator.plain(`${n.textContent}`);
case "LI": {
const indent = " ".repeat(state.listDepth - 1);
if (n.parentElement.nodeName === "OL") {
diff --git a/src/stores/VoiceRecordingStore.ts b/src/stores/VoiceRecordingStore.ts
index 81c19e7e82..df837fec88 100644
--- a/src/stores/VoiceRecordingStore.ts
+++ b/src/stores/VoiceRecordingStore.ts
@@ -17,7 +17,7 @@ limitations under the License.
import { AsyncStoreWithClient } from "./AsyncStoreWithClient";
import defaultDispatcher from "../dispatcher/dispatcher";
import { ActionPayload } from "../dispatcher/payloads";
-import { VoiceRecording } from "../voice/VoiceRecording";
+import { VoiceRecording } from "../audio/VoiceRecording";
interface IState {
recording?: VoiceRecording;
diff --git a/src/utils/MediaEventHelper.ts b/src/utils/MediaEventHelper.ts
index cf34d5dea4..8b8edcc62a 100644
--- a/src/utils/MediaEventHelper.ts
+++ b/src/utils/MediaEventHelper.ts
@@ -67,6 +67,7 @@ export class MediaEventHelper implements IDestroyable {
private prepareThumbnailUrl = async () => {
if (this.media.isEncrypted) {
const blob = await this.thumbnailBlob.value;
+ if (blob === null) return null;
return URL.createObjectURL(blob);
} else {
return this.media.thumbnailHttp;
diff --git a/test/components/structures/MessagePanel-test.js b/test/components/structures/MessagePanel-test.js
index f415b85105..dea5bcefb7 100644
--- a/test/components/structures/MessagePanel-test.js
+++ b/test/components/structures/MessagePanel-test.js
@@ -312,8 +312,12 @@ describe('MessagePanel', function() {
it('should insert the read-marker in the right place', function() {
const res = TestUtils.renderIntoDocument(
- ,
+ ,
);
const tiles = TestUtils.scryRenderedComponentsWithType(
@@ -330,8 +334,12 @@ describe('MessagePanel', function() {
it('should show the read-marker that fall in summarised events after the summary', function() {
const melsEvents = mkMelsEvents();
const res = TestUtils.renderIntoDocument(
- ,
+ ,
);
const summary = TestUtils.findRenderedDOMComponentWithClass(res, 'mx_EventListSummary');
@@ -348,8 +356,12 @@ describe('MessagePanel', function() {
it('should hide the read-marker at the end of summarised events', function() {
const melsEvents = mkMelsEventsOnly();
const res = TestUtils.renderIntoDocument(
- ,
+ ,
);
const summary = TestUtils.findRenderedDOMComponentWithClass(res, 'mx_EventListSummary');
@@ -371,7 +383,10 @@ describe('MessagePanel', function() {
// first render with the RM in one place
let mp = ReactDOM.render(
- , parentDiv);
@@ -387,7 +402,10 @@ describe('MessagePanel', function() {
// now move the RM
mp = ReactDOM.render(
- , parentDiv);
diff --git a/yarn.lock b/yarn.lock
index 5283f5778a..c576148e19 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3234,8 +3234,8 @@ eslint-config-google@^0.14.0:
integrity sha512-WsbX4WbjuMvTdeVL6+J3rK1RGhCTqjsFjX7UMSMgZiyxxaNLkoJENbrGExzERFeoTpGw3F3FypTiWAP9ZXzkEw==
"eslint-plugin-matrix-org@github:matrix-org/eslint-plugin-matrix-org#main":
- version "0.3.2"
- resolved "https://codeload.github.com/matrix-org/eslint-plugin-matrix-org/tar.gz/8529f1d77863db6327cf1a1a4fa65d06cc26f91b"
+ version "0.3.3"
+ resolved "https://codeload.github.com/matrix-org/eslint-plugin-matrix-org/tar.gz/50d6bdf6704dd95016d5f1f824f00cac6eaa64e1"
eslint-plugin-react-hooks@^4.2.0:
version "4.2.0"
|