+ { this.props.showReplyPreview && (
+
{ controls }
{ this.renderButtons(menuPosition) }
diff --git a/src/components/views/rooms/RoomPreviewBar.js b/src/components/views/rooms/RoomPreviewBar.js
index b8a4315e2d..89b493595f 100644
--- a/src/components/views/rooms/RoomPreviewBar.js
+++ b/src/components/views/rooms/RoomPreviewBar.js
@@ -28,6 +28,8 @@ import { UPDATE_EVENT } from "../../../stores/AsyncStore";
import { replaceableComponent } from "../../../utils/replaceableComponent";
import InviteReason from "../elements/InviteReason";
+const MemberEventHtmlReasonField = "io.element.html_reason";
+
const MessageCase = Object.freeze({
NotLoggedIn: "NotLoggedIn",
Joining: "Joining",
@@ -492,9 +494,13 @@ export default class RoomPreviewBar extends React.Component {
}
const myUserId = MatrixClientPeg.get().getUserId();
- const reason = this.props.room.currentState.getMember(myUserId).events.member.event.content.reason;
- if (reason) {
- reasonElement =
;
+ const memberEventContent = this.props.room.currentState.getMember(myUserId).events.member.getContent();
+
+ if (memberEventContent.reason) {
+ reasonElement =
;
}
primaryActionHandler = this.props.onJoinClick;
diff --git a/src/components/views/settings/LayoutSwitcher.tsx b/src/components/views/settings/LayoutSwitcher.tsx
index dd7accf9a8..ad8abd0033 100644
--- a/src/components/views/settings/LayoutSwitcher.tsx
+++ b/src/components/views/settings/LayoutSwitcher.tsx
@@ -26,7 +26,7 @@ import { Layout } from "../../../settings/Layout";
import { SettingLevel } from "../../../settings/SettingLevel";
interface IProps {
- userId: string;
+ userId?: string;
displayName: string;
avatarUrl: string;
messagePreviewText: string;
diff --git a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
index d9e97d570b..081b1a8698 100644
--- a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
+++ b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
@@ -149,10 +149,12 @@ export default class SecurityRoomSettingsTab extends React.Component
new encrypted room for " +
"the conversation you plan to have.",
null,
- { "a": (sub) => {
- dialog.close();
- this.createNewRoom(false, true);
- }}> { sub } },
+ { "a": (sub) => {
+ dialog.close();
+ this.createNewRoom(false, true);
+ }}> { sub } },
) }
,
@@ -248,10 +250,12 @@ export default class SecurityRoomSettingsTab extends React.Component