Merge pull request #2112 from ChildMindInstitute/develop

Release 2025.07.2

Author: aweiland

src/modules/Dashboard/hooks/useDecryptedActivityData.ts

@@ -1,12 +1,11 @@
 import { useParams } from 'react-router-dom';
 
-import { applet } from 'shared/state/Applet';
-import { Encryption, getParsedEncryptionFromServer, SessionStorageKeys } from 'shared/utils';
+import { ItemResponseType } from 'shared/consts';
 import { useEncryptionStorage } from 'shared/hooks';
+import { applet } from 'shared/state/Applet';
 import { DecryptedActivityData, EncryptedAnswerSharedProps } from 'shared/types';
-import { ItemResponseType } from 'shared/consts';
+import { checkIfShouldLogging, Encryption, getParsedEncryptionFromServer } from 'shared/utils';
 import { getDecryptedAnswers } from 'shared/utils/exportData/getDecryptedAnswers';
-import { isProduction } from 'shared/utils/env';
 
 export const getEmptyDecryptedActivityData = () => ({
   decryptedAnswers: [],
@@ -22,8 +21,7 @@ export const useDecryptedActivityData = (
   const encryption = appletData?.encryption;
   const encryptionInfoFromServer = getParsedEncryptionFromServer(dynamicEncryption ?? encryption);
   const { getAppletPrivateKey } = useEncryptionStorage();
-  const shouldLogDataInDebugMode =
-    !isProduction && sessionStorage.getItem(SessionStorageKeys.DebugMode) === 'true';
+  const shouldLogDataInDebugMode = checkIfShouldLogging();
 
   if (!encryptionInfoFromServer) return getEmptyDecryptedActivityData;
 

src/shared/features/AppletSettings/ExportDataSetting/Popups/DataExportPopup/DataExportPopup.hooks.tsx

@@ -1,12 +1,11 @@
 import { useEffect, useRef, useState } from 'react';
 
-import { getParsedEncryptionFromServer } from 'shared/utils/encryption';
-import { ExportDataResult } from 'shared/types/answer';
-import { isProduction } from 'shared/utils/env';
-import { SessionStorageKeys } from 'shared/utils/storage';
-import { useFeatureFlags } from 'shared/hooks';
 import { MultipleDecryptWorkersProps } from 'shared/features/AppletSettings/ExportDataSetting/Popups/DataExportPopup/DataExportPopup.types';
 import { DataExportWorkersManager as DataExportWorkersManagerClass } from 'shared/features/AppletSettings/ExportDataSetting/Popups/DataExportPopup/DataExportWorkersManager';
+import { useFeatureFlags } from 'shared/hooks';
+import { ExportDataResult } from 'shared/types/answer';
+import { checkIfShouldLogging } from 'shared/utils';
+import { getParsedEncryptionFromServer } from 'shared/utils/encryption';
 
 export const useMultipleDecryptWorkers = ({
   handleExportPopupClose,
@@ -23,8 +22,7 @@ export const useMultipleDecryptWorkers = ({
   const encryptionInfoFromServer = getParsedEncryptionFromServer(encryption);
   const { featureFlags } = useFeatureFlags();
 
-  const shouldLogDataInDebugMode =
-    !isProduction && sessionStorage.getItem(SessionStorageKeys.DebugMode) === 'true';
+  const shouldLogDataInDebugMode = checkIfShouldLogging();
 
   const DataExportWorkerManager = useRef(
     new DataExportWorkersManagerClass(