Merge tag 'v4.12.2' into lotus

This commit is contained in:
2026-05-23 11:26:45 -04:00
14 changed files with 59 additions and 149 deletions
+1 -2
View File
@@ -26,7 +26,6 @@ import { HTMLReactParserOptions } from 'html-react-parser';
import classNames from 'classnames';
import { ReactEditor } from 'slate-react';
import { Editor } from 'slate';
import { type SessionMembershipData } from 'matrix-js-sdk/lib/matrixrtc';
import to from 'await-to-js';
import { useAtomValue, useSetAtom } from 'jotai';
import {
@@ -1796,7 +1795,7 @@ export function RoomTimeline({ room, eventId, roomInputRef, editor }: RoomTimeli
const senderId = mEvent.getSender() ?? '';
const senderName = getMemberDisplayName(room, senderId) || getMxIdLocalPart(senderId);
const content = mEvent.getContent<SessionMembershipData>();
const content = mEvent.getContent();
const prevContent = mEvent.getPrevContent();
const callJoined = content.application;