imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Switch to using stable values for threads (#8019)

Browse source
This commit is contained in:
Germain 2022-03-11 09:04:22 +00:00 • committed by GitHub
parent d38a1fa201
commit 21d3cb08a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 49 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/components/views/rooms/MessageComposerButtons.tsx
View file

@ -20,7 +20,7 @@ import { M_POLL_START } from "matrix-events-sdk";
import React, { createContext, ReactElement, useContext, useRef } from 'react';
import { Room } from 'matrix-js-sdk/src/models/room';
import { MatrixClient } from 'matrix-js-sdk/src/client';
import { RelationType } from 'matrix-js-sdk/src/@types/event';
import { THREAD_RELATION_TYPE } from 'matrix-js-sdk/src/models/thread';
import { _t } from '../../../languageHandler';
import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
@ -318,7 +318,7 @@ class PollButton extends React.PureComponent<IPollButtonProps> {
},
);
} else {
const threadId = this.props.relation?.rel_type === RelationType.Thread
const threadId = this.props.relation?.rel_type === THREAD_RELATION_TYPE.name
? this.props.relation.event_id
: null;
@ -339,7 +339,7 @@ class PollButton extends React.PureComponent<IPollButtonProps> {
public render() {
// do not allow sending polls within threads at this time
if (this.props.relation?.rel_type === RelationType.Thread) return null;
if (this.props.relation?.rel_type === THREAD_RELATION_TYPE.name) return null;
return (
<CollapsibleButton