@@ -62,7 +62,6 @@ import RoomPreviewBar from "../views/rooms/RoomPreviewBar";
6262import RoomPreviewCard from "../views/rooms/RoomPreviewCard" ;
6363import SearchBar , { SearchScope } from "../views/rooms/SearchBar" ;
6464import RoomUpgradeWarningBar from "../views/rooms/RoomUpgradeWarningBar" ;
65- import { DecryptionFailureBar } from "../views/rooms/DecryptionFailureBar" ;
6665import AuxPanel from "../views/rooms/AuxPanel" ;
6766import RoomHeader , { ISearchInfo } from "../views/rooms/RoomHeader" ;
6867import { IOOBData , IThreepidInvite } from "../../stores/ThreepidInviteStore" ;
@@ -227,8 +226,6 @@ export interface IRoomState {
227226 threadId ?: string ;
228227 liveTimeline ?: EventTimeline ;
229228 narrow : boolean ;
230- // List of undecryptable events currently visible on-screen
231- visibleDecryptionFailures ?: MatrixEvent [ ] ;
232229 msc3946ProcessDynamicPredecessor : boolean ;
233230}
234231
@@ -428,7 +425,6 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
428425 timelineRenderingType : TimelineRenderingType . Room ,
429426 liveTimeline : undefined ,
430427 narrow : false ,
431- visibleDecryptionFailures : [ ] ,
432428 msc3946ProcessDynamicPredecessor : SettingsStore . getValue ( "feature_dynamic_room_predecessors" ) ,
433429 } ;
434430
@@ -1244,7 +1240,6 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
12441240 private onEventDecrypted = ( ev : MatrixEvent ) : void => {
12451241 if ( ! this . state . room || ! this . state . matrixClientIsReady ) return ; // not ready at all
12461242 if ( ev . getRoomId ( ) !== this . state . room . roomId ) return ; // not for us
1247- this . updateVisibleDecryptionFailures ( ) ;
12481243 if ( ev . isDecryptionFailure ( ) ) return ;
12491244 this . handleEffects ( ev ) ;
12501245 } ;
@@ -1552,20 +1547,6 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
15521547 }
15531548 } ;
15541549
1555- private updateVisibleDecryptionFailures = throttle (
1556- ( ) =>
1557- this . setState ( ( prevState ) => ( {
1558- visibleDecryptionFailures :
1559- this . messagePanel ?. getVisibleDecryptionFailures (
1560- // If there were visible failures last time we checked,
1561- // add a margin to provide hysteresis and prevent flickering
1562- ( prevState . visibleDecryptionFailures ?. length ?? 0 ) > 0 ,
1563- ) ?? [ ] ,
1564- } ) ) ,
1565- 500 ,
1566- { leading : false , trailing : true } ,
1567- ) ;
1568-
15691550 private onMessageListScroll = ( ) : void => {
15701551 if ( this . messagePanel ?. isAtEndOfLiveTimeline ( ) ) {
15711552 this . setState ( {
@@ -1578,7 +1559,6 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
15781559 } ) ;
15791560 }
15801561 this . updateTopUnreadMessagesBar ( ) ;
1581- this . updateVisibleDecryptionFailures ( ) ;
15821562 } ;
15831563
15841564 private resetJumpToEvent = ( eventId ?: string ) : void => {
@@ -2203,11 +2183,6 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
22032183 ) ;
22042184 }
22052185
2206- let decryptionFailureBar : JSX . Element | undefined ;
2207- if ( this . state . visibleDecryptionFailures && this . state . visibleDecryptionFailures . length > 0 ) {
2208- decryptionFailureBar = < DecryptionFailureBar failures = { this . state . visibleDecryptionFailures } /> ;
2209- }
2210-
22112186 if ( this . state . room ?. isSpaceRoom ( ) && ! this . props . forceTimeline ) {
22122187 return (
22132188 < SpaceRoomView
@@ -2233,7 +2208,6 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
22332208 resizeNotifier = { this . props . resizeNotifier }
22342209 >
22352210 { aux }
2236- { decryptionFailureBar }
22372211 </ AuxPanel >
22382212 ) ;
22392213
0 commit comments