nikrozman/element-web
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge identical enums (#28889)

Browse Source
This commit is contained in:
R Midhun Suresh
2025-01-13 22:17:52 +05:30
committed by GitHub
parent 0f8a2e93ce
commit 671d6de805
5 changed files with 28 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/viewmodels/memberlist/tiles/MemberTileViewModel.tsx
View File

@@ -15,9 +15,9 @@ import { Action } from "../../../../dispatcher/actions";
import { asyncSome } from "../../../../utils/arrays";
import { getUserDeviceIds } from "../../../../utils/crypto/deviceInfo";
import { RoomMember } from "../../../../models/rooms/RoomMember";
import { E2EState } from "../../../views/rooms/E2EIcon";
import { _t, _td, TranslationKey } from "../../../../languageHandler";
import UserIdentifierCustomisations from "../../../../customisations/UserIdentifier";
import { E2EStatus } from "../../../../utils/ShieldUtils";
interface MemberTileViewModelProps {
member: RoomMember;
@@ -25,7 +25,7 @@ interface MemberTileViewModelProps {
}
export interface MemberTileViewState extends MemberTileViewModelProps {
e2eStatus?: E2EState;
e2eStatus?: E2EStatus;
name: string;
onClick: () => void;
title?: string;
@@ -43,7 +43,7 @@ const PowerLabel: Record<PowerStatus, TranslationKey> = {
};
export function useMemberTileViewModel(props: MemberTileViewModelProps): MemberTileViewState {
const [e2eStatus, setE2eStatus] = useState<E2EState | undefined>();
const [e2eStatus, setE2eStatus] = useState<E2EStatus | undefined>();
useEffect(() => {
const cli = MatrixClientPeg.safeGet();
@@ -53,7 +53,7 @@ export function useMemberTileViewModel(props: MemberTileViewModelProps): MemberT
const isMe = userId === cli.getUserId();
const userTrust = await cli.getCrypto()?.getUserVerificationStatus(userId);
if (!userTrust?.isCrossSigningVerified()) {
setE2eStatus(userTrust?.wasCrossSigningVerified() ? E2EState.Warning : E2EState.Normal);
setE2eStatus(userTrust?.wasCrossSigningVerified() ? E2EStatus.Warning : E2EStatus.Normal);
return;
}
@@ -67,7 +67,7 @@ export function useMemberTileViewModel(props: MemberTileViewModelProps): MemberT
const deviceTrust = await cli.getCrypto()?.getDeviceVerificationStatus(userId, deviceId);
return !deviceTrust || (isMe ? !deviceTrust.crossSigningVerified : !deviceTrust.isVerified());
});
setE2eStatus(anyDeviceUnverified ? E2EState.Warning : E2EState.Verified);
setE2eStatus(anyDeviceUnverified ? E2EStatus.Warning : E2EStatus.Verified);
};
const onRoomStateEvents = (ev: MatrixEvent): void => {