nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'develop' into andybalaam/stas-demydiuk-membership-type3

Browse Source
This commit is contained in:
Andy Balaam
2024-03-20 17:25:23 +00:00
parent 5cd7743fcb 2cbf92860b
commit d7bdbee8d2
124 changed files with 2399 additions and 1052 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/views/dialogs/devtools/BaseTool.tsx
View File

@@ -60,7 +60,7 @@ const BaseTool: React.FC<XOR<IMinProps, IProps>> = ({
let actionButton: ReactNode = null;
if (message) {
children = message;
} else if (onAction) {
} else if (onAction && actionLabel) {
const onActionClick = (): void => {
onAction().then((msg) => {
if (typeof msg === "string") {

2
src/components/views/dialogs/devtools/RoomState.tsx
View File

@@ -38,7 +38,7 @@ export const StateEventEditor: React.FC<IEditorProps> = ({ mxEvent, onBack }) =>
);
const onSend = async ([eventType, stateKey]: string[], content: IContent): Promise<void> => {
await cli.sendStateEvent(context.room.roomId, eventType, content, stateKey);
await cli.sendStateEvent(context.room.roomId, eventType as any, content, stateKey);
};
const defaultContent = mxEvent ? stringify(mxEvent.getContent()) : undefined;