fix: display MLS device details when MLS is active (#18433)

* fix: display MLS device details when MLS is active * fix: dont display get a certificate button without E2EI enabled
wireapp · Dec 5, 2024 · ef47e2e · ef47e2e
1 parent 72f116c
commit ef47e2e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/src/script/hooks/useDeviceIdentities.ts b/src/script/hooks/useDeviceIdentities.ts
@@ -26,9 +26,12 @@ import {E2EIHandler, getUsersIdentities, MLSStatuses, WireIdentity} from '../E2E
 
 export const useUserIdentity = (userId: QualifiedId, groupId?: string, updateAfterEnrollment?: boolean) => {
   const [deviceIdentities, setDeviceIdentities] = useState<WireIdentity[] | undefined>();
+  const getDeviceIdentity = (deviceId: string) => {
+    return deviceIdentities?.find(identity => identity.deviceId === deviceId);
+  };
 
   const refreshDeviceIdentities = useCallback(async () => {
-    if (!E2EIHandler.getInstance().isE2EIEnabled() || !groupId) {
+    if (!groupId) {
       return;
     }
 
@@ -63,11 +66,6 @@ export const useUserIdentity = (userId: QualifiedId, groupId?: string, updateAft
         ? MLSStatuses.VALID
         : MLSStatuses.NOT_ACTIVATED,
 
-    getDeviceIdentity:
-      deviceIdentities !== undefined
-        ? (deviceId: string) => {
-            return deviceIdentities.find(identity => identity.deviceId === deviceId);
-          }
-        : undefined,
+    getDeviceIdentity,
   };
 };
diff --git a/...ript/page/MainContent/panels/preferences/DevicesPreferences/components/DetailedDevice.tsx b/...ript/page/MainContent/panels/preferences/DevicesPreferences/components/DetailedDevice.tsx
@@ -41,7 +41,7 @@ export const DetailedDevice: React.FC<DeviceProps> = ({
   getDeviceIdentity,
   isProteusVerified,
 }) => {
-  const getIdentity = getDeviceIdentity ? () => getDeviceIdentity(device.id) : undefined;
+  const getIdentity = () => getDeviceIdentity?.(device.id);
 
   return (
     <>

diff --git a/...nt/panels/preferences/DevicesPreferences/components/MLSDeviceDetails/MLSDeviceDetails.tsx b/...nt/panels/preferences/DevicesPreferences/components/MLSDeviceDetails/MLSDeviceDetails.tsx
@@ -17,7 +17,7 @@
  *
  */
 
-import {MLSStatuses, WireIdentity} from 'src/script/E2EIdentity';
+import {E2EIHandler, MLSStatuses, WireIdentity} from 'src/script/E2EIdentity';
 import {t} from 'Util/LocalizerUtil';
 import {splitFingerprint} from 'Util/StringUtil';
 
@@ -39,6 +39,7 @@ export const MLSDeviceDetails = ({isCurrentDevice, identity, isSelfUser = false}
   }
 
   const certificateState = identity?.status ?? MLSStatuses.NOT_ACTIVATED;
+  const isE2EIEnabled = E2EIHandler.getInstance().isE2EIEnabled();
 
   if (!isSelfUser && certificateState === MLSStatuses.NOT_ACTIVATED) {
     return null;
@@ -58,7 +59,7 @@ export const MLSDeviceDetails = ({isCurrentDevice, identity, isSelfUser = false}
         </>
       )}
 
-      {(isSelfUser || (!isSelfUser && certificateState !== MLSStatuses.NOT_ACTIVATED)) && (
+      {isE2EIEnabled && (isSelfUser || (!isSelfUser && certificateState !== MLSStatuses.NOT_ACTIVATED)) && (
         <E2EICertificateDetails identity={identity} isCurrentDevice={isCurrentDevice} />
       )}
     </div>