Remove unused code

Author: MidhunSureshR

res/css/views/right_panel/_UserInfo.pcss

@@ -244,45 +244,6 @@ Please see LICENSE files in the repository root for full details.
         flex: 1 1 0;
     }
 
-    .mx_UserInfo_devices {
-        .mx_UserInfo_device {
-            display: flex;
-            margin: $spacing-8 0;
-
-            &.mx_UserInfo_device_verified {
-                .mx_UserInfo_device_trusted {
-                    color: $accent;
-                }
-            }
-            &.mx_UserInfo_device_unverified {
-                .mx_UserInfo_device_trusted {
-                    color: $alert;
-                }
-            }
-
-            .mx_UserInfo_device_name {
-                flex: 1;
-                margin: 0 5px;
-                word-break: break-word;
-            }
-        }
-
-        /* both for icon in expand button and device item */
-        .mx_E2EIcon {
-            /* don't squeeze */
-            flex: 0 0 auto;
-            margin: 0;
-            width: 12px;
-            height: 12px;
-        }
-
-        .mx_UserInfo_expand {
-            column-gap: 5px; /* cf: mx_UserInfo_device_name */
-            margin-bottom: 11px;
-            align-items: initial; /* Cancel the default property */
-        }
-    }
-
     &.mx_UserInfo_smallAvatar {
         .mx_UserInfo_avatar {
             .mx_UserInfo_avatar_transition {

src/components/views/right_panel/UserInfo.tsx

@@ -43,7 +43,7 @@ import dis from "../../../dispatcher/dispatcher";
 import Modal from "../../../Modal";
 import { _t, UserFriendlyError } from "../../../languageHandler";
 import DMRoomMap from "../../../utils/DMRoomMap";
-import AccessibleButton, { type ButtonEvent } from "../elements/AccessibleButton";
+import { type ButtonEvent } from "../elements/AccessibleButton";
 import SdkConfig from "../../../SdkConfig";
 import MultiInviter from "../../../utils/MultiInviter";
 import { useTypedEventEmitter } from "../../../hooks/useEventEmitter";
@@ -52,7 +52,7 @@ import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import { RightPanelPhases } from "../../../stores/right-panel/RightPanelStorePhases";
 import EncryptionPanel from "./EncryptionPanel";
 import { useAsyncMemo } from "../../../hooks/useAsyncMemo";
-import { verifyDevice, verifyUser } from "../../../verification";
+import { verifyUser } from "../../../verification";
 import { Action } from "../../../dispatcher/actions";
 import { useIsEncrypted } from "../../../hooks/useIsEncrypted";
 import BaseCard from "./BaseCard";
@@ -118,92 +118,6 @@ async function openDmForUser(matrixClient: MatrixClient, user: Member): Promise<
     await startDmOnFirstMessage(matrixClient, [startDmUser]);
 }
 
-/**
- * Display one device and the related actions
- * @param userId current user id
- * @param device device to display
- * @param isUserVerified false when the user is not verified
- * @constructor
- */
-export function DeviceItem({
-    userId,
-    device,
-    isUserVerified,
-}: {
-    userId: string;
-    device: IDevice;
-    isUserVerified: boolean;
-}): JSX.Element {
-    const cli = useContext(MatrixClientContext);
-    const isMe = userId === cli.getUserId();
-
-    /** is the device verified? */
-    const isVerified = useAsyncMemo(async () => {
-        const deviceTrust = await cli.getCrypto()?.getDeviceVerificationStatus(userId, device.deviceId);
-        if (!deviceTrust) return false;
-
-        // For your own devices, we use the stricter check of cross-signing
-        // verification to encourage everyone to trust their own devices via
-        // cross-signing so that other users can then safely trust you.
-        // For other people's devices, the more general verified check that
-        // includes locally verified devices can be used.
-        return isMe ? deviceTrust.crossSigningVerified : deviceTrust.isVerified();
-    }, [cli, userId, device]);
-
-    const classes = classNames("mx_UserInfo_device", {
-        mx_UserInfo_device_verified: isVerified,
-        mx_UserInfo_device_unverified: !isVerified,
-    });
-    const iconClasses = classNames("mx_E2EIcon", {
-        mx_E2EIcon_normal: !isUserVerified,
-        mx_E2EIcon_verified: isVerified,
-        mx_E2EIcon_warning: isUserVerified && !isVerified,
-    });
-
-    const onDeviceClick = (): void => {
-        const user = cli.getUser(userId);
-        if (user) {
-            verifyDevice(cli, user, device);
-        }
-    };
-
-    let deviceName;
-    if (!device.displayName?.trim()) {
-        deviceName = device.deviceId;
-    } else {
-        deviceName = device.ambiguous ? device.displayName + " (" + device.deviceId + ")" : device.displayName;
-    }
-
-    let trustedLabel: string | undefined;
-    if (isUserVerified) trustedLabel = isVerified ? _t("common|trusted") : _t("common|not_trusted");
-
-    if (isVerified === undefined) {
-        // we're still deciding if the device is verified
-        return <div className={classes} title={device.deviceId} />;
-    } else if (isVerified) {
-        return (
-            <div className={classes} title={device.deviceId}>
-                <div className={iconClasses} />
-                <div className="mx_UserInfo_device_name">{deviceName}</div>
-                <div className="mx_UserInfo_device_trusted">{trustedLabel}</div>
-            </div>
-        );
-    } else {
-        return (
-            <AccessibleButton
-                className={classes}
-                title={device.deviceId}
-                aria-label={deviceName}
-                onClick={onDeviceClick}
-            >
-                <div className={iconClasses} />
-                <div className="mx_UserInfo_device_name">{deviceName}</div>
-                <div className="mx_UserInfo_device_trusted">{trustedLabel}</div>
-            </AccessibleButton>
-        );
-    }
-}
-
 const MessageButton = ({ member }: { member: Member }): JSX.Element => {
     const cli = useContext(MatrixClientContext);
     const [busy, setBusy] = useState(false);

src/verification.ts

@@ -10,11 +10,8 @@ import { type User, type MatrixClient, type RoomMember } from "matrix-js-sdk/src
 import { CrossSigningKey, type VerificationRequest } from "matrix-js-sdk/src/crypto-api";
 
 import dis from "./dispatcher/dispatcher";
-import Modal from "./Modal";
 import { RightPanelPhases } from "./stores/right-panel/RightPanelStorePhases";
 import { accessSecretStorage } from "./SecurityManager";
-import UntrustedDeviceDialog from "./components/views/dialogs/UntrustedDeviceDialog";
-import { type IDevice } from "./components/views/right_panel/UserInfo";
 import RightPanelStore from "./stores/right-panel/RightPanelStore";
 import { type IRightPanelCardState } from "./stores/right-panel/RightPanelStoreIPanelState";
 import { findDMForUser } from "./utils/dm/findDMForUser";
@@ -31,32 +28,6 @@ async function enable4SIfNeeded(matrixClient: MatrixClient): Promise<boolean> {
     return true;
 }
 
-export async function verifyDevice(matrixClient: MatrixClient, user: User, device: IDevice): Promise<void> {
-    if (matrixClient.isGuest()) {
-        dis.dispatch({ action: "require_registration" });
-        return;
-    }
-    // if cross-signing is not explicitly disabled, check if it should be enabled first.
-    if (matrixClient.getCrypto()?.getTrustCrossSignedDevices()) {
-        if (!(await enable4SIfNeeded(matrixClient))) {
-            return;
-        }
-    }
-
-    Modal.createDialog(UntrustedDeviceDialog, {
-        user,
-        device,
-        onFinished: async (action): Promise<void> => {
-            if (action === "sas") {
-                const verificationRequestPromise = matrixClient
-                    .getCrypto()
-                    ?.requestDeviceVerification(user.userId, device.deviceId);
-                setRightPanel({ member: user, verificationRequestPromise });
-            }
-        },
-    });
-}
-
 export async function verifyUser(matrixClient: MatrixClient, user: User): Promise<void> {
     if (matrixClient.isGuest()) {
         dis.dispatch({ action: "require_registration" });

test/unit-tests/components/views/right_panel/UserInfo-test.tsx

@@ -28,12 +28,10 @@ import {
     VerificationPhase as Phase,
     VerificationRequestEvent,
     type CryptoApi,
-    type DeviceVerificationStatus,
 } from "matrix-js-sdk/src/crypto-api";
 
 import UserInfo, {
     BanToggleButton,
-    DeviceItem,
     disambiguateDevices,
     getPowerLevels,
     isMuted,
@@ -48,7 +46,6 @@ import { RightPanelPhases } from "../../../../../src/stores/right-panel/RightPan
 import { MatrixClientPeg } from "../../../../../src/MatrixClientPeg";
 import MatrixClientContext from "../../../../../src/contexts/MatrixClientContext";
 import MultiInviter from "../../../../../src/utils/MultiInviter";
-import * as mockVerification from "../../../../../src/verification";
 import Modal from "../../../../../src/Modal";
 import { DirectoryMember, startDmOnFirstMessage } from "../../../../../src/utils/direct-messages";
 import { clearAllModals, flushPromises } from "../../../../test-utils";
@@ -532,153 +529,6 @@ describe("<UserInfoHeader />", () => {
     });
 });
 
-describe("<DeviceItem />", () => {
-    const device = { deviceId: "deviceId", displayName: "deviceName" } as Device;
-    const defaultProps = {
-        userId: defaultUserId,
-        device,
-        isUserVerified: false,
-    };
-
-    const renderComponent = (props = {}) => {
-        const Wrapper = (wrapperProps = {}) => {
-            return <MatrixClientContext.Provider value={mockClient} {...wrapperProps} />;
-        };
-
-        return render(<DeviceItem {...defaultProps} {...props} />, {
-            wrapper: Wrapper,
-        });
-    };
-
-    const setMockDeviceTrust = (isVerified = false, isCrossSigningVerified = false) => {
-        mockCrypto.getDeviceVerificationStatus.mockResolvedValue({
-            isVerified: () => isVerified,
-            crossSigningVerified: isCrossSigningVerified,
-        } as DeviceVerificationStatus);
-    };
-
-    const mockVerifyDevice = jest.spyOn(mockVerification, "verifyDevice");
-
-    beforeEach(() => {
-        setMockDeviceTrust();
-    });
-
-    afterEach(() => {
-        mockCrypto.getDeviceVerificationStatus.mockReset();
-        mockVerifyDevice.mockClear();
-    });
-
-    afterAll(() => {
-        mockVerifyDevice.mockRestore();
-    });
-
-    it("with unverified user and device, displays button without a label", async () => {
-        renderComponent();
-        await flushPromises();
-
-        expect(screen.getByRole("button", { name: device.displayName! })).toBeInTheDocument();
-        expect(screen.queryByText(/trusted/i)).not.toBeInTheDocument();
-    });
-
-    it("with verified user only, displays button with a 'Not trusted' label", async () => {
-        renderComponent({ isUserVerified: true });
-        await flushPromises();
-
-        const button = screen.getByRole("button", { name: device.displayName });
-        expect(button).toHaveTextContent(`${device.displayName}Not trusted`);
-    });
-
-    it("with verified device only, displays no button without a label", async () => {
-        setMockDeviceTrust(true);
-        renderComponent();
-        await flushPromises();
-
-        expect(screen.getByText(device.displayName!)).toBeInTheDocument();
-        expect(screen.queryByText(/trusted/)).not.toBeInTheDocument();
-    });
-
-    it("when userId is the same as userId from client, uses isCrossSigningVerified to determine if button is shown", async () => {
-        const deferred = defer<DeviceVerificationStatus>();
-        mockCrypto.getDeviceVerificationStatus.mockReturnValue(deferred.promise);
-
-        mockClient.getSafeUserId.mockReturnValueOnce(defaultUserId);
-        mockClient.getUserId.mockReturnValueOnce(defaultUserId);
-        renderComponent();
-        await flushPromises();
-
-        // set trust to be false for isVerified, true for isCrossSigningVerified
-        deferred.resolve({
-            isVerified: () => false,
-            crossSigningVerified: true,
-        } as DeviceVerificationStatus);
-
-        await expect(screen.findByText(device.displayName!)).resolves.toBeInTheDocument();
-        // expect to see no button in this case
-        expect(screen.queryByRole("button")).not.toBeInTheDocument();
-    });
-
-    it("with verified user and device, displays no button and a 'Trusted' label", async () => {
-        setMockDeviceTrust(true);
-        renderComponent({ isUserVerified: true });
-        await flushPromises();
-
-        expect(screen.queryByRole("button")).not.toBeInTheDocument();
-        expect(screen.getByText(device.displayName!)).toBeInTheDocument();
-        expect(screen.getByText("Trusted")).toBeInTheDocument();
-    });
-
-    it("does not call verifyDevice if client.getUser returns null", async () => {
-        mockClient.getUser.mockReturnValueOnce(null);
-        renderComponent();
-        await flushPromises();
-
-        const button = screen.getByRole("button", { name: device.displayName! });
-        expect(button).toBeInTheDocument();
-        await userEvent.click(button);
-
-        expect(mockVerifyDevice).not.toHaveBeenCalled();
-    });
-
-    it("calls verifyDevice if client.getUser returns an object", async () => {
-        mockClient.getUser.mockReturnValueOnce(defaultUser);
-        // set mock return of isGuest to short circuit verifyDevice call to avoid
-        // even more mocking
-        mockClient.isGuest.mockReturnValueOnce(true);
-        renderComponent();
-        await flushPromises();
-
-        const button = screen.getByRole("button", { name: device.displayName! });
-        expect(button).toBeInTheDocument();
-        await userEvent.click(button);
-
-        expect(mockVerifyDevice).toHaveBeenCalledTimes(1);
-        expect(mockVerifyDevice).toHaveBeenCalledWith(mockClient, defaultUser, device);
-    });
-
-    it("with display name", async () => {
-        const { container } = renderComponent();
-        await flushPromises();
-
-        expect(container).toMatchSnapshot();
-    });
-
-    it("without display name", async () => {
-        const device = { deviceId: "deviceId" } as Device;
-        const { container } = renderComponent({ device, userId: defaultUserId });
-        await flushPromises();
-
-        expect(container).toMatchSnapshot();
-    });
-
-    it("ambiguous display name", async () => {
-        const device = { deviceId: "deviceId", ambiguous: true, displayName: "my display name" };
-        const { container } = renderComponent({ device, userId: defaultUserId });
-        await flushPromises();
-
-        expect(container).toMatchSnapshot();
-    });
-});
-
 describe("<UserOptionsSection />", () => {
     const member = new RoomMember(defaultRoomId, defaultUserId);
     const defaultProps = { member, canInvite: false, isSpace: false };