Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ export interface UserInfoVerificationSectionState {
* used to display correct badge value
*/
isUserVerified: boolean;
/**
* used to determine if the user is self
*/
isMe: boolean;
/**
* callback function when verifyUser button is clicked
*/
Expand Down Expand Up @@ -67,13 +71,7 @@ export const useUserInfoVerificationViewModel = (
const hasUserVerificationStatus = Boolean(userTrust);
const isUserVerified = Boolean(userTrust?.isVerified());
const isMe = member.userId === cli.getUserId();
const canVerify =
hasUserVerificationStatus &&
homeserverSupportsCrossSigning &&
!isUserVerified &&
!isMe &&
devices &&
devices.length > 0;
const canVerify = hasUserVerificationStatus && homeserverSupportsCrossSigning && !isUserVerified;

const hasCrossSigningKeys = useHasCrossSigningKeys(cli, member as User, canVerify);
const verifySelectedUser = (): Promise<void> => verifyUser(cli, member as User);
Expand All @@ -82,6 +80,7 @@ export const useUserInfoVerificationViewModel = (
canVerify,
hasCrossSigningKeys,
isUserVerified,
isMe,
verifySelectedUser,
};
};
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export const UserInfoHeaderVerificationView: React.FC<{
} else if (vm.hasCrossSigningKeys === undefined) {
// We are still fetching the cross-signing keys for the user, show spinner.
content = <InlineSpinner size={24} />;
} else if (vm.canVerify && vm.hasCrossSigningKeys) {
} else if (vm.canVerify && vm.hasCrossSigningKeys && !vm.isMe) {
content = (
<div className="mx_UserInfo_container_verifyButton">
<Button
Expand Down
2 changes: 1 addition & 1 deletion src/customisations/README.md