[DDW-737] Unify CPU info in diagnostics dialog (#2818)

Co-authored-by: Daniel Main <daniel.main.cernhoff@icloud.com>

Author: szymonmaslowski

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 ### Features
 
+- Unified CPU info in diagnostics dialog ([PR 2818](https://github.com/input-output-hk/daedalus/pull/2818))
 - Implemented wallet sorting on sidebar menu ([PR 2775](https://github.com/input-output-hk/daedalus/pull/2775))
 - Implemented new token picker ([PR 2787](https://github.com/input-output-hk/daedalus/pull/2787))
 

source/common/types/environment.types.js

@@ -23,7 +23,7 @@ export type Environment = {
   mainProcessID: string,
   rendererProcessID: string,
   os: string,
-  cpu: string,
+  cpu: Cpu,
   ram: number,
   installerVersion: string,
   version: string,
@@ -78,3 +78,13 @@ export const networkPrettyNames = {
   selfnode: 'Selfnode',
   development: 'Development',
 };
+
+export type CpuThreadData = {
+  model: string,
+  speed: number,
+  times: {
+    [string]: number,
+  },
+};
+
+export type Cpu = Array<CpuThreadData>;

source/renderer/app/components/status/DaedalusDiagnostics.js

@@ -17,11 +17,7 @@ import closeCrossThin from '../../assets/images/close-cross-thin.inline.svg';
 import iconCopy from '../../assets/images/clipboard-ic.inline.svg';
 import sandClockIcon from '../../assets/images/sand-clock-xs.inline.svg';
 import LocalizableError from '../../i18n/LocalizableError';
-import {
-  formattedNumber,
-  formattedCpuModel,
-  formattedSize,
-} from '../../utils/formatters';
+import { formattedNumber, formattedSize } from '../../utils/formatters';
 import { CardanoNodeStates } from '../../../../common/types/cardano-node.types';
 import styles from './DaedalusDiagnostics.scss';
 import type { CardanoNodeState } from '../../../../common/types/cardano-node.types';
@@ -483,12 +479,11 @@ export default class DaedalusDiagnostics extends Component<Props, State> {
     const {
       platform,
       platformVersion,
-      cpu: cpuInOriginalFormat,
+      cpu,
       ram,
       availableDiskSpace: availableDiskSpaceInOriginalFormat,
     } = systemInfo;
 
-    const cpu = formattedCpuModel(cpuInOriginalFormat);
     const availableDiskSpace = formattedSize(
       availableDiskSpaceInOriginalFormat
     );

source/renderer/app/containers/status/DaedalusDiagnosticsDialog.js

@@ -6,6 +6,7 @@ import DaedalusDiagnostics from '../../components/status/DaedalusDiagnostics';
 import styles from './DaedalusDiagnosticsDialog.scss';
 import { formattedBytesToSize } from '../../utils/formatters';
 import type { InjectedDialogContainerProps } from '../../types/injectedPropsType';
+import formatCpuInfo from '../../utils/formatCpuInfo';
 
 type Props = InjectedDialogContainerProps;
 
@@ -62,7 +63,7 @@ export default class DaedalusDiagnosticsDialog extends Component<Props> {
     const systemInfo = {
       platform: environment.os,
       platformVersion: environment.platformVersion,
-      cpu: Array.isArray(environment.cpu) ? environment.cpu[0].model : '',
+      cpu: formatCpuInfo(environment.cpu),
       ram: formattedBytesToSize(environment.ram),
       availableDiskSpace: diskSpaceAvailable,
     };