Merge branch 'develop' into feat/ddw-1163-better-cpu-formatting-in-analytics

Author: danielmain

CHANGELOG.md

@@ -5,9 +5,11 @@
 ### Features
 
 - Implemented CPU name grouping mechanism for analytics ([PR 3089](https://github.com/input-output-hk/daedalus/pull/3089))
+- Implemented rounding RAM size in analytics ([PR 3088](https://github.com/input-output-hk/daedalus/pull/3088))
 
 ### Chores
 
+- Updated new Catalyst API URL ([PR 3087](https://github.com/input-output-hk/daedalus/pull/3087))
 - Fixed Storybook state for General stories ([PR 3064](https://github.com/input-output-hk/daedalus/pull/3064))
 
 ## 5.1.1

source/renderer/app/analytics/MatomoClient.ts

@@ -35,7 +35,8 @@ export class MatomoClient implements AnalyticsClient {
       [CPU_DIMENSION_KEY]: getShortCpuDescription(
         this.environment.cpu[0]?.model
       ),
-      [RAM_DIMENSION_KEY]: formattedBytesToSize(this.environment.ram),
+      [RAM_DIMENSION_KEY]: formattedBytesToSize(this.environment.ram, 0),
+      [OS_DIMENSION_KEY]: this.environment.os,
       [VERSION_DIMENSION_KEY]: this.environment.version,
     });
   };

source/renderer/app/config/urlsConfig.ts

@@ -11,7 +11,7 @@ export const DEVELOPMENT_NEWS_HASH_URL = 'newsfeed.daedaluswallet.io';
 export const MAINNET_NEWS_HASH_URL = 'newsfeed.daedaluswallet.io';
 export const TESTNET_NEWS_HASH_URL = 'newsfeed.daedaluswallet.io';
 export const STAGING_NEWS_HASH_URL = 'newsfeed.daedaluswallet.io';
-export const MAINNET_SERVICING_STATION_URL = 'servicing-station.vit.iohk.io';
+export const MAINNET_SERVICING_STATION_URL = 'servicing-station.gov.iog.io';
 export const ALLOWED_EXTERNAL_HOSTNAMES = [
   MAINNET_EXPLORER_URL,
   STAGING_EXPLORER_URL,

source/renderer/app/utils/formatters.ts

@@ -185,7 +185,10 @@ export const formattedLovelaceToAmount = (lovelace: number): number =>
   formattedAmountToBigNumber(String(lovelace))
     .dividedBy(LOVELACES_PER_ADA)
     .toNumber();
-export const formattedBytesToSize = (bytes: number): string => {
+export const formattedBytesToSize = (
+  bytes: number,
+  decimalPlaces = 1
+): string => {
   const sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB'];
   if (bytes === 0) return 'n/a';
   const i = parseInt(
@@ -194,7 +197,7 @@ export const formattedBytesToSize = (bytes: number): string => {
     10
   );
   if (i === 0) return `${bytes} ${sizes[i]})`;
-  return `${formattedNumber(bytes / 1024 ** i, 1)} ${sizes[i]}`;
+  return `${formattedNumber(bytes / 1024 ** i, decimalPlaces)} ${sizes[i]}`;
 };
 export type FormattedDownloadData = {
   timeLeft: string;