diff --git a/src/components/viewmodels/right_panel/user_info/UserInfoHeaderVerificationViewModel.tsx b/src/components/viewmodels/right_panel/user_info/UserInfoHeaderVerificationViewModel.tsx index 401c5365256..3f30064ae82 100644 --- a/src/components/viewmodels/right_panel/user_info/UserInfoHeaderVerificationViewModel.tsx +++ b/src/components/viewmodels/right_panel/user_info/UserInfoHeaderVerificationViewModel.tsx @@ -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 */ @@ -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 => verifyUser(cli, member as User); @@ -82,6 +80,7 @@ export const useUserInfoVerificationViewModel = ( canVerify, hasCrossSigningKeys, isUserVerified, + isMe, verifySelectedUser, }; }; diff --git a/src/components/views/right_panel/user_info/UserInfoHeaderVerificationView.tsx b/src/components/views/right_panel/user_info/UserInfoHeaderVerificationView.tsx index 9d42f618dda..877b64bf8e3 100644 --- a/src/components/views/right_panel/user_info/UserInfoHeaderVerificationView.tsx +++ b/src/components/views/right_panel/user_info/UserInfoHeaderVerificationView.tsx @@ -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 = ; - } else if (vm.canVerify && vm.hasCrossSigningKeys) { + } else if (vm.canVerify && vm.hasCrossSigningKeys && !vm.isMe) { content = (