You've already forked matrix-react-sdk
							
							
				mirror of
				https://github.com/matrix-org/matrix-react-sdk.git
				synced 2025-11-04 11:51:45 +03:00 
			
		
		
		
	Merge branch 'develop' into johannes/polls-dialog-scaling
This commit is contained in:
		@@ -322,7 +322,12 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
 | 
				
			|||||||
        // events and pretty much anything that can't be sent by the composer as a message. For
 | 
					        // events and pretty much anything that can't be sent by the composer as a message. For
 | 
				
			||||||
        // those we rely on local echo giving the impression of things changing, and expect them
 | 
					        // those we rely on local echo giving the impression of things changing, and expect them
 | 
				
			||||||
        // to be quick.
 | 
					        // to be quick.
 | 
				
			||||||
        const simpleSendableEvents = [EventType.Sticker, EventType.RoomMessage, EventType.RoomMessageEncrypted];
 | 
					        const simpleSendableEvents = [
 | 
				
			||||||
 | 
					            EventType.Sticker,
 | 
				
			||||||
 | 
					            EventType.RoomMessage,
 | 
				
			||||||
 | 
					            EventType.RoomMessageEncrypted,
 | 
				
			||||||
 | 
					            EventType.PollStart,
 | 
				
			||||||
 | 
					        ];
 | 
				
			||||||
        if (!simpleSendableEvents.includes(this.props.mxEvent.getType() as EventType)) return false;
 | 
					        if (!simpleSendableEvents.includes(this.props.mxEvent.getType() as EventType)) return false;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        // Default case
 | 
					        // Default case
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user