matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-12-07 03:42:20 +03:00
Code Activity

[Release] Fixes around threads beta in degraded mode (#8319)

Browse Source 
* Fix soft crash around the thread panel in degraded mode

* Better specify fallback key

* Hide MAB Threads prompt if user would have degraded mode

* Confirm user wants to enable Threads beta if in degraded mode

* Fix copy
This commit is contained in:
Michael Telatynski
2022-04-14 12:07:43 +01:00
committed by GitHub
parent 5f356093fd
commit 1c1d5ea5a9
7 changed files with 82 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/views/messages/MessageActionBar.tsx
View File

@@ -20,6 +20,7 @@ import React, { ReactElement, useEffect } from 'react';
import { EventStatus, MatrixEvent, MatrixEventEvent } from 'matrix-js-sdk/src/models/event';
import classNames from 'classnames';
import { MsgType, RelationType } from 'matrix-js-sdk/src/@types/event';
import { Thread } from 'matrix-js-sdk/src/models/thread';
import type { Relations } from 'matrix-js-sdk/src/models/relations';
import { _t } from '../../../languageHandler';
@@ -248,6 +249,11 @@ export default class MessageActionBar extends React.PureComponent<IMessageAction
];
private get showReplyInThreadAction(): boolean {
if (!SettingsStore.getValue("feature_thread") && !Thread.hasServerSideSupport) {
// hide the prompt if the user would only have degraded mode
return null;
}
const inNotThreadTimeline = this.context.timelineRenderingType !== TimelineRenderingType.Thread;
const isAllowedMessageType = !this.forbiddenThreadHeadMsgType.includes(