cleanup

wireapp · Nov 15, 2023 · 41547ec · 41547ec
1 parent 610d056
commit 41547ec
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 22 deletions.
diff --git a/src/script/components/UserDevices.tsx b/src/script/components/UserDevices.tsx
@@ -148,7 +148,7 @@ const UserDevices: React.FC<UserDevicesProps> = ({
 
       {showDeviceList && deviceMode === FIND_MODE.NOT_FOUND && <NoDevicesFound {...{noPadding, user}} />}
 
-      {current.state === UserDevicesState.DEVICE_DETAILS && (
+      {current.state === UserDevicesState.DEVICE_DETAILS && selectedClient && (
         <DeviceDetails
           {...{
             renderDeviceBadges: renderBadges,
@@ -158,7 +158,7 @@ const UserDevices: React.FC<UserDevicesProps> = ({
             logger,
             messageRepository,
             noPadding,
-            selectedClient,
+            device: selectedClient,
             user,
           }}
         />

diff --git a/src/script/components/userDevices/DeviceDetails.tsx b/src/script/components/userDevices/DeviceDetails.tsx
@@ -32,15 +32,13 @@ import type {Logger} from 'Util/Logger';
 import {splitFingerprint} from 'Util/StringUtil';
 
 import type {ClientRepository, ClientEntity} from '../../client';
-import {MLSPublicKeys} from '../../client';
 import {Config} from '../../Config';
 import {ConversationState} from '../../conversation/ConversationState';
 import type {MessageRepository} from '../../conversation/MessageRepository';
 import type {CryptographyRepository} from '../../cryptography/CryptographyRepository';
 import type {User} from '../../entity/User';
 import {MotionDuration} from '../../motion/MotionDuration';
 import {FormattedId} from '../../page/MainContent/panels/preferences/DevicesPreferences/components/FormattedId';
-import {MLSDeviceDetails} from '../../page/MainContent/panels/preferences/DevicesPreferences/components/MLSDeviceDetails';
 
 interface DeviceDetailsProps {
   clickToShowSelfFingerprint: () => void;
@@ -50,12 +48,12 @@ interface DeviceDetailsProps {
   logger: Logger;
   messageRepository: MessageRepository;
   noPadding: boolean;
-  selectedClient?: ClientEntity;
+  device: ClientEntity;
   user: User;
 }
 
 export const DeviceDetails = ({
-  selectedClient,
+  device,
   cryptographyRepository,
   user,
   clickToShowSelfFingerprint,
@@ -68,24 +66,24 @@ export const DeviceDetails = ({
   const [fingerprintRemote, setFingerprintRemote] = useState<string>();
   const [isResettingSession, setIsResettingSession] = useState(false);
 
-  const clientMeta = useMemo(() => selectedClient?.meta, [selectedClient]);
+  const clientMeta = useMemo(() => device?.meta, [device]);
 
   const {isVerified} = useKoSubscribableChildren(clientMeta, ['isVerified']);
   const {name: userName} = useKoSubscribableChildren(user, ['name']);
 
   useEffect(() => {
     setFingerprintRemote(undefined);
-    if (selectedClient) {
+    if (device) {
       void cryptographyRepository
-        .getRemoteFingerprint(user.qualifiedId, selectedClient.id)
+        .getRemoteFingerprint(user.qualifiedId, device.id)
         .then(remoteFingerprint => setFingerprintRemote(remoteFingerprint));
     }
-  }, [selectedClient]);
+  }, [device]);
 
   const clickToToggleDeviceVerification = () => {
     const toggleVerified = !isVerified;
     clientRepository
-      .verifyClient(user.qualifiedId, selectedClient, toggleVerified)
+      .verifyClient(user.qualifiedId, device, toggleVerified)
       .catch((error: DexieError) => logger.warn(`Failed to toggle client verification: ${error.message}`));
   };
 
@@ -97,19 +95,20 @@ export const DeviceDetails = ({
     setIsResettingSession(true);
     if (conversation) {
       messageRepository
-        .resetSession(user.qualifiedId, selectedClient.id, conversation)
+        .resetSession(user.qualifiedId, device.id, conversation)
         .then(_resetProgress)
         .catch(_resetProgress);
     }
   };
 
   const activeConversation = conversationState.activeConversation();
   const isConversationMLS = activeConversation && isMLSConversation(activeConversation);
-  const mlsFingerprint = selectedClient.mlsPublicKeys?.[MLSPublicKeys.ED25519];
 
   return (
     <div className={cx('participant-devices__header', {'participant-devices__header--padding': !noPadding})}>
-      {mlsFingerprint && <MLSDeviceDetails fingerprint={mlsFingerprint} />}
+      {/*
+      TODO get the fingerprint from CoreCrypto (?)
+      mlsFingerprint && <MLSDeviceDetails fingerprint={mlsFingerprint} />*/}
 
       <div className="device-proteus-details">
         <h3 className="device-details-title paragraph-body-3">{t('participantDevicesProteusDeviceVerification')}</h3>

diff --git a/...ript/page/MainContent/panels/preferences/DevicesPreferences/components/DetailedDevice.tsx b/...ript/page/MainContent/panels/preferences/DevicesPreferences/components/DetailedDevice.tsx
@@ -17,7 +17,7 @@
  *
  */
 
-import React, {useEffect, useState} from 'react';
+import React from 'react';
 
 import {ClientEntity, MLSPublicKeys} from 'src/script/client/ClientEntity';
 
@@ -43,11 +43,7 @@ export const DetailedDevice: React.FC<DeviceProps> = ({
   getCertificate,
   isProteusVerified = false,
 }) => {
-  const [certificate, setCertificate] = useState<string | undefined>();
   const mlsFingerprint = device.mlsPublicKeys?.[MLSPublicKeys.ED25519];
-  useEffect(() => {
-    getCertificate?.(device.id).then(setCertificate);
-  }, []);
 
   return (
     <>
@@ -57,7 +53,11 @@ export const DetailedDevice: React.FC<DeviceProps> = ({
       </h3>
 
       {mlsFingerprint && (
-        <MLSDeviceDetails fingerprint={mlsFingerprint} isCurrentDevice={isCurrentDevice} certificate={certificate} />
+        <MLSDeviceDetails
+          fingerprint={mlsFingerprint}
+          isCurrentDevice={isCurrentDevice}
+          getCertificate={() => getCertificate(device.id)}
+        />
       )}
 
       {/* Proteus */}

diff --git a/.../DevicesPreferences/components/DeviceDetailsPreferences/DeviceDetailsPreferences.test.tsx b/.../DevicesPreferences/components/DeviceDetailsPreferences/DeviceDetailsPreferences.test.tsx
@@ -32,6 +32,7 @@ describe('DeviceDetailsPreferences', () => {
   const defaultParams = {
     device,
     getFingerprint: jest.fn().mockResolvedValue('00000000'),
+    getCertificate: jest.fn().mockResolvedValue('00000000'),
     onClose: jest.fn(),
     onRemove: jest.fn(),
     onResetSession: jest.fn().mockResolvedValue(undefined),

diff --git a/...nt/panels/preferences/DevicesPreferences/components/MLSDeviceDetails/MLSDeviceDetails.tsx b/...nt/panels/preferences/DevicesPreferences/components/MLSDeviceDetails/MLSDeviceDetails.tsx
@@ -17,6 +17,8 @@
  *
  */
 
+import {useEffect, useState} from 'react';
+
 import {Config} from 'src/script/Config';
 import {t} from 'Util/LocalizerUtil';
 import {splitFingerprint} from 'Util/StringUtil';
@@ -31,11 +33,15 @@ import {FormattedId} from '../FormattedId';
 interface MLSDeviceDetailsProps {
   fingerprint: string;
   isCurrentDevice?: boolean;
-  certificate?: string;
+  getCertificate: () => Promise<string | undefined>;
 }
 
-export const MLSDeviceDetails = ({fingerprint, isCurrentDevice, certificate}: MLSDeviceDetailsProps) => {
+export const MLSDeviceDetails = ({fingerprint, isCurrentDevice, getCertificate}: MLSDeviceDetailsProps) => {
+  const [certificate, setCertificate] = useState<string | undefined>();
   const isE2EIEnabled = supportsMLS() && Config.getConfig().FEATURE.ENABLE_E2EI;
+  useEffect(() => {
+    getCertificate?.().then(setCertificate);
+  }, []);
 
   return (
     <div css={styles.wrapper}>