Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit eeac6df

Browse files
authored
Make threads use new UTD UI (#9876)
* Make threads use new UTD UI
1 parent da2640b commit eeac6df

File tree

3 files changed

+17
-4
lines changed

3 files changed

+17
-4
lines changed

src/components/views/rooms/EventTile.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ import { Layout } from "../../../settings/enums/Layout";
3636
import { formatTime } from "../../../DateUtils";
3737
import { MatrixClientPeg } from "../../../MatrixClientPeg";
3838
import MatrixClientContext from "../../../contexts/MatrixClientContext";
39+
import DecryptionFailureBody from "../messages/DecryptionFailureBody";
3940
import { E2EState } from "./E2EIcon";
4041
import RoomAvatar from "../avatars/RoomAvatar";
4142
import MessageContextMenu from "../context_menus/MessageContextMenu";
@@ -1329,6 +1330,8 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
13291330
<div className="mx_EventTile_body">
13301331
{this.props.mxEvent.isRedacted() ? (
13311332
<RedactedBody mxEvent={this.props.mxEvent} />
1333+
) : this.props.mxEvent.isDecryptionFailure() ? (
1334+
<DecryptionFailureBody />
13321335
) : (
13331336
MessagePreviewStore.instance.generatePreviewForEvent(this.props.mxEvent)
13341337
)}

src/components/views/rooms/ThreadSummary.tsx

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,19 @@ export const ThreadMessagePreview = ({ thread, showDisplayname = false }: IPrevi
109109
{showDisplayname && (
110110
<div className="mx_ThreadSummary_sender">{lastReply.sender?.name ?? lastReply.getSender()}</div>
111111
)}
112-
<div className="mx_ThreadSummary_content" title={preview}>
113-
<span className="mx_ThreadSummary_message-preview">{preview}</span>
114-
</div>
112+
113+
{lastReply.isDecryptionFailure() ? (
114+
<div
115+
className="mx_ThreadSummary_content mx_DecryptionFailureBody"
116+
title={_t("Unable to decrypt message")}
117+
>
118+
<span className="mx_ThreadSummary_message-preview">{_t("Unable to decrypt message")}</span>
119+
</div>
120+
) : (
121+
<div className="mx_ThreadSummary_content" title={preview}>
122+
<span className="mx_ThreadSummary_message-preview">{preview}</span>
123+
</div>
124+
)}
115125
</>
116126
);
117127
};

src/i18n/strings/en_EN.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2126,6 +2126,7 @@
21262126
"%(count)s reply|other": "%(count)s replies",
21272127
"%(count)s reply|one": "%(count)s reply",
21282128
"Open thread": "Open thread",
2129+
"Unable to decrypt message": "Unable to decrypt message",
21292130
"Jump to first unread message.": "Jump to first unread message.",
21302131
"Unable to access your microphone": "Unable to access your microphone",
21312132
"We were unable to access your microphone. Please check your browser settings and try again.": "We were unable to access your microphone. Please check your browser settings and try again.",
@@ -2311,7 +2312,6 @@
23112312
"Last month": "Last month",
23122313
"The beginning of the room": "The beginning of the room",
23132314
"Jump to date": "Jump to date",
2314-
"Unable to decrypt message": "Unable to decrypt message",
23152315
"Downloading": "Downloading",
23162316
"Decrypting": "Decrypting",
23172317
"Download": "Download",

0 commit comments

Comments
 (0)