From 878ae6304f03a876d40a490694d03452c9791c4b Mon Sep 17 00:00:00 2001 From: kanchan-gangwar Date: Sat, 16 Aug 2025 18:22:26 +0530 Subject: [PATCH 1/3] Fixed loading issue of user verification in member info panel --- .../user_info/UserInfoHeaderVerificationViewModel.tsx | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/components/viewmodels/right_panel/user_info/UserInfoHeaderVerificationViewModel.tsx b/src/components/viewmodels/right_panel/user_info/UserInfoHeaderVerificationViewModel.tsx index 401c5365256..588faa3c938 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 */ @@ -70,10 +74,7 @@ export const useUserInfoVerificationViewModel = ( const canVerify = hasUserVerificationStatus && homeserverSupportsCrossSigning && - !isUserVerified && - !isMe && - devices && - devices.length > 0; + !isUserVerified; const hasCrossSigningKeys = useHasCrossSigningKeys(cli, member as User, canVerify); const verifySelectedUser = (): Promise => verifyUser(cli, member as User); @@ -82,6 +83,7 @@ export const useUserInfoVerificationViewModel = ( canVerify, hasCrossSigningKeys, isUserVerified, + isMe, verifySelectedUser, }; }; From c3f0962f4d48404d3b1e2db8dd1d4ed3f00fb8f8 Mon Sep 17 00:00:00 2001 From: kanchan-gangwar Date: Sat, 16 Aug 2025 18:24:56 +0530 Subject: [PATCH 2/3] Fixed loading issue of user verification in member info panel --- .../right_panel/user_info/UserInfoHeaderVerificationView.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 = (