From 5378b0429ecc67d828034766a9dc89c9ebe2c67d Mon Sep 17 00:00:00 2001
From: R Midhun Suresh <hi@midhun.dev>
Date: Sun, 22 Dec 2024 17:00:26 +0530
Subject: [PATCH] Fix CI

---
 res/css/_components.pcss                      |  6 ++---
 src/components/structures/RightPanel.tsx      | 22 ++-----------------
 .../viewmodels/MemberTileViewModel.tsx        | 11 +---------
 3 files changed, 6 insertions(+), 33 deletions(-)

diff --git a/res/css/_components.pcss b/res/css/_components.pcss
index 5b5e80fc89..a54bee357d 100644
--- a/res/css/_components.pcss
+++ b/res/css/_components.pcss
@@ -281,8 +281,6 @@
 @import "./views/rooms/_EditMessageComposer.pcss";
 @import "./views/rooms/_EmojiButton.pcss";
 @import "./views/rooms/_EntityTile.pcss";
-@import "./views/rooms/_MemberTileView.pcss";
-@import "./views/rooms/_OverflowTile.pcss";
 @import "./views/rooms/_EventBubbleTile.pcss";
 @import "./views/rooms/_EventPreview.pcss";
 @import "./views/rooms/_EventTile.pcss";
@@ -292,12 +290,14 @@
 @import "./views/rooms/_LinkPreviewGroup.pcss";
 @import "./views/rooms/_LinkPreviewWidget.pcss";
 @import "./views/rooms/_LiveContentSummary.pcss";
-@import "./views/rooms/_MemberListView.pcss";
 @import "./views/rooms/_MemberListHeaderView.pcss";
+@import "./views/rooms/_MemberListView.pcss";
+@import "./views/rooms/_MemberTileView.pcss";
 @import "./views/rooms/_MessageComposer.pcss";
 @import "./views/rooms/_MessageComposerFormatBar.pcss";
 @import "./views/rooms/_NewRoomIntro.pcss";
 @import "./views/rooms/_NotificationBadge.pcss";
+@import "./views/rooms/_OverflowTile.pcss";
 @import "./views/rooms/_PinnedEventTile.pcss";
 @import "./views/rooms/_PinnedMessageBanner.pcss";
 @import "./views/rooms/_PresenceLabel.pcss";
diff --git a/src/components/structures/RightPanel.tsx b/src/components/structures/RightPanel.tsx
index 32adbce489..52b1321198 100644
--- a/src/components/structures/RightPanel.tsx
+++ b/src/components/structures/RightPanel.tsx
@@ -58,20 +58,15 @@ type Props = XOR<RoomlessProps, RoomProps>;
 
 interface IState {
     phase?: RightPanelPhases;
-    searchQuery: string;
     cardState?: IRightPanelCardState;
 }
 
 export default class RightPanel extends React.Component<Props, IState> {
     public static contextType = MatrixClientContext;
-    public declare context: React.ContextType<typeof MatrixClientContext>;
+    declare public context: React.ContextType<typeof MatrixClientContext>;
 
     public constructor(props: Props, context: React.ContextType<typeof MatrixClientContext>) {
         super(props, context);
-
-        this.state = {
-            searchQuery: "",
-        };
     }
 
     private readonly delayedUpdate = throttle(
@@ -148,10 +143,6 @@ export default class RightPanel extends React.Component<Props, IState> {
         }
     };
 
-    private onSearchQueryChanged = (searchQuery: string): void => {
-        this.setState({ searchQuery });
-    };
-
     public render(): React.ReactNode {
         let card = <div />;
         const roomId = this.props.room?.roomId;
@@ -160,16 +151,7 @@ export default class RightPanel extends React.Component<Props, IState> {
         switch (phase) {
             case RightPanelPhases.MemberList:
                 if (!!roomId) {
-                    card = (
-                        <MemberListView roomId={roomId} onClose={this.onClose} />
-                        // <MemberList
-                        //     roomId={roomId}
-                        //     key={roomId}
-                        //     onClose={this.onClose}
-                        //     searchQuery={this.state.searchQuery}
-                        //     onSearchQueryChanged={this.onSearchQueryChanged}
-                        // />
-                    );
+                    card = <MemberListView roomId={roomId} onClose={this.onClose} />;
                 }
                 break;
 
diff --git a/src/components/viewmodels/MemberTileViewModel.tsx b/src/components/viewmodels/MemberTileViewModel.tsx
index 2269c9b913..a265e0ebfb 100644
--- a/src/components/viewmodels/MemberTileViewModel.tsx
+++ b/src/components/viewmodels/MemberTileViewModel.tsx
@@ -17,9 +17,7 @@ limitations under the License.
 
 import { useEffect, useMemo, useState } from "react";
 import { RoomStateEvent, MatrixEvent, EventType } from "matrix-js-sdk/src/matrix";
-import { DeviceInfo } from "matrix-js-sdk/src/crypto/deviceinfo";
-import { CryptoEvent } from "matrix-js-sdk/src/crypto";
-import { UserVerificationStatus } from "matrix-js-sdk/src/crypto-api";
+import { UserVerificationStatus, CryptoEvent } from "matrix-js-sdk/src/crypto-api";
 
 import dis from "../../dispatcher/dispatcher";
 import { MatrixClientPeg } from "../../MatrixClientPeg";
@@ -123,17 +121,11 @@ export function useMemberTileViewModel(props: MemberTileViewModelProps): MemberT
             updateE2EStatus();
         };
 
-        const onDeviceVerificationChanged = (userId: string, deviceId: string, deviceInfo: DeviceInfo): void => {
-            if (userId !== props.member.userId) return;
-            updateE2EStatus();
-        };
-
         const { roomId } = props.member;
         if (roomId) {
             const isRoomEncrypted = cli.isRoomEncrypted(roomId);
             if (isRoomEncrypted) {
                 cli.on(CryptoEvent.UserTrustStatusChanged, onUserTrustStatusChanged);
-                cli.on(CryptoEvent.DeviceVerificationChanged, onDeviceVerificationChanged);
                 updateE2EStatus();
             } else {
                 // Listen for room to become encrypted
@@ -145,7 +137,6 @@ export function useMemberTileViewModel(props: MemberTileViewModelProps): MemberT
             if (cli) {
                 cli.removeListener(RoomStateEvent.Events, onRoomStateEvents);
                 cli.removeListener(CryptoEvent.UserTrustStatusChanged, onUserTrustStatusChanged);
-                cli.removeListener(CryptoEvent.DeviceVerificationChanged, onDeviceVerificationChanged);
             }
         };
     }, [props.member]);